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

feat(auth): grant type and acr values custom oidc parameters support #11116

Merged
merged 4 commits into from
Aug 9, 2024
Merged

feat(auth): grant type and acr values custom oidc parameters support #11116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b856e1
feat(auth): grant type and acr values custom oidc parameters support
RyanHolstien Aug 7, 2024
0bfa64a
Merge branch 'master' into feat/additionalOIDCConfigs
RyanHolstien Aug 9, 2024
4ecce83
Merge branch 'master' into feat/additionalOIDCConfigs
RyanHolstien Aug 9, 2024
7dd9746
typo
RyanHolstien Aug 9, 2024
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
12 changes: 11 additions & 1 deletion datahub-frontend/app/auth/sso/oidc/OidcConfigs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ public class OidcConfigs extends SsoConfigs {
public static final String OIDC_EXTRACT_JWT_ACCESS_TOKEN_CLAIMS =
"auth.oidc.extractJwtAccessTokenClaims";
public static final String OIDC_PREFERRED_JWS_ALGORITHM = "auth.oidc.preferredJwsAlgorithm";
public static final String OIDC_GRANT_TYPE = "auth.oidc.grantType";
public static final String OIDC_ACR_VALUES = "auth.oidc.acrValues";

/** Default values */
private static final String DEFAULT_OIDC_USERNAME_CLAIM = "email";
Expand Down Expand Up @@ -75,7 +77,9 @@ public class OidcConfigs extends SsoConfigs {
private final Optional<String> customParamResource;
private final String readTimeout;
private final Optional<Boolean> extractJwtAccessTokenClaims;
private Optional<String> preferredJwsAlgorithm;
private final Optional<String> preferredJwsAlgorithm;
private final Optional<String> grantType;
private final Optional<String> acrValues;

public OidcConfigs(Builder builder) {
super(builder);
Expand All @@ -98,6 +102,8 @@ public OidcConfigs(Builder builder) {
this.readTimeout = builder.readTimeout;
this.extractJwtAccessTokenClaims = builder.extractJwtAccessTokenClaims;
this.preferredJwsAlgorithm = builder.preferredJwsAlgorithm;
this.acrValues = builder.acrValues;
this.grantType = builder.grantType;
}

public static class Builder extends SsoConfigs.Builder<Builder> {
Expand All @@ -123,6 +129,8 @@ public static class Builder extends SsoConfigs.Builder<Builder> {
private String readTimeout = DEFAULT_OIDC_READ_TIMEOUT;
private Optional<Boolean> extractJwtAccessTokenClaims = Optional.empty();
private Optional<String> preferredJwsAlgorithm = Optional.empty();
private Optional<String> grantType = Optional.empty();
private Optional<String> acrValues = Optional.empty();

public Builder from(final com.typesafe.config.Config configs) {
super.from(configs);
Expand Down Expand Up @@ -169,6 +177,8 @@ public Builder from(final com.typesafe.config.Config configs) {
getOptional(configs, OIDC_EXTRACT_JWT_ACCESS_TOKEN_CLAIMS).map(Boolean::parseBoolean);
preferredJwsAlgorithm =
Optional.ofNullable(getOptional(configs, OIDC_PREFERRED_JWS_ALGORITHM, null));
grantType = Optional.ofNullable(getOptional(configs, OIDC_GRANT_TYPE, null));
acrValues = Optional.ofNullable(getOptional(configs, OIDC_ACR_VALUES, null));
return this;
}

Expand Down
14 changes: 13 additions & 1 deletion datahub-frontend/app/auth/sso/oidc/OidcProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import auth.sso.SsoProvider;
import auth.sso.oidc.custom.CustomOidcClient;
import com.google.common.collect.ImmutableMap;
import java.util.HashMap;
import java.util.Map;
import lombok.extern.slf4j.Slf4j;
import org.pac4j.core.client.Client;
import org.pac4j.core.http.callback.PathParameterCallbackUrlResolver;
Expand Down Expand Up @@ -64,9 +66,19 @@ private Client<OidcCredentials> createPac4jClient() {
_oidcConfigs.getResponseType().ifPresent(oidcConfiguration::setResponseType);
_oidcConfigs.getResponseMode().ifPresent(oidcConfiguration::setResponseMode);
_oidcConfigs.getUseNonce().ifPresent(oidcConfiguration::setUseNonce);
Map<String, String> customParamsMap = new HashMap<>();
_oidcConfigs
.getCustomParamResource()
.ifPresent(value -> oidcConfiguration.setCustomParams(ImmutableMap.of("resource", value)));
.ifPresent(value -> customParamsMap.put("resource", value));
_oidcConfigs
.getGrantType()
.ifPresent(value -> customParamsMap.put("grant_type", value));
_oidcConfigs
.getAcrValues()
.ifPresent(value -> customParamsMap.put("acr_values", value));
if (!customParamsMap.isEmpty()) {
oidcConfiguration.setCustomParams(customParamsMap);
}
_oidcConfigs
.getPreferredJwsAlgorithm()
.ifPresent(
Expand Down
2 changes: 2 additions & 0 deletions datahub-frontend/conf/application.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,8 @@ auth.oidc.customParam.resource = ${?AUTH_OIDC_CUSTOM_PARAM_RESOURCE}
auth.oidc.readTimeout = ${?AUTH_OIDC_READ_TIMEOUT}
auth.oidc.extractJwtAccessTokenClaims = ${?AUTH_OIDC_EXTRACT_JWT_ACCESS_TOKEN_CLAIMS} # Whether to extract claims from JWT access token. Defaults to false.
auth.oidc.preferredJwsAlgorithm = ${?AUTH_OIDC_PREFERRED_JWS_ALGORITHM} # Which jws algorithm to use
auth.oidc.acrValues = ${?AUTH_OIDC_ACR_VALUES}
auth.oidc.grantType = ${?AUTH_OIDC_GRANT_TYPE}

#
# By default, the callback URL that should be registered with the identity provider is computed as {$baseUrl}/callback/oidc.
Expand Down
Loading