refactor Single Sign-On authentication consents evaluator to get executed by processEngine

1 files changed, 30 insertions, 48 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/SendAssertionFormBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/SendAssertionFormBuilder.java
index d14910319..7121935b0 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/SendAssertionFormBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/SendAssertionFormBuilder.java
@@ -34,7 +34,8 @@ import java.net.URI;
 import org.apache.commons.io.IOUtils;
 
 import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProviderFactory;
-import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.config.auth.IOAAuthParameters;
+import at.gv.egovernment.moa.id.moduls.IRequest;
 import at.gv.egovernment.moa.id.util.FormBuildUtils;
 import at.gv.egovernment.moa.logging.Logger;
 
@@ -46,8 +47,6 @@ public class SendAssertionFormBuilder {
 	private static final String TEMPLATEBGCOLOR = "style=\"background-color: #COLOR#\"";
 	
 	private static String URL = "#URL#";
-	private static String MODUL = "#MODUL#";
-	private static String ACTION = "#ACTION#";
 	private static String ID = "#ID#";
 	private static String OANAME = "#OAName#";
 	private static String CONTEXTPATH = "#CONTEXTPATH#";
@@ -56,8 +55,7 @@ public class SendAssertionFormBuilder {
 	
 	private static String SERVLET = CONTEXTPATH+"/SSOSendAssertionServlet";
 	
-	private static String getTemplate() {
-		
+	private static String getTemplate() {		
 		String pathLocation;
 		InputStream input = null;
 		try {
@@ -68,12 +66,9 @@ public class SendAssertionFormBuilder {
 				File file = new File(new URI(pathLocation));
 				input = new  FileInputStream(file);
 			
-			} catch (FileNotFoundException e)  {
-				
-				Logger.warn("No LoginFormTempaltes found. Use Generic Templates from package.");
-			
-				pathLocation = "resources/templates/" + HTMLTEMPLATEFULL;
-			
+			} catch (FileNotFoundException e)  {				
+				Logger.warn("No LoginFormTempaltes found. Use Generic Templates from package.");			
+				pathLocation = "resources/templates/" + HTMLTEMPLATEFULL;			
 				input = Thread.currentThread()
 						.getContextClassLoader()
 						.getResourceAsStream(pathLocation);
@@ -82,48 +77,43 @@ public class SendAssertionFormBuilder {
 			
 			return getTemplate(input);
 			
-		} catch (Exception e) {
+		} catch (Exception e) {			
+			return null;
+			
+		} finally {
 			try {
-				input.close();
+				if (input != null)
+					input.close();
 				
-			} catch (IOException e1) {
+			} catch (IOException e) {
 				Logger.warn("SendAssertionTemplate inputstream can not be closed.", e);
+				
 			}
-			
-			return null;
-		}
-		
+		}		
 	}
 	
 	private static String getTemplate(InputStream input) {
+			String template = null;			
+		try {				
 
-			String template = null;
-			
-			try {				
-	
-				StringWriter writer = new StringWriter();
-				IOUtils.copy(input, writer);
-				template = writer.toString();
-				template = template.replace(URL, SERVLET);
-								
-			} catch (Exception e) {
-				Logger.error("Failed to read template", e);
-				
-			} finally {
-				try {
-					input.close();
-					
-				} catch (IOException e) {
-					Logger.warn("SendAssertionTemplate inputstream can not be closed.", e);
-				}
-			}
+			StringWriter writer = new StringWriter();
+			IOUtils.copy(input, writer);
+			template = writer.toString();
+			template = template.replace(URL, SERVLET);
+							
+		} catch (Exception e) {
+			Logger.error("Failed to read template", e);
 			
+		}			
 		return template;
 	}
 
-	public static String buildForm(String modul, String action, String id, OAAuthParameter oaParam, String contextpath) {
+	public static String buildForm(IRequest pendingReq) {
 		String value = null;
 		
+		String contextpath = pendingReq.getAuthURL();
+		IOAAuthParameters oaParam = pendingReq.getOnlineApplicationConfiguration();
+		
 		byte[] oatemplate = oaParam.getSendAssertionTemplate();
 		// OA specific template requires a size of 8 bits minimum
 		if (oatemplate != null && oatemplate.length > 7) {
@@ -137,15 +127,7 @@ public class SendAssertionFormBuilder {
 		}
 		
 		if(value != null) {
-//			if(modul == null) {
-//				modul = SAML1Protocol.PATH;
-//			}
-//			if(action == null) {
-//				action = SAML1Protocol.GETARTIFACT;
-//			}
-			value = value.replace(MODUL, modul);
-			value = value.replace(ACTION, action);
-			value = value.replace(ID, id);
+			value = value.replace(ID, pendingReq.getRequestID());
 			value = value.replace(OANAME, oaParam.getFriendlyName());
 			
 			if (contextpath.endsWith("/"))