-
Notifications
You must be signed in to change notification settings - Fork 43
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Allow to add nickname as attribute during a registration request (#789)
* Make it configurable (default is false)
- Loading branch information
1 parent
c2cd839
commit 4bc7379
Showing
7 changed files
with
253 additions
and
54 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
169 changes: 169 additions & 0 deletions
169
...n-service/src/test/java/it/infn/mw/iam/test/registration/RegistrationAttributesTests.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,169 @@ | ||
| /** | ||
| * Copyright (c) Istituto Nazionale di Fisica Nucleare (INFN). 2016-2021 | ||
| * | ||
| * 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 it.infn.mw.iam.test.registration; | ||
|
|
||
| import static it.infn.mw.iam.registration.DefaultRegistrationRequestService.NICKNAME_ATTRIBUTE_KEY; | ||
| import static it.infn.mw.iam.test.ext_authn.saml.SamlAuthenticationTestSupport.DEFAULT_IDP_ID; | ||
| import static it.infn.mw.iam.test.ext_authn.saml.SamlAuthenticationTestSupport.T1_EPUID; | ||
| import static org.junit.Assert.assertTrue; | ||
| import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; | ||
|
|
||
| import org.junit.After; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.http.MediaType; | ||
| import org.springframework.test.context.TestPropertySource; | ||
| import org.springframework.test.context.junit4.SpringRunner; | ||
| import org.springframework.test.web.servlet.MockMvc; | ||
|
|
||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
|
|
||
| import it.infn.mw.iam.authn.saml.util.Saml2Attribute; | ||
| import it.infn.mw.iam.persistence.model.IamAccount; | ||
| import it.infn.mw.iam.persistence.model.IamSamlId; | ||
| import it.infn.mw.iam.persistence.repository.IamAccountRepository; | ||
| import it.infn.mw.iam.registration.RegistrationRequestDto; | ||
| import it.infn.mw.iam.test.api.TestSupport; | ||
| import it.infn.mw.iam.test.ext_authn.oidc.OidcTestConfig; | ||
| import it.infn.mw.iam.test.util.WithMockOIDCUser; | ||
| import it.infn.mw.iam.test.util.WithMockSAMLUser; | ||
| import it.infn.mw.iam.test.util.annotation.IamMockMvcIntegrationTest; | ||
| import it.infn.mw.iam.test.util.oauth.MockOAuth2Filter; | ||
|
|
||
|
|
||
| @RunWith(SpringRunner.class) | ||
| @IamMockMvcIntegrationTest | ||
| @TestPropertySource(properties = {"iam.registration.add-nickname-as-attribute=true"}) | ||
| public class RegistrationAttributesTests extends TestSupport { | ||
|
|
||
| @Autowired | ||
| private ObjectMapper objectMapper; | ||
|
|
||
| @Autowired | ||
| private MockOAuth2Filter oauth2Filter; | ||
|
|
||
| @Autowired | ||
| private MockMvc mvc; | ||
|
|
||
| @Autowired | ||
| private IamAccountRepository iamAccountRepo; | ||
|
|
||
| @Before | ||
| public void setup() { | ||
| oauth2Filter.cleanupSecurityContext(); | ||
| } | ||
|
|
||
| @After | ||
| public void teardown() { | ||
| oauth2Filter.cleanupSecurityContext(); | ||
| } | ||
|
|
||
| private RegistrationRequestDto createRegistrationRequest() { | ||
|
|
||
| String username = "test-attributes"; | ||
|
|
||
| String email = username + "@example.org"; | ||
| RegistrationRequestDto request = new RegistrationRequestDto(); | ||
| request.setGivenname("Test"); | ||
| request.setFamilyname("User"); | ||
| request.setEmail(email); | ||
| request.setUsername(username); | ||
| request.setNotes("Some short notes..."); | ||
| request.setPassword("password"); | ||
|
|
||
| return request; | ||
| } | ||
|
|
||
| @Test | ||
| public void linkAttributesFromLocalRegistrationRequest() throws Exception { | ||
|
|
||
| RegistrationRequestDto r = createRegistrationRequest(); | ||
| mvc | ||
| .perform(post("/registration/create").contentType(MediaType.APPLICATION_JSON) | ||
| .content(objectMapper.writeValueAsString(r))) | ||
| .andExpect(status().isOk()); | ||
|
|
||
| IamAccount account = iamAccountRepo.findByEmail("test-attributes@example.org") | ||
| .orElseThrow(() -> new AssertionError("Expected account not found")); | ||
| assertTrue(account.getAttributeByName(NICKNAME_ATTRIBUTE_KEY) | ||
| .get() | ||
| .getValue() | ||
| .equals("test-attributes")); | ||
|
|
||
| iamAccountRepo.delete(account); | ||
|
|
||
| } | ||
|
|
||
| @Test | ||
| @WithMockOIDCUser(subject = TEST_100_USER, issuer = OidcTestConfig.TEST_OIDC_ISSUER) | ||
| public void linkAttributesFromOidcRegistrationRequest() throws Exception { | ||
|
|
||
| String username = "test-oidc-subject"; | ||
|
|
||
| String email = username + "@example.org"; | ||
| RegistrationRequestDto request = new RegistrationRequestDto(); | ||
| request.setGivenname("Test"); | ||
| request.setFamilyname("User"); | ||
| request.setEmail(email); | ||
| request.setUsername(username); | ||
| request.setNotes("Some short notes..."); | ||
|
|
||
| mvc | ||
| .perform(post("/registration/create").contentType(MediaType.APPLICATION_JSON) | ||
| .content(objectMapper.writeValueAsBytes(request))) | ||
| .andExpect(status().isOk()); | ||
|
|
||
| IamAccount account = iamAccountRepo.findByOidcId(OidcTestConfig.TEST_OIDC_ISSUER, TEST_100_USER) | ||
| .orElseThrow(() -> new AssertionError("Expected account not found")); | ||
| assertTrue( | ||
| account.getAttributeByName(NICKNAME_ATTRIBUTE_KEY).get().getValue().equals(username)); | ||
|
|
||
| iamAccountRepo.delete(account); | ||
| } | ||
|
|
||
| @Test | ||
| @WithMockSAMLUser(issuer = DEFAULT_IDP_ID, subject = T1_EPUID) | ||
| public void linkAttributesFromSamlRegistrationRequest() throws Throwable { | ||
|
|
||
| String username = "test-saml-ext-reg"; | ||
|
|
||
| String email = username + "@example.org"; | ||
| RegistrationRequestDto request = new RegistrationRequestDto(); | ||
| request.setGivenname("Test"); | ||
| request.setFamilyname("Saml User"); | ||
| request.setEmail(email); | ||
| request.setUsername(username); | ||
| request.setNotes("Some short notes..."); | ||
|
|
||
| mvc | ||
| .perform(post("/registration/create").contentType(MediaType.APPLICATION_JSON) | ||
| .content(objectMapper.writeValueAsBytes(request))) | ||
| .andExpect(status().isOk()); | ||
|
|
||
| IamSamlId id = new IamSamlId(DEFAULT_IDP_ID, Saml2Attribute.EPUID.getAttributeName(), T1_EPUID); | ||
|
|
||
| IamAccount account = iamAccountRepo.findBySamlId(id) | ||
| .orElseThrow(() -> new AssertionError("Expected account not found")); | ||
| assertTrue( | ||
| account.getAttributeByName(NICKNAME_ATTRIBUTE_KEY).get().getValue().equals(username)); | ||
|
|
||
| iamAccountRepo.delete(account); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.