* optionalen useUTC Parameter in Konfig eingefügt (damit IssueInstant in SAML Assertion auf UTC einstellbar)

* optionalen sourceID Parameter bei MOA-ID Aufruf eingefügt (wird 1:1 in SAML Assertion übernommen)
* Update Doku (useUTC, sourceID, Vollmachten-Profile)
* Ablaufänderung bei Vollmachten-Modus (Signatur Zertifikat wird aus Signatur entnommen und nicht mittels eigenem Infobox-Request)


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

1 files changed, 11 insertions, 4 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataAssertionBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataAssertionBuilder.java
index 367116c73..7032e09eb 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataAssertionBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataAssertionBuilder.java
@@ -69,9 +69,10 @@ public class AuthenticationDataAssertionBuilder extends AuthenticationAssertionB
       "   <saml:Attribute AttributeName=''bkuURL'' AttributeNamespace=''" + MOA_NS_URI + "''>" + NL +
       "     <saml:AttributeValue>{9}</saml:AttributeValue>" + NL +
       "   </saml:Attribute>" + NL +
-	  "{10}" + 
-      "{11}" +
+      "{10}" +      
+	  "{11}" + 
       "{12}" +
+      "{13}" +      
 	  "	</saml:AttributeStatement>" + NL +
 	  "</saml:Assertion>";
 	
@@ -103,9 +104,10 @@ public class AuthenticationDataAssertionBuilder extends AuthenticationAssertionB
       "   <saml:Attribute AttributeName=''bkuURL'' AttributeNamespace=''" + MOA_NS_URI + "''>" + NL +
       "     <saml:AttributeValue>{10}</saml:AttributeValue>" + NL +
       "   </saml:Attribute>" + NL +
-	  "{11}" + 
-      "{12}" +
+      "{11}" +
+	  "{12}" + 
       "{13}" +
+      "{14}" +
 	  "	</saml:AttributeStatement>" + NL +
 	  "</saml:Assertion>";
 	/**
@@ -156,6 +158,7 @@ public class AuthenticationDataAssertionBuilder extends AuthenticationAssertionB
     String bkuURL,
     String signerCertificateBase64,
     boolean businessService,
+    String sourceID,
     List extendedSAMLAttributes) 
   throws BuildException 
   {
@@ -195,6 +198,7 @@ public class AuthenticationDataAssertionBuilder extends AuthenticationAssertionB
   	String assertion;
     try {
     	
+   	
       assertion = MessageFormat.format(AUTH_DATA, new Object[] {
         authData.getAssertionID(), 
         authData.getIssuer(), 
@@ -206,6 +210,7 @@ public class AuthenticationDataAssertionBuilder extends AuthenticationAssertionB
         StringUtils.removeXMLDeclaration(xmlPersonData), 
         isQualifiedCertificate,
         bkuURL,
+        buildSourceIDSAMLAttributes(sourceID),
         publicAuthorityAttribute,
         signerCertificateAttribute,
         buildExtendedSAMLAttributes(extendedSAMLAttributes)});
@@ -244,6 +249,7 @@ public class AuthenticationDataAssertionBuilder extends AuthenticationAssertionB
     String bkuURL,
     String signerCertificateBase64,
     boolean businessService,
+    String sourceID,
     List extendedSAMLAttributes) 
   throws BuildException 
   {
@@ -295,6 +301,7 @@ public class AuthenticationDataAssertionBuilder extends AuthenticationAssertionB
         StringUtils.removeXMLDeclaration(xmlMandateData),
         isQualifiedCertificate,
         bkuURL,
+        buildSourceIDSAMLAttributes(sourceID),
         publicAuthorityAttribute,
         signerCertificateAttribute,
         buildExtendedSAMLAttributes(extendedSAMLAttributes)});