fix attribute escaping problem in IdentityLinkAssertionParser and move the escaping into SL1.0 AuthBlock builder and validator

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

3 files changed, 7 insertions, 3 deletions

diff --git a/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java b/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
index a77ba45a5..a500a7c93 100644
--- a/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
+++ b/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
@@ -536,7 +536,10 @@ public class AuthenticationServer extends BaseAuthenticationServer {
 			IOAAuthParameters oaParam, IRequest pendingReq) throws BuildException, ConfigurationException, EAAFBuilderException {
 
 		IIdentityLink identityLink = session.getIdentityLink();
-		String issuer = identityLink.getName();
+		String issuer = identityLink.getName();		
+		// replace ' in name with '
+		issuer = issuer.replaceAll("'", "'");	
+		
 		String gebDat = identityLink.getDateOfBirth();
 
 		String identificationValue = null;
diff --git a/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/builder/PersonDataBuilder.java b/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/builder/PersonDataBuilder.java
index fb65bac04..d2429e63b 100644
--- a/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/builder/PersonDataBuilder.java
+++ b/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/builder/PersonDataBuilder.java
@@ -93,6 +93,7 @@ public class PersonDataBuilder {
         prIdentification.getFirstChild().setNodeValue("");
       }
       String xmlString = DOMUtils.serializeNode(prPerson);
+      
       return xmlString;
     }
     catch (Exception ex) {
diff --git a/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/validator/CreateXMLSignatureResponseValidator.java b/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/validator/CreateXMLSignatureResponseValidator.java
index ab9be7163..78d999971 100644
--- a/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/validator/CreateXMLSignatureResponseValidator.java
+++ b/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/validator/CreateXMLSignatureResponseValidator.java
@@ -161,7 +161,7 @@ public class CreateXMLSignatureResponseValidator {
 	    }
 	    // replace ' in name with '
 	    issuer = issuer.replaceAll("'", "'");    
-	    if (!issuer.equals(identityLink.getName()))
+	    if (!issuer.equals(identityLink.getName().replaceAll("'", "'")))
 	        throw new ValidateException("validator.33", new Object[] {issuer, identityLink.getName()});
 	        
 	    
@@ -467,7 +467,7 @@ public class CreateXMLSignatureResponseValidator {
 	      throw new ValidateException("validator.39", new Object[] {issueInstant, session.getIssueInstant()});
 	    }
 	    
-	    String name = identityLink.getName();
+	    String name = identityLink.getName().replaceAll("'", "'");
 	    
 	    if (!issuer.equals(name)) {
 	      throw new ValidateException("validator.33", new Object[] {issuer, name});