Adapted for MOA-ID 1.4 (validating additional infoboxes).

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

3 files changed, 162 insertions, 6 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 eb7d76fda..6287c99dd 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
@@ -137,11 +137,10 @@ public class CreateXMLSignatureResponseParser {
         String attrName = XPathUtils.getAttributeValue(samlAttr, "@AttributeName", "");
         String attrNamespace = XPathUtils.getAttributeValue(samlAttr, "@AttributeNamespace", "");
         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, "");
+        Element attrValueElem = (Element)XPathUtils.selectSingleNode(samlAttr, SAML_ATTRIBUTE_VALUE_XPATH);
+        attrValue = DOMUtils.getElementFromNodeList(attrValueElem.getChildNodes());
+        if (attrValue == null) {
+          attrValue = attrValueElem.getFirstChild().getNodeValue();
         }
         samlAttributes.add(new SAMLAttribute(attrName, attrNamespace, attrValue));
       }
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/parser/ExtendedInfoboxReadResponseParser.java b/id.server/src/at/gv/egovernment/moa/id/auth/parser/ExtendedInfoboxReadResponseParser.java
new file mode 100644
index 000000000..e493f07fb
--- /dev/null
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/parser/ExtendedInfoboxReadResponseParser.java
@@ -0,0 +1,157 @@
+package at.gv.egovernment.moa.id.auth.parser;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Vector;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import at.gv.egovernment.moa.id.ParseException;
+import at.gv.egovernment.moa.id.auth.data.InfoboxToken;
+import at.gv.egovernment.moa.id.auth.data.InfoboxTokenImpl;
+import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moa.util.Constants;
+import at.gv.egovernment.moa.util.DOMUtils;
+
+/**
+ * Parses and unmarshales <code>InfoboxReadResponse<code>.
+ * This parser is especially used for parsing additional responses (additional to that
+ * one  containing the <code>IdentityLink</code> retuned from the BKU as an answer of
+ * a <code>&lt;PushInfobox&gt;</code> request.
+ */
+public class ExtendedInfoboxReadResponseParser {
+
+  /**
+   * Hide default constructor.
+   */
+  private ExtendedInfoboxReadResponseParser() {
+  }
+  
+  /**
+   * Parses and unmarshales the given <code>infoboxReadResponse</code> to a list of 
+   * {@link at.gv.egovernment.moa.id.auth.data.InfoboxToken InfoboxToken} objects.
+   * The method parses the given <code>infoboxReadResponse</code> 
+   * 
+   * @param infoboxReadResponse The infobox read response to be unmarshaled.
+   * @param infoboxName         The name of the infobox the reponse corresponds to.
+   * 
+   * @return  A list of {@link at.gv.egovernment.moa.id.auth.data.InfoboxToken InfoboxToken} 
+   *          objects. Maybe empty.
+   *                            
+   * @throws ParseException     If an error occurs on parsing and unmarshaling the response.
+   */
+  public static List parseInfoboxReadResponse(String infoboxReadResponse, String infoboxName) 
+    throws ParseException
+  {
+    Element infoboxReadResponseElem = null;
+    try {
+      Document doc = 
+        DOMUtils.parseDocument(infoboxReadResponse, true, Constants.ALL_SCHEMA_LOCATIONS, null);
+      infoboxReadResponseElem = doc.getDocumentElement();
+    } catch (Exception e) {
+      Logger.error("InfoboxReadResponse for \"" + infoboxName + 
+        "\"-infobox could not be parsed successfully: " + e.getMessage());
+      throw new ParseException("parser.01", new Object[] {infoboxName + "-InfoboxReadResponse"});
+    } 
+    
+    Vector infoboxTokenList = new Vector();
+    
+    if (infoboxReadResponseElem != null) {
+      // avoid using namespace URI or prefix, because it might change within the response
+      // (e.g.: sl11-namespace, some child sl10-namespace
+      List infoboxReadResponseChildren = DOMUtils.getChildElements(infoboxReadResponseElem);
+      String key = null;
+      boolean primary = true;
+      Element infoboxReadResponseChild = (Element)infoboxReadResponseChildren.get(0);
+      String infoboxReadResponseChildName = infoboxReadResponseChild.getLocalName();
+      if (infoboxReadResponseChildName.equals("AssocArrayData")) {
+        // get the <Pair> child elements from the <AssocArrayData> element
+        List assocArrayPairs = DOMUtils.getChildElements(infoboxReadResponseChild);
+        Iterator assocArrayPairIt = assocArrayPairs.iterator();
+        int pairCount = 0;
+        // step through the <Pair> elemnts
+        while (assocArrayPairIt.hasNext()) {
+          Element assocArrayPair = (Element)assocArrayPairIt.next();
+          // check if the element actually a "Pair" element and not only a "key"
+          if (assocArrayPair.getLocalName().equals("Key")) {
+            // do not accept only a Key
+            throw new ParseException("parser.07", new Object[] {infoboxName});
+          }
+          key = assocArrayPair.getAttribute("Key");
+          if (pairCount > 0) {
+            primary = false;
+          }
+          pairCount++;          
+          infoboxTokenList.addAll(getTokenFromXMLOrBase64Content(assocArrayPair, infoboxName, key, primary));
+        }
+        
+      } else if (infoboxReadResponseChildName.equals("BinaryFileData")) {
+        infoboxTokenList.addAll(getTokenFromXMLOrBase64Content(infoboxReadResponseChild, infoboxName, null, true));
+      }
+    }          
+    return infoboxTokenList; 
+  }
+  
+  /**
+   * Unmarshales the <code>&lt;XMLContent&gt;</code> or 
+   * <code>&lt;Base64Content&gt;</code> child of the given element to a list of
+   * infobox token.
+   * 
+   * @param contentParent   The elment including the <code>&lt;XMLContent&gt;</code> or 
+   *                        <code>&lt;Base64Content&gt;</code> child to unmarshal the
+   *                        infobox token from.
+   * @param infoboxName     The name of the infobox.
+   * @param key             The key of an <code>AssocArrayData-Pair</code>. 
+   *                        Maybe <code>null</code>.
+   * @param primary         Specifies whether this token is the first (e.g. in an 
+   *                        AssocArrayData) token.
+   *                        
+   * @return                A infobox token list.
+   * 
+   * @throws ParseException If the <code>contentParent</code> has no <code>&lt;XMLContent&gt;</code>  
+   *                        or <code>&lt;Base64Content&gt;</code> child or the
+   *                        <code>&lt;XMLContent&gt;</code> is empty.
+   */
+  public static List getTokenFromXMLOrBase64Content(
+    Element contentParent, 
+    String infoboxName, 
+    String key, 
+    boolean primary) 
+  throws ParseException 
+  {
+    Vector tokenList = new Vector();
+    // get the <XMLContent> or <Base64Content> 
+    List content = DOMUtils.getChildElements(contentParent);
+    if (content.size() == 1) {
+      Element contentElem = (Element)content.get(0);
+      if (contentElem.getLocalName().equals("XMLContent")) {
+        List xmlContentChildren = DOMUtils.getChildElements(contentElem);       
+        if (xmlContentChildren.size() == 0) {
+          throw new ParseException("parser.06", new Object[] {infoboxName, "Inhalt", "XMLContent"});
+        }
+        int xmlCount = 0;
+        Iterator contentIt = xmlContentChildren.iterator();
+        while (contentIt.hasNext()) {
+          Element xmlToken = (Element)contentIt.next();
+          if (xmlCount > 0) {
+            primary = false;
+          }
+          InfoboxToken infoboxToken = new InfoboxTokenImpl(key, primary, xmlToken);
+          tokenList.add(infoboxToken);
+          xmlCount++;
+        }
+      } else {
+        String base64Token = contentElem.getFirstChild().getNodeValue();
+        InfoboxToken infoboxToken = new InfoboxTokenImpl(key, primary, base64Token);
+        tokenList.add(infoboxToken);
+      }
+    } else {
+      throw new ParseException("parser.06", 
+        new Object[] {infoboxName, "XMLContent oder Base64Content", contentParent.getLocalName()});
+    }
+    return tokenList;
+  }
+  
+  
+}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParser.java b/id.server/src/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParser.java
index 092bc68c9..9d8cff6f5 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParser.java
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParser.java
@@ -89,7 +89,7 @@ public class IdentityLinkAssertionParser {
       + "Identification";
 
   /** Xpath expression to the Identification Value element */	
-  private static final String PERSON_IDENT_VALUE_XPATH =
+  public static final String PERSON_IDENT_VALUE_XPATH =
     PERSON_XPATH
     	+ "/"
       + PDATA