Merge pull request #3857 from brave/fix/3851

If directly-entered URL load fails, show the location of the displayed page
brave · Sep 12, 2016 · b8f54c8 · b8f54c8
2 parents bf710ce + 670b4d4
commit b8f54c8
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 3 deletions.
diff --git a/js/stores/windowStore.js b/js/stores/windowStore.js
@@ -293,9 +293,6 @@ const doAction = (action) => {
         windowState = windowState.mergeIn(tabStatePath(action.key), {
           location: action.location
         })
-        // force a navbar update in case this was called from an app
-        // initiated navigation (bookmarks, etc...)
-        updateNavBarInput(action.location, frameStatePath(action.key))
       }
       break
     case WindowConstants.WINDOW_SET_NAVIGATED:

diff --git a/test/components/navigationBarTest.js b/test/components/navigationBarTest.js
@@ -82,6 +82,31 @@ describe('navigationBar', function () {
       })
     })
 
+    describe('document.write spoofing', function () {
+      Brave.beforeAll(this)
+
+      before(function * () {
+        var page1 = Brave.server.url('urlbarSpoof.html')
+        yield setup(this.app.client)
+        yield this.app.client
+          .tabByUrl(Brave.newTabUrl)
+          .url(page1)
+          .waitForUrl(page1)
+          .waitForExist('input')
+          .leftClick('input')
+      })
+
+      it('updates the location in the navbar to blank', function * () {
+        yield this.app.client
+          .windowByUrl(Brave.browserWindowUrl)
+          .waitUntil(function () {
+            return this.getValue(urlInput).then((val) => {
+              return val === ''
+            })
+          })
+      })
+    })
+
     describe('page with a title', function () {
       Brave.beforeAll(this)
 
@@ -559,6 +584,29 @@ describe('navigationBar', function () {
   })
 
   describe('submit', function () {
+    describe('page that does not load', function () {
+      Brave.beforeAll(this)
+
+      before(function * () {
+        var page1 = 'https://bayden.com/test/redir/goscript.aspx'
+        yield setup(this.app.client)
+        yield this.app.client.waitForExist(urlInput)
+        yield this.app.client.keys(page1)
+        // hit enter
+        yield this.app.client.keys('\uE007')
+      })
+
+      it('clears urlbar if page does not load', function * () {
+        yield this.app.client
+          .waitUntil(function () {
+            return this.getValue(urlInput).then((val) => {
+              console.log('value', val)
+              return val === ''
+            })
+          })
+      })
+    })
+
     describe('with url input value', function () {
       Brave.beforeAll(this)
 

diff --git a/test/fixtures/urlbarSpoof.html b/test/fixtures/urlbarSpoof.html
@@ -0,0 +1,10 @@
+<html>
+<script>
+function spoof() {
+  w = window.open('https:/www.google.com', 'target');
+  w.document.write('<h1 id="message">Here we could place a phishing login panel</h1>');
+  w.document.close();
+}
+</script>
+<input type="submit" onclick="spoof()" value="PoC!">
+</html>