1 files changed, 50 insertions, 38 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 cae470cc4..4264ca2cb 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
@@ -45,26 +45,22 @@ public class CreateXMLSignatureResponseParser {
   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;
+  /** This is the root element of the CreateXMLsignatureResponse */
+  private Element sigResponse_;
 
   /**
-   * Constructor for CreateXMLSignatureResponseParser.
-   * A DOM-representation of the incoming String will be created
-   * @param xmlResponse <code>&lt;InfoboxReadResponse&gt;</code> as String
+   * Parses and validates the document given as string and extracts the 
+   * root element.
+   * 
+   * @param xmlResponse <code>&lt;CreateXMLSignatureResponse&gt;</code> as String
+   * 
    * @throws AuthenticationException if any authentication error occurs
    * @throws ParseException if an element cannot be parsed
    */
   public CreateXMLSignatureResponseParser(String xmlResponse) throws AuthenticationException, ParseException {
-    ErrorResponseParser erp = new ErrorResponseParser(xmlResponse);
-    if (erp.getErrorCode() != null) {
-      throw new AuthenticationException("auth.08", new Object[] { erp.getErrorCode(), erp.getErrorInfo()});
-    }
-
     try {
-
       InputStream s = new ByteArrayInputStream(xmlResponse.getBytes("UTF-8"));
-      sigResponse = DOMUtils.parseXmlValidating(s);
+      init(s);
     }
     catch (Throwable t) {
       throw new ParseException("parser.01", new Object[] { t.toString()}, t);
@@ -72,27 +68,16 @@ public class CreateXMLSignatureResponseParser {
   }
 
   /**
-   * Constructor for CreateXMLSignatureResponseParser.
-   * A DOM-representation of the incoming Inputstream will be created
-   * @param xmlResponse <code>&lt;InfoboxReadResponse&gt;</code> as InputStream
-   * @throws AuthenticationException if any Authentication error occurs
+   * Parses and validates the document given as stream and extracts the 
+   * root element.
+   * 
+   * @param xmlResponse <code>&lt;CreateXMLSignatureResponse&gt;</code> as String
+   * 
+   * @throws AuthenticationException if any authentication error occurs
    * @throws ParseException if an element cannot be parsed
    */
   public CreateXMLSignatureResponseParser(InputStream is) throws AuthenticationException, ParseException {
-
-    ErrorResponseParser erp = new ErrorResponseParser(is);
-    if (erp.getErrorCode() != null) {
-      throw new AuthenticationException("auth.08", new Object[] { erp.getErrorCode(), erp.getErrorInfo()});
-    }
-
-    try {
-
-      sigResponse = DOMUtils.parseXmlValidating(is);
-      
-    }
-    catch (Throwable t) {
-      throw new ParseException("parser.01", new Object[] { t.toString()}, t);
-    }
+    init(is); 
   }
 
   /**
@@ -101,13 +86,40 @@ public class CreateXMLSignatureResponseParser {
   * @param xmlResponse <code>&lt;InfoboxReadResponse&gt;</code> as InputStream
   */
   public CreateXMLSignatureResponseParser(Element xmlResponse) {
-    sigResponse = xmlResponse;
-
+    sigResponse_ = xmlResponse;
+  }
+  
+  /**
+   * Initializes the parser.
+   * Parses and validates the document given as stream and extracts the 
+   * root element.
+   * 
+   * @param is  The CreateXMLSignatureResponse as stream.
+   * @throws AuthenticationException if an authentication error occurs.
+   * @throws ParseException If an error occurs on parsing the the document.
+   */
+  private void init(InputStream is) throws AuthenticationException, ParseException {
+    try {
+      
+      Element responseElem = DOMUtils.parseXmlValidating(is);
+      
+      if ("CreateXMLSignatureResponse".equals(responseElem.getLocalName())) {
+        sigResponse_ = responseElem;
+      } else {
+        ErrorResponseParser erp = new ErrorResponseParser(responseElem);
+        throw new AuthenticationException("auth.08", new Object[] { erp.getErrorCode(), erp.getErrorInfo()});
+      }
+      
+    } catch (Throwable t) {
+      throw new ParseException("parser.01", new Object[] { t.toString()}, t);
+    }
   }
 
   /**
-   * Parses the identity link from <code>&lt;InfoboxReadResponse&gt;</code>
-   * @return Identity link
+   * Unmarshalls the <@link sigResponse> to an 
+   * <code>&lt;CreateXMLSignatureResponse&gt;</code> object.
+   * 
+   * @return a <code>&lt;CreateXMLSignatureResponse&gt;</code> object
    * @throws ParseException
    */
 
@@ -115,10 +127,10 @@ public class CreateXMLSignatureResponseParser {
     CreateXMLSignatureResponse cResp;
     try {
       cResp = new CreateXMLSignatureResponse();
-      String slPrefix = XPathUtils.getSlPrefix(sigResponse);
-      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);
+      String slPrefix = XPathUtils.getSlPrefix(sigResponse_);
+      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) {