updated for wbPK

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

2 files changed, 136 insertions, 34 deletions

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;
   }
 
 	/**