Skip to content

add same custom http client for jwks refresh #47

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

add same custom http client for jwks refresh #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions jwt-authorizer/src/authorizer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ where
}
KeySourceType::Jwks(url) => {
let jwks_url = Url::parse(url.as_str()).map_err(|e| InitError::JwksUrlError(e.to_string()))?;
let key_store_manager = KeyStoreManager::new(jwks_url, refresh.unwrap_or_default());
let key_store_manager = KeyStoreManager::new(jwks_url, refresh.unwrap_or_default(), http_client);
Authorizer {
key_source: KeySource::KeyStoreSource(key_store_manager),
claims_checker,
Expand All @@ -210,10 +210,10 @@ where
}
}
KeySourceType::Discovery(issuer_url) => {
let jwks_url = Url::parse(&oidc::discover_jwks(issuer_url.as_str(), http_client).await?)
let jwks_url = Url::parse(&oidc::discover_jwks(issuer_url.as_str(), http_client.clone()).await?)
.map_err(|e| InitError::JwksUrlError(e.to_string()))?;

let key_store_manager = KeyStoreManager::new(jwks_url, refresh.unwrap_or_default());
let key_store_manager = KeyStoreManager::new(jwks_url, refresh.unwrap_or_default(), http_client);
Authorizer {
key_source: KeySource::KeyStoreSource(key_store_manager),
claims_checker,
Expand Down
22 changes: 15 additions & 7 deletions jwt-authorizer/src/jwks/key_store_manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use jsonwebtoken::{jwk::JwkSet, Algorithm};
use reqwest::Url;
use reqwest::{Client, Url};
use std::{
sync::Arc,
time::{Duration, Instant},
Expand Down Expand Up @@ -55,6 +55,7 @@ pub struct KeyStoreManager {
/// in case of fail loading (error or key not found), minimal interval
refresh: Refresh,
keystore: Arc<Mutex<KeyStore>>,
client: Option<Client>,
}

pub struct KeyStore {
Expand All @@ -67,7 +68,7 @@ pub struct KeyStore {
}

impl KeyStoreManager {
pub(crate) fn new(key_url: Url, refresh: Refresh) -> KeyStoreManager {
pub(crate) fn new(key_url: Url, refresh: Refresh, client: Option<Client>) -> KeyStoreManager {
KeyStoreManager {
key_url,
refresh,
Expand All @@ -76,6 +77,7 @@ impl KeyStoreManager {
load_time: None,
fail_time: None,
})),
client,
}
}

Expand All @@ -85,7 +87,7 @@ impl KeyStoreManager {
let key = match self.refresh.strategy {
RefreshStrategy::Interval => {
if ks_gard.can_refresh(self.refresh.refresh_interval, self.refresh.retry_interval) {
ks_gard.refresh(&self.key_url, &[]).await?;
ks_gard.refresh(&self.key_url, &[], self.client.as_ref()).await?;
}
ks_gard.get_key(header)?
}
Expand All @@ -95,7 +97,7 @@ impl KeyStoreManager {
if let Some(jwk) = jwk_opt {
jwk
} else if ks_gard.can_refresh(self.refresh.refresh_interval, self.refresh.retry_interval) {
ks_gard.refresh(&self.key_url, &[("kid", kid)]).await?;
ks_gard.refresh(&self.key_url, &[("kid", kid)], self.client.as_ref()).await?;
ks_gard.find_kid(kid).ok_or_else(|| AuthError::InvalidKid(kid.to_owned()))?
} else {
return Err(AuthError::InvalidKid(kid.to_owned()));
Expand All @@ -112,6 +114,7 @@ impl KeyStoreManager {
"alg",
&serde_json::to_string(&header.alg).map_err(|_| AuthError::InvalidKeyAlg(header.alg))?,
)],
self.client.as_ref(),
)
.await?;
ks_gard
Expand All @@ -127,7 +130,7 @@ impl KeyStoreManager {
// if jwks endpoint is down for the loading, respect retry_interval
&& ks_gard.can_refresh(self.refresh.refresh_interval, self.refresh.retry_interval)
{
ks_gard.refresh(&self.key_url, &[]).await?;
ks_gard.refresh(&self.key_url, &[], self.client.as_ref()).await?;
}
ks_gard.get_key(header)?
}
Expand All @@ -151,8 +154,10 @@ impl KeyStore {
}
}

async fn refresh(&mut self, key_url: &Url, qparam: &[(&str, &str)]) -> Result<(), AuthError> {
reqwest::Client::new()
async fn refresh(&mut self, key_url: &Url, qparam: &[(&str, &str)], client: Option<&Client>) -> Result<(), AuthError> {
client
.cloned()
.unwrap_or_default()
.get(key_url.as_ref())
.query(qparam)
.send()
Expand Down Expand Up @@ -372,6 +377,7 @@ mod tests {
refresh_interval: Duration::from_millis(10),
retry_interval: Duration::from_millis(5),
},
None,
);

// 1st RELOAD
Expand Down Expand Up @@ -419,6 +425,7 @@ mod tests {
refresh_interval: Duration::from_millis(10),
retry_interval: Duration::from_millis(5),
},
None,
);

// STEP 1: initial (lazy) reloading
Expand Down Expand Up @@ -477,6 +484,7 @@ mod tests {
strategy: RefreshStrategy::NoRefresh,
..Default::default()
},
None,
);

// STEP 1: initial (lazy) reloading
Expand Down