move citizen-card authentication and validation (Security-layer communication) to discrete module

1 files changed, 43 insertions, 0 deletions

diff --git a/id/server/modules/moa-id-modules-saml1/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java b/id/server/modules/moa-id-modules-saml1/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java
index e70e71d49..eb869756e 100644
--- a/id/server/modules/moa-id-modules-saml1/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java
+++ b/id/server/modules/moa-id-modules-saml1/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java
@@ -25,6 +25,7 @@ package at.gv.egovernment.moa.id.protocols.saml1;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.List;
+import java.util.Vector;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBElement;
@@ -33,9 +34,13 @@ import javax.xml.namespace.QName;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
 
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.w3c.dom.Element;
 import org.xml.sax.SAXException;
 
+import eu.stork.peps.auth.commons.IPersonalAttributeList;
+import eu.stork.peps.auth.commons.PersonalAttribute;
+
 import at.gv.egovernment.moa.id.auth.AuthenticationServer;
 import at.gv.egovernment.moa.id.auth.builder.AuthenticationDataAssertionBuilder;
 import at.gv.egovernment.moa.id.auth.builder.BPKBuilder;
@@ -43,6 +48,7 @@ import at.gv.egovernment.moa.id.auth.builder.PersonDataBuilder;
 import at.gv.egovernment.moa.id.auth.builder.SAMLArtifactBuilder;
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
 import at.gv.egovernment.moa.id.auth.data.ExtendedSAMLAttribute;
+import at.gv.egovernment.moa.id.auth.data.ExtendedSAMLAttributeImpl;
 import at.gv.egovernment.moa.id.auth.data.IdentityLink;
 import at.gv.egovernment.moa.id.auth.exception.AuthenticationException;
 import at.gv.egovernment.moa.id.auth.exception.BuildException;
@@ -120,6 +126,43 @@ public class SAML1AuthenticationServer extends AuthenticationServer {
 	}
 	
 	/**
+	 * Transforms additional STORK attributes to MOA Extended attributes
+	 * @param iPersonalAttributeList STORK attribute list
+	 * @return
+	 */
+	public static List<ExtendedSAMLAttribute> addAdditionalSTORKAttributes(IPersonalAttributeList iPersonalAttributeList) {
+		List<ExtendedSAMLAttribute> moaExtendedSAMLAttributeList = new Vector<ExtendedSAMLAttribute>();
+		
+		if(null == iPersonalAttributeList)
+			return moaExtendedSAMLAttributeList;
+		
+		Logger.trace("Adding the following attributes to MOA assertion: ");
+		int count = 0;
+
+		for (PersonalAttribute attribute : iPersonalAttributeList) {
+			Object attributeValue = attribute.getValue();
+			if (null == attributeValue)
+				attributeValue = attribute.getComplexValue();
+
+			// escape attributeValue
+			attributeValue = StringEscapeUtils.escapeXml10(attributeValue.toString());
+			// and remove trailing and tailing brackets. Might break something but we never saw an array with more than one entry!
+			attributeValue = ((String) attributeValue).substring(1, ((String) attributeValue).length() - 1);
+
+			ExtendedSAMLAttribute extendedSAMLAttribute = 
+				new ExtendedSAMLAttributeImpl(attribute.getName(), attributeValue, Constants.STORK_NS_URI, 0);
+			moaExtendedSAMLAttributeList.add(extendedSAMLAttribute);
+			count++;
+			Logger.trace("Additional attribute: " + attribute.getName());
+		}
+		
+		Logger.debug("Added " + count + " STORK attribute(s) to the MOA assertion.");		
+		
+		return moaExtendedSAMLAttributeList;
+	}
+	
+	
+	/**
 	 * Retrieves <code>AuthenticationData</code> indexed by the SAML artifact.
 	 * The <code>AuthenticationData</code> is deleted from the store upon end of
 	 * this call.