mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-05-07 07:27:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

sdk: Store OIDC issuer as a String rather than a Url

Browse Source 
The url crate normalizes the string, but during OIDC verification steps,
the issuer verification must be made against the exact string that was
provided.

Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
This commit is contained in:
Kévin Commaille
2023-03-16 10:21:40 +01:00
committed by Jonas Platte
parent 57fb659b86
commit e23be44345
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bindings/matrix-sdk-ffi/src/client.rs
View File

@@ -251,7 +251,7 @@ impl Client {
/// The OIDC Provider that is trusted by the homeserver. `None` when
/// not configured.
pub async fn authentication_issuer(&self) -> Option<String> {
self.client.authentication_issuer().await.map(|server| server.to_string())
self.client.authentication_issuer().await
}
/// The sliding sync proxy that is trusted by the homeserver. `None` when

7
crates/matrix-sdk/src/client/builder.rs
View File

@@ -378,7 +378,7 @@ impl ClientBuilder {
let base_client = BaseClient::with_store_config(store_config);
let http_client = HttpClient::new(inner_http_client.clone(), self.request_config);
let mut authentication_issuer: Option<Url> = None;
let mut authentication_issuer = None;
#[cfg(feature = "experimental-sliding-sync")]
let mut sliding_sync_proxy: Option<Url> = None;
let homeserver = match homeserver_cfg {
@@ -402,9 +402,8 @@ impl ClientBuilder {
err => ClientBuildError::Http(err),
})?;
if let Some(issuer) = well_known.authentication.map(|auth| auth.issuer) {
authentication_issuer = Url::parse(&issuer).ok();
}
authentication_issuer = well_known.authentication.map(|auth| auth.issuer);
#[cfg(feature = "experimental-sliding-sync")]
if let Some(proxy) = well_known.sliding_sync_proxy.map(|p| p.url) {
sliding_sync_proxy = Url::parse(&proxy).ok();

4
crates/matrix-sdk/src/client/mod.rs
View File

@@ -145,7 +145,7 @@ pub(crate) struct ClientInner {
/// The URL of the homeserver to connect to.
homeserver: RwLock<Url>,
/// The OIDC Provider that is trusted by the homeserver.
authentication_issuer: Option<RwLock<Url>>,
authentication_issuer: Option<RwLock<String>>,
/// The sliding sync proxy that is trusted by the homeserver.
#[cfg(feature = "experimental-sliding-sync")]
sliding_sync_proxy: Option<RwLock<Url>>,
@@ -330,7 +330,7 @@ impl Client {
}
/// The OIDC Provider that is trusted by the homeserver.
pub async fn authentication_issuer(&self) -> Option<Url> {
pub async fn authentication_issuer(&self) -> Option<String> {
let server = self.inner.authentication_issuer.as_ref()?;
Some(server.read().await.clone())
}