[tbb-commits] [torbutton/master] Bug #13078: environment variable to skip TorButton control port verification

[gk at torproject.org]

commit 38a59e819604de5018db5db54fb08fd9e1581d1f
Author: Patrick Schleizer <adrelanos at riseup.net>
Date:   Sun Sep 7 20:49:41 2014 +0000

    Bug #13078: environment variable to skip TorButton control port verification
---
 src/chrome/content/torbutton.js |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index 5aed682..bf06e04 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -1875,8 +1875,12 @@ function torbutton_do_tor_check()
 
   // If we have a tor control port and transparent torification is off,
   // perform a check via the control port.
+  const kEnvSkipControlPortTest = "TOR_SKIP_CONTROLPORTTEST";
+  var env = Cc["@mozilla.org/process/environment;1"]
+                 .getService(Ci.nsIEnvironment);
   if (m_tb_control_port &&
       !m_tb_prefs.getBoolPref("extensions.torbutton.saved.transparentTor") &&
+      !env.exists(kEnvSkipControlPortTest) &&
       m_tb_prefs.getBoolPref("extensions.torbutton.local_tor_check")) {
     if (torbutton_local_tor_check())
       checkSvc.statusOfTorCheck = checkSvc.kCheckSuccessful;