-
Notifications
You must be signed in to change notification settings - Fork 6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixes gh-3907
- Loading branch information
Showing
81 changed files
with
6,485 additions
and
50 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
123 changes: 123 additions & 0 deletions
123
...tation/web/configurers/oauth2/client/AuthorizationCodeAuthenticationFilterConfigurer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| /* | ||
| * Copyright 2012-2017 the original author or authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.springframework.security.config.annotation.web.configurers.oauth2.client; | ||
|
|
||
| import org.springframework.core.convert.converter.Converter; | ||
| import org.springframework.http.client.ClientHttpResponse; | ||
| import org.springframework.security.config.annotation.web.HttpSecurityBuilder; | ||
| import org.springframework.security.config.annotation.web.configurers.AbstractAuthenticationFilterConfigurer; | ||
| import org.springframework.security.oauth2.client.authentication.AuthorizationCodeAuthenticationProcessingFilter; | ||
| import org.springframework.security.oauth2.client.authentication.AuthorizationCodeAuthenticationProvider; | ||
| import org.springframework.security.oauth2.client.authentication.AuthorizationCodeAuthenticationToken; | ||
| import org.springframework.security.oauth2.client.authentication.AuthorizationGrantTokenExchanger; | ||
| import org.springframework.security.oauth2.client.authentication.nimbus.NimbusAuthorizationCodeTokenExchanger; | ||
| import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository; | ||
| import org.springframework.security.oauth2.client.user.OAuth2UserService; | ||
| import org.springframework.security.oauth2.client.user.nimbus.NimbusOAuth2UserService; | ||
| import org.springframework.security.oauth2.core.user.OAuth2User; | ||
| import org.springframework.security.web.util.matcher.RequestMatcher; | ||
| import org.springframework.util.Assert; | ||
|
|
||
| import java.net.URI; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| /** | ||
| * @author Joe Grandja | ||
| */ | ||
| final class AuthorizationCodeAuthenticationFilterConfigurer<H extends HttpSecurityBuilder<H>> extends | ||
| AbstractAuthenticationFilterConfigurer<H, AuthorizationCodeAuthenticationFilterConfigurer<H>, AuthorizationCodeAuthenticationProcessingFilter> { | ||
|
|
||
| private AuthorizationGrantTokenExchanger<AuthorizationCodeAuthenticationToken> authorizationCodeTokenExchanger; | ||
| private OAuth2UserService userInfoService; | ||
| private Map<URI, Converter<ClientHttpResponse, ? extends OAuth2User>> userInfoTypeConverters = new HashMap<>(); | ||
|
|
||
|
|
||
| AuthorizationCodeAuthenticationFilterConfigurer() { | ||
| super(new AuthorizationCodeAuthenticationProcessingFilter(), null); | ||
| } | ||
|
|
||
| AuthorizationCodeAuthenticationFilterConfigurer<H> clientRegistrationRepository(ClientRegistrationRepository clientRegistrationRepository) { | ||
| Assert.notNull(clientRegistrationRepository, "clientRegistrationRepository cannot be null"); | ||
| Assert.notEmpty(clientRegistrationRepository.getRegistrations(), "clientRegistrationRepository cannot be empty"); | ||
| this.getBuilder().setSharedObject(ClientRegistrationRepository.class, clientRegistrationRepository); | ||
| return this; | ||
| } | ||
|
|
||
| AuthorizationCodeAuthenticationFilterConfigurer<H> authorizationCodeTokenExchanger( | ||
| AuthorizationGrantTokenExchanger<AuthorizationCodeAuthenticationToken> authorizationCodeTokenExchanger) { | ||
|
|
||
| Assert.notNull(authorizationCodeTokenExchanger, "authorizationCodeTokenExchanger cannot be null"); | ||
| this.authorizationCodeTokenExchanger = authorizationCodeTokenExchanger; | ||
| return this; | ||
| } | ||
|
|
||
| AuthorizationCodeAuthenticationFilterConfigurer<H> userInfoService(OAuth2UserService userInfoService) { | ||
| Assert.notNull(userInfoService, "userInfoService cannot be null"); | ||
| this.userInfoService = userInfoService; | ||
| return this; | ||
| } | ||
|
|
||
| AuthorizationCodeAuthenticationFilterConfigurer<H> userInfoTypeConverter(Converter<ClientHttpResponse, ? extends OAuth2User> userInfoConverter, URI userInfoUri) { | ||
| Assert.notNull(userInfoConverter, "userInfoConverter cannot be null"); | ||
| Assert.notNull(userInfoUri, "userInfoUri cannot be null"); | ||
| this.userInfoTypeConverters.put(userInfoUri, userInfoConverter); | ||
| return this; | ||
| } | ||
|
|
||
| String getLoginUrl() { | ||
| return super.getLoginPage(); | ||
| } | ||
|
|
||
| String getLoginFailureUrl() { | ||
| return super.getFailureUrl(); | ||
| } | ||
|
|
||
| @Override | ||
| public void init(H http) throws Exception { | ||
| AuthorizationCodeAuthenticationProvider authenticationProvider = new AuthorizationCodeAuthenticationProvider( | ||
| this.getAuthorizationCodeTokenExchanger(), this.getUserInfoService()); | ||
| authenticationProvider = this.postProcess(authenticationProvider); | ||
| http.authenticationProvider(authenticationProvider); | ||
| super.init(http); | ||
| } | ||
|
|
||
| @Override | ||
| public void configure(H http) throws Exception { | ||
| AuthorizationCodeAuthenticationProcessingFilter authFilter = this.getAuthenticationFilter(); | ||
| authFilter.setClientRegistrationRepository(OAuth2LoginConfigurer.getClientRegistrationRepository(this.getBuilder())); | ||
| super.configure(http); | ||
| } | ||
|
|
||
| @Override | ||
| protected RequestMatcher createLoginProcessingUrlMatcher(String loginProcessingUrl) { | ||
| return this.getAuthenticationFilter().getAuthorizeRequestMatcher(); | ||
| } | ||
|
|
||
| private AuthorizationGrantTokenExchanger<AuthorizationCodeAuthenticationToken> getAuthorizationCodeTokenExchanger() { | ||
| if (this.authorizationCodeTokenExchanger == null) { | ||
| this.authorizationCodeTokenExchanger = new NimbusAuthorizationCodeTokenExchanger(); | ||
| } | ||
| return this.authorizationCodeTokenExchanger; | ||
| } | ||
|
|
||
| private OAuth2UserService getUserInfoService() { | ||
| if (this.userInfoService == null) { | ||
| this.userInfoService = new NimbusOAuth2UserService(this.userInfoTypeConverters); | ||
| } | ||
| return this.userInfoService; | ||
| } | ||
| } |
61 changes: 61 additions & 0 deletions
61
...ation/web/configurers/oauth2/client/AuthorizationCodeRequestRedirectFilterConfigurer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| /* | ||
| * Copyright 2012-2017 the original author or authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.springframework.security.config.annotation.web.configurers.oauth2.client; | ||
|
|
||
| import org.springframework.security.config.annotation.web.HttpSecurityBuilder; | ||
| import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; | ||
| import org.springframework.security.oauth2.client.authentication.AuthorizationCodeRequestRedirectFilter; | ||
| import org.springframework.security.oauth2.client.authentication.AuthorizationRequestUriBuilder; | ||
| import org.springframework.security.oauth2.client.authentication.DefaultAuthorizationRequestUriBuilder; | ||
| import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository; | ||
| import org.springframework.util.Assert; | ||
|
|
||
| /** | ||
| * @author Joe Grandja | ||
| */ | ||
| final class AuthorizationCodeRequestRedirectFilterConfigurer<B extends HttpSecurityBuilder<B>> extends | ||
| AbstractHttpConfigurer<AuthorizationCodeRequestRedirectFilterConfigurer<B>, B> { | ||
|
|
||
| private AuthorizationRequestUriBuilder authorizationRequestBuilder; | ||
|
|
||
| AuthorizationCodeRequestRedirectFilterConfigurer<B> clientRegistrationRepository(ClientRegistrationRepository clientRegistrationRepository) { | ||
| Assert.notNull(clientRegistrationRepository, "clientRegistrationRepository cannot be null"); | ||
| Assert.notEmpty(clientRegistrationRepository.getRegistrations(), "clientRegistrationRepository cannot be empty"); | ||
| this.getBuilder().setSharedObject(ClientRegistrationRepository.class, clientRegistrationRepository); | ||
| return this; | ||
| } | ||
|
|
||
| AuthorizationCodeRequestRedirectFilterConfigurer<B> authorizationRequestBuilder(AuthorizationRequestUriBuilder authorizationRequestBuilder) { | ||
| Assert.notNull(authorizationRequestBuilder, "authorizationRequestBuilder cannot be null"); | ||
| this.authorizationRequestBuilder = authorizationRequestBuilder; | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public void configure(B http) throws Exception { | ||
| AuthorizationCodeRequestRedirectFilter filter = new AuthorizationCodeRequestRedirectFilter( | ||
| OAuth2LoginConfigurer.getClientRegistrationRepository(this.getBuilder()), | ||
| this.getAuthorizationRequestBuilder()); | ||
| http.addFilter(this.postProcess(filter)); | ||
| } | ||
|
|
||
| private AuthorizationRequestUriBuilder getAuthorizationRequestBuilder() { | ||
| if (this.authorizationRequestBuilder == null) { | ||
| this.authorizationRequestBuilder = new DefaultAuthorizationRequestUriBuilder(); | ||
| } | ||
| return this.authorizationRequestBuilder; | ||
| } | ||
| } |
Oops, something went wrong.