Merge pull request #396 from SenYu/fix/http_in_https

(Fix/http in https) location.protocol should include final ":"
sockjs · Dec 6, 2017 · 436e997 · 436e997
2 parents 4d18fd5 + 9567393
commit 436e997
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/location.js b/lib/location.js
@@ -2,7 +2,7 @@
 
 module.exports = global.location || {
   origin: 'http://localhost:80'
-, protocol: 'http'
+, protocol: 'http:'
 , host: 'localhost'
 , port: 80
 , href: 'http://localhost/'

diff --git a/lib/main.js b/lib/main.js
@@ -75,7 +75,7 @@ function SockJS(url, protocols, options) {
 
   var secure = parsedUrl.protocol === 'https:';
   // Step 2 - don't allow secure origin with an insecure protocol
-  if (loc.protocol === 'https' && !secure) {
+  if (loc.protocol === 'https:' && !secure) {
     throw new Error('SecurityError: An insecure SockJS connection may not be initiated from a page loaded over HTTPS');
   }
 

diff --git a/tests/lib/main-node.js b/tests/lib/main-node.js
@@ -9,7 +9,7 @@ describe('SockJS', function() {
 
     describe('WebSocket specification step #2', function () {
       var main = proxyquire('../../lib/main', { './location': {
-        protocol: 'https'
+        protocol: 'https:'
       }});
       var sjs = proxyquire('../../lib/entry', { './main': main });