Merge pull request #13375 from brave/fix/disable-webusb

disable webusb and bluetooth API explicitly
brave · Mar 7, 2018 · 5143bd3 · 5143bd3
2 parents 43232e0 + 027f15f
commit 5143bd3
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 0 deletions.
diff --git a/app/extensions/brave/content/scripts/navigator.js b/app/extensions/brave/content/scripts/navigator.js
@@ -12,6 +12,11 @@ chrome.webFrame.setGlobal("navigator.getBattery", function () {
   return new Promise((resolve, reject) => { reject(new Error('navigator.getBattery not supported.')) })
 })
 
+// bluetooth is not currently supported
+executeScript("window.Navigator.prototype.__defineGetter__('bluetooth', () => { return undefined })")
+// webusb also not supported yet
+executeScript("window.Navigator.prototype.__defineGetter__('usb', () => { return undefined })")
+
 if (chrome.contentSettings.doNotTrack == 'allow') {
   executeScript("window.Navigator.prototype.__defineGetter__('doNotTrack', () => { return 1 })")
 }

diff --git a/test/contents/contentLoadingTest.js b/test/contents/contentLoadingTest.js
@@ -51,4 +51,20 @@ describe('content loading', function () {
       .windowByUrl(Brave.browserWindowUrl)
       .waitForTextValue('[data-test-id="tabTitle"]', 'fail')
   })
+
+  it('does not support bluetooth API', function * () {
+    const page1 = Brave.fixtureUrl('navigator.html')
+    yield this.app.client
+      .tabByIndex(0)
+      .url(page1)
+      .waitForTextValue('#bluetooth', 'undefined')
+  })
+
+  it('does not support webusb API', function * () {
+    const page1 = Brave.fixtureUrl('navigator.html')
+    yield this.app.client
+      .tabByIndex(0)
+      .url(page1)
+      .waitForTextValue('#webusb', 'undefined')
+  })
 })
diff --git a/test/fixtures/navigator.html b/test/fixtures/navigator.html
@@ -0,0 +1,12 @@
+<html>
+	<div id='bluetooth'>
+	testing...
+	</div>
+	<div id='webusb'>
+	testing...
+	</div>
+    <script>
+		bluetooth.innerText = navigator.bluetooth
+		webusb.innerText = navigator.usb
+    </script>
+</html>