1 files changed, 55 insertions, 24 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 f65a3c011..24b848176 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
@@ -22,6 +22,7 @@
  ******************************************************************************/
 package at.gv.egovernment.moa.id.auth.builder;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -58,32 +59,50 @@ public class SendAssertionFormBuilder {
 	private static String SERVLET = CONTEXTPATH+"/SSOSendAssertionServlet";
 	
 	private static String getTemplate() {
-
-			String template = null;
-			InputStream input = null;
 		
-			try {				
-				String pathLocation;
-					
-				String rootconfigdir = AuthConfigurationProvider.getInstance().getRootConfigFileDir();	
-				pathLocation = rootconfigdir + HTMLTEMPLATESDIR + HTMLTEMPLATEFULL;
+		String pathLocation;
+		InputStream input = null;
+		try {
+			String rootconfigdir = AuthConfigurationProvider.getInstance().getRootConfigFileDir();	
+			pathLocation = rootconfigdir + HTMLTEMPLATESDIR + HTMLTEMPLATEFULL;
+		
+			try {
+				File file = new File(new URI(pathLocation));
+				input = new  FileInputStream(file);
+			
+			} catch (FileNotFoundException e)  {
 				
-				try {
-					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;
-					
-					input = Thread.currentThread()
-							.getContextClassLoader()
-							.getResourceAsStream(pathLocation);
-					
-				}
+				Logger.warn("No LoginFormTempaltes found. Use Generic Templates from package.");
+			
+				pathLocation = "resources/templates/" + HTMLTEMPLATEFULL;
+			
+				input = Thread.currentThread()
+						.getContextClassLoader()
+						.getResourceAsStream(pathLocation);
+			
+			}
+			
+			return getTemplate(input);
+			
+		} catch (Exception e) {
+			try {
+				input.close();
 				
+			} catch (IOException e1) {
+				Logger.warn("SendAssertionTemplate inputstream can not be closed.", e);
+			}
+			
+			return null;
+		}
+		
+	}
+	
+	private static String getTemplate(InputStream input) {
+
+			String template = null;
+			
+			try {				
+	
 				StringWriter writer = new StringWriter();
 				IOUtils.copy(input, writer);
 				template = writer.toString();
@@ -105,7 +124,19 @@ public class SendAssertionFormBuilder {
 	}
 
 	public static String buildForm(String modul, String action, String id, OAAuthParameter oaParam, String contextpath) {
-		String value = getTemplate();
+		String value = null;
+		
+		byte[] oatemplate = oaParam.getSendAssertionTemplate();
+		// OA specific template requires a size of 8 bits minimum
+		if (oatemplate != null && oatemplate.length > 7) {
+			InputStream is = new ByteArrayInputStream(oatemplate);
+			value = getTemplate(is);
+			
+		} else {
+			//load default BKU-selection template
+			value = getTemplate();
+			
+		}
 		
 		if(value != null) {
 			if(modul == null) {