ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-02-07 03:40:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pass in csrf token & nonce (generated externally)

Browse Source
This commit is contained in:
Grant Limberg 2021-10-29 15:43:39 -07:00
parent 56cf874d99
commit ebc4c898ff
No known key found for this signature in database
GPG Key ID: 2BA62CCABBB4095A
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zeroidc/src/lib.rs
View File

@ -8,7 +8,7 @@ use std::time::Duration;
use openidconnect::core::{CoreClient, CoreProviderMetadata, CoreResponseType}; use openidconnect::core::{CoreClient, CoreProviderMetadata, CoreResponseType};
use openidconnect::reqwest::http_client; use openidconnect::reqwest::http_client;
use openidconnect::AuthenticationFlow; use openidconnect::{AuthenticationFlow, PkceCodeVerifier};
use openidconnect::{ClientId, CsrfToken, IssuerUrl, Nonce, PkceCodeChallenge, RedirectUrl, Scope}; use openidconnect::{ClientId, CsrfToken, IssuerUrl, Nonce, PkceCodeChallenge, RedirectUrl, Scope};
use url::Url; use url::Url;
@ -39,6 +39,7 @@ struct authres {
url: Url, url: Url,
csrf_token: CsrfToken, csrf_token: CsrfToken,
nonce: Nonce, nonce: Nonce,
pkce_verifier: PkceCodeVerifier,
} }
impl ZeroIDC { impl ZeroIDC {
@ -117,15 +118,15 @@ impl ZeroIDC {
} }
} }
fn get_auth_url(&mut self) -> Option<authres> { fn get_auth_url(&mut self, csrf_token: String, nonce: String) -> Option<authres> {
let (pkce_challenge, pkce_verifier) = PkceCodeChallenge::new_random_sha256(); let (pkce_challenge, pkce_verifier) = PkceCodeChallenge::new_random_sha256();
let r = (*self.inner.lock().unwrap()).oidc_client.as_ref().map(|c| { let r = (*self.inner.lock().unwrap()).oidc_client.as_ref().map(|c| {
let (auth_url, csrf_token, nonce) = c let (auth_url, csrf_token, nonce) = c
.authorize_url( .authorize_url(
AuthenticationFlow::<CoreResponseType>::AuthorizationCode, AuthenticationFlow::<CoreResponseType>::AuthorizationCode,
csrf_func("my-csrf".to_string()), csrf_func(csrf_token),
nonce_func("my-nonce".to_string()), nonce_func(nonce),
) )
.add_scope(Scope::new("read".to_string())) .add_scope(Scope::new("read".to_string()))
.add_scope(Scope::new("read".to_string())) .add_scope(Scope::new("read".to_string()))
@ -137,6 +138,7 @@ impl ZeroIDC {
url: auth_url, url: auth_url,
csrf_token, csrf_token,
nonce, nonce,
pkce_verifier,
}; };
}); });