Disable feature in private mode

brave · Sep 9, 2016 · 7aded75 · 7aded75
1 parent 8db6933
commit 7aded75
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 15 deletions.
diff --git a/docs/state.md b/docs/state.md
@@ -273,7 +273,7 @@ WindowStore
         realm: string
       },
       isExtendedValidation: boolean, // is using https ev
-      runInsecureContent: string, // first domain of running active mixed content
+      runInsecureContent: boolean, // has active mixed content
       blockedRunInsecureContent: string, // first domain of blocked active mixed content
     },
     parentFrameKey: number, // the key of the frame this frame was opened from

diff --git a/js/components/frame.js b/js/components/frame.js
@@ -764,7 +764,7 @@ class Frame extends ImmutableComponent {
         const runInsecureContent = parsedUrl.protocol === 'https:' && this.runInsecureContent()
         windowActions.setSecurityState(this.frame, {
           secure: isSecure,
-          runInsecureContent: runInsecureContent ? this.props.location : null
+          runInsecureContent: runInsecureContent
         })
         if (isSecure) {
           // Check that there isn't a cert error.

diff --git a/js/components/siteInfo.js b/js/components/siteInfo.js
@@ -25,8 +25,9 @@ class SiteInfo extends ImmutableComponent {
     this.props.onHide()
   }
   onDenyRunInsecureContent () {
-    appActions.removeSiteSetting(siteUtil.getOrigin(this.runInsecureContent), 'runInsecureContent')
-    ipc.emit(messages.SHORTCUT_ACTIVE_FRAME_LOAD_URL, {}, this.runInsecureContent)
+    appActions.removeSiteSetting(siteUtil.getOrigin(this.location),
+      'runInsecureContent', this.isPrivate)
+    ipc.emit(messages.SHORTCUT_ACTIVE_FRAME_LOAD_URL, {}, this.location)
     this.props.onHide()
   }
   get isExtendedValidation () {
@@ -47,6 +48,9 @@ class SiteInfo extends ImmutableComponent {
   get partitionNumber () {
     return this.props.frameProps.getIn(['partitionNumber'])
   }
+  get location () {
+    return this.props.frameProps.getIn(['location'])
+  }
   render () {
     let secureIcon
     if (this.isSecure && !this.runInsecureContent) {
@@ -97,6 +101,10 @@ class SiteInfo extends ImmutableComponent {
           </ul>
         </li>
     }
+    // Disable in private mode for now
+    if (this.isPrivate) {
+      runInsecureContentInfo = null
+    }
 
     return <Dialog onHide={this.props.onHide} className='siteInfo' isClickDismiss>
       <ul onClick={(e) => e.stopPropagation()}>

diff --git a/js/state/contentSettings.js b/js/state/contentSettings.js
@@ -173,15 +173,6 @@ const getContentSettingsFromSiteSettings = (appState) => {
     }
   }
 
-  // temporarySiteSettings
-  hostSettings = appState.get('temporarySiteSettings').toJS()
-  for (let hostPattern in hostSettings) {
-    let hostSetting = hostSettings[hostPattern]
-    if (typeof hostSetting.runInsecureContent === 'boolean') {
-      addContentSettings(contentSettings.runInsecureContent, hostPattern, '*',
-        hostSetting.runInsecureContent ? 'allow' : 'block')
-    }
-  }
   return { content_settings: contentSettings }
 }
 

diff --git a/test/components/navigationBarTest.js b/test/components/navigationBarTest.js
@@ -360,7 +360,7 @@ describe('navigationBar', function () {
         .waitForVisible(dismissAllowRunInsecureContentButton)
         .waitForVisible(allowRunInsecureContentButton)
         .click(allowRunInsecureContentButton)
-        .tabByUrl(this.page1Url)
+        .tabByIndex(0)
         .waitUntil(() => {
           return this.app.client.getCssProperty('body', 'background-color').then((color) =>
             color.value === 'rgba(255,0,0,1)'
@@ -394,8 +394,22 @@ describe('navigationBar', function () {
             color.value === 'rgba(128,128,128,1)'
           )
         })
+        .windowByUrl(Brave.browserWindowUrl)
+        .ipcSend(messages.SHORTCUT_NEW_FRAME, page1Url, { partitionNumber: 1 })
+        .waitUntil(function () {
+          return this.getWindowState().then((val) => {
+            return val.value.frames.length === 4
+          })
+        })
+        .windowByUrl(Brave.browserWindowUrl)
+        .tabByIndex(3)
+        .waitUntil(() => {
+          return this.app.client.getCssProperty('body', 'background-color').then((color) =>
+            color.value === 'rgba(128,128,128,1)'
+          )
+        })
     })
-    it('Limit effect of running insecure content in private frame', function * () {
+    it.skip('Limit effect of running insecure content in private frame', function * () {
       const page1Url = 'https://mixed-script.badssl.com/'
       yield this.app.client
         .ipcSend(messages.SHORTCUT_NEW_FRAME, page1Url, { isPrivate: true })
@@ -454,6 +468,20 @@ describe('navigationBar', function () {
             color.value === 'rgba(128,128,128,1)'
           )
         })
+        .windowByUrl(Brave.browserWindowUrl)
+        .ipcSend(messages.SHORTCUT_NEW_FRAME, page1Url, { partitionNumber: 1 })
+        .waitUntil(function () {
+          return this.getWindowState().then((val) => {
+            return val.value.frames.length === 5
+          })
+        })
+        .windowByUrl(Brave.browserWindowUrl)
+        .tabByIndex(4)
+        .waitUntil(() => {
+          return this.app.client.getCssProperty('body', 'background-color').then((color) =>
+            color.value === 'rgba(128,128,128,1)'
+          )
+        })
     })
   })