diff options
Diffstat (limited to 'eidas_modules/authmodule-eIDAS-v2/src/test/java')
| -rw-r--r-- | eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/CreateIdentityLinkTaskEidNewTest.java | 85 | 
1 files changed, 49 insertions, 36 deletions
| diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/CreateIdentityLinkTaskEidNewTest.java b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/CreateIdentityLinkTaskEidNewTest.java index 00e01a2c..888b7631 100644 --- a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/CreateIdentityLinkTaskEidNewTest.java +++ b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/CreateIdentityLinkTaskEidNewTest.java @@ -1,8 +1,8 @@  package at.asitplus.eidas.specific.modules.auth.eidas.v2.test.tasks; -import static at.asitplus.eidas.specific.connector.MsEidasNodeConstants.PROP_CONFIG_SP_AUTHBLOCK_FRIENDLYNAME; -import static at.asitplus.eidas.specific.connector.MsEidasNodeConstants.PROP_CONFIG_SP_AUTHBLOCK_PW; -import static at.asitplus.eidas.specific.connector.MsEidasNodeConstants.PROP_CONFIG_SP_EID_MODE; +import static at.asitplus.eidas.specific.connector.MsEidasNodeConstants.PROP_CONFIG_SP_AUTHBLOCK_KEYSTSTORE_FRIENDLYNAME; +import static at.asitplus.eidas.specific.connector.MsEidasNodeConstants.PROP_CONFIG_SP_AUTHBLOCK_KEYSTORE_PASSWORD; +import static at.asitplus.eidas.specific.connector.MsEidasNodeConstants.PROP_CONFIG_SP_NEW_EID_MODE;  import static org.mockito.ArgumentMatchers.any;  import static org.powermock.api.mockito.PowerMockito.when; @@ -69,8 +69,8 @@ public class CreateIdentityLinkTaskEidNewTest {    @Autowired(required = true)    private CreateIdentityLinkTask task; -//  @Autowired(required = true) -//  private FinalizeAuthenticationTask authTask; +  //  @Autowired(required = true) +  //  private FinalizeAuthenticationTask authTask;    @Autowired(required = true)    private DummySpecificCommunicationService commService;    @Autowired(required = true) @@ -87,7 +87,7 @@ public class CreateIdentityLinkTaskEidNewTest {    private static final String PW = "f/+saJBc3a}*/T^s";    private static final String ALIAS = "connectorkeypair"; -   +    @Rule    public final SoapServiceRule soap = SoapServiceRule.newInstance(); @@ -99,8 +99,7 @@ public class CreateIdentityLinkTaskEidNewTest {    @BeforeClass    public static void classInitializer() throws IOException {      final String current = new java.io.File(".").toURI().toString(); -    System.setProperty("eidas.ms.configuration", current -        + "src/test/resources/config/junit_config_3.properties"); +    System.setProperty("eidas.ms.configuration", current + "src/test/resources/config/junit_config_3.properties");    } @@ -118,18 +117,17 @@ public class CreateIdentityLinkTaskEidNewTest {      final Map<String, String> spConfig = new HashMap<>();      spConfig.put(EaafConfigConstants.SERVICE_UNIQUEIDENTIFIER, "testSp");      spConfig.put("target", "urn:publicid:gv.at:cdid+XX"); -    spConfig.put(PROP_CONFIG_SP_EID_MODE, "new"); -    spConfig.put(PROP_CONFIG_SP_AUTHBLOCK_PW, PW); -    spConfig.put(PROP_CONFIG_SP_AUTHBLOCK_FRIENDLYNAME, ALIAS); +    spConfig.put(PROP_CONFIG_SP_NEW_EID_MODE, "true"); +    spConfig.put(PROP_CONFIG_SP_AUTHBLOCK_KEYSTORE_PASSWORD, PW); +    spConfig.put(PROP_CONFIG_SP_AUTHBLOCK_KEYSTSTORE_FRIENDLYNAME, ALIAS);      oaParam = new DummySpConfiguration(spConfig, basicConfig);      pendingReq = new TestRequestImpl();      AuthenticationResponse response = buildDummyAuthResponse(); - - -    pendingReq.getSessionData(AuthProcessDataWrapper.class).setGenericDataToSession(Constants.DATA_FULL_EIDAS_RESPONSE, response); +    pendingReq.getSessionData(AuthProcessDataWrapper.class) +              .setGenericDataToSession(Constants.DATA_FULL_EIDAS_RESPONSE, response);      pendingReq.setSpConfig(oaParam);      pendingReq.setPendingReqId(at.gv.egiz.eaaf.core.impl.utils.Random.nextProcessReferenceValue());      pendingReq.setAuthUrl("http://test.com/"); @@ -143,33 +141,48 @@ public class CreateIdentityLinkTaskEidNewTest {    @NotNull    private AuthenticationResponse buildDummyAuthResponse() throws URISyntaxException { -    AttributeDefinition attributeDef = AttributeDefinition.builder().friendlyName(Constants.eIDAS_ATTR_PERSONALIDENTIFIER) -        .nameUri(new URI("ad", "sd", "ff")).personType(PersonType.LEGAL_PERSON) -        .xmlType(new QName("http://saf", "as", "af")) -        .attributeValueMarshaller("eu.eidas.auth.commons.attribute.impl.LiteralStringAttributeValueMarshaller").build(); -    AttributeDefinition attributeDef2 = AttributeDefinition.builder().friendlyName(Constants.eIDAS_ATTR_CURRENTFAMILYNAME) -        .nameUri(new URI("ad", "sd", "fff")).personType(PersonType.LEGAL_PERSON) -        .xmlType(new QName("http://saf", "as", "aff")) -        .attributeValueMarshaller("eu.eidas.auth.commons.attribute.impl.LiteralStringAttributeValueMarshaller").build(); -    AttributeDefinition attributeDef3 = AttributeDefinition.builder().friendlyName(Constants.eIDAS_ATTR_CURRENTGIVENNAME) -        .nameUri(new URI("ad", "sd", "ffff")).personType(PersonType.LEGAL_PERSON) -        .xmlType(new QName("http://saf", "as", "afff")) -        .attributeValueMarshaller("eu.eidas.auth.commons.attribute.impl.LiteralStringAttributeValueMarshaller").build(); +    AttributeDefinition attributeDef = AttributeDefinition.builder() +                                                          .friendlyName(Constants.eIDAS_ATTR_PERSONALIDENTIFIER) +                                                          .nameUri(new URI("ad", "sd", "ff")) +                                                          .personType(PersonType.LEGAL_PERSON) +                                                          .xmlType(new QName("http://saf", "as", "af")) +                                                          .attributeValueMarshaller( +                                                              "eu.eidas.auth.commons.attribute.impl.LiteralStringAttributeValueMarshaller") +                                                          .build(); +    AttributeDefinition attributeDef2 = AttributeDefinition.builder() +                                                           .friendlyName(Constants.eIDAS_ATTR_CURRENTFAMILYNAME) +                                                           .nameUri(new URI("ad", "sd", "fff")) +                                                           .personType(PersonType.LEGAL_PERSON) +                                                           .xmlType(new QName("http://saf", "as", "aff")) +                                                           .attributeValueMarshaller( +                                                               "eu.eidas.auth.commons.attribute.impl.LiteralStringAttributeValueMarshaller") +                                                           .build(); +    AttributeDefinition attributeDef3 = AttributeDefinition.builder() +                                                           .friendlyName(Constants.eIDAS_ATTR_CURRENTGIVENNAME) +                                                           .nameUri(new URI("ad", "sd", "ffff")) +                                                           .personType(PersonType.LEGAL_PERSON) +                                                           .xmlType(new QName("http://saf", "as", "afff")) +                                                           .attributeValueMarshaller( +                                                               "eu.eidas.auth.commons.attribute.impl.LiteralStringAttributeValueMarshaller") +                                                           .build();      AttributeDefinition attributeDef4 = AttributeDefinition.builder().friendlyName(Constants.eIDAS_ATTR_DATEOFBIRTH) -        .nameUri(new URI("ad", "sd", "fffff")).personType(PersonType.LEGAL_PERSON) -        .xmlType(new QName("http://saf", "as", "affff")) -        .attributeValueMarshaller("eu.eidas.auth.commons.attribute.impl.DateTimeAttributeValueMarshaller").build(); +                                                           .nameUri(new URI("ad", "sd", "fffff")) +                                                           .personType(PersonType.LEGAL_PERSON) +                                                           .xmlType(new QName("http://saf", "as", "affff")) +                                                           .attributeValueMarshaller( +                                                               "eu.eidas.auth.commons.attribute.impl.DateTimeAttributeValueMarshaller") +                                                           .build(); -    ImmutableAttributeMap attributeMap = ImmutableAttributeMap.builder().put(attributeDef, "de/st/" + RandomStringUtils.randomNumeric(64)) -        .put(attributeDef2, RandomStringUtils.randomAlphabetic(10)) -        .put(attributeDef3, RandomStringUtils.randomAlphabetic(10)) -        .put(attributeDef4, "2001-01-01") -        .build(); +    ImmutableAttributeMap attributeMap = ImmutableAttributeMap.builder().put(attributeDef, "de/st/" + RandomStringUtils +        .randomNumeric(64)).put(attributeDef2, RandomStringUtils.randomAlphabetic(10)).put(attributeDef3, +                                                                                           RandomStringUtils +                                                                                               .randomAlphabetic(10)) +                                                              .put(attributeDef4, "2001-01-01").build();      val b = new AuthenticationResponse.Builder(); -    return b.id("aasdf").issuer("asd").subject("asf").statusCode("200").inResponseTo("asdf") -        .subjectNameIdFormat("afaf").attributes(attributeMap).build(); +    return b.id("aasdf").issuer("asd").subject("asf").statusCode("200").inResponseTo("asdf").subjectNameIdFormat("afaf") +            .attributes(attributeMap).build();    }    @Test | 
