Release build 4.43.0 [ci release]

jonathanKingston · github-actions[bot] · commit 0e630cce7402 · 2023-11-03T16:54:13.000Z
diff --git a/Sources/ContentScopeScripts/dist/contentScope.js b/Sources/ContentScopeScripts/dist/contentScope.js
@@ -2347,7 +2347,7 @@
           this.notificationFix();
         }
         if (this.getFeatureSettingEnabled("permissions")) {
-          const settings = this.getFeatureSettingEnabled("permissions");
+          const settings = this.getFeatureSetting("permissions");
           this.permissionsFix(settings);
         }
         if (this.getFeatureSettingEnabled("cleanIframeValue")) {
@@ -2438,7 +2438,18 @@
           "notifications",
           "push",
           "persistent-storage",
-          "midi"
+          "midi",
+          "accelerometer",
+          "ambient-light-sensor",
+          "background-sync",
+          "bluetooth",
+          "camera",
+          "clipboard",
+          "device-info",
+          "gyroscope",
+          "magnetometer",
+          "microphone",
+          "speaker"
         ];
         const validPermissionNames = settings.validPermissionNames || defaultValidPermissionNames;
         permissions.query = new Proxy((query) => {
@@ -2450,7 +2461,7 @@
             throw new TypeError("Failed to execute 'query' on 'Permissions': Failed to read the 'name' property from 'PermissionDescriptor': Required member is undefined.");
           }
           if (!validPermissionNames.includes(query.name)) {
-            throw new TypeError("Failed to execute 'query' on 'Permissions': Failed to read the 'name' property from 'PermissionDescriptor': The provided value 's' is not a valid enum value of type PermissionName.");
+            throw new TypeError(`Failed to execute 'query' on 'Permissions': Failed to read the 'name' property from 'PermissionDescriptor': The provided value '${query.name}' is not a valid enum value of type PermissionName.`);
           }
           return Promise.resolve(new PermissionStatus(query.name, "denied"));
         }, {
diff --git a/build/android/contentScope.js b/build/android/contentScope.js
@@ -7464,7 +7464,7 @@
                 this.notificationFix();
             }
             if (this.getFeatureSettingEnabled('permissions')) {
-                const settings = this.getFeatureSettingEnabled('permissions');
+                const settings = this.getFeatureSetting('permissions');
                 this.permissionsFix(settings);
             }
             if (this.getFeatureSettingEnabled('cleanIframeValue')) {
@@ -7561,7 +7561,18 @@
                 'notifications',
                 'push',
                 'persistent-storage',
-                'midi'
+                'midi',
+                'accelerometer',
+                'ambient-light-sensor',
+                'background-sync',
+                'bluetooth',
+                'camera',
+                'clipboard',
+                'device-info',
+                'gyroscope',
+                'magnetometer',
+                'microphone',
+                'speaker'
             ];
             const validPermissionNames = settings.validPermissionNames || defaultValidPermissionNames;
             permissions.query = new Proxy((query) => {
@@ -7573,7 +7584,7 @@
                     throw new TypeError("Failed to execute 'query' on 'Permissions': Failed to read the 'name' property from 'PermissionDescriptor': Required member is undefined.")
                 }
                 if (!validPermissionNames.includes(query.name)) {
-                    throw new TypeError("Failed to execute 'query' on 'Permissions': Failed to read the 'name' property from 'PermissionDescriptor': The provided value 's' is not a valid enum value of type PermissionName.")
+                    throw new TypeError(`Failed to execute 'query' on 'Permissions': Failed to read the 'name' property from 'PermissionDescriptor': The provided value '${query.name}' is not a valid enum value of type PermissionName.`)
                 }
                 return Promise.resolve(new PermissionStatus(query.name, 'denied'))
             }, {
diff --git a/build/contentScope.js b/build/contentScope.js
@@ -11819,7 +11819,7 @@
                 this.notificationFix();
             }
             if (this.getFeatureSettingEnabled('permissions')) {
-                const settings = this.getFeatureSettingEnabled('permissions');
+                const settings = this.getFeatureSetting('permissions');
                 this.permissionsFix(settings);
             }
             if (this.getFeatureSettingEnabled('cleanIframeValue')) {
@@ -11916,7 +11916,18 @@
                 'notifications',
                 'push',
                 'persistent-storage',
-                'midi'
+                'midi',
+                'accelerometer',
+                'ambient-light-sensor',
+                'background-sync',
+                'bluetooth',
+                'camera',
+                'clipboard',
+                'device-info',
+                'gyroscope',
+                'magnetometer',
+                'microphone',
+                'speaker'
             ];
             const validPermissionNames = settings.validPermissionNames || defaultValidPermissionNames;
             permissions.query = new Proxy((query) => {
@@ -11928,7 +11939,7 @@
                     throw new TypeError("Failed to execute 'query' on 'Permissions': Failed to read the 'name' property from 'PermissionDescriptor': Required member is undefined.")
                 }
                 if (!validPermissionNames.includes(query.name)) {
-                    throw new TypeError("Failed to execute 'query' on 'Permissions': Failed to read the 'name' property from 'PermissionDescriptor': The provided value 's' is not a valid enum value of type PermissionName.")
+                    throw new TypeError(`Failed to execute 'query' on 'Permissions': Failed to read the 'name' property from 'PermissionDescriptor': The provided value '${query.name}' is not a valid enum value of type PermissionName.`)
                 }
                 return Promise.resolve(new PermissionStatus(query.name, 'denied'))
             }, {
diff --git a/build/integration/contentScope.js b/build/integration/contentScope.js
@@ -11819,7 +11819,7 @@
                 this.notificationFix();
             }
             if (this.getFeatureSettingEnabled('permissions')) {
-                const settings = this.getFeatureSettingEnabled('permissions');
+                const settings = this.getFeatureSetting('permissions');
                 this.permissionsFix(settings);
             }
             if (this.getFeatureSettingEnabled('cleanIframeValue')) {
@@ -11916,7 +11916,18 @@
                 'notifications',
                 'push',
                 'persistent-storage',
-                'midi'
+                'midi',
+                'accelerometer',
+                'ambient-light-sensor',
+                'background-sync',
+                'bluetooth',
+                'camera',
+                'clipboard',
+                'device-info',
+                'gyroscope',
+                'magnetometer',
+                'microphone',
+                'speaker'
             ];
             const validPermissionNames = settings.validPermissionNames || defaultValidPermissionNames;
             permissions.query = new Proxy((query) => {
@@ -11928,7 +11939,7 @@
                     throw new TypeError("Failed to execute 'query' on 'Permissions': Failed to read the 'name' property from 'PermissionDescriptor': Required member is undefined.")
                 }
                 if (!validPermissionNames.includes(query.name)) {
-                    throw new TypeError("Failed to execute 'query' on 'Permissions': Failed to read the 'name' property from 'PermissionDescriptor': The provided value 's' is not a valid enum value of type PermissionName.")
+                    throw new TypeError(`Failed to execute 'query' on 'Permissions': Failed to read the 'name' property from 'PermissionDescriptor': The provided value '${query.name}' is not a valid enum value of type PermissionName.`)
                 }
                 return Promise.resolve(new PermissionStatus(query.name, 'denied'))
             }, {
diff --git a/integration-test/test-web-compat.js b/integration-test/test-web-compat.js
@@ -147,7 +147,7 @@ describe('Ensure Notification and Permissions interface is injected', () => {
         const page = await browser.newPage()
         // Fake the Notification API not existing in this browser
         const removePermissionsScript = `
-            Object.defineProperty(window.navigator, 'permissions', { writable: true })
+            Object.defineProperty(window.navigator, 'permissions', { writable: true, value: undefined })
         `
         function checkForPermissions () {
             return !!window.navigator.permissions
@@ -156,6 +156,13 @@ describe('Ensure Notification and Permissions interface is injected', () => {
             const descriptor = Object.getOwnPropertyDescriptor(window.navigator, 'permissions')
             return descriptor === undefined
         }
+        function checkPermissionThrows (name) {
+            try {
+                window.navigator.permissions.query({ name })
+            } catch (e) {
+                return e.message
+            }
+        }
 
         await gotoAndWait(page, `http://localhost:${port}/blank.html`, { site: { enabledFeatures: [] } })
         const initialPermissions = await page.evaluate(checkForPermissions)
@@ -181,7 +188,8 @@ describe('Ensure Notification and Permissions interface is injected', () => {
                             'notifications',
                             'push',
                             'persistent-storage',
-                            'midi'
+                            'midi',
+                            'test-value'
                         ]
                     }
                 }
@@ -193,5 +201,12 @@ describe('Ensure Notification and Permissions interface is injected', () => {
         const modifiedDescriptorSerialization = await page.evaluate(checkObjectDescriptorIsNotPresent)
         // This fails in a test condition purely because we have to add a descriptor to modify the prop
         expect(modifiedDescriptorSerialization).toEqual(false)
+
+        const permissionThrows = await page.evaluate(checkPermissionThrows, 'not-existent')
+        expect(permissionThrows).not.toBeUndefined()
+        expect(permissionThrows).toContain('not-existent')
+
+        const doesNotThrow = await page.evaluate(checkPermissionThrows, 'test-value')
+        expect(doesNotThrow).toBeUndefined()
     })
 })
diff --git a/src/features/web-compat.js b/src/features/web-compat.js
@@ -29,7 +29,7 @@ export default class WebCompat extends ContentFeature {
             this.notificationFix()
         }
         if (this.getFeatureSettingEnabled('permissions')) {
-            const settings = this.getFeatureSettingEnabled('permissions')
+            const settings = this.getFeatureSetting('permissions')
             this.permissionsFix(settings)
         }
         if (this.getFeatureSettingEnabled('cleanIframeValue')) {
@@ -126,7 +126,18 @@ export default class WebCompat extends ContentFeature {
             'notifications',
             'push',
             'persistent-storage',
-            'midi'
+            'midi',
+            'accelerometer',
+            'ambient-light-sensor',
+            'background-sync',
+            'bluetooth',
+            'camera',
+            'clipboard',
+            'device-info',
+            'gyroscope',
+            'magnetometer',
+            'microphone',
+            'speaker'
         ]
         const validPermissionNames = settings.validPermissionNames || defaultValidPermissionNames
         permissions.query = new Proxy((query) => {
@@ -138,7 +149,7 @@ export default class WebCompat extends ContentFeature {
                 throw new TypeError("Failed to execute 'query' on 'Permissions': Failed to read the 'name' property from 'PermissionDescriptor': Required member is undefined.")
             }
             if (!validPermissionNames.includes(query.name)) {
-                throw new TypeError("Failed to execute 'query' on 'Permissions': Failed to read the 'name' property from 'PermissionDescriptor': The provided value 's' is not a valid enum value of type PermissionName.")
+                throw new TypeError(`Failed to execute 'query' on 'Permissions': Failed to read the 'name' property from 'PermissionDescriptor': The provided value '${query.name}' is not a valid enum value of type PermissionName.`)
             }
             return Promise.resolve(new PermissionStatus(query.name, 'denied'))
         }, {
