From 6a84601be2df2863d0147439e80460fa7afeef47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luca=20B=C3=B6sch?= <luca.boesch@bfh.ch>
Date: Mon, 7 Sep 2020 13:29:16 +0200
Subject: [PATCH] MDL-69645 quizaccess: Set allowPreferencesWindow to false in
 manual config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Luca Bösch <luca.boesch@bfh.ch>
---
 mod/quiz/accessrule/seb/classes/quiz_settings.php  |  1 +
 mod/quiz/accessrule/seb/tests/helper_test.php      |  4 +--
 .../accessrule/seb/tests/quiz_settings_test.php    | 30 ++++++++++++++--------
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/mod/quiz/accessrule/seb/classes/quiz_settings.php b/mod/quiz/accessrule/seb/classes/quiz_settings.php
index c621a5114f9..cfc1b7db9c4 100644
--- a/mod/quiz/accessrule/seb/classes/quiz_settings.php
+++ b/mod/quiz/accessrule/seb/classes/quiz_settings.php
@@ -460,6 +460,7 @@ class quiz_settings extends persistent {
 
         // One of the requirements for USE_SEB_CONFIG_MANUALLY is setting examSessionClearCookiesOnStart to false.
         $this->plist->set_or_update_value('examSessionClearCookiesOnStart', new CFBoolean(false));
+        $this->plist->set_or_update_value('allowPreferencesWindow', new CFBoolean(false));
         $this->config = $this->plist->to_xml();
     }
 
diff --git a/mod/quiz/accessrule/seb/tests/helper_test.php b/mod/quiz/accessrule/seb/tests/helper_test.php
index a034ca453ac..e131b2de771 100644
--- a/mod/quiz/accessrule/seb/tests/helper_test.php
+++ b/mod/quiz/accessrule/seb/tests/helper_test.php
@@ -186,8 +186,8 @@ class quizaccess_seb_helper_testhelpertrait extends advanced_testcase {
             . "<false/><key>audioMute</key><false/><key>allowSpellCheck</key><false/><key>browserWindowAllowReload</key>"
             . "<true/><key>URLFilterEnable</key><false/><key>URLFilterEnableContentFilter</key><false/>"
             . "<key>URLFilterRules</key><array/><key>startURL</key><string>$url</string>"
-            . "<key>sendBrowserExamKey</key><true/><key>examSessionClearCookiesOnStart</key><false/>"
-            . "</dict></plist>\n", $config);
+            . "<key>sendBrowserExamKey</key><true/><key>examSessionClearCookiesOnStart</key>"
+            . "<key>allowPreferencesWindow</key><false/><false/></dict></plist>\n", $config);
     }
 
 }
diff --git a/mod/quiz/accessrule/seb/tests/quiz_settings_test.php b/mod/quiz/accessrule/seb/tests/quiz_settings_test.php
index 57f05135011..d01b7e556a8 100644
--- a/mod/quiz/accessrule/seb/tests/quiz_settings_test.php
+++ b/mod/quiz/accessrule/seb/tests/quiz_settings_test.php
@@ -91,7 +91,8 @@ class quizaccess_seb_quiz_settings_testcase extends advanced_testcase {
                 . "<string>9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08</string><key>URLFilterRules</key>"
                 . "<array><dict><key>action</key><integer>1</integer><key>active</key><true/><key>expression</key>"
                 . "<string>test.com</string><key>regex</key><false/></dict></array><key>startURL</key><string>$this->url</string>"
-                . "<key>sendBrowserExamKey</key><true/><key>examSessionClearCookiesOnStart</key><false/></dict></plist>\n",
+                . "<key>sendBrowserExamKey</key><true/><key>examSessionClearCookiesOnStart</key><false/>"
+                . "<key>allowPreferencesWindow</key><false/></dict></plist>\n",
             $config);
     }
 
@@ -122,7 +123,8 @@ class quizaccess_seb_quiz_settings_testcase extends advanced_testcase {
             . "<string>9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08</string><key>URLFilterRules</key>"
             . "<array><dict><key>action</key><integer>1</integer><key>active</key><true/><key>expression</key>"
             . "<string>test.com</string><key>regex</key><false/></dict></array><key>startURL</key><string>$this->url</string>"
-            . "<key>sendBrowserExamKey</key><true/><key>examSessionClearCookiesOnStart</key><false/></dict></plist>\n", $config);
+            . "<key>sendBrowserExamKey</key><true/><key>examSessionClearCookiesOnStart</key><false/>"
+            . "<key>allowPreferencesWindow</key><false/></dict></plist>\n", $config);
 
         $quizsettings->set('filterembeddedcontent', 1); // Alter the settings.
         $quizsettings->save();
@@ -137,7 +139,8 @@ class quizaccess_seb_quiz_settings_testcase extends advanced_testcase {
             . "<string>9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08</string><key>URLFilterRules</key>"
             . "<array><dict><key>action</key><integer>1</integer><key>active</key><true/><key>expression</key>"
             . "<string>test.com</string><key>regex</key><false/></dict></array><key>startURL</key><string>$this->url</string>"
-            . "<key>sendBrowserExamKey</key><true/><key>examSessionClearCookiesOnStart</key><false/></dict></plist>\n", $config);
+            . "<key>sendBrowserExamKey</key><true/><key>examSessionClearCookiesOnStart</key><false/>"
+            . "<key>allowPreferencesWindow</key><false/></dict></plist>\n", $config);
     }
 
     /**
@@ -148,7 +151,7 @@ class quizaccess_seb_quiz_settings_testcase extends advanced_testcase {
 
         $quizsettings = new quiz_settings(0, $settings);
         $configkey = $quizsettings->get_config_key();
-        $this->assertEquals("89557366c34cb64a33781e1fb767cb15380731efdfb967e037476ef420f1d7b8",
+        $this->assertEquals("b35510bd754f9d106ff88b9d2dc1bb297cddc9fc7b4bdde2dbda4e7d9e4b50d8",
             $configkey
         );
     }
@@ -161,12 +164,12 @@ class quizaccess_seb_quiz_settings_testcase extends advanced_testcase {
 
         $quizsettings = new quiz_settings(0, $settings);
         $configkey = $quizsettings->get_config_key();
-        $this->assertEquals("89557366c34cb64a33781e1fb767cb15380731efdfb967e037476ef420f1d7b8",
+        $this->assertEquals("b35510bd754f9d106ff88b9d2dc1bb297cddc9fc7b4bdde2dbda4e7d9e4b50d8",
                 $configkey);
 
         $quizsettings->set('filterembeddedcontent', 1); // Alter the settings.
         $configkey = $quizsettings->get_config_key();
-        $this->assertEquals("4476e7fc1e4e769c930685535b0f6377e6f736cd6c24b68db512455a95f028b5",
+        $this->assertEquals("58010792504cccc18f7b0e5c9680fe60b567e8c1b5fb9798654cc9bad9ddf30c",
             $configkey);
     }
 
@@ -571,7 +574,8 @@ class quizaccess_seb_quiz_settings_testcase extends advanced_testcase {
                 . "<key>active</key><true/><key>expression</key>"
                 . "<string>second.hello</string><key>regex</key><false/></dict></array>"
                 . "<key>startURL</key><string>https://www.example.com/moodle/mod/quiz/view.php?id=1</string>"
-                . "<key>sendBrowserExamKey</key><true/><key>examSessionClearCookiesOnStart</key><false/></dict></plist>\n",
+                . "<key>sendBrowserExamKey</key><true/><key>examSessionClearCookiesOnStart</key><false/>"
+                . "<key>allowPreferencesWindow</key><false/></dict></plist>\n",
             ],
             'blocked simple expessions' => [
                 (object) [
@@ -597,7 +601,8 @@ class quizaccess_seb_quiz_settings_testcase extends advanced_testcase {
                 . "<key>active</key><true/><key>expression</key>"
                 . "<string>second.hello</string><key>regex</key><false/></dict></array>"
                 . "<key>startURL</key><string>https://www.example.com/moodle/mod/quiz/view.php?id=1</string>"
-                . "<key>sendBrowserExamKey</key><true/><key>examSessionClearCookiesOnStart</key><false/></dict></plist>\n",
+                . "<key>sendBrowserExamKey</key><true/><key>examSessionClearCookiesOnStart</key><false/>"
+                . "<key>allowPreferencesWindow</key><false/></dict></plist>\n",
             ],
             'enabled regex expessions' => [
                 (object) [
@@ -623,7 +628,8 @@ class quizaccess_seb_quiz_settings_testcase extends advanced_testcase {
                 . "<key>active</key><true/><key>expression</key>"
                 . "<string>second.hello</string><key>regex</key><true/></dict></array>"
                 . "<key>startURL</key><string>https://www.example.com/moodle/mod/quiz/view.php?id=1</string>"
-                . "<key>sendBrowserExamKey</key><true/><key>examSessionClearCookiesOnStart</key><false/></dict></plist>\n",
+                . "<key>sendBrowserExamKey</key><true/><key>examSessionClearCookiesOnStart</key><false/>"
+                . "<key>allowPreferencesWindow</key><false/></dict></plist>\n",
             ],
             'blocked regex expessions' => [
                 (object) [
@@ -649,7 +655,8 @@ class quizaccess_seb_quiz_settings_testcase extends advanced_testcase {
                 . "<key>active</key><true/><key>expression</key>"
                 . "<string>second.hello</string><key>regex</key><true/></dict></array>"
                 . "<key>startURL</key><string>https://www.example.com/moodle/mod/quiz/view.php?id=1</string>"
-                . "<key>sendBrowserExamKey</key><true/><key>examSessionClearCookiesOnStart</key><false/></dict></plist>\n",
+                . "<key>sendBrowserExamKey</key><true/><key>examSessionClearCookiesOnStart</key><false/>"
+                . "<key>allowPreferencesWindow</key><false/></dict></plist>\n",
             ],
             'multiple simple expessions' => [
                 (object) [
@@ -677,7 +684,8 @@ class quizaccess_seb_quiz_settings_testcase extends advanced_testcase {
                 . "<key>active</key><true/><key>expression</key>"
                 . "<string>second.hello</string><key>regex</key><true/></dict></array>"
                 . "<key>startURL</key><string>https://www.example.com/moodle/mod/quiz/view.php?id=1</string>"
-                . "<key>sendBrowserExamKey</key><true/><key>examSessionClearCookiesOnStart</key><false/></dict></plist>\n",
+                . "<key>sendBrowserExamKey</key><true/><key>examSessionClearCookiesOnStart</key><false/>"
+                . "<key>allowPreferencesWindow</key><false/></dict></plist>\n",
             ],
         ];
     }
-- 
2.14.3 (Apple Git-98)