update mostly all GUI forms to split JavaScript and CSS from html code to support "Content Security-Policy" http headers

2 files changed, 9 insertions, 2 deletions

diff --git a/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java b/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
index faeb0158b..f7c3db8d1 100644
--- a/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
+++ b/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
@@ -213,7 +213,7 @@ public class AuthenticationServer extends BaseAuthenticationServer {
 		try {
 			String htmlForm = new GetIdentityLinkFormBuilder().build(template,
 					session.getBkuURL(), infoboxReadRequest, dataURL, null,
-					null, pushInfobox, oaParam, appletheigth, appletwidth);
+					null, pushInfobox, oaParam, appletheigth, appletwidth, pendingReq.getAuthURL());
 
 			return htmlForm;
 
diff --git a/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java b/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java
index ef81af94b..f7aba5e53 100644
--- a/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java
+++ b/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java
@@ -78,6 +78,9 @@ public class GetIdentityLinkFormBuilder extends Builder {
 //  private static final String CERTINFO_DATAURL_TAG = "<CertInfoDataURL>";
   /** special tag in the HTML template to be substituted for the infoboxes to be pushed from the BKU */
   private static final String PUSHINFOBOX_TAG = "<PushInfobox>";
+  
+  private static final String CONTEXTURL_TAG = "<ContextURL>";
+  
   /** special tag in the HTML template to be substituted for the BKU URL */
   /** private static int all contains the representation to replace all tags*/
   private static final int ALL = -1;
@@ -155,7 +158,8 @@ public class GetIdentityLinkFormBuilder extends Builder {
     String certInfoDataURL, 
     String pushInfobox, IOAAuthParameters oaParam, 
     String appletheigth,
-    String appletwidth)
+    String appletwidth,
+  	String contextURL)
   throws BuildException 
   {      
   	String htmlForm = htmlTemplate == null ? DEFAULT_HTML_TEMPLATE : htmlTemplate;
@@ -163,6 +167,9 @@ public class GetIdentityLinkFormBuilder extends Builder {
     htmlForm = replaceTag(htmlForm, XMLREQUEST_TAG, encodeParameter(xmlRequest), true, ALL);
     htmlForm = replaceTag(htmlForm, DATAURL_TAG, dataURL, true, ALL);
     htmlForm = replaceTag(htmlForm, PUSHINFOBOX_TAG, pushInfobox, false, ALL);
+    
+    htmlForm = replaceTag(htmlForm, CONTEXTURL_TAG, contextURL, false, ALL);
+    
 //new:wird oben mitreplaced    htmlForm = replaceTag(htmlForm, BKU_TAG, bkuURL);