disable webusb API

fix #13374 Test Plan: automated tests for content loading should pass
brave · Mar 2, 2018 · 7570fcb · 7570fcb
1 parent ab32f5e
commit 7570fcb
Show file tree

Hide file tree

Showing 3 changed files with 64 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,21 @@ chrome.webFrame.setGlobal("navigator.getBattery", function () {
   return new Promise((resolve, reject) => { reject(new Error('navigator.getBattery not supported.')) })
 })
 
+// bluetooth is not currently supported anyway, but disable it just in case
+chrome.webFrame.setGlobal("navigator.bluetooth.requestDevice", function () {
+  return new Promise((resolve, reject) => { reject(new Error('navigator.bluetooth not supported.')) })
+})
+
+// disable webusb due to
+// https://www.wired.com/story/chrome-yubikey-phishing-webusb/
+chrome.webFrame.setGlobal("navigator.usb.getDevices", function () {
+  return new Promise((resolve, reject) => { resolve([]) })
+})
+chrome.webFrame.setGlobal("navigator.usb.requestDevice", function () {
+  return new Promise((resolve, reject) => { reject(new Error('navigator.usb not supported.')) })
+})
+
+
 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,23 @@ 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)
+      .click('#button')
+      .waitForTextValue('#bluetooth', 'Error: navigator.bluetooth not supported.')
+  })
+
+  it('does not support webusb API', function * () {
+    const page1 = Brave.fixtureUrl('navigator.html')
+    yield this.app.client
+      .tabByIndex(0)
+      .url(page1)
+      .click('#button2')
+      .waitForTextValue('#webusb', 'Error: navigator.usb not supported.')
+      .waitForTextValue('#devices', '0')
+  })
 })
diff --git a/test/fixtures/navigator.html b/test/fixtures/navigator.html
@@ -0,0 +1,30 @@
+<html>
+	<button id='button'>bluetooth</button>
+	<button id='button2'>webusb</button>
+	<div id='bluetooth'>
+	testing...
+	</div>
+	<div id='webusb'>
+	testing...
+	</div>
+	<div id='devices'>
+	testing...
+	</div>
+    <script>
+		button.onclick = () => {
+		  navigator.bluetooth.requestDevice({acceptAllDevices: true}).catch((err) => {
+			  bluetooth.innerText = err
+		  })
+		}
+        button2.onclick = () => {
+		  navigator.usb.getDevices().then((dev) => {
+			devices.innerText = dev.length
+		  }).catch((err) => {
+			devices.innerText = err
+		  })
+		  navigator.usb.requestDevice({filters: []}).catch((err) => {
+			webusb.innerText = err
+		  })
+        }
+    </script>
+</html>