SAK-39946 allow trusted iframes to use camera or microphone (sakaipro…

…ject#5554)
bizzkriss · May 8, 2018 · eb331fd · eb331fd
1 parent d0b35dd
commit eb331fd
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 0 deletions.
diff --git a/basiclti/basiclti-portlet/src/java/org/sakaiproject/portlets/IMSBLTIPortlet.java b/basiclti/basiclti-portlet/src/java/org/sakaiproject/portlets/IMSBLTIPortlet.java
@@ -253,6 +253,7 @@ public void doView(RenderRequest request, RenderResponse response)
 					text.append("width=\"100%\" frameborder=\"0\" marginwidth=\"0\"\n");
 					text.append("marginheight=\"0\" scrolling=\"auto\"\n");
 					text.append(" allowfullscreen=\"true\" webkitallowfullscreen=\"true\" mozallowfullscreen=\"true\"\n");
+					text.append(" allow=\"camera; microphone\"\n");
 					text.append("src=\""+iframeUrl+"\">\n");
 					text.append(rb.getString("noiframes"));
 					text.append("<br>");

diff --git a/lessonbuilder/tool/src/webapp/templates/IFramePage.html b/lessonbuilder/tool/src/webapp/templates/IFramePage.html
@@ -41,6 +41,7 @@ <h2 rsf:id="title">Insert Page Title Here</h2>
 								allowfullscreen="true"
 								webkitallowfullscreen="true"
 								mozallowfullscreen="true"
+								allow="camera; microphone"
 								rsf:id="iframe"
 							>
 							</iframe>

diff --git a/lessonbuilder/tool/src/webapp/templates/ShowItem.html b/lessonbuilder/tool/src/webapp/templates/ShowItem.html
@@ -186,6 +186,7 @@
 			allowfullscreen="true"
 			webkitallowfullscreen="true"
 			mozallowfullscreen="true"
+			allow="camera; microphone"
 			scrolling="auto">
 		</iframe>
 		<script>

diff --git a/lessonbuilder/tool/src/webapp/templates/ShowPage.html b/lessonbuilder/tool/src/webapp/templates/ShowPage.html
@@ -464,6 +464,7 @@ <h3 rsf:id="sectionHeader" id="sectionHeader" class="sectionHeader"><span rsf:id
                            allowfullscreen="true"
                            webkitallowfullscreen="true"
                            mozallowfullscreen="true"
+                           allow="camera; microphone"
                            rsf:id="blti-iframe"
                                id="blti-iframe"
                            >
@@ -569,6 +570,7 @@ <h3 rsf:id="sectionHeader" id="sectionHeader" class="sectionHeader"><span rsf:id
                          allowfullscreen="true"
                          webkitallowfullscreen="true"
                          mozallowfullscreen="true"
+                         allow="camera; microphone"
                          rsf:id="iframe"
                              id="iframe"
                          ></iframe>
@@ -611,6 +613,7 @@ <h3 rsf:id="sectionHeader" id="sectionHeader" class="sectionHeader"><span rsf:id
                             allowfullscreen="allowfullscreen"
                             webkitallowfullscreen="true"
                             mozallowfullscreen="true"
+                            allow="camera; microphone"
                             class="playerwidth"></iframe>
 			<div rsf:id="youtube-td" role="toolbar" class="edit-col"><div><a role="button" aria-haspopup="dialog" aria-controls="youtube-dialog" href="#" class="usebutton edit-youtube" onclick="return false" rsf:id="youtube-edit"><span aria-hidden="true" class="fa-edit fa-edit-icon"></span></a><a role="button" href="#" class="usebutton del-item-link" onclick="return false"><span aria-hidden="true" class="fa-trash-o fa-edit-icon"></span></a><a role="button" aria-haspopup="dialog" aria-controls="youtube-dialog" href="#" class="usebutton add-link" onclick="return false"><span aria-hidden="true" class="fa-plus fa-edit-icon plus-edit-icon"></span></a></div></div>
                       </div>
@@ -962,6 +965,7 @@ <h3 class="questionText" rsf:id="questionText"></h3>
 		   allowfullscreen="true"
 		   webkitallowfullscreen="true"
 		   mozallowfullscreen="true"
+		   allow="camera; microphone"
 		   id="iframe"
 		   ></iframe>
 		   <ul class="navIntraTool">

diff --git a/web/web-portlet/src/bundle/vm/main.vm b/web/web-portlet/src/bundle/vm/main.vm
@@ -82,6 +82,7 @@ $tlang.getString("gen.trouble.loading")
     marginheight="0"
     scrolling="auto"
     allowfullscreen="true" webkitallowfullscreen="true" mozallowfullscreen="true"
+    allow="camera; microphone"
     src="$!source">
 </iframe>
 <script>