Skip to content

Adds option to support IdP that require PKCE for confidential clients. #69

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

Closed
wants to merge 3 commits into from
Closed

Adds option to support IdP that require PKCE for confidential clients. #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a49d4a
Adds option to support IdP that require PKCE for confidential clients.
jhhhnikt Jun 15, 2022
6f227a8
Update option to support IdP that require PKCE for confidential clients.
jhhhnikt Jun 17, 2022
c523277
Renamed option to support IdP that require PKCE for confidential clie…
jhhhnikt Jun 17, 2022
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
5 changes: 3 additions & 2 deletions src/main/java/eu/openanalytics/containerproxy/auth/impl/OpenIDAuthenticationBackend.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
import org.springframework.security.oauth2.client.OAuth2AuthorizedClient;
import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserRequest;
import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserService;
import org.springframework.security.oauth2.client.oidc.web.logout.OidcClientInitiatedLogoutSuccessHandler;
import org.springframework.security.oauth2.client.registration.ClientRegistration;
import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
import org.springframework.security.oauth2.client.registration.InMemoryClientRegistrationRepository;
Expand Down Expand Up @@ -99,6 +98,8 @@ public boolean hasAuthorization() {
public void configureHttpSecurity(HttpSecurity http, AuthorizedUrl anyRequestConfigurer) throws Exception {
ClientRegistrationRepository clientRegistrationRepo = createClientRepo();
oAuth2AuthorizedClientRepository = new HttpSessionOAuth2AuthorizedClientRepository();
boolean withPKCE = Boolean.parseBoolean(environment.getProperty("proxy.openid.with-pkce"));
log.info("\"with-pkce\" configuration is {}.", withPKCE ? "enabled" : "disabled (default)");

anyRequestConfigurer.authenticated();

Expand All @@ -108,7 +109,7 @@ public void configureHttpSecurity(HttpSecurity http, AuthorizedUrl anyRequestCon
.clientRegistrationRepository(clientRegistrationRepo)
.authorizedClientRepository(oAuth2AuthorizedClientRepository)
.authorizationEndpoint()
.authorizationRequestResolver(new FixedDefaultOAuth2AuthorizationRequestResolver(clientRegistrationRepo, OAuth2AuthorizationRequestRedirectFilter.DEFAULT_AUTHORIZATION_REQUEST_BASE_URI))
.authorizationRequestResolver(new FixedDefaultOAuth2AuthorizationRequestResolver(clientRegistrationRepo, OAuth2AuthorizationRequestRedirectFilter.DEFAULT_AUTHORIZATION_REQUEST_BASE_URI, withPKCE))
.and()
.failureHandler(new AuthenticationFailureHandler() {

Expand Down
12 changes: 10 additions & 2 deletions ...openanalytics/containerproxy/security/FixedDefaultOAuth2AuthorizationRequestResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
import org.springframework.security.oauth2.client.web.DefaultOAuth2AuthorizationRequestResolver;
import org.springframework.security.oauth2.client.web.OAuth2AuthorizationRequestCustomizers;
import org.springframework.security.oauth2.client.web.OAuth2AuthorizationRequestResolver;
import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequest;

Expand All @@ -36,10 +37,17 @@
*/
public class FixedDefaultOAuth2AuthorizationRequestResolver implements OAuth2AuthorizationRequestResolver {

private DefaultOAuth2AuthorizationRequestResolver delegate;
private final DefaultOAuth2AuthorizationRequestResolver delegate;

public FixedDefaultOAuth2AuthorizationRequestResolver(ClientRegistrationRepository clientRegistrationRepository, String authorizationRequestBaseUri) {
delegate = new DefaultOAuth2AuthorizationRequestResolver(clientRegistrationRepository, authorizationRequestBaseUri);
this.delegate = new DefaultOAuth2AuthorizationRequestResolver(clientRegistrationRepository, authorizationRequestBaseUri);
}

public FixedDefaultOAuth2AuthorizationRequestResolver(ClientRegistrationRepository clientRegistrationRepository, String authorizationRequestBaseUri, boolean withPKCE) {
this(clientRegistrationRepository, authorizationRequestBaseUri);
if (withPKCE) {
this.delegate.setAuthorizationRequestCustomizer(OAuth2AuthorizationRequestCustomizers.withPkce());
}
}

@Override
Expand Down