signed the new fake idl

3 files changed, 13 insertions, 10 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java
index 52488c3cb..4d84ce0a5 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java
@@ -951,7 +951,13 @@ public class AuthenticationDataBuilder implements MOAIDAuthConstants {
             //resign IDL
 			IdentityLinkReSigner identitylinkresigner = IdentityLinkReSigner.getInstance();					
 			Element resignedilAssertion;
-			resignedilAssertion = identitylinkresigner.resignIdentityLink(businessServiceIdl.getSamlAssertion());    				    				
+
+			AuthConfigurationProvider config = AuthConfigurationProvider.getInstance();
+			if (config.isIdentityLinkResigning()) {
+				resignedilAssertion = identitylinkresigner.resignIdentityLink(businessServiceIdl.getSamlAssertion(), config.getIdentityLinkResigningKey());
+			} else {
+				resignedilAssertion = businessServiceIdl.getSamlAssertion();
+			}
 			IdentityLinkAssertionParser resignedIDLParser = new IdentityLinkAssertionParser(resignedilAssertion);
 			IdentityLink resignedIDL = resignedIDLParser.parseIdentityLink();
 			
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java
index 0a8f0db6f..10d0ddbc4 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java
@@ -408,6 +408,11 @@ public class PEPSConnectorServlet extends AuthServlet {
 					prDateOfBirth.getFirstChild().setNodeValue(dateOfBirth);

 

 		            identityLink = new IdentityLinkAssertionParser(idlassertion).parseIdentityLink();

+

+		            //resign IDL

+					IdentityLinkReSigner identitylinkresigner = IdentityLinkReSigner.getInstance();

+					Element resignedilAssertion = identitylinkresigner.resignIdentityLink(identityLink.getSamlAssertion(), config.getStorkFakeIdLResigningKey());

+					identityLink = new IdentityLinkAssertionParser(resignedilAssertion).parseIdentityLink();

 				} else {

 					//contact SZR Gateway

 					Logger.debug("Starting connecting SZR Gateway");

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/IdentityLinkReSigner.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/IdentityLinkReSigner.java
index 090bea486..520b81b17 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/IdentityLinkReSigner.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/IdentityLinkReSigner.java
@@ -71,13 +71,9 @@ public class IdentityLinkReSigner {
 		return instance;
 	}
 	
-	public Element resignIdentityLink(Element idl) throws MOAIDException {
+	public Element resignIdentityLink(Element idl, String keyGroupId) throws MOAIDException {
 		
 		try {
-			AuthConfigurationProvider config = AuthConfigurationProvider.getInstance();
-						
-			if (config.isIdentityLinkResigning()) {
-				
 				if (idl == null) {
 					Logger.warn("IdentityLink is empty");
 					return null;
@@ -91,7 +87,6 @@ public class IdentityLinkReSigner {
 				
 				SPSSFactory spssFac = SPSSFactory.getInstance();
 				
-				String keyGroupId = config.getIdentityLinkResigningKey();
 				if (MiscUtil.isEmpty(keyGroupId)) {
 					Logger.warn("No IdentityLink reSigning-Key definded");
 					throw new MOAIDException("config.19", new Object[]{});
@@ -166,9 +161,6 @@ public class IdentityLinkReSigner {
 			    	Logger.warn("Allgemeiner Fehler beim Aufruf von MOA-SS: Unbekannter ResponseType von MOA-SS");
 			    	throw new MOAIDException("builder.05", new Object[]{});
 			    }
-			    				
-			} else 
-				return idl;
 						
 		} catch (ConfigurationException e) {
 			Logger.warn("Configuration can not be loaded", e);