-
Notifications
You must be signed in to change notification settings - Fork 739
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactors out custom UserInfoTokenServices to check and enforce restr…
…icted domain param (#250)
- Loading branch information
Travis Tomsu
committed
Jun 27, 2016
1 parent
fc8f7eb
commit afcb3d2
Showing
4 changed files
with
173 additions
and
70 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
113 changes: 113 additions & 0 deletions
113
...n/groovy/com/netflix/spinnaker/gate/security/oauth2/SpinnakerUserInfoTokenServices.groovy
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,113 @@ | ||
| /* | ||
| * Copyright 2016 Google, Inc. | ||
| * | ||
| * 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 com.netflix.spinnaker.gate.security.oauth2 | ||
|
|
||
| import com.netflix.spinnaker.gate.security.rolesprovider.UserRolesProvider | ||
| import com.netflix.spinnaker.gate.services.CredentialsService | ||
| import com.netflix.spinnaker.security.User | ||
| import groovy.util.logging.Slf4j | ||
| import org.springframework.beans.factory.annotation.Autowired | ||
| import org.springframework.cloud.security.oauth2.resource.ResourceServerProperties | ||
| import org.springframework.cloud.security.oauth2.resource.UserInfoTokenServices | ||
| import org.springframework.security.authentication.BadCredentialsException | ||
| import org.springframework.security.core.AuthenticationException | ||
| import org.springframework.security.oauth2.common.OAuth2AccessToken | ||
| import org.springframework.security.oauth2.common.exceptions.InvalidTokenException | ||
| import org.springframework.security.oauth2.provider.OAuth2Authentication | ||
| import org.springframework.security.oauth2.provider.OAuth2Request | ||
| import org.springframework.security.oauth2.provider.token.ResourceServerTokenServices | ||
| import org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationToken | ||
|
|
||
| /** | ||
| * ResourceServerTokenServices is an interface used to manage access tokens. The UserInfoTokenService object is an | ||
| * implementation of that interface that uses an access token to get the logged in user's data (such as email or | ||
| * profile). We want to customize the Authentication object that is returned to include our custom (Kork) User. | ||
| */ | ||
| @Slf4j | ||
| class SpinnakerUserInfoTokenServices implements ResourceServerTokenServices { | ||
| @Autowired | ||
| ResourceServerProperties sso | ||
|
|
||
| @Autowired | ||
| UserInfoTokenServices userInfoTokenServices | ||
|
|
||
| @Autowired | ||
| CredentialsService credentialsService | ||
|
|
||
| @Autowired | ||
| UserRolesProvider userRolesProvider | ||
|
|
||
| @Autowired | ||
| OAuth2SsoConfig.UserInfoMapping userInfoMapping | ||
|
|
||
| @Autowired | ||
| OAuth2SsoConfig.UserInfoRequirements userInfoRequirements | ||
|
|
||
| @Override | ||
| OAuth2Authentication loadAuthentication(String accessToken) throws AuthenticationException, InvalidTokenException { | ||
| OAuth2Authentication oAuth2Authentication = userInfoTokenServices.loadAuthentication(accessToken) | ||
|
|
||
| Map details = oAuth2Authentication.userAuthentication.details as Map | ||
|
|
||
| if (!hasAllUserInfoRequirements(details)) { | ||
| throw new BadCredentialsException("User's info does not have all required fields.") | ||
| } | ||
|
|
||
| def username = details[userInfoMapping.username] as String | ||
| def roles = userRolesProvider.loadRoles(username) | ||
|
|
||
| User spinnakerUser = new User( | ||
| email: details[userInfoMapping.email] as String, | ||
| firstName: details[userInfoMapping.firstName] as String, | ||
| lastName: details[userInfoMapping.lastName] as String, | ||
| allowedAccounts: credentialsService.getAccountNames(roles), | ||
| roles: roles, | ||
| username: username).asImmutable() | ||
|
|
||
| PreAuthenticatedAuthenticationToken authentication = new PreAuthenticatedAuthenticationToken( | ||
| spinnakerUser, | ||
| null /* credentials */, | ||
| spinnakerUser.authorities | ||
| ) | ||
|
|
||
| // impl copied from UserInfoTokenServices | ||
| OAuth2Request storedRequest = new OAuth2Request(null, sso.clientId, null, true /*approved*/, | ||
| null, null, null, null, null); | ||
|
|
||
| return new OAuth2Authentication(storedRequest, authentication) | ||
| } | ||
|
|
||
| @Override | ||
| OAuth2AccessToken readAccessToken(String accessToken) { | ||
| return userInfoTokenServices.readAccessToken(accessToken) | ||
| } | ||
|
|
||
| boolean hasAllUserInfoRequirements(Map details) { | ||
| if (!userInfoRequirements) { | ||
| return true | ||
| } | ||
|
|
||
| def invalidFields = userInfoRequirements.findAll { String reqKey, String reqVal -> | ||
| details[reqKey] != reqVal | ||
| } | ||
| if (log.debugEnabled) { | ||
| log.debug "Invalid userInfo response: " + invalidFields.collect({k, v -> "got $k=${details[k]}, wanted $v"}).join(", ") | ||
| } | ||
|
|
||
| return !invalidFields | ||
| } | ||
| } |
52 changes: 52 additions & 0 deletions
52
...oovy/com/netflix/spinnaker/gate/security/oauth2/SpinnakerUserInfoTokenServicesSpec.groovy
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,52 @@ | ||
| /* | ||
| * Copyright 2016 Google, Inc. | ||
| * | ||
| * 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 com.netflix.spinnaker.gate.security.oauth2 | ||
|
|
||
| import spock.lang.Specification | ||
| import spock.lang.Subject | ||
|
|
||
| class SpinnakerUserInfoTokenServicesSpec extends Specification { | ||
|
|
||
| def "should check restricted domain flag if set"() { | ||
| setup: | ||
| def userInfoRequirements = new OAuth2SsoConfig.UserInfoRequirements(); | ||
| @Subject tokenServices = new SpinnakerUserInfoTokenServices(userInfoRequirements: userInfoRequirements) | ||
|
|
||
| expect: "no domain restriction means everything matches" | ||
| tokenServices.hasAllUserInfoRequirements([:]) | ||
| tokenServices.hasAllUserInfoRequirements(["hd": "foo.com"]) | ||
| tokenServices.hasAllUserInfoRequirements(["bar": "foo.com"]) | ||
| tokenServices.hasAllUserInfoRequirements(["bar": "bar.com"]) | ||
|
|
||
| when: "domain restricted but not found on userAuthorizationUri" | ||
| userInfoRequirements.hd = "foo.com" | ||
|
|
||
| then: | ||
| !tokenServices.hasAllUserInfoRequirements([:]) | ||
| tokenServices.hasAllUserInfoRequirements(["hd": "foo.com"]) | ||
| !tokenServices.hasAllUserInfoRequirements(["bar": "foo.com"]) | ||
| !tokenServices.hasAllUserInfoRequirements(["bar": "bar.com"]) | ||
|
|
||
| when: "multiple restriction values" | ||
| userInfoRequirements.bar = "bar.com" | ||
|
|
||
| then: | ||
| !tokenServices.hasAllUserInfoRequirements(["hd": "foo.com"]) | ||
| !tokenServices.hasAllUserInfoRequirements(["bar": "bar.com"]) | ||
| tokenServices.hasAllUserInfoRequirements(["hd": "foo.com", "bar": "bar.com"]) | ||
| } | ||
| } |