updated for wbPK

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

6 files changed, 283 insertions, 83 deletions

diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilder.java
index 41f439d04..ec412deb3 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilder.java
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilder.java
@@ -12,26 +12,39 @@ import at.gv.egovernment.moa.util.Constants;
  * @version $Id$
  */
 public class AuthenticationBlockAssertionBuilder implements Constants {
-  /** private static String nl contains the NewLine representation in Java*/
+  /** the NewLine representation in Java*/
 	private static String nl = "\n";
-  /** private static String AUTH_BLOCK contains an XML-Auth-Block-Template */
+  /** template for the Auth-Block */
   private static String AUTH_BLOCK = 
-  	"<saml:Assertion xmlns:saml=''" + SAML_NS_URI + "'' MajorVersion=''1'' MinorVersion=''0'' AssertionID=''any'' Issuer=''{0}'' IssueInstant=''{1}''>" + nl +
-  	"	<saml:AttributeStatement>" + nl +
-		"		<saml:Subject>" + nl +
-		"			<saml:NameIdentifier>{2}</saml:NameIdentifier>" + nl +
-	  "		</saml:Subject>" + nl +
-	  "		<saml:Attribute AttributeName=''Geschaeftsbereich'' AttributeNamespace=''" + MOA_NS_URI + "''>" + nl +
-	  "			<saml:AttributeValue>{3}</saml:AttributeValue>" + nl +
-	  "		</saml:Attribute>" + nl +
-	  "		<saml:Attribute AttributeName=''OA'' AttributeNamespace=''" + MOA_NS_URI + "''>" + nl +
-	  "			<saml:AttributeValue>{4}</saml:AttributeValue>" + nl +
-	  "		</saml:Attribute>" + nl +
-   	"		<saml:Attribute AttributeName=''Geburtsdatum'' AttributeNamespace=''" + MOA_NS_URI + "''>" + nl +
-	  "			<saml:AttributeValue>{5}</saml:AttributeValue>" + nl +
-	  "		</saml:Attribute>" + nl +
-	  "	</saml:AttributeStatement>" + nl +
-		"</saml:Assertion>";
+    "<saml:Assertion xmlns:saml=''" + SAML_NS_URI + "''{0} MajorVersion=''1'' MinorVersion=''0'' AssertionID=''any'' Issuer=''{1}'' IssueInstant=''{2}''>" + nl +
+    " <saml:AttributeStatement>" + nl +
+    "   <saml:Subject>" + nl +
+    "     <saml:NameIdentifier>{3}</saml:NameIdentifier>" + nl +
+    "   </saml:Subject>" + nl +
+    "{4}" + 
+    "   <saml:Attribute AttributeName=''OA'' AttributeNamespace=''" + MOA_NS_URI + "''>" + nl +
+    "     <saml:AttributeValue>{5}</saml:AttributeValue>" + nl +
+    "   </saml:Attribute>" + nl +
+    "   <saml:Attribute AttributeName=''Geburtsdatum'' AttributeNamespace=''" + MOA_NS_URI + "''>" + nl +
+    "     <saml:AttributeValue>{6}</saml:AttributeValue>" + nl +
+    "   </saml:Attribute>" + nl +
+    " </saml:AttributeStatement>" + nl +
+    "</saml:Assertion>";
+  
+  private static String GESCHAEFTS_BEREICH_ATTRIBUTE =
+    "   <saml:Attribute AttributeName=''Geschaeftsbereich'' AttributeNamespace=''" + MOA_NS_URI + "''>" + nl +
+    "     <saml:AttributeValue>{0}</saml:AttributeValue>" + nl +
+    "   </saml:Attribute>" + nl;
+  
+  private static String WBPK_ATTRIBUTE =
+    "   <saml:Attribute AttributeName=''wbPK'' AttributeNamespace=''" + MOA_NS_URI + "''>" + nl +
+    "     <saml:AttributeValue>" + nl +
+    "       <pr:Identification>" + nl +
+    "         <pr:Value>{0}</pr:Value>" + nl +
+    "         <pr:Type>{1}</pr:Type>" + nl +
+    "       </pr:Identification>" + nl +
+    "     </saml:AttributeValue>" + nl +
+    "   </saml:Attribute>" + nl;
 
   /**
    * Constructor for AuthenticationBlockAssertionBuilder.
@@ -39,21 +52,56 @@ public class AuthenticationBlockAssertionBuilder implements Constants {
   public AuthenticationBlockAssertionBuilder() {
     super();
   }
+  
   /**
-   * Builds the authentication block <code>&lt;saml:Assertion&gt;</code>.
+   * Builds the authentication block <code>&lt;saml:Assertion&gt;</code> 
    * 
    * @param issuer authentication block issuer; <code>"GivenName FamilyName"</code>
    * @param issueInstant current timestamp
    * @param authURL URL of MOA-ID authentication component
-   * @param target "Gesch&auml;ftsbereich"
+   * @param target "Gesch&auml;ftsbereich"; maybe <code>null</code> if the application
+   *               is a business application
+   * @param identityLinkValue the content of the <code>&lt;pr:Value&gt;</code>
+   *                          child element of the <code>&lt;pr:Identification&gt;</code>
+   *                          element derived from the Identitylink; this is the
+   *                          value of the <code>wbPK</code>;
+   *                          maybe <code>null</code> if the application is a public service
+   * @param identiyLinkType   the content of the <code>&lt;pr:Type&gt;</code>
+   *                          child element of the <code>&lt;pr:Identification&gt;</code>
+   *                          element derived from the Identitylink; this includes the
+   *                          URN prefix and the identification number of the business
+   *                          application used as input for wbPK computation;
+   *                          maybe <code>null</code> if the application is a public service
    * @param oaURL public URL of online application requested
    * @return String representation of authentication block 
    *          <code>&lt;saml:Assertion&gt;</code> built
    */
-  public String build(String issuer, String issueInstant, String authURL, String target, String oaURL, String GebDat) {
-  	String assertion = MessageFormat.format(
-  		AUTH_BLOCK, new Object[] { issuer, issueInstant, authURL, target, oaURL, GebDat});
-	  return assertion;
+  public String buildAuthBlock(String issuer, 
+                                String issueInstant, 
+                                String authURL, 
+                                String target,
+                                String identityLinkValue, 
+                                String identityLinkType,
+                                String oaURL, 
+                                String GebDat) 
+  {
+    
+    String gebeORwbpk = "";
+    String wbpkNSDeclaration = "";
+    if (target == null) {
+      // OA is a business application
+      gebeORwbpk =  MessageFormat.format(
+        WBPK_ATTRIBUTE, new Object[] { identityLinkValue, identityLinkType });
+      wbpkNSDeclaration = " xmlns:pr=\"" + PD_NS_URI + "\" xmlns:si=\"" + PD_NS_URI + "\"";
+    } else {
+      gebeORwbpk =  MessageFormat.format(
+        GESCHAEFTS_BEREICH_ATTRIBUTE, new Object[] { target });
+    }
+    
+    String assertion = MessageFormat.format(
+      AUTH_BLOCK, new Object[] { wbpkNSDeclaration, issuer, issueInstant, authURL, gebeORwbpk, oaURL, GebDat});
+    return assertion;
+    
   }
 
 }
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataAssertionBuilder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataAssertionBuilder.java
index eaf9aa0ae..cdb660010 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataAssertionBuilder.java
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataAssertionBuilder.java
@@ -26,19 +26,23 @@ public class AuthenticationDataAssertionBuilder implements Constants {
     " MajorVersion=''1'' MinorVersion=''0'' AssertionID=''{0}'' Issuer=''{1}'' IssueInstant=''{2}''>" + NL +
 	  "	<saml:AttributeStatement>" + NL + 
 	  "		<saml:Subject>" + NL +
-	  "			<saml:NameIdentifier NameQualifier=''urn:publicid:gv.at:cdid+bPK''>{3}</saml:NameIdentifier>" + NL +
+	  "			<saml:NameIdentifier NameQualifier=''{3}''>{4}</saml:NameIdentifier>" + NL +
 	  "     <saml:SubjectConfirmation>" + NL +
 	  "       <saml:ConfirmationMethod>" + MOA_NS_URI + "cm</saml:ConfirmationMethod>" + NL +
-	  "       <saml:SubjectConfirmationData>{4}{5}</saml:SubjectConfirmationData>" + NL +
+	  "       <saml:SubjectConfirmationData>{5}{6}</saml:SubjectConfirmationData>" + NL +
 	  "     </saml:SubjectConfirmation>" + NL +
 	  "		</saml:Subject>" + NL +
 	  "		<saml:Attribute AttributeName=''PersonData'' AttributeNamespace=''" + PD_NS_URI + "''>" + NL +
-	  "			<saml:AttributeValue>{6}</saml:AttributeValue>" + NL +
+	  "			<saml:AttributeValue>{7}</saml:AttributeValue>" + NL +
 	  "		</saml:Attribute>" + NL +
 	  "		<saml:Attribute AttributeName=''isQualifiedCertificate'' AttributeNamespace=''" + MOA_NS_URI + "''>" + NL +
-	  "			<saml:AttributeValue>{7}</saml:AttributeValue>" + NL +
+	  "			<saml:AttributeValue>{8}</saml:AttributeValue>" + NL +
 	  "		</saml:Attribute>" + NL +
-	  "{8}" + 
+    "   <saml:Attribute AttributeName=''bkuURL'' AttributeNamespace=''" + MOA_NS_URI + "''>" + NL +
+    "     <saml:AttributeValue>{9}</saml:AttributeValue>" + NL +
+    "   </saml:Attribute>" + NL +
+	  "{10}" + 
+    "{11}" +
 	  "	</saml:AttributeStatement>" + NL +
 	  "</saml:Assertion>";
 	/**
@@ -49,6 +53,11 @@ public class AuthenticationDataAssertionBuilder implements Constants {
 	  "		<saml:Attribute AttributeName=''isPublicAuthority'' AttributeNamespace=''urn:oid:1.2.40.0.10.1.1.1''>" + NL +
 	  "			<saml:AttributeValue>{0}</saml:AttributeValue>" + NL +
 	  "		</saml:Attribute>" + NL;
+  
+  private static final String SIGNER_CERTIFICATE_ATT = 
+    "   <saml:Attribute AttributeName=''SignerCertificate'' AttributeNamespace=''" + MOA_NS_URI + "''>" + NL +
+    "     <saml:AttributeValue>{0}</saml:AttributeValue>" + NL +
+    "   </saml:Attribute>" + NL;
 	  
   /**
    * Constructor for AuthenticationDataAssertionBuilder.
@@ -67,6 +76,12 @@ public class AuthenticationDataAssertionBuilder implements Constants {
    * 				 <code>lt;saml:SubjectConfirmationData&gt;</code> element; may include
    * 				 the <code>"Stammzahl"</code> or not; may be empty
    * @param xmlIdentityLink the IdentityLink
+   * @param signerCertificateBase64 Base64 encoded certificate of the signer. Maybe
+   *         an empty string if the signer certificate should not be provided. 
+   *         Will be ignored if the <code>businessService</code> parameter is
+   *         set to <code>false</code>.
+   * @param businessService <code>true</code> if the online application is a
+   *                        business service, otherwise <code>false</code>
    * @return the <code>&lt;saml:Assertion&gt;</code>
    * @throws BuildException if an error occurs during the build process
    */
@@ -74,7 +89,10 @@ public class AuthenticationDataAssertionBuilder implements Constants {
   	AuthenticationData authData, 
   	String xmlPersonData, 
   	String xmlAuthBlock, 
-  	String xmlIdentityLink) throws BuildException {
+  	String xmlIdentityLink,
+    String bkuURL,
+    String signerCertificateBase64,
+    boolean businessService) throws BuildException {
   		
   	String isQualifiedCertificate = authData.isQualifiedCertificate() ? "true" : "false";
   	String publicAuthorityAttribute = "";
@@ -85,17 +103,38 @@ public class AuthenticationDataAssertionBuilder implements Constants {
   		publicAuthorityAttribute = MessageFormat.format(
   			PUBLIC_AUTHORITY_ATT, new Object[] { publicAuthorityIdentification });
   	}
-
+    
+    
+    String signerCertificateAttribute = "";
+    if (signerCertificateBase64 != "") {
+      signerCertificateAttribute = MessageFormat.format(
+        SIGNER_CERTIFICATE_ATT, new Object[] { signerCertificateBase64 });
+    } 
+    
+    String pkType;
+    String pkValue;
+    if (businessService) {
+      pkType = authData.getIdentificationType();
+      pkValue = authData.getWPBK();
+           
+    } else {
+      pkType = URN_PREFIX_BPK;
+      pkValue = authData.getPBK();
+    }
+    
   	String assertion = MessageFormat.format(AUTH_DATA, new Object[] {
-  		authData.getAssertionID(),
+  		authData.getAssertionID(), 
   		authData.getIssuer(), 
   		authData.getIssueInstant(), 
-  		authData.getPBK(), 
-  		removeXMLDeclaration(xmlAuthBlock),
-  		removeXMLDeclaration(xmlIdentityLink),
+      pkType,
+  		pkValue, 
+  		removeXMLDeclaration(xmlAuthBlock), 
+  		removeXMLDeclaration(xmlIdentityLink), 
   		removeXMLDeclaration(xmlPersonData), 
-  		isQualifiedCertificate, 
-  		publicAuthorityAttribute});
+  		isQualifiedCertificate,
+      bkuURL,
+  		publicAuthorityAttribute,
+      signerCertificateAttribute}); 
     return assertion;
   }
   
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/CertInfoVerifyXMLSignatureRequestBuilder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/CertInfoVerifyXMLSignatureRequestBuilder.java
index 5ceb1d1c0..cb6c8b31b 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/CertInfoVerifyXMLSignatureRequestBuilder.java
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/builder/CertInfoVerifyXMLSignatureRequestBuilder.java
@@ -1,9 +1,13 @@
 package at.gv.egovernment.moa.id.auth.builder;
 
+import java.io.File;
 import java.io.IOException;
+import java.text.MessageFormat;
 
 import at.gv.egovernment.moa.id.BuildException;
+import at.gv.egovernment.moa.util.Constants;
 import at.gv.egovernment.moa.util.FileUtils;
+import at.gv.egovernment.moa.util.StringUtils;
 
 /**
  * Builder for the <code>&lt;VerifyXMLSignatureRequest&gt;</code> structure
@@ -12,10 +16,26 @@ import at.gv.egovernment.moa.util.FileUtils;
  * @author Paul Ivancsics
  * @version $Id$
  */
-public class CertInfoVerifyXMLSignatureRequestBuilder extends Builder {
+public class CertInfoVerifyXMLSignatureRequestBuilder extends Builder implements Constants {
   
   /** special tag in the VerifyXMLRequest template to be substituted for a <code>&lt;dsig:Signature&gt;</code> */
   private static final String SIGNATURE_TAG = "<dsig:Signature/>";
+  
+  /** private static String nl contains the NewLine representation in Java*/
+  private static final String nl = "\n";
+    /**
+   * XML template for the CertInfoVerifyXMLSignatureRequest to be built
+   */ 
+  static final String CERTINFO_REQUEST =
+    "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + nl +                                                                  
+    "<{0}:VerifyXMLSignatureRequest {2} xmlns:xml=\"" + XML_NS_URI + "\" xmlns:dsig=\"" + DSIG_NS_URI +  "\">" + nl +
+    "  <{0}:SignatureInfo>" + nl +
+    "    <{0}:SignatureEnvironment>" + nl +
+    "      <{1}:XMLContent xml:space=\"preserve\"><dsig:Signature/></{1}:XMLContent>" + nl +
+    "    </{0}:SignatureEnvironment>" + nl +
+    "    <{0}:SignatureLocation>//dsig:Signature</{0}:SignatureLocation>" + nl +
+    "  </{0}:SignatureInfo>" + nl +
+    "</{0}:VerifyXMLSignatureRequest>";
 
   /**
    * Constructor
@@ -28,16 +48,30 @@ public class CertInfoVerifyXMLSignatureRequestBuilder extends Builder {
    * @return the XML structure
    * @throws BuildException
    */
-  public String build() throws BuildException {
-    String resCertInfoRequest = "resources/xmldata/CertInfoVerifyXMLSignatureRequest.xml";
-    String resDsigSignature = "resources/xmldata/CertInfoDsigSignature.xml";
-    String certInfoRequest;
-    try {
-      certInfoRequest = FileUtils.readResource(resCertInfoRequest, "UTF-8");
-    }
-    catch (IOException ex) {
-      throw new BuildException("auth.04", new Object[] {resCertInfoRequest, ex.toString()});
+  public String build(boolean slVersion12) throws BuildException {
+    
+    String sl10Prefix;
+    String sl11Prefix;
+    String slNsDeclaration;
+        
+    if (slVersion12) {
+            
+      sl10Prefix = SL12_PREFIX;
+      sl11Prefix = SL12_PREFIX;
+      slNsDeclaration = "xmlns:" + SL12_PREFIX + "=\"" + SL12_NS_URI + "\"";
+      
+    } else {
+      
+      sl10Prefix = SL10_PREFIX;
+      sl11Prefix = SL11_PREFIX;
+      slNsDeclaration = "xmlns:" + sl11Prefix + "=\"" + SL11_NS_URI + "\" xmlns:" + sl10Prefix + "=\"" + SL10_NS_URI + "\"";
+      
     }
+    
+    String certInfoRequest = MessageFormat.format(CERTINFO_REQUEST, new Object[] {sl11Prefix, sl10Prefix, slNsDeclaration});
+    String resDsigSignature = "resources/xmldata/CertInfoDsigSignature.xml";
+    
+    
     try {
       String dsigSignature = FileUtils.readResource(resDsigSignature, "UTF-8");
       certInfoRequest = replaceTag(certInfoRequest, SIGNATURE_TAG, dsigSignature);
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureRequestBuilder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureRequestBuilder.java
index 48320c4f5..51429251e 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureRequestBuilder.java
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureRequestBuilder.java
@@ -3,6 +3,7 @@ package at.gv.egovernment.moa.id.auth.builder;
 import java.text.MessageFormat;
 
 import at.gv.egovernment.moa.util.Constants;
+import at.gv.egovernment.moa.util.StringUtils;
 
 /**
  * Builder for the <code>&lt;CreateXMLSignatureRequest&gt;</code> structure
@@ -17,22 +18,23 @@ public class CreateXMLSignatureRequestBuilder implements Constants {
   private static final String nl = "\n";
     /**
    * XML template for the <code>&lt;moa:CreateXMLSignatureRequest&gt;</code> to be built
-   */
+   */     
 	private static final String CREATE_XML_SIGNATURE_REQUEST = 
-		"<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" + nl +
-		"<sl11:CreateXMLSignatureRequest xmlns:dsig=''" + DSIG_NS_URI + "'' xmlns:sl10=''" + SL10_NS_URI + "'' xmlns:sl11=''" + SL11_NS_URI + "''>" + nl +
-		" <sl11:KeyboxIdentifier>{1}</sl11:KeyboxIdentifier>" + nl +
-		" <sl11:DataObjectInfo Structure=''detached''>" + nl +
-		"  <sl10:DataObject Reference=''''/>" + nl +
-		"{2}" +
-		" </sl11:DataObjectInfo>" + nl +
-		" <sl11:SignatureInfo>" + nl +
-		"  <sl11:SignatureEnvironment>" + nl +
-		"   <sl10:XMLContent>{0}</sl10:XMLContent>" + nl +
-		"  </sl11:SignatureEnvironment>" + nl +
-		"  <sl11:SignatureLocation Index=''2''>/saml:Assertion</sl11:SignatureLocation>" + nl +
-		" </sl11:SignatureInfo>" + nl +
-		"</sl11:CreateXMLSignatureRequest>";
+    "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" + nl +
+    "<{3}:CreateXMLSignatureRequest xmlns:dsig=''" + DSIG_NS_URI + "'' {5}>" + nl +
+    " <{3}:KeyboxIdentifier>{1}</{3}:KeyboxIdentifier>" + nl +
+    " <{3}:DataObjectInfo Structure=''detached''>" + nl +
+    "  <{4}:DataObject Reference=''''/>" + nl +
+    "{2}" +
+    " </{3}:DataObjectInfo>" + nl +
+    " <{3}:SignatureInfo>" + nl +
+    "  <{3}:SignatureEnvironment>" + nl +
+    "   <{4}:XMLContent>{0}</{4}:XMLContent>" + nl +
+    "  </{3}:SignatureEnvironment>" + nl +
+    "  <{3}:SignatureLocation Index=''2''>/saml:Assertion</{3}:SignatureLocation>" + nl +
+    " </{3}:SignatureInfo>" + nl +
+    "</{3}:CreateXMLSignatureRequest>";
+  
 
   /**
    * Constructor for CreateXMLSignatureRequestBuilder.
@@ -46,14 +48,46 @@ public class CreateXMLSignatureRequestBuilder implements Constants {
 	 * 
 	 * @param authBlock String representation of XML authentication block
 	 * @param keyBoxIdentfier the key box identifier which will be used (e.g. CertifiedKeypair)
+   * @param slVersion12 specifies whether the Security Layer version number is 1.2 or not
 	 * @return String representation of <code>&lt;CreateXMLSignatureRequest&gt;</code>
 	 */
-	public String build(String authBlock, String keyBoxIdentifier, String[] dsigTransformInfos) {
-		String dsigTransformInfosString = "";
-		for (int i = 0; i < dsigTransformInfos.length; i++)
+	public String build(String authBlock, String keyBoxIdentifier, String[] dsigTransformInfos, boolean slVersion12) {
+		
+    String sl10Prefix;
+    String sl11Prefix;
+    String slNsDeclaration;
+    
+    String dsigTransformInfosString = "";
+		for (int i = 0; i < dsigTransformInfos.length; i++) {
       dsigTransformInfosString += dsigTransformInfos[i];
+    }
+    
+    if (slVersion12) {
+      
+      // replace the SecurityLayer namespace prefixes and URIs within the transforms
+      dsigTransformInfosString = StringUtils.changeSLVersion(dsigTransformInfosString,
+                                                             SL10_PREFIX, SL12_PREFIX,
+                                                             SL10_NS_URI, SL12_NS_URI);
+      sl10Prefix = SL12_PREFIX;
+      sl11Prefix = SL12_PREFIX;
+      slNsDeclaration = "xmlns:" + SL12_PREFIX + "='" + SL12_NS_URI + "'";
+      
+    } else {
+      
+      sl10Prefix = SL10_PREFIX;
+      sl11Prefix = SL11_PREFIX;
+      slNsDeclaration = "xmlns:" + sl10Prefix + "='" + SL10_NS_URI + "' xmlns:" + sl11Prefix + "='" + SL11_NS_URI + "'";
+      
+    }
+      
 		String request = MessageFormat.format(
-			CREATE_XML_SIGNATURE_REQUEST, new Object[] { authBlock, keyBoxIdentifier, dsigTransformInfosString });
+			CREATE_XML_SIGNATURE_REQUEST, new Object[] { authBlock, 
+                                                   keyBoxIdentifier, 
+                                                   dsigTransformInfosString, 
+                                                   sl11Prefix, 
+                                                   sl10Prefix, 
+                                                   slNsDeclaration });
+    
 		return request;
 	}
 }
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java
index dbc14804d..4fb5b0837 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java
@@ -27,8 +27,6 @@ public class GetIdentityLinkFormBuilder extends Builder {
   /** special tag in the HTML template to be substituted for the certificate info data URL */
   private static final String CERTINFO_DATAURL_TAG = "<CertInfoDataURL>";
 
-  /** default BKU URL */
-  private static final String DEFAULT_BKU = "http://localhost:3495/http-security-layer-request";
   /** default HTML template */
   private static final String DEFAULT_HTML_TEMPLATE = 
     "<meta http-equiv=\"content-type\" content=\"text/html; charset=UTF-8\">" + nl +
@@ -84,11 +82,11 @@ public class GetIdentityLinkFormBuilder extends Builder {
     throws BuildException {
       
   	String htmlForm = htmlTemplate == null ? DEFAULT_HTML_TEMPLATE : htmlTemplate;
-    String bku = bkuURL == null ? DEFAULT_BKU : bkuURL;
-    htmlForm = replaceTag(htmlForm, BKU_TAG, bku);
+//    String bku = bkuURL == null ? DEFAULT_BKU : bkuURL;
+    htmlForm = replaceTag(htmlForm, BKU_TAG, bkuURL);
     htmlForm = replaceTag(htmlForm, XMLREQUEST_TAG, encodeParameter(xmlRequest));
     htmlForm = replaceTag(htmlForm, DATAURL_TAG, dataURL);
-    htmlForm = replaceTag(htmlForm, BKU_TAG, bku);
+    htmlForm = replaceTag(htmlForm, BKU_TAG, bkuURL);
     htmlForm = replaceTag(htmlForm, CERTINFO_XMLREQUEST_TAG, encodeParameter(certInfoXMLRequest));
     htmlForm = replaceTag(htmlForm, CERTINFO_DATAURL_TAG, certInfoDataURL);
   	return htmlForm;
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilder.java
index d3e100671..c2bafe43b 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilder.java
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilder.java
@@ -11,29 +11,76 @@ import at.gv.egovernment.moa.util.Constants;
  */
 public class InfoboxReadRequestBuilder implements Constants {
 
-  /**
-   * XML template for the <code>&lt;sl10:InfoboxReadRequest&gt;</code> to be built
-   */	
-  String INFOBOX_READ_REQUEST =
-		"<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" +
-    "<sl10:InfoboxReadRequest xmlns:sl10=\"" + SL10_NS_URI + "\">" +
-    "<sl10:InfoboxIdentifier>IdentityLink</sl10:InfoboxIdentifier>" +
-    "<sl10:BinaryFileParameters ContentIsXMLEntity=\"true\"/>" +
-   	"</sl10:InfoboxReadRequest>";
 
   /**
    * Constructor for InfoboxReadRequestBuilder.
    */
   public InfoboxReadRequestBuilder() {
   }
+   
+  
   /**
    * Builds an <code>&lt;InfoboxReadRequest&gt;</code>.
    * 
+   * @param slVersion12           specifies whether the Security Layer version is
+   *                              version 1.2 or not
+   * @param businessService       specifies whether the online application is a
+   *                              business service or not
+   * @param identityLinkDomainIdentifier  the identification number of the business 
+   *                              company; maybe <code>null</code> if the OA
+   *                              is a public service; must not be <code>null</code>
+   *                              if the OA is a business service
+   * 
    * @return <code>&lt;InfoboxReadRequest&gt;</code> as String
    */
-  public String build() {
-    String request = INFOBOX_READ_REQUEST;
-    return request;
+  public String build(boolean slVersion12, boolean businessService, String identityLinkDomainIdentifier) {
+    
+    String slPrefix;
+    String slNsDeclaration;
+    
+    if (slVersion12) {
+      slPrefix = SL12_PREFIX;
+      slNsDeclaration = SL12_NS_URI;
+    } else {
+      slPrefix = SL10_PREFIX;
+      slNsDeclaration = SL10_NS_URI;
+    }
+        
+    StringBuffer sb = new StringBuffer("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>");
+    sb.append("<");
+    sb.append(slPrefix);
+    sb.append(":InfoboxReadRequest xmlns:");
+    sb.append(slPrefix);
+    sb.append("=\"");
+    sb.append(slNsDeclaration);
+    sb.append("\">");
+    sb.append("<");
+    sb.append(slPrefix);
+    sb.append(":InfoboxIdentifier>IdentityLink</");
+    sb.append(slPrefix);
+    sb.append(":InfoboxIdentifier>");
+    sb.append("<");
+    sb.append(slPrefix);
+    sb.append(":BinaryFileParameters ContentIsXMLEntity=\"true\"/>");
+    if (businessService) {
+      sb.append("<");
+      sb.append(slPrefix);
+      sb.append(":BoxSpecificParameters>");
+      sb.append("<");
+      sb.append(slPrefix);
+      sb.append(":IdentityLinkDomainIdentifier>");
+      sb.append(identityLinkDomainIdentifier);
+      sb.append("</sl:IdentityLinkDomainIdentifier>");
+      sb.append("</");
+      sb.append(slPrefix);
+      sb.append(":BoxSpecificParameters>");
+    }
+    sb.append("</");
+    sb.append(slPrefix);
+    sb.append(":InfoboxReadRequest>");
+    
+    return sb.toString();
+       
   }
 
 }