SAK-42105 Configuration for browser feature policy in iframes part 2 (s…

…akaiproject#7103) I missed a few changes in vm files by accident :)
BruceMcl · Jul 10, 2019 · 450fc9a · 450fc9a
1 parent 65b1cc5
commit 450fc9a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/basiclti/web-ifp/src/java/org/sakaiproject/portlets/SakaiIFrame.java b/basiclti/web-ifp/src/java/org/sakaiproject/portlets/SakaiIFrame.java
@@ -231,7 +231,7 @@ public void doView(RenderRequest request, RenderResponse response)
 				context.put("validator", validator);
 				context.put("source",source);
 				context.put("height",height);
-				context.put("browser-feature-allow", ServerConfigurationService.getStrings("browser.feature.allow"));
+				context.put("browser-feature-allow", String.join(";", ServerConfigurationService.getStrings("browser.feature.allow")));
 				sendAlert(request,context);
 				context.put("popupdone", Boolean.valueOf(popupDone != null));
 				context.put("popup", Boolean.valueOf(popup));

diff --git a/web/web-portlet/src/java/org/sakaiproject/portlets/PortletIFrame.java b/web/web-portlet/src/java/org/sakaiproject/portlets/PortletIFrame.java
@@ -387,7 +387,7 @@ public void doView(RenderRequest request, RenderResponse response)
 				context.put("validator", validator);
 				context.put("source",url);
 				context.put("height",height);
-				context.put("browser-feature-allow", ServerConfigurationService.getStrings("browser.feature.allow"));
+				context.put("browser-feature-allow", String.join(";", ServerConfigurationService.getStrings("browser.feature.allow")));
 				sendAlert(request,context);
 				context.put("popup", Boolean.valueOf(popup));
 				context.put("popupdone", Boolean.valueOf(popupDone != null));

diff --git a/web/web-tool/tool/src/java/org/sakaiproject/web/tool/IFrameAction.java b/web/web-tool/tool/src/java/org/sakaiproject/web/tool/IFrameAction.java
@@ -763,7 +763,7 @@ public String buildMainPanelContext(VelocityPortlet portlet, Context context, Ru
 		if(url != null && url.startsWith("http:") && ServerConfigurationService.getServerUrl().startsWith("https:")){
 			context.put("popup", true);
 		}
-		context.put("browser-feature-allow", ServerConfigurationService.getStrings("browser.feature.allow"));
+		context.put("browser-feature-allow", String.join(";", ServerConfigurationService.getStrings("browser.feature.allow")));
 		//for annotatedurl
 		context.put(TARGETPAGE_URL, state.getAttribute(TARGETPAGE_URL));
 		context.put(TARGETPAGE_POPUP, state.getAttribute(TARGETPAGE_POPUP));
@@ -831,7 +831,7 @@ public String buildOptionsPanelContext(VelocityPortlet portlet, Context context,
 		String special = (String) state.getAttribute(SPECIAL);
 		String source = "";
 		String siteId = "";
-		context.put("browser-feature-allow", ServerConfigurationService.getStrings("browser.feature.allow"));
+		context.put("browser-feature-allow", String.join(";", ServerConfigurationService.getStrings("browser.feature.allow")));
 		if (special == null)
 		{
 			source = (String) state.getAttribute(SOURCE);