Netflix/Widevine notification banner does not go away

Fix #11054 Auditors: @bridiver, @NejcZdovc
brave · Sep 21, 2017 · a2c4124 · a2c4124
1 parent 472f152
commit a2c4124
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 4 deletions.
diff --git a/app/ledger.js b/app/ledger.js
@@ -229,6 +229,10 @@ const doAction = (state, action) => {
       break
 
     case appConstants.APP_CHANGE_SITE_SETTING:
+      if (!action.hostPattern) {
+        console.warn('Changing site settings should always have a hostPattern')
+        break
+      }
       i = action.hostPattern.indexOf('://')
       if (i === -1) break
 

diff --git a/app/renderer/components/main/main.js b/app/renderer/components/main/main.js
@@ -308,7 +308,7 @@ class Main extends React.Component {
   componentWillUpdate (nextProps) {
     if (!this.props.isWidevineReady && nextProps.isWidevineReady) {
       // User may have enabled from preferences and no details are present
-      if (this.props.widevineLocation) {
+      if (!this.props.widevineLocation) {
         return
       }
 

diff --git a/app/renderer/components/main/notificationItem.js b/app/renderer/components/main/notificationItem.js
@@ -32,7 +32,11 @@ class NotificationItem extends React.Component {
 
   clickHandler (buttonIndex) {
     if (this.props.nonce) {
-      ipc.send(
+      // This needs to be changed into an app action but it is
+      // currently ipc.emit on purpose so the message goes to the
+      // renderer.  Listeners for NOTIFICATION_RESPONSE with
+      // a nonce is on the renderer only.
+      ipc.emit(
         messages.NOTIFICATION_RESPONSE + this.props.nonce,
         {},
         this.props.message,
@@ -41,6 +45,9 @@ class NotificationItem extends React.Component {
         this.props.index
       )
     } else {
+      // This needs to be changed into an app action but it is
+      // currently using ipc.send on purpose. The listener without
+      // a nonce is on the browser side.
       ipc.send(
         messages.NOTIFICATION_RESPONSE,
         this.props.message,

diff --git a/test/about/componentUpdaterTest.js b/test/about/componentUpdaterTest.js
@@ -42,8 +42,6 @@ describe('component updater', function () {
       const url = Brave.server.url('drm.html')
       yield this.app.client
         .windowByUrl(Brave.browserWindowUrl)
-        .setResourceEnabled(appConfig.resourceNames.WIDEVINE, true)
-        .waitForResourceReady(appConfig.resourceNames.WIDEVINE)
         .tabByIndex(0)
         .url(url)
         .waitForUrl(url)
@@ -54,4 +52,33 @@ describe('component updater', function () {
         // TODO(bbondy): flashBlock.js should be less aggressive so we can detect this with the drm.html #output div.
     })
   })
+  describe('Google Widevine is enabled but disallowed by default', function () {
+    Brave.beforeAll(this)
+    before(function * () {
+      yield setup(this.app.client)
+    })
+    it('can be allowed', function * () {
+      const isLinux = process.platform === 'linux'
+      if (isLinux) {
+        this.skip()
+        return
+      }
+      const allowButton = 'button=Allow'
+      const notificationItem = '.notificationItem'
+      const url = Brave.server.url('drm.html')
+      yield this.app.client
+        .windowByUrl(Brave.browserWindowUrl)
+        .setResourceEnabled(appConfig.resourceNames.WIDEVINE, true)
+        .waitForResourceReady(appConfig.resourceNames.WIDEVINE)
+        .tabByIndex(0)
+        .url(url)
+        .waitForUrl(url)
+        .windowByUrl(Brave.browserWindowUrl)
+        .waitForElementCount(notificationItem, 1)
+        .waitForElementCount(allowButton, 1)
+        .click(allowButton)
+        .waitForElementCount(notificationItem, 0)
+        // TODO(bbondy): flashBlock.js should be less aggressive so we can detect this with the drm.html #output div.
+    })
+  })
 })