- SSO finalized

- SSO Session is not closed if a new single authentication operation is started
- PVP2 Configuration from Database (but without Metadata) --> TODO: change MetaDataProvider
- Add additional UserFrame in case of SSO
- MOASession encryption

TODO: MetaDataProvider, IdentityLink resign, SSO with Mandates, Legacy Template generation

1 files changed, 27 insertions, 22 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/StartAuthentificationParameterParser.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/StartAuthentificationParameterParser.java
index 3f82c2a4c..c9a10b812 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/StartAuthentificationParameterParser.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/StartAuthentificationParameterParser.java
@@ -36,7 +36,7 @@ public class StartAuthentificationParameterParser implements MOAIDAuthConstants{
 		
 		String targetFriendlyName = null;
 		
-	    String sso = req.getParameter(PARAM_SSO);
+//	    String sso = req.getParameter(PARAM_SSO);
 		
 	    // escape parameter strings
 	    //TODO: use URLEncoder.encode!!
@@ -46,17 +46,20 @@ public class StartAuthentificationParameterParser implements MOAIDAuthConstants{
 	    templateURL = StringEscapeUtils.escapeHtml(templateURL);
 	    useMandate = StringEscapeUtils.escapeHtml(useMandate);
 	    ccc = StringEscapeUtils.escapeHtml(ccc);
-	    sso = StringEscapeUtils.escapeHtml(sso);
+//	    sso = StringEscapeUtils.escapeHtml(sso);
 	    
 	      // check parameter
-		if (!ParamValidatorUtils.isValidOA(oaURL))
-           throw new WrongParametersException("StartAuthentication", PARAM_OA, "auth.12");
+	    
+	    //pvp2.x can use general identifier (equals oaURL in SAML1)
+//		if (!ParamValidatorUtils.isValidOA(oaURL))
+//           throw new WrongParametersException("StartAuthentication", PARAM_OA, "auth.12");
+	    
 	    if (!ParamValidatorUtils.isValidUseMandate(useMandate))
              throw new WrongParametersException("StartAuthentication", PARAM_USEMANDATE, "auth.12");		    
 	    if (!ParamValidatorUtils.isValidCCC(ccc))
              throw new WrongParametersException("StartAuthentication", PARAM_CCC, "auth.12");
-	    if (!ParamValidatorUtils.isValidUseMandate(sso))
-            throw new WrongParametersException("StartAuthentication", PARAM_SSO, "auth.12");
+//	    if (!ParamValidatorUtils.isValidUseMandate(sso))
+//            throw new WrongParametersException("StartAuthentication", PARAM_SSO, "auth.12");
 	    
 		//check UseMandate flag
 		String useMandateString = null;
@@ -74,22 +77,7 @@ public class StartAuthentificationParameterParser implements MOAIDAuthConstants{
 	    
 		moasession.setUseMandate(useMandateString);
 		
-		
-		//check useSSO flag
-		String useSSOString = null;
-		boolean useSSOBoolean = false;
-		if ((sso != null) && (sso.compareTo("") != 0)) {
-			useSSOString = sso;
-		} else {
-			useSSOString = "false";
-		}
-
-		if (useSSOString.compareToIgnoreCase("true") == 0)
-			useSSOBoolean = true;
-		else
-			useSSOBoolean = false;
-		moasession.setSsoRequested(useSSOBoolean);
-		
+				
 	    //load OnlineApplication configuration
 	    OAAuthParameter oaParam;
 		if (moasession.getPublicOAURLPrefix() != null) {
@@ -128,6 +116,23 @@ public class StartAuthentificationParameterParser implements MOAIDAuthConstants{
 			}
 			
 			
+//			//check useSSO flag
+//			String useSSOString = null;
+//			boolean useSSOBoolean = false;
+//			if ((sso != null) && (sso.compareTo("") != 0)) {
+//				useSSOString = sso;
+//			} else {
+//				useSSOString = "false";
+//			}
+	//
+//			if (useSSOString.compareToIgnoreCase("true") == 0)
+//				useSSOBoolean = true;
+//			else
+//				useSSOBoolean = false;
+			
+			//moasession.setSsoRequested(useSSOBoolean);
+			moasession.setSsoRequested(true && oaParam.useSSO());  //make always SSO if OA requested it!!!!
+			
 			//Validate BKU URI
 		    if (!ParamValidatorUtils.isValidBKUURI(bkuURL, oaParam.getBKUURL()))
 			       throw new WrongParametersException("StartAuthentication", PARAM_BKU, "auth.12");