Skip to content

feat: support setting clientAuthenticationMethod for OIDC #765

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
dervoeti wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: support setting clientAuthenticationMethod for OIDC #765

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
13 changes: 13 additions & 0 deletions rust/operator-binary/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,14 @@ fn append_oidc_config(
.well_known_config_url()
.context(InvalidWellKnownConfigUrlSnafu)?;

let client_auth_method = serde_json::to_value(
client_options.client_authentication_method,
)
.expect("ClientAuthenticationMethod should serialize to JSON");
let client_auth_method = client_auth_method
.as_str()
.expect("ClientAuthenticationMethod should serialize to a string");

formatdoc!(
"
{{ 'name': 'keycloak',
Expand All @@ -248,6 +256,7 @@ fn append_oidc_config(
}},
'api_base_url': '{api_base_url}',
'server_metadata_url': '{well_known_config_url}',
'token_endpoint_auth_method': '{client_auth_method}',
}},
}}",
scopes = scopes.join(" "),
Expand Down Expand Up @@ -460,6 +469,7 @@ mod tests {
oidc: oidc::v1alpha1::ClientAuthenticationOptions {
client_credentials_secret_ref: "test-client-secret1".to_string(),
extra_scopes: vec!["roles".to_string()],
client_authentication_method: Default::default(),
product_specific_fields: (),
},
},
Expand All @@ -468,6 +478,7 @@ mod tests {
oidc: oidc::v1alpha1::ClientAuthenticationOptions {
client_credentials_secret_ref: "test-client-secret2".to_string(),
extra_scopes: vec![],
client_authentication_method: Default::default(),
product_specific_fields: (),
},
},
Expand Down Expand Up @@ -509,6 +520,7 @@ mod tests {
}},
'api_base_url': 'https://my.keycloak1.server:12345/realms/sdp/protocol/',
'server_metadata_url': 'https://my.keycloak1.server:12345/realms/sdp/.well-known/openid-configuration',
'token_endpoint_auth_method': 'client_secret_basic',
}},
}},
{{ 'name': 'keycloak',
Expand All @@ -522,6 +534,7 @@ mod tests {
}},
'api_base_url': 'http://my.keycloak2.server/protocol/',
'server_metadata_url': 'http://my.keycloak2.server/.well-known/openid-configuration',
'token_endpoint_auth_method': 'client_secret_basic',
}},
}}
]
Expand Down
2 changes: 2 additions & 0 deletions rust/operator-binary/src/crd/authentication.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,7 @@ mod tests {
oidc: oidc::v1alpha1::ClientAuthenticationOptions {
client_credentials_secret_ref: "airflow-oidc-client1".into(),
extra_scopes: vec!["groups".into()],
client_authentication_method: Default::default(),
product_specific_fields: ()
}
},
Expand All @@ -488,6 +489,7 @@ mod tests {
oidc: oidc::v1alpha1::ClientAuthenticationOptions {
client_credentials_secret_ref: "airflow-oidc-client2".into(),
extra_scopes: Vec::new(),
client_authentication_method: Default::default(),
product_specific_fields: ()
}
}
Expand Down
Loading