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): populate profile_id in for the HeaderAuth of v1 #6936

Merged
merged 7 commits into from
Dec 26, 2024
Merged

fix(router): populate profile_id in for the HeaderAuth of v1 #6936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a294e0e
feat(router): populate profileid in for the HeaderAuth of v1
ShankarSinghC Dec 24, 2024
f22c910
chore: run formatter
hyperswitch-bot[bot] Dec 24, 2024
1767d9b
address pr comments
ShankarSinghC Dec 26, 2024
40d1f4f
Merge branch 'relay/fix-header-auth' of https://github.com/juspay/hyp…
ShankarSinghC Dec 26, 2024
ff57138
unmask prfile id in headers
ShankarSinghC Dec 26, 2024
f167a1c
Merge branch 'main' into relay/fix-header-auth
ShankarSinghC Dec 26, 2024
1fc28a9
include the unmask profile id headers in more configs
ShankarSinghC Dec 26, 2024
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
2 changes: 1 addition & 1 deletion config/deployments/integration_test.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ outgoing_enabled = true
connectors_with_webhook_source_verification_call = "paypal" # List of connectors which has additional source verification api-call

[unmasked_headers]
keys = "accept-language,user-agent"
keys = "accept-language,user-agent,x-profile-id"

[saved_payment_methods]
sdk_eligible_payment_methods = "card"
Expand Down
2 changes: 1 addition & 1 deletion config/deployments/production.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ outgoing_enabled = true
connectors_with_webhook_source_verification_call = "paypal" # List of connectors which has additional source verification api-call

[unmasked_headers]
keys = "accept-language,user-agent"
keys = "accept-language,user-agent,x-profile-id"

[saved_payment_methods]
sdk_eligible_payment_methods = "card"
Expand Down
2 changes: 1 addition & 1 deletion config/deployments/sandbox.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ outgoing_enabled = true
connectors_with_webhook_source_verification_call = "paypal" # List of connectors which has additional source verification api-call

[unmasked_headers]
keys = "accept-language,user-agent"
keys = "accept-language,user-agent,x-profile-id"

[saved_payment_methods]
sdk_eligible_payment_methods = "card"
Expand Down
2 changes: 1 addition & 1 deletion config/development.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,7 @@ enabled = true
file_storage_backend = "file_system"

[unmasked_headers]
keys = "accept-language,user-agent"
keys = "accept-language,user-agent,x-profile-id"

[opensearch]
host = "https://localhost:9200"
Expand Down
2 changes: 1 addition & 1 deletion config/docker_compose.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ source = "logs"
file_storage_backend = "file_system"

[unmasked_headers]
keys = "accept-language,user-agent"
keys = "accept-language,user-agent,x-profile-id"

[opensearch]
host = "https://opensearch:9200"
Expand Down
28 changes: 23 additions & 5 deletions crates/router/src/services/authentication.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,6 +666,13 @@ where
metrics::PARTIAL_AUTH_FAILURE.add(1, &[]);
};

let profile_id = HeaderMapStruct::new(request_headers)
.get_id_type_from_header_if_present::<id_type::ProfileId>(headers::X_PROFILE_ID)
.change_context(errors::ValidationError::IncorrectValueProvided {
field_name: "X-Profile-Id",
})
.change_context(errors::ApiErrorResponse::Unauthorized)?;

let payload = ExtractedPayload::from_headers(request_headers)
.and_then(|value| {
let (algo, secret) = state.get_detached_auth()?;
Expand All @@ -687,8 +694,13 @@ where
merchant_id: Some(merchant_id),
key_id: Some(key_id),
} => {
let auth =
construct_authentication_data(state, &merchant_id, request_headers).await?;
let auth = construct_authentication_data(
state,
&merchant_id,
request_headers,
profile_id,
)
.await?;
Ok((
auth.clone(),
AuthenticationType::ApiKey {
Expand All @@ -702,8 +714,13 @@ where
merchant_id: Some(merchant_id),
key_id: None,
} => {
let auth =
construct_authentication_data(state, &merchant_id, request_headers).await?;
let auth = construct_authentication_data(
state,
&merchant_id,
request_headers,
profile_id,
)
.await?;
Ok((
auth.clone(),
AuthenticationType::PublishableKey {
Expand Down Expand Up @@ -779,6 +796,7 @@ async fn construct_authentication_data<A>(
state: &A,
merchant_id: &id_type::MerchantId,
request_headers: &HeaderMap,
profile_id: Option<id_type::ProfileId>,
) -> RouterResult<AuthenticationData>
where
A: SessionStateInfo + Sync,
Expand Down Expand Up @@ -830,7 +848,7 @@ where
merchant_account: merchant,
platform_merchant_account,
key_store,
profile_id: None,
profile_id,
};

Ok(auth)
Expand Down
2 changes: 1 addition & 1 deletion loadtest/config/development.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ client_secret = ""
partner_id = ""

[unmasked_headers]
keys = "accept-language,user-agent"
keys = "accept-language,user-agent,x-profile-id"

[multitenancy]
enabled = false
Expand Down
Loading