1 files changed, 26 insertions, 12 deletions
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/parser/InfoboxReadResponseParser.java b/id.server/src/at/gv/egovernment/moa/id/auth/parser/InfoboxReadResponseParser.java
index 012a5b559..05272a695 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/parser/InfoboxReadResponseParser.java
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/parser/InfoboxReadResponseParser.java
@@ -19,17 +19,17 @@ import at.gv.egovernment.moa.util.XPathUtils;
  */
 
 public class InfoboxReadResponseParser {
-  //
-  // XPath namespace prefix shortcuts
-  //
-  /** Xpath prefix for reaching SecurityLayer 1.0 Namespaces */
-  private static final String SL10 = Constants.SL10_PREFIX + ":";
-  /** Xpath prefix for reaching SAML Namespaces */
-  private static final String SAML = Constants.SAML_PREFIX + ":";
-  /** Xpath expression to the root element */  
-  private static final String ROOT = "/" + SL10 + "InfoboxReadResponse/";
-  /** Xpath expression to the SAML:Assertion element */  
-  private static final String SAML_ASSERTION_XPATH = ROOT + SL10 + "BinaryFileData/" + SL10 + "XMLContent/" + SAML + "Assertion";
+//  //
+//  // XPath namespace prefix shortcuts
+//  //
+//  /** Xpath prefix for reaching SecurityLayer 1.0 Namespaces */
+//  private static final String SL10 = Constants.SL10_PREFIX + ":";
+//  /** Xpath prefix for reaching SAML Namespaces */
+//  private static final String SAML = Constants.SAML_PREFIX + ":";
+//  /** Xpath expression to the root element */  
+//  private static final String ROOT = "/" + SL10 + "InfoboxReadResponse/";
+//  /** Xpath expression to the SAML:Assertion element */  
+//  private static final String SAML_ASSERTION_XPATH = ROOT + SL10 + "BinaryFileData/" + SL10 + "XMLContent/" + SAML + "Assertion";
 
   /** This is the root element of the XML-Document provided by the Security Layer Card*/
   private Element infoBoxElem;
@@ -86,8 +86,21 @@ public class InfoboxReadResponseParser {
    */
   public String parseSAMLAssertion() throws ParseException {
     try {
-      Element samlAssertion = (Element) XPathUtils.selectSingleNode(infoBoxElem, SAML_ASSERTION_XPATH);
+      
+      String slPrefix = infoBoxElem.getPrefix();
+      StringBuffer sb = new StringBuffer("/");      
+      sb.append(slPrefix);
+      sb.append(":InfoboxReadResponse/");
+      sb.append(slPrefix);
+      sb.append(":BinaryFileData/");
+      sb.append(slPrefix);
+      sb.append(":XMLContent/");
+      sb.append(Constants.SAML_PREFIX);
+      sb.append(":Assertion");
+      String samlAssertionXPath = sb.toString();
+      Element samlAssertion = (Element) XPathUtils.selectSingleNode(infoBoxElem, samlAssertionXPath);
       return DOMUtils.serializeNode(samlAssertion);
+      
     }
     catch (Throwable t) {
       throw new ParseException("parser.01", new Object[] { t.toString()}, t);
@@ -105,5 +118,6 @@ public class InfoboxReadResponseParser {
     IdentityLinkAssertionParser ilParser = new IdentityLinkAssertionParser(samlAssertionString);
     return ilParser.parseIdentityLink();
   }
+  
 
 }