Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(router): add choice to use the appropriate key for jws verification #2917

Merged
merged 6 commits into from
Nov 17, 2023
Merged

fix(router): add choice to use the appropriate key for jws verification #2917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8fb0334
fix(router): add choice to use the appropriate key for jws verification
ShankarSinghC Nov 17, 2023
2fab973
formatting
ShankarSinghC Nov 17, 2023
081fc48
chore: run formatter
github-actions[bot] Nov 17, 2023
9c1bf2d
make the locker choice as option
ShankarSinghC Nov 17, 2023
c2e5ba7
Merge branch 'fix-rust-locker-mg-2' of https://github.com/juspay/hype…
ShankarSinghC Nov 17, 2023
d7ea88d
address failing checks
ShankarSinghC Nov 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 23 additions & 16 deletions crates/router/src/core/payment_methods/cards.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,10 +440,11 @@ pub async fn get_payment_method_from_hs_locker<'a>(
let jwe_body: services::JweBody = response
.get_response_inner("JweBody")
.change_context(errors::VaultError::FetchPaymentMethodFailed)?;
let decrypted_payload = payment_methods::get_decrypted_response_payload(jwekey, jwe_body)
.await
.change_context(errors::VaultError::FetchPaymentMethodFailed)
.attach_printable("Error getting decrypted response payload for get card")?;
let decrypted_payload =
payment_methods::get_decrypted_response_payload(jwekey, jwe_body, locker_choice)
.await
.change_context(errors::VaultError::FetchPaymentMethodFailed)
.attach_printable("Error getting decrypted response payload for get card")?;
let get_card_resp: payment_methods::RetrieveCardResp = decrypted_payload
.parse_struct("RetrieveCardResp")
.change_context(errors::VaultError::FetchPaymentMethodFailed)?;
Expand Down Expand Up @@ -490,10 +491,11 @@ pub async fn call_to_locker_hs<'a>(
.get_response_inner("JweBody")
.change_context(errors::VaultError::FetchCardFailed)?;

let decrypted_payload = payment_methods::get_decrypted_response_payload(jwekey, jwe_body)
.await
.change_context(errors::VaultError::SaveCardFailed)
.attach_printable("Error getting decrypted response payload")?;
let decrypted_payload =
payment_methods::get_decrypted_response_payload(jwekey, jwe_body, Some(locker_choice))
.await
.change_context(errors::VaultError::SaveCardFailed)
.attach_printable("Error getting decrypted response payload")?;
let stored_card_resp: payment_methods::StoreCardResp = decrypted_payload
.parse_struct("StoreCardResp")
.change_context(errors::VaultError::ResponseDeserializationFailed)?;
Expand Down Expand Up @@ -557,10 +559,11 @@ pub async fn get_card_from_hs_locker<'a>(
let jwe_body: services::JweBody = response
.get_response_inner("JweBody")
.change_context(errors::VaultError::FetchCardFailed)?;
let decrypted_payload = payment_methods::get_decrypted_response_payload(jwekey, jwe_body)
.await
.change_context(errors::VaultError::FetchCardFailed)
.attach_printable("Error getting decrypted response payload for get card")?;
let decrypted_payload =
payment_methods::get_decrypted_response_payload(jwekey, jwe_body, Some(locker_choice))
.await
.change_context(errors::VaultError::FetchCardFailed)
.attach_printable("Error getting decrypted response payload for get card")?;
let get_card_resp: payment_methods::RetrieveCardResp = decrypted_payload
.parse_struct("RetrieveCardResp")
.change_context(errors::VaultError::FetchCardFailed)?;
Expand Down Expand Up @@ -609,10 +612,14 @@ pub async fn delete_card_from_hs_locker<'a>(
.change_context(errors::ApiErrorResponse::InternalServerError)
.attach_printable("Failed while executing call_connector_api for delete card");
let jwe_body: services::JweBody = response.get_response_inner("JweBody")?;
let decrypted_payload = payment_methods::get_decrypted_response_payload(jwekey, jwe_body)
.await
.change_context(errors::ApiErrorResponse::InternalServerError)
.attach_printable("Error getting decrypted response payload for delete card")?;
let decrypted_payload = payment_methods::get_decrypted_response_payload(
jwekey,
jwe_body,
Some(api_enums::LockerChoice::Basilisk),
)
.await
.change_context(errors::ApiErrorResponse::InternalServerError)
.attach_printable("Error getting decrypted response payload for delete card")?;
let delete_card_resp: payment_methods::DeleteCardResp = decrypted_payload
.parse_struct("DeleteCardResp")
.change_context(errors::ApiErrorResponse::InternalServerError)?;
Expand Down
17 changes: 15 additions & 2 deletions crates/router/src/core/payment_methods/transformers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,14 +189,27 @@ pub async fn get_decrypted_response_payload(
#[cfg(not(feature = "kms"))] jwekey: &settings::Jwekey,
#[cfg(feature = "kms")] jwekey: &settings::ActiveKmsSecrets,
jwe_body: encryption::JweBody,
locker_choice: Option<api_enums::LockerChoice>,
) -> CustomResult<String, errors::VaultError> {
let target_locker = locker_choice.unwrap_or(api_enums::LockerChoice::Basilisk);

#[cfg(feature = "kms")]
let public_key = jwekey.jwekey.peek().vault_encryption_key.as_bytes();
let public_key = match target_locker {
api_enums::LockerChoice::Basilisk => jwekey.jwekey.peek().vault_encryption_key.as_bytes(),
api_enums::LockerChoice::Tartarus => {
jwekey.jwekey.peek().rust_locker_encryption_key.as_bytes()
}
};

#[cfg(feature = "kms")]
let private_key = jwekey.jwekey.peek().vault_private_key.as_bytes();

#[cfg(not(feature = "kms"))]
let public_key = jwekey.vault_encryption_key.as_bytes();
let public_key = match target_locker {
api_enums::LockerChoice::Basilisk => jwekey.vault_encryption_key.as_bytes(),
api_enums::LockerChoice::Tartarus => jwekey.rust_locker_encryption_key.as_bytes(),
};

#[cfg(not(feature = "kms"))]
let private_key = jwekey.vault_private_key.as_bytes();

Expand Down
Loading