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

Correctly handle OIDC config with no client_secret set #16806

Merged
merged 2 commits into from Jan 10, 2024
Merged

Correctly handle OIDC config with no client_secret set #16806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d87eb9
Correctly handle OIDC config with no `client_secret` set
erikjohnston Jan 10, 2024
18dfe1b
Newsfile
erikjohnston Jan 10, 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
1 change: 1 addition & 0 deletions changelog.d/16806.misc
View file
Open in desktop
@@ -0,0 +1 @@
Reject OIDC config when `client_secret` isn't specified, but the auth method requires one.
15 changes: 14 additions & 1 deletion synapse/config/oidc.py
View file
Open in desktop
Expand Up @@ -299,6 +299,19 @@ def _parse_oidc_config_dict(
config_path + ("client_secret",),
)

# If no client secret is specified then the auth method must be None
client_auth_method = oidc_config.get("client_auth_method")
if client_secret is None and client_secret_jwt_key is None:
if client_auth_method is None:
client_auth_method = "none"
elif client_auth_method != "none":
raise ConfigError(
"No 'client_secret' is set in OIDC config, and 'client_auth_method' is not set to 'none'"
)

if client_auth_method is None:
client_auth_method = "client_secret_basic"

return OidcProviderConfig(
idp_id=idp_id,
idp_name=oidc_config.get("idp_name", "OIDC"),
Expand All @@ -309,7 +322,7 @@ def _parse_oidc_config_dict(
client_id=oidc_config["client_id"],
client_secret=client_secret,
client_secret_jwt_key=client_secret_jwt_key,
client_auth_method=oidc_config.get("client_auth_method", "client_secret_basic"),
client_auth_method=client_auth_method,
pkce_method=oidc_config.get("pkce_method", "auto"),
scopes=oidc_config.get("scopes", ["openid"]),
authorization_endpoint=oidc_config.get("authorization_endpoint"),
Expand Down