fix attribute escaping problem in SimpleIdentityLinkAssertionParser1.0.6

this fix can be deactivated by property: 'configuration.bugfix.enable.idl.escaping' to get backward compatibility

9 files changed, 316 insertions, 17 deletions

diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/api/idp/auth/data/IIdentityLink.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/api/idp/auth/data/IIdentityLink.java
index c5c08d87..df71b30a 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/api/idp/auth/data/IIdentityLink.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/api/idp/auth/data/IIdentityLink.java
@@ -58,9 +58,12 @@ public interface IIdentityLink {
 	String getGivenName();
 
 	/**
-	   * Returns the name.
-	   * @return The name.
-	   */
+	 * Return  the name as 'givenName + " " + familyName'<br>
+	 * This method should be used any more. Use getFamilyName() and getGivenName() separately.
+	 * 
+	 * @return The name.
+	*/
+	@Deprecated
 	String getName();
 
 	/**
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/AbstractAuthenticationDataBuilder.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/AbstractAuthenticationDataBuilder.java
index 3ba2c2cf..f578afd8 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/AbstractAuthenticationDataBuilder.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/AbstractAuthenticationDataBuilder.java
@@ -60,7 +60,10 @@ import at.gv.egiz.eaaf.core.impl.utils.XPathUtils;
  
 
 public abstract class AbstractAuthenticationDataBuilder implements IAuthenticationDataBuilder {
-	private static final Logger log = LoggerFactory.getLogger(AbstractAuthenticationDataBuilder.class);		
+	private static final Logger log = LoggerFactory.getLogger(AbstractAuthenticationDataBuilder.class);
+	
+	public static final String CONFIG_PROP_ENABLE_IDL_ATTRIBUTE_ESCAPEING = "configuration.bugfix.enable.idl.escaping";
+	
 	protected Collection<String> includedToGenericAuthData = null;	
 	@Autowired protected IConfiguration basicConfig;
 	
@@ -384,10 +387,25 @@ public abstract class AbstractAuthenticationDataBuilder implements IAuthenticati
 		authData.setIdentificationValue(identityLink.getIdentificationValue());
 		authData.setIdentificationType(identityLink.getIdentificationType());
 
-		authData.setGivenName(identityLink.getGivenName());
-		authData.setFamilyName(identityLink.getFamilyName());
+		/* GivenNames and FamilyNames with simple Apostrophe were escaped with &#39; 
+		 * in IdentityLinkParser since 5 years. This feature was bug-fix for an SL1.0 AuthBlock problem.
+		 * However, the authentication attributes (SAML2, eIDAS, OpenID-Connect) also includes this escaped values,
+		 * but there it is not neccesary. We fix this problem in 3.4.3, but the fix can be deactivated 
+		 * for dependency reasons. 
+		 */
+		if (basicConfig.getBasicMOAIDConfigurationBoolean(CONFIG_PROP_ENABLE_IDL_ATTRIBUTE_ESCAPEING, false)) {
+			authData.setGivenName(identityLink.getGivenName().replaceAll("'", "&#39;"));
+			authData.setFamilyName(identityLink.getFamilyName().replaceAll("'", "&#39;"));
+			
+		} else {
+			authData.setGivenName(identityLink.getGivenName());
+			authData.setFamilyName(identityLink.getFamilyName());
+			
+		}
+		
 		authData.setDateOfBirth(identityLink.getDateOfBirth());
 		
+		
 		//remove corresponding keys from genericSessionData if exists
 		includedGenericSessionData.remove(PVPAttributeDefinitions.PRINCIPAL_NAME_NAME);
 		includedGenericSessionData.remove(PVPAttributeDefinitions.GIVEN_NAME_NAME);
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/IdentityLink.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/IdentityLink.java
index becd630e..367643ec 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/IdentityLink.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/IdentityLink.java
@@ -86,10 +86,6 @@ public class IdentityLink implements Serializable, IIdentityLink{
 	 */
 	private String familyName;
   
-  /**
-   * The name as (givenName + familyName)
-   */
-  private String name;
 	/**
 	 * date of birth
 	 */
@@ -157,11 +153,10 @@ public String getGivenName() {
  * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#getName()
  */
   @Override
-public String getName() {
-    if (name == null) {
-      name = givenName + " " + familyName;
-    }
-    return name;
+  @Deprecated
+  public String getName() {
+    return givenName + " " + familyName;
+    
   }
   
   /* (non-Javadoc)
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/SimpleIdentityLinkAssertionParser.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/SimpleIdentityLinkAssertionParser.java
index 0aec58a2..658e6a42 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/SimpleIdentityLinkAssertionParser.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/SimpleIdentityLinkAssertionParser.java
@@ -274,8 +274,8 @@ public class SimpleIdentityLinkAssertionParser {
 	  String familyname = XPathUtils.getElementValue(assertionElem, PERSON_FAMILY_NAME_XPATH, "");
 
 	  // replace ' in name with &#39;
-	  givenname = givenname.replaceAll("'", "&#39;");
-	  familyname = familyname.replaceAll("'", "&#39;");			
+//	  givenname = givenname.replaceAll("'", "&#39;");
+//	  familyname = familyname.replaceAll("'", "&#39;");			
 		
       identityLink.setGivenName(givenname);
       identityLink.setFamilyName(familyname);
diff --git a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/AuthenticationDataBuilderTest.java b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/AuthenticationDataBuilderTest.java
new file mode 100644
index 00000000..c4acbaad
--- /dev/null
+++ b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/AuthenticationDataBuilderTest.java
@@ -0,0 +1,107 @@
+package at.gv.egiz.eaaf.core.impl.idp.auth;
+
+import java.io.ByteArrayInputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.util.Base64Utils;
+
+import at.gv.egiz.eaaf.core.api.idp.IAuthData;
+import at.gv.egiz.eaaf.core.impl.idp.auth.data.AuthProcessDataWrapper;
+import at.gv.egiz.eaaf.core.impl.idp.auth.data.SimpleIdentityLinkAssertionParser;
+import at.gv.egiz.eaaf.core.impl.idp.module.test.DummyConfiguration;
+import at.gv.egiz.eaaf.core.impl.idp.module.test.DummySPConfiguration;
+import at.gv.egiz.eaaf.core.impl.idp.module.test.TestRequestImpl;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration("/SpringTest-context_eaaf_core.xml")
+public class AuthenticationDataBuilderTest {
+
+	@Autowired private TestAuthenticationDataBuilder authBuilder;
+	@Autowired private DummyConfiguration authConfig;
+	
+	private static final String DUMMY_IDL_2 = "<saml:Assertion AssertionID="elgatest.egiz.gv.at-AssertionIDXXXŐzgür_XXXTüzekçi" IssueInstant="2019-03-04T15:53:04+01:00" Issuer="http://portal.bmi.gv.at/ref/szr/issuer" MajorVersion="1" MinorVersion="0" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:ecdsa="http://www.w3.org/2001/04/xmldsig-more#" xmlns:pr="http://reference.e-government.gv.at/namespace/persondata/20020228#" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:si="http://www.w3.org/2001/XMLSchema-instance">
	<saml:AttributeStatement>
		<saml:Subject>
			<saml:SubjectConfirmation>
				<saml:ConfirmationMethod>urn:oasis:names:tc:SAML:1.0:cm:sender-vouches</saml:ConfirmationMethod>
				<saml:SubjectConfirmationData>
					<pr:Person si:type="pr:PhysicalPersonType"><pr:Identification><pr:Value>RUxHQVRlc3RQQjBYWFjFkHpnw7xyX1hYWFTDvHpla8OnaQ==</pr:Value><pr:Type>urn:publicid:gv.at:baseid</pr:Type></pr:Identification><pr:Name><pr:GivenName>XXXŐz'gür</pr:GivenName><pr:FamilyName primary="undefined">XXXTüzekçi</pr:FamilyName></pr:Name><pr:DateOfBirth>1973-06-04</pr:DateOfBirth></pr:Person>
				</saml:SubjectConfirmationData>
			</saml:SubjectConfirmation>
		</saml:Subject>
		<saml:Attribute AttributeName="CitizenPublicKey" AttributeNamespace="urn:publicid:gv.at:namespaces:identitylink:1.2"><saml:AttributeValue><dsig:RSAKeyValue><dsig:Modulus>/UKRFHbAaEkgVdgM1SDOJjWHqK37rJYStPqtUXzo9VNorO83Yoyza9b0dp7muS8ojZ24YEPLQFwY
BIZdm4NHrA5vlVVkDeuBx6mTpEpeu7d2E3wuYmQWN41QxVj6OpXoHtszOcj7uFofzmRGOOUB35LC
H6C0LLZI559kpOnaqkdKmO7vwnaQ4y10pzBv2wSpSfv4v9HWsBaF1QkX6ifCyAnIKKqJs4zKTn+a
GI/KAJ9whjoFBOrwS3NQi+VRTlOa7JtwqxpIeF+Ow4Gl3igUok3hklbU2xIXpnUysPahjQ0L6nND
YTufP/cFlk5i/GPYvkN62GwFxFJ5l0h/P7AkIh+VfdB/D7HUXh/OWgfzOL+fEDgb/WG3PMzyNmQM
nPBGPomataNDKekHa5F09LEPty/Fp051/1DQ6T1xsjfydmuiVlX6HEFjf1dbd8qKFFnSCsqDpPuD
GHMq+JKIf7nGAkXIlki0577uo342lZxpTVTFVAFvBGKFzk3eC32OCp9J</dsig:Modulus><dsig:Exponent>AQAB</dsig:Exponent></dsig:RSAKeyValue></saml:AttributeValue></saml:Attribute><saml:Attribute AttributeName="CitizenPublicKey" AttributeNamespace="urn:publicid:gv.at:namespaces:identitylink:1.2"><saml:AttributeValue><dsig:RSAKeyValue><dsig:Modulus>yPXbapFaaprqifUuIiLsGALiWSLdlPcQ7EFdfyS34ESI4a2Bs0mLSnnEcWcxrcZX3rlIQpJjIpoU
A+RDol5PkSphHCL6IvIQMfkkxH5gK6jCzTSV9REVmqRTE1sqRcBQGnDYp26pHQhc0GHmw6ujx+PO
uvQ62oaQIqQvtOfKXPQyyWL19rXW97+EG0y0Kwei8tVcMnjbydKM/vywMEoqEqMf0F+GKcwp7ent
ZsruDTH+cKIbpWuJKg00UHkhn9AfdbPWw6V9e+BhqSIXq0hhHfJCAw6pYuXiV6tODJPFvu17WbBt
Wpuz2NGTLSv75rejIBkOS2NLKAfWraVhTh67Vw==</dsig:Modulus><dsig:Exponent>AQAB</dsig:Exponent></dsig:RSAKeyValue></saml:AttributeValue></saml:Attribute>
	</saml:AttributeStatement>
<dsig:Signature xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference URI=""><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xpath-19991116"><dsig:XPath>not(ancestor-or-self::pr:Identification)</dsig:XPath></dsig:Transform><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>7NfrEBJdl854rdmAh1ctQ2X7WMc=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://www.w3.org/2000/09/xmldsig#Manifest" URI="#manifest"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>hfg8za3mYqu5QSbUzXHxDe5/SNE=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>muWb39TagCd3NwWcu5ikEJuJpZdnedRDcdm17IZv+OEVEtqylRur/wX6AGUCU/PU
ZnCudNGVpCHLYzHipN5c8obmnhllINoSENO5ov5jiMoNKodAexJIN6mZODBd/TmT
m70ViWyrGULbIYl/whlv1lga3J8cx8KSoPz8SwNL2qwUj2to/Ahg4kcJlqOs25YM
NX/waInw6DR7NGCJoE+ZZSppHwwQm6v+9HY9E86seBAAPxI9M1jJ4ZWb329jFtiA
qvb8s6jxr2ll8uVagqXCYhX9+WNQwayqYL+Ow8OplUzoN1TiKhRmQKZIwKYC1Z8y
K+vjAlQO2aONs4HUhoR6d26e/MU1fbeXHqTzrfb9GXWHyttTdjxbzkZA1F82lQFo
5+VzcMHQRg7sDJ865ZMs3ppceh/9ZSfoOf5HYDPYuWecODigZQYXtMYpuPQTk+Cm
s9ZJGzBV2lemfNC9QU78tfn6p1UZrSLnsXaXmUc8Ec53PiHAOvznXtB5cEnaWgZ2
uLeF8KSRl6J0eNQ9JDPgSN0sfalbVCdhCTNQmrRtOjUf3e7u3xIMzRufn0oj6Htp
t3hEDHXnI/dNMlppRIyxpd1lZ9mrXfIKrrLeWqtgwpPu94hUHQ/eJz1k3/H3Hz3d
ZDxvAEc3SDDdoQWy/GPfiqspEfclgtJCJCa8/kvu7RU=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIIFZDCCA0ygAwIBAgIJAJav+zeqU/DMMA0GCSqGSIb3DQEBCwUAMFwxCzAJBgNV
BAYTAkFUMQ0wCwYDVQQKEwRFR0laMRYwFAYDVQQLEw1Tb2Z0d2FyZUNhcmRzMSYw
JAYDVQQDFB1UZXN0X1NvZnR3YXJlY2FyZHNfSURMX1NpZ25lcjAeFw0xNjEwMTgx
MDM5MDdaFw0xOTA3MTQxMDM5MDdaMFwxCzAJBgNVBAYTAkFUMQ0wCwYDVQQKEwRF
R0laMRYwFAYDVQQLEw1Tb2Z0d2FyZUNhcmRzMSYwJAYDVQQDFB1UZXN0X1NvZnR3
YXJlY2FyZHNfSURMX1NpZ25lcjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
ggIBALkLgt+MFTxLfRzcEIZ0bycIFg7g/HPN7QWIZ67bHzrb6ehebzF9VinzDZXC
kfKWdUJbkNSuWKWrp2X62f7oGhdqK0yFc+Dlo+OpIDgQiWCpBfKJo8cPWsiAmNuT
xWVagU5faI1h7xvvOVMybWe92nivfqLOuEx6WvX/UoIawRHV2VmPGFgZocM5G0X6
bUVEpqxAa3qOIlRr0poB+RA0PA86hRpRYal/Or93D8BfQH5l8zV9QcvPe/KeJSpJ
HgGWmEs593LtNuA1Rv1iDpuu10y7C2FeMBvcUpRkR7WAj7vIYVtQILXCh1FhfN1b
Hg6xLVTyshlgUn7ARQJYoJ3togdGamDRlnKU2rXN9j88Tw6fAdcCvWbWVtjy8pNj
WLkVJMlFWdfO6/5LAva1HxROMhFx7QOPhOzemetCtT2fI4FTAk9Vyf9wTUQOL8sq
K73t1A419lYS8WuUCzHDxLujLiTuwoIUgzMN/bqMEZrogPLY2Kj4vmZMZ4gU2PU7
Yw+Xfang3+/yK1gYNEebpdvPi8SVUAnus/Cfmdwdn9O/naWiBpjc06GJvMbegjxw
oPBM5c0SkCR5xCaygZL2OBpRMKgdfrk4k0pj5ZUm+mtrOGojtRZJEZQCBpVPk1yD
3L4/Z4AZofOo8dSkUR+xJN0oKnIdfndvBxNF4sxY4IwOvFRrAgMBAAGjKTAnMAkG
A1UdEwQCMAAwCwYDVR0PBAQDAgWgMA0GByooAAoBBwEEAgUAMA0GCSqGSIb3DQEB
CwUAA4ICAQBcED7tE8qmAwFBdhyoz1D8yodEZmmdXZwksA/kI+o+5wQs6Y/qvw7j
+eBvlctyXCXWh1eFeb/FaiA5Cpoak8Nc/oY7T/yBj5gfKHlNqVT1owaBkHsEYMBv
aUXxyDCbnFMznJfkxjbvFbQdd1hceJht8Dx+ikpB6MJHqHIEry0WWgf3JdN5PErr
ATndjBE4BaTZ2q6sCv+SdK60Mk0mYA6l6nSC9eB8G9C4bA1cQEOu6+FPmFzSkiIF
temA1tjQnhxKZZigzxIN3EQAnq/23jf+CkxAt5GkpUjqF5bqKI1nerJOgn4Jm5j6
sPZGpGllzHLBaybfY63Az4sERC28OlqFw1vxQs4hWIWNWEAMF3Oz4+pYg4OIIh5C
Nr1aqJgssWfOZrX2KSz2vqrZoU67zq84MQcJTSmgKVBb9OnrC5tYn5YVUlydPPjr
Um0iHlWC0MFiIgSzx6Ti2HnPgc0UHsA6IpSTo+UufYYNDiFCssRbu4r0/Syq4MP3
ghYXdP9Tj0FISz2TvM6YQfzHej94bZcVNwnF4pWEnGZtBbNVvJRw9iJHHkDWLiYM
1B73zs7+pA8YgKqExDHXc1Shou5HvSuTXSmaTMUHrCkhotHfpqYhrJiAmJ+OftNv
6oxMPfNhZg01eOotm1J+WV2mJbgcPTNSC1ONcSFdQ5vZZLL24J2Hcw==</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo><dsig:Object><dsig:Manifest Id="manifest"><dsig:Reference URI=""><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xpath-19991116"><dsig:XPath xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">not(ancestor-or-self::dsig:Signature)</dsig:XPath></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>AsxTzkZdAYC4SK5q8ysJKT7yduQ=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object></dsig:Signature></saml:Assertion>";
+	
+	@Test
+	public void dummyTest() throws Exception {
+		
+		
+	}  
+	  
+	  
+	
+	@Test
+	public void buildAuthDataWithIDLOnly_2_without_flag() throws Exception {
+		buildAuthDataWithIDLOnly_2(null, "XXXŐz'gür", "XXXTüzekçi");
+		System.out.println("IDPParser and AuthDataBuilder without escape config --> Successfull");
+		
+	}
+	
+	
+	@Test
+	public void buildAuthDataWithIDLOnly_2_with_flag_true() throws Exception {
+		buildAuthDataWithIDLOnly_2(true, "XXXŐz&#39;gür", "XXXTüzekçi");
+		System.out.println("IDPParser and AuthDataBuilder with escape config 'true' --> Successfull");
+		
+	}
+	
+	@Test
+	public void buildAuthDataWithIDLOnly_2_with_flag_false() throws Exception {
+		buildAuthDataWithIDLOnly_2(false, "XXXŐz'gür", "XXXTüzekçi");
+		System.out.println("IDPParser and AuthDataBuilder with escape config 'false' --> Successfull");
+		
+	}
+	
+	private void buildAuthDataWithIDLOnly_2(Boolean idlEscaptionFlag, String givenName, String familyName) throws Exception {
+		IAuthData authData = null;
+		
+		try {
+			authConfig.setIsIDLEscapingEnabled(idlEscaptionFlag);		
+			
+			TestRequestImpl pendingReq = new TestRequestImpl();						
+			Map<String, String> spConfigMap = new HashMap<String, String>();
+			spConfigMap.put("target", "urn:publicid:gv.at:cdid+ZP-MH");
+			
+			DummySPConfiguration spConfig = new DummySPConfiguration(spConfigMap , authConfig);
+			pendingReq.setSpConfig(spConfig);
+				
+			HashMap<String, Object> sessionStore = new HashMap<String, Object>();
+			AuthProcessDataWrapper wrapper = new AuthProcessDataWrapper(sessionStore);
+			wrapper.setIdentityLink(new SimpleIdentityLinkAssertionParser(new ByteArrayInputStream(Base64Utils.decode(DUMMY_IDL_2.getBytes()))).parseIdentityLink());
+			pendingReq.setRawDataToTransaction(sessionStore);
+						
+			authData = authBuilder.buildAuthenticationData(pendingReq);
+			
+		} catch (Exception e) {
+			e.printStackTrace();
+			throw e;
+			
+		}
+		
+		if (authData == null)
+			throw new Exception("AuthenticationData is 'null'");
+		
+		if (!authData.getFamilyName().equals(familyName))
+			throw new Exception("Familyname wrong");
+		
+		if (!authData.getGivenName().equals(givenName))
+			throw new Exception("GivenName wrong");
+						
+		if (!authData.getFormatedDateOfBirth().equals("1973-06-04"))
+			throw new Exception("DateOfBirth wrong");
+		 
+		
+		if (!authData.getIdentificationValue().equals("RUxHQVRlc3RQQjBYWFjFkHpnw7xyX1hYWFTDvHpla8OnaQ=="))
+			throw new Exception("baseId wrong");
+		
+		if (!authData.getIdentificationType().equals("urn:publicid:gv.at:baseid"))
+			throw new Exception("baseIdType wrong");
+						
+	}
+	
+}
diff --git a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/TestAuthenticationDataBuilder.java b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/TestAuthenticationDataBuilder.java
new file mode 100644
index 00000000..834c2d6e
--- /dev/null
+++ b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/TestAuthenticationDataBuilder.java
@@ -0,0 +1,45 @@
+package at.gv.egiz.eaaf.core.impl.idp.auth;
+
+import at.gv.egiz.eaaf.core.api.IRequest;
+import at.gv.egiz.eaaf.core.api.idp.IAuthData;
+import at.gv.egiz.eaaf.core.api.idp.ISPConfiguration;
+import at.gv.egiz.eaaf.core.api.idp.auth.data.IAuthProcessDataContainer;
+import at.gv.egiz.eaaf.core.exceptions.EAAFAuthenticationException;
+import at.gv.egiz.eaaf.core.exceptions.EAAFBuilderException;
+import at.gv.egiz.eaaf.core.impl.data.Pair;
+import at.gv.egiz.eaaf.core.impl.idp.AuthenticationData;
+import at.gv.egiz.eaaf.core.impl.idp.auth.builder.AbstractAuthenticationDataBuilder;
+import at.gv.egiz.eaaf.core.impl.idp.auth.data.AuthProcessDataWrapper;
+
+public class TestAuthenticationDataBuilder extends AbstractAuthenticationDataBuilder {
+
+	@Override
+	public IAuthData buildAuthenticationData(IRequest pendingReq) throws EAAFAuthenticationException {
+
+		AuthenticationData authData = new AuthenticationData();
+		try {
+			generateBasicAuthData(authData, pendingReq, pendingReq.getSessionData(AuthProcessDataWrapper.class));
+			
+		} catch (Exception e) {
+			e.printStackTrace();
+			throw new EAAFAuthenticationException("AuthDataGeneration FAILED", null, e);
+			
+		}
+		return authData;
+	}
+
+	@Override
+	protected Pair<String, String> getEncryptedbPKFromPVPAttribute(IAuthProcessDataContainer authProcessDataContainer,
+			AuthenticationData authData, ISPConfiguration spConfig) throws EAAFBuilderException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	protected Pair<String, String> getbaseIDFromSZR(AuthenticationData authData, String notValidbPK,
+			String notValidbPKType) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}
diff --git a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/module/test/DummyConfiguration.java b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/module/test/DummyConfiguration.java
new file mode 100644
index 00000000..cae22fc4
--- /dev/null
+++ b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/module/test/DummyConfiguration.java
@@ -0,0 +1,90 @@
+package at.gv.egiz.eaaf.core.impl.idp.module.test;
+
+import java.net.URI;
+import java.net.URL;
+import java.util.Map;
+import java.util.Properties;
+
+import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
+import at.gv.egiz.eaaf.core.api.idp.ISPConfiguration;
+import at.gv.egiz.eaaf.core.exceptions.EAAFConfigurationException;
+import at.gv.egiz.eaaf.core.exceptions.EAAFException;
+import at.gv.egiz.eaaf.core.impl.idp.auth.builder.AbstractAuthenticationDataBuilder;
+
+public class DummyConfiguration implements IConfiguration {
+
+	private Boolean isIDLEscapingEnabled = null;
+	
+	@Override
+	public String getBasicConfiguration(String key) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String getBasicConfiguration(String key, String defaultValue) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Map<String, String> getBasicMOAIDConfigurationWithPrefix(String prefix) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public boolean getBasicMOAIDConfigurationBoolean(String key, boolean defaultValue) {
+		if (AbstractAuthenticationDataBuilder.CONFIG_PROP_ENABLE_IDL_ATTRIBUTE_ESCAPEING.equals(key)) {
+			if (isIDLEscapingEnabled == null)
+				return defaultValue;
+			else
+				return isIDLEscapingEnabled;
+			
+		}
+		
+		
+		return false;
+	}
+
+	@Override
+	public ISPConfiguration getServiceProviderConfiguration(String uniqueID) throws EAAFConfigurationException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public <T> T getServiceProviderConfiguration(String spIdentifier, Class<T> decorator)
+			throws EAAFConfigurationException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Properties getFullConfigurationProperties() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public URI getConfigurationRootDirectory() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public URI getConfigurationFilePath() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String validateIDPURL(URL authReqUrl) throws EAAFException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public void setIsIDLEscapingEnabled(Boolean isIDLEscapingEnabled) {
+		this.isIDLEscapingEnabled = isIDLEscapingEnabled;
+	}
+}
diff --git a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/module/test/DummySPConfiguration.java b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/module/test/DummySPConfiguration.java
new file mode 100644
index 00000000..f51c95ab
--- /dev/null
+++ b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/module/test/DummySPConfiguration.java
@@ -0,0 +1,21 @@
+package at.gv.egiz.eaaf.core.impl.idp.module.test;
+
+import java.util.Map;
+
+import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
+import at.gv.egiz.eaaf.core.impl.idp.conf.SPConfigurationImpl;
+
+public class DummySPConfiguration extends SPConfigurationImpl {
+
+	public DummySPConfiguration(Map<String, String> spConfig, IConfiguration authConfig) {
+		super(spConfig, authConfig);
+		
+	}
+	
+	@Override
+	public String getAreaSpecificTargetIdentifier() {
+		return getConfigurationValue("target");
+				
+	}
+
+}
diff --git a/eaaf_core/src/test/resources/SpringTest-context_eaaf_core.xml b/eaaf_core/src/test/resources/SpringTest-context_eaaf_core.xml
new file mode 100644
index 00000000..523e9fc7
--- /dev/null
+++ b/eaaf_core/src/test/resources/SpringTest-context_eaaf_core.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:tx="http://www.springframework.org/schema/tx"
+	xmlns:aop="http://www.springframework.org/schema/aop"
+	xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
+		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
+
+	<bean id="TestAuthenticationDataBuilder" 
+				class="at.gv.egiz.eaaf.core.impl.idp.auth.TestAuthenticationDataBuilder"/>
+								
+								
+	<!-- Dummy test classes -->								
+	<bean id="DummyConfig" 
+				class="at.gv.egiz.eaaf.core.impl.idp.module.test.DummyConfiguration"/>
+												
+</beans>