Uppdates:

* Version 1.5.2
* Added: undocumented useCondition and conditionLength configuration parameter (allows to add a saml:Conditions to the SAML assertiopn)

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

1 files changed, 18 insertions, 3 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
index e86db4a5c..5ffff2787 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
@@ -1508,6 +1508,8 @@ public class AuthenticationServer implements MOAIDAuthConstants {
         AuthConfigurationProvider.getInstance().getOnlineApplicationParameter(
           session.getPublicOAURLPrefix());
     boolean useUTC = oaParam.getUseUTC();
+    boolean useCondition = oaParam.getUseCondition();
+    int conditionLength = oaParam.getConditionLength();
     
     // builds authentication data and stores it together with a SAML artifact
     AuthenticationData authData = buildAuthenticationData(session, vsresp, useUTC);
@@ -1532,7 +1534,9 @@ public class AuthenticationServer implements MOAIDAuthConstants {
               session.getBkuURL(),
               session.getAssertionSignerCertificateBase64(),
               session.getAssertionBusinessService(),
-              session.getExtendedSAMLAttributesOA());
+              session.getExtendedSAMLAttributesOA(),
+              useCondition,
+              conditionLength);
           authData.setSamlAssertion(samlAssertion);
           
           String assertionFile = AuthConfigurationProvider.getInstance().getGenericConfigurationParameter("AuthenticationServer.WriteAssertionToFile");
@@ -1661,11 +1665,15 @@ public class AuthenticationServer implements MOAIDAuthConstants {
 //    	e.printStackTrace();
 //    }
     String mandateData = null;
+    boolean useCondition = false;
+    int conditionLength = -1;
 	try {
 		OAAuthParameter oaParam =
 		      AuthConfigurationProvider.getInstance().getOnlineApplicationParameter(
 		        session.getPublicOAURLPrefix());
 		boolean provideStammzahl = oaParam.getProvideStammzahl();
+		useCondition = oaParam.getUseCondition();
+		conditionLength = oaParam.getConditionLength();
 		if (!provideStammzahl) {
 			String isPrPerson = mandatePerson.getAttribute("xsi:type");
 					
@@ -1686,6 +1694,7 @@ public class AuthenticationServer implements MOAIDAuthConstants {
 		throw new AuthenticationException("auth.16", new Object[] { GET_MIS_SESSIONID});
 	}
     
+	
     String samlAssertion =
     	new AuthenticationDataAssertionBuilder().buildMandate(
     			authData, 
@@ -1697,7 +1706,9 @@ public class AuthenticationServer implements MOAIDAuthConstants {
     			session.getAssertionSignerCertificateBase64(),
     			session.getAssertionBusinessService(),
     			session.getSourceID(),
-    			session.getExtendedSAMLAttributesOA());
+    			session.getExtendedSAMLAttributesOA(),
+    			useCondition,
+    			conditionLength);
     authData.setSamlAssertion(samlAssertion);
           
     String assertionFile = AuthConfigurationProvider.getInstance().getGenericConfigurationParameter("AuthenticationServer.WriteAssertionToFile");
@@ -1799,6 +1810,8 @@ public class AuthenticationServer implements MOAIDAuthConstants {
         AuthConfigurationProvider.getInstance().getOnlineApplicationParameter(
           session.getPublicOAURLPrefix());
     boolean useUTC = oaParam.getUseUTC();
+    boolean useCondition = oaParam.getUseCondition();
+    int conditionLength = oaParam.getConditionLength();
     AuthenticationData authData = buildAuthenticationData(session, vsresp, useUTC);
     
     
@@ -1811,7 +1824,9 @@ public class AuthenticationServer implements MOAIDAuthConstants {
           session.getBkuURL(),
           session.getAssertionSignerCertificateBase64(),
           session.getAssertionBusinessService(),
-          session.getExtendedSAMLAttributesOA());
+          session.getExtendedSAMLAttributesOA(),
+          useCondition,
+          conditionLength);
       authData.setSamlAssertion(samlAssertion);
       
       String assertionFile = AuthConfigurationProvider.getInstance().getGenericConfigurationParameter("AuthenticationServer.WriteAssertionToFile");