1 files changed, 143 insertions, 21 deletions

diff --git a/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java b/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java
index 53f763630..c399b72b7 100644
--- a/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java
+++ b/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java
@@ -14,6 +14,7 @@ import java.util.Map;
 
 import org.w3c.dom.Attr;
 import org.w3c.dom.Element;
+import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.w3c.dom.traversal.NodeIterator;
 
@@ -27,6 +28,8 @@ import at.gv.egovernment.moa.util.BoolUtils;
 import at.gv.egovernment.moa.util.Constants;
 import at.gv.egovernment.moa.util.DOMUtils;
 import at.gv.egovernment.moa.util.FileUtils;
+import at.gv.egovernment.moa.util.StringUtils;
+import at.gv.egovernment.moa.util.XPathException;
 import at.gv.egovernment.moa.util.XPathUtils;
 
 /**
@@ -73,7 +76,7 @@ public class ConfigurationBuilder {
   private static final String AUTH_BKU_XPATH =
     ROOT + CONF + "AuthComponent/" + CONF + "BKUSelection";
   /** an XPATH-Expression */ 
-	private static final String AUTH_SECLAYER_TRANSFORMS_INFO_FILENAME_XPATH =
+	public static final String AUTH_SECLAYER_TRANSFORMS_INFO_FILENAME_XPATH =
     ROOT + CONF + "AuthComponent/" + CONF + "SecurityLayer/" + CONF + "TransformsInfo/@filename";
   /** an XPATH-Expression */ 
   private static final String AUTH_MOA_SP_XPATH =
@@ -102,6 +105,10 @@ public class ConfigurationBuilder {
   /** an XPATH-Expression */ 
   private static final String OA_AUTH_COMPONENT_XPATH = CONF + "AuthComponent";
   /** an XPATH-Expression */ 
+  private static final String OA_AUTH_COMPONENT_IDENT_NUMBER_XPATH = CONF + "IdentificationNumber";
+  /** an XPATH-Expression */ 
+  private static final String OA_AUTH_COMPONENT_TRANSFORMS_INFO_FILENAME_XPATH = CONF + "TransformsInfo/@filename";
+  /** an XPATH-Expression */ 
   private static final String OA_PROXY_COMPONENT_XPATH = CONF + "ProxyComponent";
   /** an XPATH-Expression */ 
   private static final String OA_PROXY_COMPONENT_ABSOLUTE_XPATH = ROOT + CONF + "OnlineApplication/" + CONF + "ProxyComponent";
@@ -134,6 +141,9 @@ public class ConfigurationBuilder {
   private static final String OACONF_LOGIN_TYPE_XPATH =
     ROOTOA + CONF + "LoginType";
   /** an XPATH-Expression */ 
+  private static final String OACONF_BINDING_TYPE_XPATH =
+    ROOTOA + CONF + "Binding";
+  /** an XPATH-Expression */ 
   private static final String OACONF_PARAM_AUTH_PARAMETER_XPATH =
     ROOTOA + CONF + "ParamAuth/" + CONF + "Parameter";
   /** an XPATH-Expression */ 
@@ -219,26 +229,50 @@ public class ConfigurationBuilder {
   /**
    * Build a string array with all filenames leading
    * to the Transforms Information for the Security Layer
-   * @return String[] of filenames to the Security Layer Transforms Information
+   * @param businessService <code>true</code> if the application is a
+   *        business application, otherwise <code>false</code>
+   * @return String[] of filenames to the Security Layer Transforms Information 
+   *         or <code>null</code> if no transforms are included
    */
-  public String[] buildTransformsInfoFileNames() {
-
+  public String[] buildTransformsInfoFileNames(Node contextNode, String xpathExpr) {
+    
     List transformsInfoFileNames = new ArrayList();
-    NodeIterator tiIter =
-      XPathUtils.selectNodeIterator(
-        getConfigElem(),
-        AUTH_SECLAYER_TRANSFORMS_INFO_FILENAME_XPATH);
-    Attr tiElem;
-
-    while ((tiElem = (Attr) tiIter.nextNode()) != null) {
-
-      String tiFileName = tiElem.getNodeValue();
-      transformsInfoFileNames.add(tiFileName);
+    
+    try {
+      NodeIterator tiIter = XPathUtils.selectNodeIterator(contextNode, xpathExpr);
+      
+      Attr tiElem;
+      while ((tiElem = (Attr) tiIter.nextNode()) != null) {
+        String tiFileName = tiElem.getNodeValue();
+        transformsInfoFileNames.add(tiFileName);
+      }
+      
+      String[] result = new String[transformsInfoFileNames.size()];
+      transformsInfoFileNames.toArray(result);
+  
+      return result;
+    } catch (XPathException xpe) {
+      return new String[0];
     }
-    String[] result = new String[transformsInfoFileNames.size()];
-    transformsInfoFileNames.toArray(result);
-
-    return result;
+  }
+  
+  
+  /**
+   * Loads the <code>transformsInfos</code> from files.
+   * @throws Exception on any exception thrown
+   */
+  public String[] loadTransformsInfos(String[] transformsInfoFileNames) throws Exception {
+    
+    String[] transformsInfos = new String[transformsInfoFileNames.length];
+    for (int i = 0; i < transformsInfoFileNames.length; i++) {
+      String fileURL = transformsInfoFileNames[i];
+
+      //if fileURL is relative to rootConfigFileDir make it absolute          
+      fileURL = FileUtils.makeAbsoluteURL(fileURL, rootConfigFileDir);      
+      String transformsInfo = FileUtils.readURL(fileURL, DEFAULT_ENCODING);
+      transformsInfos[i] = transformsInfo;
+    }
+    return transformsInfos;
   }
 
   /**
@@ -311,6 +345,7 @@ public class ConfigurationBuilder {
     return result;
   }
 
+
   /**
    * Return a string array containing all X509 Subject Names 
    * of the Identity Link Signers
@@ -343,7 +378,7 @@ public class ConfigurationBuilder {
    * with all relevant information for the authentication component of the online 
    * application
    */
-  public OAAuthParameter[] buildOnlineApplicationAuthParameters() {
+  public OAAuthParameter[] buildOnlineApplicationAuthParameters() throws ConfigurationException {
 
     List OA_set = new ArrayList();
     NodeList OAIter = XPathUtils.selectNodeList(getConfigElem(), OA_XPATH);
@@ -354,16 +389,60 @@ public class ConfigurationBuilder {
         (Element) XPathUtils.selectSingleNode(oAElem, OA_AUTH_COMPONENT_XPATH);
 
       OAAuthParameter oap = new OAAuthParameter();
-      oap.setPublicURLPrefix(oAElem.getAttribute("publicURLPrefix"));
+      String publicURLPrefix = oAElem.getAttribute("publicURLPrefix");
+      oap.setPublicURLPrefix(publicURLPrefix);
       oap.setKeyBoxIdentier(oAElem.getAttribute("keyBoxIdentifier"));
       
+      // get the type of the online application
+      String oaType = oAElem.getAttribute("type");
+      oap.setOaType(oaType);
+      String slVersion = "1.1";
+      if ("businessService".equalsIgnoreCase(oaType)) {
+        if (authComponent==null) {
+          Logger.error("Missing \"AuthComponent\" for OA of type \"businessService\"");
+          throw new ConfigurationException("config.02", null);
+        } 
+        Element identificationNumberElem =
+          (Element) XPathUtils.selectSingleNode(authComponent, OA_AUTH_COMPONENT_IDENT_NUMBER_XPATH);
+        if (identificationNumberElem==null) {
+          Logger.error("Missing \"IdentificationNumber\" for OA of type \"businessService\"");
+          throw new ConfigurationException("config.02", null);
+        } 
+        Element identificationNumberChild = DOMUtils.getElementFromNodeList(identificationNumberElem.getChildNodes());
+        if (identificationNumberChild == null) {
+          Logger.error("Missing \"IdentificationNumber\" for OA of type \"businessService\"");
+          throw new ConfigurationException("config.02", null);
+        }
+        oap.setIdentityLinkDomainIdentifier(buildIdentityLinkDomainIdentifier(identificationNumberChild));
+        
+        // if OA type is "businessSErvice" set slVersion to 1.2 and ignore parameter in config file
+        Logger.info("OA type is \"businessService\"; setting Security Layer version to 1.2");
+        slVersion = "1.2";
+        
+      } else {
+        
+        if (authComponent!=null) {
+          slVersion = authComponent.getAttribute("slVersion");
+        }
+        
+      }
+      oap.setSlVersion(slVersion);
       //Check if there is an Auth-Block to read from configuration
+      
       if (authComponent!=null)
       {
         oap.setProvideStammzahl(BoolUtils.valueOf(authComponent.getAttribute("provideStammzahl")));
         oap.setProvideAuthBlock(BoolUtils.valueOf(authComponent.getAttribute("provideAUTHBlock")));
         oap.setProvideIdentityLink(BoolUtils.valueOf(authComponent.getAttribute("provideIdentityLink")));
-      }
+        oap.setProvideCertificate(BoolUtils.valueOf(authComponent.getAttribute("provideCertificate")));
+        // load OA specific transforms if present
+        String[] transformsInfoFileNames = buildTransformsInfoFileNames(authComponent, OA_AUTH_COMPONENT_TRANSFORMS_INFO_FILENAME_XPATH);        
+        try {
+          oap.setTransformsInfos(loadTransformsInfos(transformsInfoFileNames));
+        } catch (Exception ex) {
+          Logger.error("Error loading transforms specified for OA \"" + publicURLPrefix + "\"; using default transforms.");
+        }               
+      } 
       OA_set.add(oap);
     }
     OAAuthParameter[] result =
@@ -438,6 +517,7 @@ public class ConfigurationBuilder {
       OAProxyParameter oap = new OAProxyParameter();
       
       oap.setPublicURLPrefix(oAElem.getAttribute("publicURLPrefix"));
+      oap.setOaType(oAElem.getAttribute("type"));
       Element proxyComponentElem = (Element) XPathUtils.selectSingleNode(oAElem,OA_PROXY_COMPONENT_XPATH);        
       if (proxyComponentElem != null) {
         oap.setConfigFileURL(XPathUtils.getAttributeValue(oAElem, OA_PROXY_URL_XPATH, null));
@@ -503,8 +583,12 @@ public class ConfigurationBuilder {
     OAConfiguration oaConfiguration = new OAConfiguration();
 
     //The LoginType hast to be "stateless" or "stateful" to be valid
+
     oaConfiguration.setLoginType(
       XPathUtils.getElementValue(root, OACONF_LOGIN_TYPE_XPATH, null));
+    
+    oaConfiguration.setBinding(
+      XPathUtils.getElementValue(root, OACONF_BINDING_TYPE_XPATH, OAConfiguration.BINDUNG_FULL));    
       
     //Try to build the Parameter Auth Parameters
     NodeIterator paramAuthIter =
@@ -672,6 +756,44 @@ public class ConfigurationBuilder {
       return ChainingModes.CHAIN_MODE;
     }
   }
+  
+  /**
+   * Builds the IdentityLinkDomainIdentifier as needed for providing it to the
+   * SecurityLayer for computation of the wbPK.
+   * <p>e.g.:<br>
+   * input element:
+   * <br>
+   * <code>&lt;pr:Firmenbuchnummer shortForm="FN"&gt;000468 i&lt;/pr:Firmenbuchnummer&gt;</code>
+   * <p>
+   * return value: <code>urn:publicid:gv.at+wbpk+FN468i</code>
+   * 
+   * @param number  The element holding the identification number of the business
+   *                company.
+   * @return
+   */
+  private String buildIdentityLinkDomainIdentifier(Element number) {
+    if (number == null) {
+      return null;
+    }
+    String identificationNumber = number.getFirstChild().getNodeValue();
+    // remove all blanks
+    identificationNumber = StringUtils.removeBlanks(identificationNumber);
+    if (number.getLocalName().equals("Firmenbuchnummer")) {
+      // delete zeros from the beginning of the number
+      identificationNumber = StringUtils.deleteLeadingZeros(identificationNumber);
+      // remove hyphens
+      identificationNumber = StringUtils.removeToken(identificationNumber, "-");
+    }
+    StringBuffer identityLinkDomainIdentifier = new StringBuffer(Constants.URN_PREFIX_WBPK);
+    identityLinkDomainIdentifier.append("+");
+    String shortForm = number.getAttribute("ShortForm");
+    if (!identificationNumber.startsWith(shortForm)) {
+      identityLinkDomainIdentifier.append(shortForm);
+    }
+    identityLinkDomainIdentifier.append("+");
+    identityLinkDomainIdentifier.append(identificationNumber);
+    return identityLinkDomainIdentifier.toString();
+  }
 
   /**
    * Method warn.