HPI Identifikation als Alternative zu wbPK im businessService-Modus

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@805 d688527b-c9ab-4aba-bd8d-4036d912da1d

1 files changed, 59 insertions, 52 deletions

diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/validator/CreateXMLSignatureResponseValidator.java b/id.server/src/at/gv/egovernment/moa/id/auth/validator/CreateXMLSignatureResponseValidator.java
index 78f62de50..efb33ea59 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/validator/CreateXMLSignatureResponseValidator.java
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/validator/CreateXMLSignatureResponseValidator.java
@@ -87,6 +87,7 @@ public class CreateXMLSignatureResponseValidator {
     boolean foundOA = false;
     boolean foundGB = false;
     boolean foundWBPK = false;
+    int offset = 0;
     
     // check number of SAML aatributes
     List extendedSAMLAttributes = session.getExtendedSAMLAttributesAUTH();
@@ -96,6 +97,7 @@ public class CreateXMLSignatureResponseValidator {
     }
     int expectedSAMLAttributeNumber = 
       AuthenticationBlockAssertionBuilder.NUM_OF_SAML_ATTRIBUTES + extendedSAMLAttributesNum;
+    if (!session.getSAMLAttributeGebeORwbpk()) expectedSAMLAttributeNumber--;
     int actualSAMLAttributeNumber = samlAttributes.length;
     if (actualSAMLAttributeNumber != expectedSAMLAttributeNumber) {
       Logger.error("Wrong number of SAML attributes in CreateXMLSignatureResponse: expected " + 
@@ -105,58 +107,63 @@ public class CreateXMLSignatureResponseValidator {
         new Object[] {String.valueOf(actualSAMLAttributeNumber), String.valueOf(expectedSAMLAttributeNumber)});
     }
     
-    // check the first attribute ("Geschaeftsbereich" or "wbPK")
-    SAMLAttribute samlAttribute = samlAttributes[0];
-    if (businessService) {
-      if (!samlAttribute.getName().equals("wbPK")) {
-        if (samlAttribute.getName().equals("Geschaeftsbereich")) {
-          throw new ValidateException("validator.26", null);
-        } else {
-          throw new ValidateException(
-          "validator.37", 
-          new Object[] {samlAttribute.getName(), "wbPK", String.valueOf(1)});
-        }
-      }          
-      if (samlAttribute.getNamespace().equals("http://reference.e-government.gv.at/namespace/moa/20020822#")) {          
-        foundWBPK = true;
-        try {
-          Element attrValue = (Element)samlAttribute.getValue();
-          String value = ((Element)attrValue.getElementsByTagNameNS(Constants.PD_NS_URI, "Value").item(0)).getFirstChild().getNodeValue();
-          String type =  ((Element)attrValue.getElementsByTagNameNS(Constants.PD_NS_URI, "Type").item(0)).getFirstChild().getNodeValue();
-          if (!value.equals(identityLink.getIdentificationValue())) {
-            throw new ValidateException("validator.28", null); 
-          }
-          if (!type.equals(identityLink.getIdentificationType())) {
-            throw new ValidateException("validator.28", null); 
-          }
-        } catch (Exception ex) {
-          throw new ValidateException("validator.29", null);
-        }
-      } else {
-        throw new ValidateException("validator.30", null);
-      }    
+    SAMLAttribute samlAttribute;
+    if (session.getSAMLAttributeGebeORwbpk()) {
+    	// check the first attribute ("Geschaeftsbereich" or "wbPK")
+		samlAttribute = samlAttributes[0];
+		if (businessService) {
+		  if (!samlAttribute.getName().equals("wbPK")) {
+		    if (samlAttribute.getName().equals("Geschaeftsbereich")) {
+		      throw new ValidateException("validator.26", null);
+		    } else {
+		      throw new ValidateException(
+		      "validator.37", 
+		      new Object[] {samlAttribute.getName(), "wbPK", String.valueOf(1)});
+		    }
+		  }          
+		  if (samlAttribute.getNamespace().equals("http://reference.e-government.gv.at/namespace/moa/20020822#")) {          
+		    foundWBPK = true;
+		    try {
+		      Element attrValue = (Element)samlAttribute.getValue();
+		      String value = ((Element)attrValue.getElementsByTagNameNS(Constants.PD_NS_URI, "Value").item(0)).getFirstChild().getNodeValue();
+		      String type =  ((Element)attrValue.getElementsByTagNameNS(Constants.PD_NS_URI, "Type").item(0)).getFirstChild().getNodeValue();
+		      if (!value.equals(identityLink.getIdentificationValue())) {
+		        throw new ValidateException("validator.28", null); 
+		      }
+		      if (!type.equals(identityLink.getIdentificationType())) {
+		        throw new ValidateException("validator.28", null); 
+		      }
+		    } catch (Exception ex) {
+		      throw new ValidateException("validator.29", null);
+		    }
+		  } else {
+		    throw new ValidateException("validator.30", null);
+		  }    
+		} else {
+		  if (!samlAttribute.getName().equals("Geschaeftsbereich")) {
+		    if (samlAttribute.getName().equals("wbPK")) {
+		      throw new ValidateException("validator.26", null);
+		    } else {
+		      throw new ValidateException(
+		      "validator.37", 
+		      new Object[] {samlAttribute.getName(), "Geschaeftsbereich", String.valueOf(1)});
+		    }
+		  }
+		  if (samlAttribute.getNamespace().equals("http://reference.e-government.gv.at/namespace/moa/20020822#")) {          
+		    foundGB = true;             
+		    if (!gbTarget.equals((String)samlAttribute.getValue())) {
+		      throw new ValidateException("validator.13", null); 
+		    }             
+		  } else {
+		    throw new ValidateException("validator.12", null);
+		  }
+		}
     } else {
-      if (!samlAttribute.getName().equals("Geschaeftsbereich")) {
-        if (samlAttribute.getName().equals("wbPK")) {
-          throw new ValidateException("validator.26", null);
-        } else {
-          throw new ValidateException(
-          "validator.37", 
-          new Object[] {samlAttribute.getName(), "Geschaeftsbereich", String.valueOf(1)});
-        }
-      }
-      if (samlAttribute.getNamespace().equals("http://reference.e-government.gv.at/namespace/moa/20020822#")) {          
-        foundGB = true;             
-        if (!gbTarget.equals((String)samlAttribute.getValue())) {
-          throw new ValidateException("validator.13", null); 
-        }             
-      } else {
-        throw new ValidateException("validator.12", null);
-      }
+		offset--;
     }
-    
+
     // check the second attribute (must be "OA")
-    samlAttribute = samlAttributes[1];
+    samlAttribute = samlAttributes[1 + offset];
     if (!samlAttribute.getName().equals("OA")) {
       throw new ValidateException(
           "validator.37", 
@@ -172,7 +179,7 @@ public class CreateXMLSignatureResponseValidator {
     }
       
     // check the third attribute (must be "Geburtsdatum")
-    samlAttribute = samlAttributes[2];
+    samlAttribute = samlAttributes[2 + offset];
     if (!samlAttribute.getName().equals("Geburtsdatum")) {
       throw new ValidateException(
           "validator.37", 
@@ -189,7 +196,7 @@ public class CreateXMLSignatureResponseValidator {
     }
       
     // now check the extended SAML attributes
-    int i = AuthenticationBlockAssertionBuilder.NUM_OF_SAML_ATTRIBUTES;
+    int i = AuthenticationBlockAssertionBuilder.NUM_OF_SAML_ATTRIBUTES + offset;
     if (extendedSAMLAttributes != null) {
       Iterator it = extendedSAMLAttributes.iterator();
       while (it.hasNext()) {
@@ -250,7 +257,7 @@ public class CreateXMLSignatureResponseValidator {
     
     if (!foundOA) throw new ValidateException("validator.14", null); 
     if (businessService) {
-      if (!foundWBPK) throw new ValidateException("validator.31", null);
+      if (session.getSAMLAttributeGebeORwbpk() && !foundWBPK) throw new ValidateException("validator.31", null);
     } else {
       if (!foundGB) throw new ValidateException("validator.11", null);
     }