Merge branch 'moa2_0_tlenz' of https://gitlab.iaik.tugraz.at/afitzek/moa-idspss into moa2_0_tlenz

Conflicts:
	id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties

1 files changed, 20 insertions, 7 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java
index fec2d2b35..ee0b4e7e2 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java
@@ -32,6 +32,7 @@ import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
 import at.gv.egovernment.moa.id.data.AuthenticationData;
 import at.gv.egovernment.moa.id.moduls.IRequest;
 import at.gv.egovernment.moa.id.storage.AssertionStorage;
+import at.gv.egovernment.moa.id.util.IdentityLinkReSigner;
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.Base64Utils;
 import at.gv.egovernment.moa.util.Constants;
@@ -193,14 +194,26 @@ public class SAML1AuthenticationServer extends AuthenticationServer {
 					.getAuthBlock() : "";
 					
 			//set IdentityLink for assortion
-			String ilAssertion = saml1parameter.isProvideIdentityLink() ? authData.getIdentityLink()
-					.getSerializedSamlAssertion()
-					: "";
-			if (!saml1parameter.isProvideStammzahl()) {
-				ilAssertion = StringUtils.replaceAll(ilAssertion, authData.getIdentityLink()
-						.getIdentificationValue(), "");
+			String ilAssertion = "";
+			if (saml1parameter.isProvideIdentityLink()) {		
+				if (session.getBusinessService()) {
+					IdentityLinkReSigner identitylinkresigner = IdentityLinkReSigner.getInstance();
+					
+					Element resignedilAssertion = identitylinkresigner.resignIdentityLink(authData.getIdentityLink()
+								.getSamlAssertion());
+					
+					ilAssertion = DOMUtils.serializeNode(resignedilAssertion);
+					
+				} else {
+					ilAssertion = authData.getIdentityLink().getSerializedSamlAssertion();
+					
+					if (!saml1parameter.isProvideStammzahl())
+						ilAssertion = StringUtils.replaceAll(ilAssertion, authData.getIdentityLink()
+								.getIdentificationValue(), "");
+					
+				}
 			}
-			
+
 			String samlAssertion;
 			
 			if (session.getUseMandate()) {