Convert origin host and protocol to lower case in proxy urls

#1
DevExpress · Jul 30, 2015 · 76d5232 · 76d5232
1 parent c1f520d
commit 76d5232
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 8 deletions.
diff --git a/src/client/sandboxes/dom-accessor-wrappers.js b/src/client/sandboxes/dom-accessor-wrappers.js
@@ -40,10 +40,14 @@ function isStyleInstance (instance) {
     if (instance instanceof NativeMethods.styleClass)
         return true;
 
-    return instance && typeof instance === 'object' && typeof instance.border !== 'undefined' &&
-           (instance.toString() === '[object CSSStyleDeclaration]' ||
-            instance.toString() === '[object CSS2Properties]' ||
-            instance.toString() === '[object MSStyleCSSProperties]');
+    if (instance && typeof instance === 'object' && typeof instance.border !== 'undefined') {
+        instance = instance.toString();
+
+        return instance === '[object CSSStyleDeclaration]' || instance === '[object CSS2Properties]' ||
+               instance === '[object MSStyleCSSProperties]';
+    }
+
+    return false;
 }
 
 function isLocationInstance (instance) {
@@ -58,7 +62,7 @@ function getAnchorProperty (el, prop) {
     if (el.href) {
         var parsedProxyUrl = UrlUtil.parseProxyUrl(el.href);
 
-        anchor.href = parsedProxyUrl ? UrlUtil.formatUrl(parsedProxyUrl.originResourceInfo) : el.href;
+        anchor.href = parsedProxyUrl ? parsedProxyUrl.originUrl : el.href;
 
         return anchor[prop];
     }
@@ -68,7 +72,7 @@ function getAnchorProperty (el, prop) {
 
 function setAnchorProperty (el, prop, value) {
     if (el.href) {
-        anchor.href  = UrlUtil.formatUrl(UrlUtil.parseProxyUrl(el.href).originResourceInfo);
+        anchor.href  = UrlUtil.parseProxyUrl(el.href).originUrl;
         anchor[prop] = value;
         el.setAttribute('href', anchor.href);
 
@@ -680,7 +684,7 @@ export function init (window, document) {
 
             get: function (doc) {
                 var proxyUrl = UrlUtil.parseProxyUrl(doc.referrer);
-                var result   = proxyUrl ? UrlUtil.formatUrl(proxyUrl.originResourceInfo) : '';
+                var result   = proxyUrl ? proxyUrl.originResourceInfo.originUrl : '';
 
                 return result;
             },

diff --git a/src/proxy.js b/src/proxy.js
@@ -120,6 +120,8 @@ export default class Proxy extends Router {
         session.proxy                 = this;
         this.openSessions[session.id] = session;
 
+        url = urlUtils.convertHostToLowerCase(url);
+
         return urlUtils.getProxyUrl(url, this.server1Info.hostname, this.server1Info.port, session.id);
     }
 

diff --git a/src/utils/url.js b/src/utils/url.js
@@ -71,6 +71,14 @@ UrlUtil.sameOriginCheck = function (location, checkedUrl) {
     return false;
 };
 
+// NOTE: Convert origin protocol and hostname to lower case
+// (https://github.com/superroma/testcafe-hammerhead/issues/1)
+UrlUtil.convertHostToLowerCase = function (url) {
+    var parsedUrl = UrlUtil.parseUrl(url);
+
+    return (parsedUrl.protocol + '//' + parsedUrl.host).toLowerCase() + parsedUrl.partAfterHost;
+};
+
 UrlUtil.getProxyUrl = function (url, proxyHostname, proxyPort, jobUid, jobOwnerToken, resourceType) {
     validateOriginUrl(url);
 
@@ -81,7 +89,7 @@ UrlUtil.getProxyUrl = function (url, proxyHostname, proxyPort, jobUid, jobOwnerT
 
     params = params.join(REQUEST_DESCRIPTOR_VALUES_SEPARATOR);
 
-    return 'http://' + proxyHostname + ':' + proxyPort + '/' + params + '/' + url;
+    return 'http://' + proxyHostname + ':' + proxyPort + '/' + params + '/' + UrlUtil.convertHostToLowerCase(url);
 };
 
 UrlUtil.getDomain = function (parsed) {

diff --git a/test/mocha/proxy-test.js b/test/mocha/proxy-test.js
@@ -251,6 +251,13 @@ describe('Proxy', function () {
                 })
                 .catch(done);
         });
+
+        it('Should convert origin host and protocol to lower case', function () {
+            // BUG: https://github.com/superroma/testcafe-hammerhead/issues/1
+            var proxiedUrl = proxy.openSession('hTtp://ExaMple.Com:123/paTh/Image?Name=Value&#Hash', session);
+
+            expect(proxiedUrl).to.have.string('http://example.com:123/paTh/Image?Name=Value&#Hash');
+        });
     });
 
 

diff --git a/test/qunit/fixtures/util/url.js b/test/qunit/fixtures/util/url.js
@@ -202,6 +202,13 @@ test('remove unnecessary slashes form the begin of the url', function () {
     strictEqual(proxy, 'http://localhost:5555/t!u/https://example.com/');
 });
 
+test('convert origin host and protocol to lower case', function () {
+    // BUG: https://github.com/superroma/testcafe-hammerhead/issues/1
+    var proxy = UrlUtil.getProxyUrl('hTtp://eXamPle.Com:123/paTh/Image?Name=Value&#Hash');
+
+    ok(proxy.indexOf('http://example.com:123/paTh/Image?Name=Value&#Hash') !== -1);
+});
+
 module('parse proxy url');
 
 test('http', function () {