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

Jump to bottom

fix(connector_token): Move config redis #4540

Merged
merged 9 commits into from
May 13, 2024
Merged

fix(connector_token): Move config redis #4540

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6998f4f
moved connector account creds to read from redis
May 3, 2024
5ff6038
added db fallback
May 3, 2024
53bbba5
chore: run formatter
hyperswitch-bot[bot] May 3, 2024
eadfc38
resolved conflicts
May 6, 2024
58ac90f
resolved conflicts
May 9, 2024
f1f4fca
chore: run formatter
hyperswitch-bot[bot] May 9, 2024
ebeb323
renamed const
May 9, 2024
b9423a7
chore: run formatter
hyperswitch-bot[bot] May 9, 2024
078a44f
resolved clippy error
May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 10 additions & 0 deletions crates/diesel_models/src/configs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,13 @@ impl From<ConfigUpdate> for ConfigUpdateInternal {
}
}
}

impl From<ConfigNew> for Config {
fn from(config_new: ConfigNew) -> Self {
Self {
id: 0i32,
key: config_new.key,
config: config_new.config,
}
}
}
86 changes: 61 additions & 25 deletions crates/router/src/core/payments/helpers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ use data_models::{
use diesel_models::enums;
// TODO : Evaluate all the helper functions ()
use error_stack::{report, ResultExt};
use futures::future::Either;
use josekit::jwe;
use masking::{ExposeInterface, PeekInterface};
use openssl::{
Expand Down Expand Up @@ -3060,27 +3061,27 @@ pub async fn insert_merchant_connector_creds_to_config(
merchant_connector_details: admin::MerchantConnectorDetailsWrap,
) -> RouterResult<()> {
if let Some(encoded_data) = merchant_connector_details.encoded_data {
match db
.insert_config(storage::ConfigNew {
key: format!(
"mcd_{merchant_id}_{}",
merchant_connector_details.creds_identifier
),
config: encoded_data.peek().to_owned(),
})
let redis = &db
.get_redis_conn()
.change_context(errors::ApiErrorResponse::InternalServerError)
.attach_printable("Failed to get redis connection")?;

let key = format!(
"mcd_{merchant_id}_{}",
merchant_connector_details.creds_identifier
);

redis
.serialize_and_set_key_with_expiry(key.as_str(), &encoded_data.peek(), i64::from(900))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we not use hardcoded 900 value instead use const something like TOKEN_TTL

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure

.await
{
Ok(_) => Ok(()),
Err(err) => {
if err.current_context().is_db_unique_violation() {
Ok(())
} else {
Err(err
.map_or_else(
|e| {
Err(e
.change_context(errors::ApiErrorResponse::InternalServerError)
.attach_printable("Failed to insert connector_creds to config"))
}
}
}
},
|_| Ok(()),
)
} else {
Ok(())
}
Expand Down Expand Up @@ -3153,14 +3154,49 @@ pub async fn get_merchant_connector_account(
let db = &*state.store;
match creds_identifier {
Some(creds_identifier) => {
let mca_config = db
.find_config_by_key(format!("mcd_{merchant_id}_{creds_identifier}").as_str())
let key = format!("mcd_{merchant_id}_{creds_identifier}");
let redis_fetch = || async {
db.get_redis_conn()
.change_context(errors::ApiErrorResponse::InternalServerError)
.attach_printable("Failed to get redis connection")
.async_and_then(|redis| async move {
redis
.get_and_deserialize_key(key.as_str(), "String")
.await
.change_context(
errors::ApiErrorResponse::MerchantConnectorAccountNotFound {
id: key,
},
)
.attach_printable("Failed to get redis Value")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you also specify which data we failed to retrieve from redis, just for better tracking since MerchantConnectorAccountNotFound does not specify that it is a value from external system

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does the result from this function logged or returned somewhere?

})
.await
};

let db_fetch = || async {
db.find_config_by_key(format!("mcd_{merchant_id}_{creds_identifier}").as_str())
.await
.to_not_found_response(
errors::ApiErrorResponse::MerchantConnectorAccountNotFound {
id: format!("mcd_{merchant_id}_{creds_identifier}"),
},
)
};

let mca_config: String = redis_fetch()
.await
.to_not_found_response(
errors::ApiErrorResponse::MerchantConnectorAccountNotFound {
id: format!("mcd_{merchant_id}_{creds_identifier}"),
.map_or_else(
|_| {
Either::Left(async {
match db_fetch().await {
Ok(config_entry) => Ok(config_entry.config),
Err(e) => Err(e),
}
})
},
)?;
|result| Either::Right(async { Ok(result) }),
)
.await?;

let private_key = state
.conf
Expand All @@ -3170,7 +3206,7 @@ pub async fn get_merchant_connector_account(
.peek()
.as_bytes();

let decrypted_mca = services::decrypt_jwe(mca_config.config.as_str(), services::KeyIdCheck::SkipKeyIdCheck, private_key, jwe::RSA_OAEP_256)
let decrypted_mca = services::decrypt_jwe(mca_config.as_str(), services::KeyIdCheck::SkipKeyIdCheck, private_key, jwe::RSA_OAEP_256)
.await
.change_context(errors::ApiErrorResponse::UnprocessableEntity{
message: "decoding merchant_connector_details failed due to invalid data format!".into()})
Expand Down
26 changes: 17 additions & 9 deletions crates/router/src/db/configs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,21 @@ impl ConfigInterface for Store {
config: storage::ConfigNew,
) -> CustomResult<storage::Config, errors::StorageError> {
let conn = connection::pg_connection_write(self).await?;
config
let inserted = config
.insert(&conn)
.await
.map_err(|error| report!(errors::StorageError::from(error)))
.map_err(|error| report!(errors::StorageError::from(error)))?;

self.get_redis_conn()
.map_err(Into::<errors::StorageError>::into)?
.publish(
consts::PUB_SUB_CHANNEL,
CacheKind::Config((&inserted.key).into()),
)
.await
.map_err(Into::<errors::StorageError>::into)?;

Ok(inserted)
}

#[instrument(skip_all)]
Expand Down Expand Up @@ -126,7 +137,7 @@ impl ConfigInterface for Store {
async fn find_config_by_key_unwrap_or(
&self,
key: &str,
// If the config is not found it will be created with the default value.
// If the config is not found it will be cached with the default value.
default_config: Option<String>,
) -> CustomResult<storage::Config, errors::StorageError> {
let find_else_unwrap_or = || async {
Expand All @@ -139,17 +150,14 @@ impl ConfigInterface for Store {
Err(err) => {
if err.current_context().is_db_not_found() {
default_config
.ok_or(err)
.async_and_then(|c| async {
.map(|c| {
storage::ConfigNew {
key: key.to_string(),
config: c,
}
.insert(&conn)
.await
.map_err(|error| report!(errors::StorageError::from(error)))
.into()
})
.await
.ok_or(err)
} else {
Err(err)
}
Expand Down