1 files changed, 52 insertions, 13 deletions

diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/parser/CreateXMLSignatureResponseParser.java b/id.server/src/at/gv/egovernment/moa/id/auth/parser/CreateXMLSignatureResponseParser.java
index 1079a48de..094fa091f 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/parser/CreateXMLSignatureResponseParser.java
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/parser/CreateXMLSignatureResponseParser.java
@@ -6,9 +6,11 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.w3c.dom.Element;
+import org.w3c.dom.Node;
 import org.w3c.dom.traversal.NodeIterator;
 
-import at.gv.egovernment.moa.id.*;
+import at.gv.egovernment.moa.id.AuthenticationException;
+import at.gv.egovernment.moa.id.ParseException;
 import at.gv.egovernment.moa.id.auth.data.CreateXMLSignatureResponse;
 import at.gv.egovernment.moa.id.auth.data.SAMLAttribute;
 import at.gv.egovernment.moa.util.Constants;
@@ -27,16 +29,13 @@ public class CreateXMLSignatureResponseParser {
   //
   // XPath namespace prefix shortcuts
   //
-  /** Xpath prefix for reaching SecurityLayer 1.0 Namespaces */
-  private static final String SL10 = Constants.SL10_PREFIX + ":";
-  /** Xpath prefix for reaching SecurityLayer 1.1 Namespaces */
-  private static final String SL11 = Constants.SL11_PREFIX + ":";
+
   /** Xpath prefix for reaching SAML Namespaces */
   private static final String SAML = Constants.SAML_PREFIX + ":";
   /** Xpath prefix for reaching XML-DSIG Namespaces */
   private static final String DSIG = Constants.DSIG_PREFIX + ":";
   /** Xpath expression to the root element */
-  private static final String ROOT = "/" + SL11 + "CreateXMLSignatureResponse/";
+  private static final String ROOT = ":CreateXMLSignatureResponse/";
   /** Xpath expression to the SAML:Assertion element */
   private static final String SAML_ASSERTION_XPATH = ROOT + SAML + "Assertion";
   /** Xpath expression to the SAML:NameIdentifier element */
@@ -45,7 +44,8 @@ public class CreateXMLSignatureResponseParser {
   private static final String SAML_ATTRIBUTE_XPATH = SAML_ASSERTION_XPATH + "/" + SAML + "AttributeStatement/" + SAML + "Attribute";
   /** Xpath expression to the AttributeValue element */
   private static final String SAML_ATTRIBUTE_VALUE_XPATH = SAML + "AttributeValue";
-
+  
+  
   /** This is the root element of the XML-Document provided by the Security Layer Card */
   private Element sigResponse;
 
@@ -89,6 +89,7 @@ public class CreateXMLSignatureResponseParser {
     try {
 
       sigResponse = DOMUtils.parseXmlValidating(is);
+      
     }
     catch (Throwable t) {
       throw new ParseException("parser.01", new Object[] { t.toString()}, t);
@@ -114,17 +115,23 @@ public class CreateXMLSignatureResponseParser {
   public CreateXMLSignatureResponse parseResponse() throws ParseException {
     CreateXMLSignatureResponse cResp;
     try {
-
       cResp = new CreateXMLSignatureResponse();
-      cResp.setSamlNameIdentifier(XPathUtils.getElementValue(sigResponse, SAML_SUBJECT_NAME_IDENTIFIER_XPATH, null));
-      cResp.setSamlAssertion((Element) XPathUtils.selectSingleNode(sigResponse, SAML_ASSERTION_XPATH));
-      NodeIterator attrIter = XPathUtils.selectNodeIterator(sigResponse, SAML_ATTRIBUTE_XPATH);
+      String slPrefix = sigResponse.getPrefix();
+      cResp.setSamlNameIdentifier(XPathUtils.getElementValue(sigResponse, "/" + slPrefix + SAML_SUBJECT_NAME_IDENTIFIER_XPATH, null));
+      cResp.setSamlAssertion((Element) XPathUtils.selectSingleNode(sigResponse, "/" + slPrefix + SAML_ASSERTION_XPATH));
+      NodeIterator attrIter = XPathUtils.selectNodeIterator(sigResponse, "/" + slPrefix + SAML_ATTRIBUTE_XPATH);
       Element samlAttr;
       List samlAttributes = new ArrayList();
       while ((samlAttr = (Element) attrIter.nextNode()) != null) {
         String attrName = XPathUtils.getAttributeValue(samlAttr, "@AttributeName", "");
         String attrNamespace = XPathUtils.getAttributeValue(samlAttr, "@AttributeNamespace", "");
-        String attrValue = XPathUtils.getElementValue(samlAttr, SAML_ATTRIBUTE_VALUE_XPATH, "");
+        Object attrValue;
+        if ("wbPK".equals(attrName)) {
+          Element attrValueElem = (Element)XPathUtils.selectSingleNode(samlAttr, SAML_ATTRIBUTE_VALUE_XPATH);
+          attrValue = DOMUtils.getElementFromNodeList(attrValueElem.getChildNodes());
+        } else {
+          attrValue = XPathUtils.getElementValue(samlAttr, SAML_ATTRIBUTE_VALUE_XPATH, "");
+        }
         samlAttributes.add(new SAMLAttribute(attrName, attrNamespace, attrValue));
       }
       SAMLAttribute[] result = new SAMLAttribute[samlAttributes.size()];
@@ -136,5 +143,37 @@ public class CreateXMLSignatureResponseParser {
     }
     return cResp;
   }
-
+  
+//  public CreateXMLSignatureResponse parseResponse1() throws ParseException {
+//    CreateXMLSignatureResponse cResp;
+//    try {
+//      cResp = new CreateXMLSignatureResponse();
+//      Element samlAssertion = (Element)sigResponse.getElementsByTagNameNS(Constants.SAML_NS_URI, "Assertion").item(0);
+//      cResp.setSamlAssertion(samlAssertion);
+//      Element samlAttributeStatement = (Element)samlAssertion.getElementsByTagNameNS(Constants.SAML_NS_URI, "AttributeStatement").item(0);
+//      Element samlSubject = (Element)samlAttributeStatement.getElementsByTagNameNS(Constants.SAML_NS_URI, "Subject").item(0);
+//      Element samlNameIdentifier = (Element)samlSubject.getElementsByTagNameNS(Constants.SAML_NS_URI, "NameIdentifier").item(0);
+//      cResp.setSamlNameIdentifier(samlNameIdentifier.getFirstChild().getNodeValue());
+//      NodeList nl = samlAttributeStatement.getElementsByTagNameNS(Constants.SAML_NS_URI, "Attribute");
+//      List samlAttributes = new ArrayList();
+//      for (int i=0; i<nl.getLength(); i++) {
+//        Element samlAttribute = (Element)nl.item(i);
+//        String attrName = samlAttribute.getAttribute("AttributeName");  
+//        String attrNamespace = samlAttribute.getAttribute("AttributeNamespace");
+//        String attrValue = ((Element)samlAttribute.getElementsByTagNameNS(Constants.SAML_NS_URI, "AttributeValue").item(0)).getFirstChild().getNodeValue();
+//        samlAttributes.add(new SAMLAttribute(attrName, attrNamespace, attrValue));
+//      }
+//      SAMLAttribute[] result = new SAMLAttribute[samlAttributes.size()];
+//      samlAttributes.toArray(result);
+//      cResp.setSamlAttributes(result);
+//    }
+//    catch (Throwable t) {
+//      throw new ParseException("parser.01", new Object[] { t.toString()}, t);
+//    }
+//    return cResp;
+//  }
+  
+  
+ 
+  
 }