fix: url calculation in make_url

src/core/config/mod.rs

@@ -2698,9 +2698,11 @@ pub struct IdentityProvider {
 	pub userid_claims: BTreeSet<String>,
 
 	/// Optional extra path components after the issuer_url leading to the
-	/// location of the `.well-known` directory used for discovery. This will be
+	/// location of the `.well-known` directory used for discovery. If the path
-	/// empty for specification-compliant providers. We have supplied any known
+	/// starts with a slash it will be treated as absolute, meaning overwriting
-	/// values based on `brand` (e.g. `/login/oauth` for GitHub).
+	/// any path in the issuer_url. The path needs to end with a slash. This
+	/// will be empty for specification-compliant providers. We have supplied
+	/// any known values based on `brand` (e.g. `login/oauth/` for GitHub).
 	pub base_path: Option<String>,
 
 	/// Overrides the `.well-known` location where the provider's openid

src/service/oauth/providers.rs

@@ -136,7 +136,7 @@ async fn configure(&self, mut provider: Provider) -> Result<Provider> {
 
 	if provider.base_path.is_none() {
 		provider.base_path = match provider.brand.as_str() {
-			| "github" => Some("/login/oauth".to_owned()),
+			| "github" => Some("login/oauth/".to_owned()),
 			| _ => None,
 		};
 	}
@@ -157,7 +157,7 @@ async fn configure(&self, mut provider: Provider) -> Result<Provider> {
 			.and_then(JsonValue::as_str)
 			.map(Url::parse)
 			.transpose()?
-			.or_else(|| make_url(&provider, "/authorize").ok())
+			.or_else(|| make_url(&provider, "authorize").ok())
 			.map(|url| provider.authorization_url.replace(url));
 	}
 
@@ -167,7 +167,7 @@ async fn configure(&self, mut provider: Provider) -> Result<Provider> {
 			.and_then(JsonValue::as_str)
 			.map(Url::parse)
 			.transpose()?
-			.or_else(|| make_url(&provider, "/revocation").ok())
+			.or_else(|| make_url(&provider, "revocation").ok())
 			.map(|url| provider.revocation_url.replace(url));
 	}
 
@@ -177,7 +177,7 @@ async fn configure(&self, mut provider: Provider) -> Result<Provider> {
 			.and_then(JsonValue::as_str)
 			.map(Url::parse)
 			.transpose()?
-			.or_else(|| make_url(&provider, "/introspection").ok())
+			.or_else(|| make_url(&provider, "introspection").ok())
 			.map(|url| provider.introspection_url.replace(url));
 	}
 
@@ -189,7 +189,7 @@ async fn configure(&self, mut provider: Provider) -> Result<Provider> {
 			.transpose()?
 			.or_else(|| match provider.brand.as_str() {
 				| "github" => "https://api.github.com/user".try_into().ok(),
-				| _ => make_url(&provider, "/userinfo").ok(),
+				| _ => make_url(&provider, "userinfo").ok(),
 			})
 			.map(|url| provider.userinfo_url.replace(url));
 	}
@@ -202,9 +202,9 @@ async fn configure(&self, mut provider: Provider) -> Result<Provider> {
 			.transpose()?
 			.or_else(|| {
 				let path = if provider.brand == "github" {
-					"/access_token"
+					"access_token"
 				} else {
-					"/token"
+					"token"
 				};
 
 				make_url(&provider, path).ok()
@@ -237,7 +237,7 @@ pub async fn discover(&self, provider: &Provider) -> Result<JsonValue> {
 fn discovery_url(provider: &Provider) -> Result<Url> {
 	let default_url = provider
 		.discovery
-		.then(|| make_url(provider, "/.well-known/openid-configuration"))
+		.then(|| make_url(provider, ".well-known/openid-configuration"))
 		.transpose()?;
 
 	let Some(url) = provider
@@ -288,14 +288,17 @@ fn make_url(provider: &Provider, path: &str) -> Result<Url> {
 	let mut suffix = provider.base_path.clone().unwrap_or_default();
 
 	suffix.push_str(path);
-	let url = provider
+	let issuer = provider.issuer_url.as_ref().ok_or_else(|| {
-		.issuer_url
+		let id = &provider.client_id;
-		.as_ref()
+		err!(Config("issuer_url", "Provider {id:?} required field"))
-		.ok_or_else(|| {
+	})?;
-			let id = &provider.client_id;
+	let issuer_path = issuer.path();
-			err!(Config("issuer_url", "Provider {id:?} required field"))
-		})?
-		.join(&suffix)?;
 
-	Ok(url)
+	if issuer_path.ends_with('/') {
+		Ok(issuer.join(suffix.as_str())?)
+	} else {
+		let mut url = issuer.to_owned();
+		url.set_path((issuer_path.to_owned() + "/").as_str());
+		Ok(url.join(&suffix)?)
+	}
 }

tuwunel-example.toml

@@ -2307,9 +2307,11 @@
 #userid_claims = []
 
 # Optional extra path components after the issuer_url leading to the
-# location of the `.well-known` directory used for discovery. This will be
+# location of the `.well-known` directory used for discovery. If the path
-# empty for specification-compliant providers. We have supplied any known
+# starts with a slash it will be treated as absolute, meaning overwriting
-# values based on `brand` (e.g. `/login/oauth` for GitHub).
+# any path in the issuer_url. The path needs to end with a slash. This
+# will be empty for specification-compliant providers. We have supplied
+# any known values based on `brand` (e.g. `login/oauth/` for GitHub).
 #
 #base_path =