Bug 1177909 - Part 2: add test cases when WebSockets use system proxy; r=bagder

MozReview-Commit-ID: BzHbieN2W4y

--HG--
extra : rebase_source : 657f746da022a49a8c4317e02161dff5af125fac

netwerk/test/unit/test_bug1177909.js

@@ -0,0 +1,149 @@
+"use strict";
+
+Cu.import("resource://gre/modules/NetUtil.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://testing-common/MockRegistrar.jsm");
+
+XPCOMUtils.defineLazyServiceGetter(this, "gProxyService",
+                                   "@mozilla.org/network/protocol-proxy-service;1",
+                                   "nsIProtocolProxyService");
+
+XPCOMUtils.defineLazyGetter(this, "systemSettings", function() {
+  return {
+    QueryInterface: function (iid) {
+      if (iid.equals(Components.interfaces.nsISupports) ||
+          iid.equals(Components.interfaces.nsISystemProxySettings))
+        return this;
+      throw Components.results.NS_ERROR_NO_INTERFACE;
+    },
+
+    mainThreadOnly: true,
+    PACURI: null,
+
+    getProxyForURI: function(aSpec, aScheme, aHost, aPort) {
+      if (aPort != -1) {
+        return 'SOCKS5 http://localhost:9050'
+      }
+      if (aScheme == 'http' ||
+          aScheme == 'https' ||
+          aScheme == 'ftp') {
+        return 'PROXY http://localhost:8080';
+      }
+      return 'DIRECT';
+    }
+  };
+});
+
+let gMockProxy = MockRegistrar.register("@mozilla.org/system-proxy-settings;1",
+                                        systemSettings);
+
+do_register_cleanup(() => {
+  MockRegistrar.unregister(gMockProxy);
+});
+
+function makeChannel(uri) {
+  return NetUtil.newChannel({
+    uri: uri,
+    loadUsingSystemPrincipal: true,
+  });
+}
+
+async function TestProxyType(chan, flags) {
+  const prefs = Cc["@mozilla.org/preferences-service;1"]
+                   .getService(Ci.nsIPrefBranch);
+  prefs.setIntPref(
+    "network.proxy.type",
+    Components.interfaces.nsIProtocolProxyService.PROXYCONFIG_SYSTEM);
+
+  return await new Promise((resolve, reject) => {
+    gProxyService.asyncResolve(chan, flags, {
+      onProxyAvailable(req, uri, pi, status) {
+        resolve(pi);
+      }
+    });
+  });
+}
+
+async function TestProxyTypeByURI(uri) {
+  return await TestProxyType(makeChannel(uri), 0);
+}
+
+add_task(async function testHttpProxy() {
+  let pi = await TestProxyTypeByURI("http://www.mozilla.org/");
+  equal(pi.host, "localhost", "Expected proxy host to be localhost");
+  equal(pi.port, 8080, "Expected proxy port to be 8080");
+  equal(pi.type, "http", "Expected proxy type to be http");
+});
+
+add_task(async function testHttpsProxy() {
+  let pi = await TestProxyTypeByURI("https://www.mozilla.org/");
+  equal(pi.host, "localhost", "Expected proxy host to be localhost");
+  equal(pi.port, 8080, "Expected proxy port to be 8080");
+  equal(pi.type, "http", "Expected proxy type to be http");
+});
+
+add_task(async function testFtpProxy() {
+  let pi = await TestProxyTypeByURI("ftp://ftp.mozilla.org/");
+  equal(pi.host, "localhost", "Expected proxy host to be localhost");
+  equal(pi.port, 8080, "Expected proxy port to be 8080");
+  equal(pi.type, "http", "Expected proxy type to be http");
+});
+
+add_task(async function testSocksProxy() {
+  let pi = await TestProxyTypeByURI("http://www.mozilla.org:1234/");
+  equal(pi.host, "localhost", "Expected proxy host to be localhost");
+  equal(pi.port, 9050, "Expected proxy port to be 8080");
+  equal(pi.type, "socks", "Expected proxy type to be http");
+});
+
+add_task(async function testDirectProxy() {
+  // Do what |WebSocketChannel::AsyncOpen| do, but do not prefer https proxy.
+  let proxyURI = Cc["@mozilla.org/network/standard-url;1"].createInstance(Ci.nsIURI);
+  proxyURI.spec = "wss://ws.mozilla.org/";
+  let uri = proxyURI.clone();
+  uri.scheme = "https";
+
+  let ioService = Cc["@mozilla.org/network/io-service;1"].
+                  getService(Ci.nsIIOService2);
+  let chan = ioService.
+    newChannelFromURIWithProxyFlags2(uri,
+                                     proxyURI,
+                                     0,
+                                     null,
+                                     Services.scriptSecurityManager.getSystemPrincipal(),
+                                     null,
+                                     Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL,
+                                     Ci.nsIContentPolicy.TYPE_OTHER);
+
+  let pi = await TestProxyType(chan, 0);
+  equal(pi, null, "Expected proxy host to be null");
+});
+
+add_task(async function testWebSocketProxy() {
+  // Do what |WebSocketChannel::AsyncOpen| do
+  let proxyURI = Cc["@mozilla.org/network/standard-url;1"].createInstance(Ci.nsIURI);
+  proxyURI.spec = "wss://ws.mozilla.org/";
+  let uri = proxyURI.clone();
+  uri.scheme = "https";
+
+  let proxyFlags = Ci.nsIProtocolProxyService.RESOLVE_PREFER_HTTPS_PROXY |
+                   Ci.nsIProtocolProxyService.RESOLVE_ALWAYS_TUNNEL;
+
+  let ioService = Cc["@mozilla.org/network/io-service;1"].
+                  getService(Ci.nsIIOService2);
+  let chan = ioService.
+    newChannelFromURIWithProxyFlags2(uri,
+                                     proxyURI,
+                                     proxyFlags,
+                                     null,
+                                     Services.scriptSecurityManager.getSystemPrincipal(),
+                                     null,
+                                     Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL,
+                                     Ci.nsIContentPolicy.TYPE_OTHER);
+
+  let pi = await TestProxyType(chan, proxyFlags);
+  equal(pi.host, "localhost", "Expected proxy host to be localhost");
+  equal(pi.port, 8080, "Expected proxy port to be 8080");
+  equal(pi.type, "http", "Expected proxy type to be http");
+});

netwerk/test/unit/xpcshell.ini

@@ -172,6 +172,7 @@ skip-if = os == "android"
 skip-if = bits != 32
 [test_bug935499.js]
 [test_bug1064258.js]
+[test_bug1177909.js]
 [test_bug1218029.js]
 [test_udpsocket.js]
 [test_udpsocket_offline.js]