aboutsummaryrefslogtreecommitdiff
path: root/eidas_modules/authmodule-eIDAS-v2
diff options
context:
space:
mode:
authorlalber <lukas.alber@iaik.tugraz.at>2020-10-20 09:02:39 +0200
committerlalber <lukas.alber@iaik.tugraz.at>2020-10-20 09:02:39 +0200
commit3332e8c363b624e7478f303c403ea709844e822f (patch)
tree031e28168cadf848b9317f28ebeea6188302bbc5 /eidas_modules/authmodule-eIDAS-v2
parentf696b4085fd10b3b9d627437f439b222903e13e1 (diff)
downloadNational_eIDAS_Gateway-3332e8c363b624e7478f303c403ea709844e822f.tar.gz
National_eIDAS_Gateway-3332e8c363b624e7478f303c403ea709844e822f.tar.bz2
National_eIDAS_Gateway-3332e8c363b624e7478f303c403ea709844e822f.zip
fixes thanks to Thomas
Diffstat (limited to 'eidas_modules/authmodule-eIDAS-v2')
-rw-r--r--eidas_modules/authmodule-eIDAS-v2/pom.xml6
-rw-r--r--eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateIdentityLinkTask.java7
-rw-r--r--eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/CreateIdentityLinkTaskEidNewTest.java11
3 files changed, 12 insertions, 12 deletions
diff --git a/eidas_modules/authmodule-eIDAS-v2/pom.xml b/eidas_modules/authmodule-eIDAS-v2/pom.xml
index 7bbdaf78..4fe2bb36 100644
--- a/eidas_modules/authmodule-eIDAS-v2/pom.xml
+++ b/eidas_modules/authmodule-eIDAS-v2/pom.xml
@@ -161,12 +161,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>eu.eidas</groupId>
- <artifactId>eidas-light-commons</artifactId>
- <version>2.4.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>at.gv.egiz.eaaf</groupId>
<artifactId>eaaf_core_utils</artifactId>
<scope>test</scope>
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateIdentityLinkTask.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateIdentityLinkTask.java
index e4a22cbc..93813ff5 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateIdentityLinkTask.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateIdentityLinkTask.java
@@ -95,6 +95,9 @@ public class CreateIdentityLinkTask extends AbstractAuthServletTask {
@Autowired
private ICcSpecificEidProcessingService eidPostProcessor;
+ @Autowired
+ EaafKeyStoreFactory keyStoreFactory;
+
/*
* (non-Javadoc)
*
@@ -331,14 +334,14 @@ public class CreateIdentityLinkTask extends AbstractAuthServletTask {
}
private String getPkFromKeystore() throws EaafException, KeyStoreException {
- EaafKeyStoreFactory keyStoreFactory = new EaafKeyStoreFactory();
KeyStoreConfiguration configuration = new KeyStoreConfiguration();
final String current = new java.io.File(".").toURI().toString();
configuration.setSoftKeyStoreFilePath(current + "src/test/resources/keystore/teststore.jks");
-
configuration.setSoftKeyStorePassword("f/+saJBc3a}*/T^s");
configuration.setKeyStoreType(KeyStoreConfiguration.KeyStoreType.JKS);
+ configuration.setFriendlyName("connectorkeypair");
+ configuration.setKeyStoreName("connectorkeypair");
val ks = keyStoreFactory.buildNewKeyStore(configuration);
val publicKey = ks.getFirst().getCertificate("connectorkeypair").getPublicKey();
return Base64.getEncoder().encodeToString(publicKey.getEncoded());
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 185181dd..f674b6b1 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
@@ -63,6 +63,7 @@ import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
+import szrservices.PersonInfoType;
import szrservices.SZR;
import szrservices.SZRException_Exception;
@@ -144,7 +145,7 @@ public class CreateIdentityLinkTaskEidNewTest {
executionContext.put(MsEidasNodeConstants.REQ_PARAM_SELECTED_COUNTRY, "XX");
- szrMock = soap.mock(SZR.class, "http://localhost:2526/szrService");
+ szrMock = soap.mock(SZR.class, "http://localhost:1234/demoszr");
}
@NotNull
@@ -183,9 +184,11 @@ public class CreateIdentityLinkTaskEidNewTest {
// keystore password f/+saJBc3a}*/T^s
try {
- SZR szrMock2 = Mockito.mock(SZR.class, Mockito.CALLS_REAL_METHODS);
-// when(szrMock, "getStammzahlEncrypted", any(), any()).thenReturn(RandomStringUtils.randomNumeric(10));
- when(szrMock2, "getStammzahlEncrypted", any(), any()).thenReturn(RandomStringUtils.randomNumeric(10));
+ String test = szrMock.getStammzahlEncrypted(new PersonInfoType(), false);
+
+// SZR szrMock2 = Mockito.mock(SZR.class, Mockito.CALLS_REAL_METHODS);
+ when(szrMock, "getStammzahlEncrypted", any(), any()).thenReturn(RandomStringUtils.randomNumeric(10));
+// when(szrMock2, "getStammzahlEncrypted", any(), any()).thenReturn(RandomStringUtils.randomNumeric(10));
// Wie kann ich das vom Bean rein gehängte SZR mit dem Mock überschreiben?
task.execute(pendingReq, executionContext);