updated for wbPK

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

5 files changed, 326 insertions, 75 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.
diff --git a/id.server/src/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java b/id.server/src/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
index a722868e0..d354ba910 100644
--- a/id.server/src/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
+++ b/id.server/src/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
@@ -88,12 +88,14 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
 	 * multiple files can be given for different mime types
 	 */
   private String[] transformsInfoFileNames;
+  
 	/**
 	 * transformations for rendering in the secure viewer of the security layer implementation,
 	 * read from {@link transformsInfoFileNames};
 	 * multiple transformation can be given for different mime types
 	 */
   private String[] transformsInfos;
+  
   /**
    * parameters for connection to MOA SP component
    */
@@ -218,8 +220,8 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
       bKUSelectable = (bKUConnectionParameter!=null);
       bKUSelectionType = builder.buildAuthBKUSelectionType();
 		  genericConfiguration = builder.buildGenericConfiguration();
-		  transformsInfoFileNames = builder.buildTransformsInfoFileNames();
-		  loadTransformsInfos();
+		  transformsInfoFileNames = builder.buildTransformsInfoFileNames(builder.getConfigElem(), ConfigurationBuilder.AUTH_SECLAYER_TRANSFORMS_INFO_FILENAME_XPATH);
+		  transformsInfos = builder.loadTransformsInfos(transformsInfoFileNames);
 	    moaSpConnectionParameter = builder.buildMoaSpConnectionParameter();
 	    moaSpIdentityLinkTrustProfileID = builder.getMoaSpIdentityLinkTrustProfileID();
 	    moaSpAuthBlockTrustProfileID = builder.getMoaSpAuthBlockTrustProfileID();
@@ -229,9 +231,9 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
       defaultChainingMode = builder.getDefaultChainingMode();
       chainingModes = builder.buildChainingModes();  
       trustedCACertificates = builder.getTrustedCACertificates();
-      trustedCACertificates = FileUtils.makeAbsoluteURL(trustedCACertificates, rootConfigFileDir);    } 
+      trustedCACertificates = FileUtils.makeAbsoluteURL(trustedCACertificates, rootConfigFileDir);     
 
-    catch (Throwable t) {
+    } catch (Throwable t) {
       throw new ConfigurationException("config.02", null, t);
   	}
   }
@@ -240,17 +242,35 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
    * Loads the <code>transformsInfos</code> from files.
    * @throws Exception on any exception thrown
    */
-  private void loadTransformsInfos() throws Exception {
-	 	
-	 	transformsInfos = new String[transformsInfoFileNames.length];
-  	for (int i = 0; i < transformsInfoFileNames.length; i++) {
-  		String fileURL = transformsInfoFileNames[i];
+//  private void loadTransformsInfos() throws Exception {
+//	 	
+//	 	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;
+//  	}
+//  }
+  
+  /**
+   * Loads the <code>transformsInfos</code> from files.
+   * @throws Exception on any exception thrown
+   */
+  private 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;
-  	}
+      //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;
   }
   /**
    * Return a string array with all filenames leading
diff --git a/id.server/src/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java b/id.server/src/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java
index 223abc632..ad4dd4b62 100644
--- a/id.server/src/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java
+++ b/id.server/src/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java
@@ -1,5 +1,7 @@
 package at.gv.egovernment.moa.id.config.auth;
 
+import at.gv.egovernment.moa.id.config.OAParameter;
+
 /**
  * Configuration parameters belonging to an online application,
  * to use with the MOA ID Auth component.
@@ -7,17 +9,32 @@ package at.gv.egovernment.moa.id.config.auth;
  * @author Stefan Knirsch
  * @version $Id$
  */
-public class OAAuthParameter {
-
-	/**
-	 * public URL prefix of the online application
-	 */
-  private String publicURLPrefix;
-  
+public class OAAuthParameter extends OAParameter {
+  /**
+   * Sercurity Layer version
+   */
+  private String slVersion;
+  /**
+   * true, if the Security Layer version is version 1.2, otherwise false
+   */
+  private boolean slVersion12;
+  /**
+   * identityLinkDomainIdentifier 
+   * (e.g <code>urn:publicid:gv.at+wbpk+FN468i</code> for a "Firmenbuchnummer") 
+   * <br>
+   * only used within a business application context for providing it to the  
+   * security layer as input for wbPK computation
+   */
+  private String identityLinkDomainIdentifier;  
 	/**
 	 * key box Identifier (e.g. CertifiedKeypair, SecureSignatureKeypair)
 	 */  
   private String keyBoxIdentifier;
+  /**
+   * transformations for rendering in the secure viewer of the security layer 
+   * implementation; multiple transformation can be given for different mime types
+   */  
+  private String[] transformsInfos;
 	/**
 	 * determines whether "Stammzahl" is to be included in the authentication data
 	 */
@@ -30,7 +47,45 @@ public class OAAuthParameter {
 	 * determines whether identity link is to be included in the authentication data
 	 */
   private boolean provideIdentityLink;
-
+  /**
+   * determines whether the certificate is to be included in the authentication data
+   */
+  private boolean provideCertificate;
+  
+  /**
+   * Returns <code>true</code> if the Security Layer version is version 1.2,
+   * otherwise <code>false</code>.
+   * @return <code>true</code> if the Security Layer version is version 1.2,
+   * otherwise <code>false</code>
+   */
+  public boolean getSlVersion12() {
+    return slVersion12;
+  }
+  
+  /**
+   * Returns the security layer version.
+   * @return the security layer version.
+   */
+  public String getSlVersion() {
+    return slVersion;
+  }
+  
+  /**
+   * Returns the identityLinkDomainIdentifier.
+   * @return the identityLinkDomainIdentifier.
+   */
+  public String getIdentityLinkDomainIdentifier() {
+    return identityLinkDomainIdentifier;
+  }
+  
+  /**
+   * Returns the transformsInfos.
+   * @return the transformsInfos.
+   */
+  public String[] getTransformsInfos() {
+    return transformsInfos;
+  }
+  
   /**
    * Returns the provideAuthBlock.
    * @return String
@@ -54,15 +109,17 @@ public class OAAuthParameter {
   public boolean getProvideStammzahl() {
     return provideStammzahl;
   }
-
+  
   /**
-   * Returns the publicURLPrefix.
-   * @return String
+   * Returns <code>true</code> if the certificate should be provided within the
+   * authentication data, otherwise <code>false</code>.
+   * @return <code>true</code> if the certificate should be provided, 
+   *         otherwise <code>false</code>
    */
-  public String getPublicURLPrefix() {
-    return publicURLPrefix;
+  public boolean getProvideCertifcate() {
+    return provideCertificate;
   }
-
+  
 	/**
 		* Returns the key box identifier.
 		* @return String
@@ -70,7 +127,32 @@ public class OAAuthParameter {
 	 public String getKeyBoxIdentifier() {
 		 return keyBoxIdentifier;
 	 }
-
+  /**
+   * Sets the security layer version.
+   * Also sets {@link slVersion12} to <code>true</code> if the Security Layer
+   * version is 1.2.
+   * @param the security layer version to be used.
+   */
+  public void setSlVersion(String slVersion) {
+    this.slVersion = slVersion;
+    if ("1.2".equals(slVersion)) {
+      this.slVersion12 = true;
+    }
+  }
+  /**
+   * Sets the IdentityLinkDomainIdentifier.
+   * @param the IdentityLinkDomainIdentifiern number of the online application.
+   */
+  public void setIdentityLinkDomainIdentifier(String identityLinkDomainIdentifier) {
+    this.identityLinkDomainIdentifier = identityLinkDomainIdentifier;
+  }
+  /**
+   * Sets the transformsInfos.
+   * @param the transformsInfos to be used.
+   */
+  public void setTransformsInfos(String[] transformsInfos) {
+    this.transformsInfos = transformsInfos;
+  }
   /**
    * Sets the provideAuthBlock.
    * @param provideAuthBlock The provideAuthBlock to set
@@ -94,13 +176,13 @@ public class OAAuthParameter {
   public void setProvideStammzahl(boolean provideStammzahl) {
     this.provideStammzahl = provideStammzahl;
   }
-
+  
   /**
-   * Sets the publicURLPrefix.
-   * @param publicURLPrefix The publicURLPrefix to set
+   * Sets the provideCertificate variable.
+   * @param provideCertificate The provideCertificate value to set
    */
-  public void setPublicURLPrefix(String publicURLPrefix) {
-    this.publicURLPrefix = publicURLPrefix;
+  public void setProvideCertificate(boolean provideCertificate) {
+    this.provideCertificate = provideCertificate;
   }
 
 	/**
diff --git a/id.server/src/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.java b/id.server/src/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.java
index c9a13fee5..ef7c7e323 100644
--- a/id.server/src/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.java
+++ b/id.server/src/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.java
@@ -27,6 +27,14 @@ public class OAConfiguration {
   /** Constant for an auth method */
   public static final String PARAM_AUTH = "param";
   
+  
+  /** Constant for binding */  
+  public static final String BINDUNG_USERNAME = "userName";
+  /** Constant for binding */
+  public static final String BINDUNG_FULL = "full";
+  /** Constant for binding */
+  public static final String BINDUNG_NONE = "none";
+  
   /** login type: stateful or stateless */
   String loginType;
   /** authentication type: basic, header, or param */
@@ -45,6 +53,8 @@ public class OAConfiguration {
   String basicAuthUserIDMapping;
   /** mapping for password to be used in case of authentication type <code>"basic-auth"</code> */
   String basicAuthPasswordMapping;
+  /** Binding for basic authentication */
+  String binding;
   
   /**
    * Returns the basicAuthPasswordMapping.
@@ -87,6 +97,14 @@ public class OAConfiguration {
   }
   
   /**
+   * Returns the binding.
+   * @return String
+   */
+  public String getBinding() {
+    return binding;
+  }
+  
+  /**
    * Sets the basicAuthPasswordMapping.
    * @param basicAuthPasswordMapping The basicAuthPasswordMapping to set
    */
@@ -141,5 +159,13 @@ public class OAConfiguration {
   public void setAuthType(String authLoginType) {
     this.authType = authLoginType;
   }
+  
+  /**
+   * Sets the binding.
+   * @param binding The binding to be set.
+   */
+  public void setBinding (String binding) {
+    this.binding = binding;
+  }
 
 }
diff --git a/id.server/src/at/gv/egovernment/moa/id/config/proxy/OAProxyParameter.java b/id.server/src/at/gv/egovernment/moa/id/config/proxy/OAProxyParameter.java
index a16dcfa26..12b16c115 100644
--- a/id.server/src/at/gv/egovernment/moa/id/config/proxy/OAProxyParameter.java
+++ b/id.server/src/at/gv/egovernment/moa/id/config/proxy/OAProxyParameter.java
@@ -1,6 +1,7 @@
 package at.gv.egovernment.moa.id.config.proxy;
 
 import at.gv.egovernment.moa.id.config.ConnectionParameter;
+import at.gv.egovernment.moa.id.config.OAParameter;
 
 /**
  * Configuration parameters belonging to an online application,
@@ -9,12 +10,12 @@ import at.gv.egovernment.moa.id.config.ConnectionParameter;
  * @author Stefan Knirsch
  * @version $Id$
  */
-public class OAProxyParameter {
+public class OAProxyParameter extends OAParameter {
 
-	/**
-	 * public URL prefix of the online application
-	 */
-  private String publicURLPrefix;
+//	/**
+//	 * public URL prefix of the online application
+//	 */
+//  private String publicURLPrefix;
   /**
    * URL of online application configuration file;
    * defaults to relative URL <code>/moaconfig.xml</code>
@@ -100,21 +101,21 @@ public class OAProxyParameter {
     this.connectionParameter = proxyConnectionParameter;
   }
 
-  /**
-   * Returns the publicURLPrefix.
-   * @return String
-   */
-  public String getPublicURLPrefix() {
-    return publicURLPrefix;
-  }
-
-  /**
-   * Sets the publicURLPrefix.
-   * @param publicURLPrefix The publicURLPrefix to set
-   */
-  public void setPublicURLPrefix(String url) {
-    this.publicURLPrefix = url;
-  }
+//  /**
+//   * Returns the publicURLPrefix.
+//   * @return String
+//   */
+//  public String getPublicURLPrefix() {
+//    return publicURLPrefix;
+//  }
+//
+//  /**
+//   * Sets the publicURLPrefix.
+//   * @param publicURLPrefix The publicURLPrefix to set
+//   */
+//  public void setPublicURLPrefix(String url) {
+//    this.publicURLPrefix = url;
+//  }
 
   /**
    * Returns the connectionBuilderImpl.