Backed out changeset 3d2b43bd09e6 (bug 1103196)
authorSebastian Hengst <archaeopteryx@coole-files.de>
Fri, 25 Nov 2016 00:18:36 +0100
changeset 324221 e74e31391dbd1807aa7be7160e34ecc1a7be3893
parent 324220 f43e5a1f88a04b2fede6d17f41756b5598b39d6b
child 324222 9c1a017771468294719d900658314f79b6e26f79
push id24
push usermaklebus@msu.edu
push dateTue, 20 Dec 2016 03:11:33 +0000
bugs1103196
milestone53.0a1
backs out3d2b43bd09e653723f6df5d6c34c91cdc3fd212d
Backed out changeset 3d2b43bd09e6 (bug 1103196)
testing/marionette/driver.js
--- a/testing/marionette/driver.js
+++ b/testing/marionette/driver.js
@@ -120,20 +120,16 @@ this.GeckoDriver = function(appName, ser
   this.observing = null;
   this._browserIds = new WeakMap();
 
   // user-defined timeouts
   this.scriptTimeout = 30000;  // 30 seconds
   this.searchTimeout = null;
   this.pageTimeout = 300000;  // five minutes
 
-  // Unsigned or invalid TLS certificates will be ignored if secureTLS
-  // is set to false.
-  this.secureTLS = true;
-
   // The curent context decides if commands should affect chrome- or
   // content space.
   this.context = Context.CONTENT;
 
   this.importedScripts = new evaluate.ScriptStorageService(
       [Context.CHROME, Context.CONTENT]);
   this.sandboxes = new Sandboxes(() => this.getCurrentWindow());
   this.actions = new action.Chain();
@@ -145,17 +141,16 @@ this.GeckoDriver = function(appName, ser
   this.testName = null;
 
   this.sessionCapabilities = {
     // mandated capabilities
     "browserName": Services.appinfo.name.toLowerCase(),
     "browserVersion": Services.appinfo.version,
     "platformName": Services.sysinfo.getProperty("name").toLowerCase(),
     "platformVersion": Services.sysinfo.getProperty("version"),
-    "acceptInsecureCerts": !this.secureTLS,
 
     // supported features
     "raisesAccessibilityExceptions": false,
     "rotatable": this.appName == "B2G",
     "acceptSslCerts": false,
     "proxy": {},
 
     // proprietary extensions
@@ -649,24 +644,16 @@ GeckoDriver.prototype.setSessionCapabili
     throw new SessionNotCreatedError(
         `Not all requiredCapabilities could be met: ${JSON.stringify(errors)}`);
   };
 
   // clone, overwrite, and set
   let caps = copy(this.sessionCapabilities);
   caps = copy(newCaps, caps);
   logger.config("Changing capabilities: " + JSON.stringify(caps));
-
-  // update session state
-  this.secureTLS = !caps.acceptInsecureCerts;
-  if (!this.secureTLS) {
-    logger.warn("Invalid or self-signed TLS certificates " +
-        "will be discarded for this session");
-  }
-
   this.sessionCapabilities = caps;
 };
 
 GeckoDriver.prototype.setUpProxy = function(proxy) {
   logger.config("User-provided proxy settings: " + JSON.stringify(proxy));
 
   assert.object(proxy);
   if (!proxy.hasOwnProperty("proxyType")) {