- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-45.4.0esr-6.5-1] Bug 1273371, don't use the searchbar for this test, instead use a separate textbox, r=gijs
by gk＠torproject.org 28 Oct '16

28 Oct '16

commit 0aa148499aaa1748036e9e89567c6e709dd16dbc Author: Neil Deakin <neil(a)mozilla.com> Date: Mon Oct 17 13:55:16 2016 -0400 Bug 1273371, don't use the searchbar for this test, instead use a separate textbox, r=gijs This and the previous two commits fix bug 20442 in our bug tracker. --- .../test/general/browser_clipboard_pastefile.js | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/browser/base/content/test/general/browser_clipboard_pastefile.js b/browser/base/content/test/general/browser_clipboard_pastefile.js index 094628f..55acc2b 100644 --- a/browser/base/content/test/general/browser_clipboard_pastefile.js +++ b/browser/base/content/test/general/browser_clipboard_pastefile.js @@ -2,15 +2,16 @@ // event.clipboardData. add_task(function*() { - var searchbar = document.getElementById("searchbar"); + var textbox = document.createElement("textbox"); + document.documentElement.appendChild(textbox); - searchbar.focus(); - searchbar.value = "Text"; - searchbar.select(); + textbox.focus(); + textbox.value = "Text"; + textbox.select(); yield new Promise((resolve, reject) => { - searchbar.addEventListener("copy", function copyEvent(event) { - searchbar.removeEventListener("copy", copyEvent, true); + textbox.addEventListener("copy", function copyEvent(event) { + textbox.removeEventListener("copy", copyEvent, true); event.clipboardData.setData("text/plain", "Alternate"); // For this test, it doesn't matter that the file isn't actually a file. event.clipboardData.setData("application/x-moz-file", "Sample"); @@ -36,11 +37,11 @@ add_task(function*() { }); is (output, "Passed", "Paste file"); - searchbar.focus(); + textbox.focus(); yield new Promise((resolve, reject) => { - searchbar.addEventListener("paste", function copyEvent(event) { - searchbar.removeEventListener("paste", copyEvent, true); + textbox.addEventListener("paste", function copyEvent(event) { + textbox.removeEventListener("paste", copyEvent, true); let dt = event.clipboardData; is(dt.types.length, 3, "number of types"); @@ -55,5 +56,7 @@ add_task(function*() { EventUtils.synthesizeKey("v", { accelKey: true }); }); + document.documentElement.removeChild(textbox); + yield BrowserTestUtils.removeTab(tab); });

1 0

[tor-browser/tor-browser-45.4.0esr-6.5-1] Bug 1249522, when a file is present, only specify file type, r=smaug
by gk＠torproject.org 28 Oct '16

28 Oct '16

commit 3bfc8bc8ea3a87010c2203f752af19b29bf4c0b2 Author: Neil Deakin <neil(a)mozilla.com> Date: Wed May 11 10:04:19 2016 -0400 Bug 1249522, when a file is present, only specify file type, r=smaug --- browser/base/content/test/general/browser.ini | 2 + .../test/general/browser_clipboard_pastefile.js | 59 +++++++++++++++++++++ .../content/test/general/clipboard_pastefile.html | 37 +++++++++++++ dom/events/DataTransfer.cpp | 60 +++++++++++++--------- dom/events/DataTransfer.h | 3 +- .../mochitest/chrome/test_sanityChromeUtils.xul | 4 +- 6 files changed, 139 insertions(+), 26 deletions(-) diff --git a/browser/base/content/test/general/browser.ini b/browser/base/content/test/general/browser.ini index 44e5d15..3224ce5 100644 --- a/browser/base/content/test/general/browser.ini +++ b/browser/base/content/test/general/browser.ini @@ -25,6 +25,7 @@ support-files = bug792517.html bug792517.sjs bug839103.css + clipboard_pastefile.html discovery.html domplate_test.js download_page.html @@ -283,6 +284,7 @@ skip-if = os == 'win' || e10s # Bug 1159268 - Need a content-process safe versio [browser_canonizeURL.js] skip-if = e10s # Bug 1094510 - test hits the network in e10s mode only [browser_clipboard.js] +[browser_clipboard_pastefile.js] [browser_contentAreaClick.js] [browser_contextSearchTabPosition.js] skip-if = os == "mac" || e10s # bug 967013; e10s: bug 1094761 - test hits the network in e10s, causing next test to crash diff --git a/browser/base/content/test/general/browser_clipboard_pastefile.js b/browser/base/content/test/general/browser_clipboard_pastefile.js new file mode 100644 index 0000000..094628f --- /dev/null +++ b/browser/base/content/test/general/browser_clipboard_pastefile.js @@ -0,0 +1,59 @@ +// This test is used to check that pasting files removes all non-file data from +// event.clipboardData. + +add_task(function*() { + var searchbar = document.getElementById("searchbar"); + + searchbar.focus(); + searchbar.value = "Text"; + searchbar.select(); + + yield new Promise((resolve, reject) => { + searchbar.addEventListener("copy", function copyEvent(event) { + searchbar.removeEventListener("copy", copyEvent, true); + event.clipboardData.setData("text/plain", "Alternate"); + // For this test, it doesn't matter that the file isn't actually a file. + event.clipboardData.setData("application/x-moz-file", "Sample"); + event.preventDefault(); + resolve(); + }, true) + + EventUtils.synthesizeKey("c", { accelKey: true }); + }); + + let tab = yield BrowserTestUtils.openNewForegroundTab(gBrowser, + "https://example.com/browser/browser/base/content/test/general/clipboard_pas…"); + let browser = tab.linkedBrowser; + + yield ContentTask.spawn(browser, { }, function* (arg) { + content.document.getElementById("input").focus(); + }); + + yield BrowserTestUtils.synthesizeKey("v", { accelKey: true }, browser); + + let output = yield ContentTask.spawn(browser, { }, function* (arg) { + return content.document.getElementById("output").textContent; + }); + is (output, "Passed", "Paste file"); + + searchbar.focus(); + + yield new Promise((resolve, reject) => { + searchbar.addEventListener("paste", function copyEvent(event) { + searchbar.removeEventListener("paste", copyEvent, true); + + let dt = event.clipboardData; + is(dt.types.length, 3, "number of types"); + ok(dt.types.contains("text/plain"), "text/plain exists in types"); + ok(dt.mozTypesAt(0).contains("text/plain"), "text/plain exists in mozTypesAt"); + is(dt.getData("text/plain"), "Alternate", "text/plain returned in getData"); + is(dt.mozGetDataAt("text/plain", 0), "Alternate", "text/plain returned in mozGetDataAt"); + + resolve(); + }, true); + + EventUtils.synthesizeKey("v", { accelKey: true }); + }); + + yield BrowserTestUtils.removeTab(tab); +}); diff --git a/browser/base/content/test/general/clipboard_pastefile.html b/browser/base/content/test/general/clipboard_pastefile.html new file mode 100644 index 0000000..fcbf60e --- /dev/null +++ b/browser/base/content/test/general/clipboard_pastefile.html @@ -0,0 +1,37 @@ +<html><body> +<script> +function checkPaste(event) +{ + let output = document.getElementById("output"); + output.textContent = checkPasteHelper(event); +} + +function checkPasteHelper(event) +{ + let dt = event.clipboardData; + if (dt.types.length != 2) + return "Wrong number of types; got " + dt.types.length; + + for (let type of dt.types) { + if (type != "Files" && type != "application/x-moz-file") + return "Invalid type for types; got" + type; + } + + for (let type of dt.mozTypesAt(0)) { + if (type != "Files" && type != "application/x-moz-file") + return "Invalid type for mozTypesAt; got" + type; + } + + if (dt.getData("text/plain")) + return "text/plain found with getData"; + if (dt.mozGetDataAt("text/plain", 0)) + return "text/plain found with mozGetDataAt"; + + return "Passed"; +} +</script> + +<input id="input" onpaste="checkPaste(event)"> +<div id="output"></div> + +</body></html> diff --git a/dom/events/DataTransfer.cpp b/dom/events/DataTransfer.cpp index 2ad0eff..a6c9342 100644 --- a/dom/events/DataTransfer.cpp +++ b/dom/events/DataTransfer.cpp @@ -359,25 +359,8 @@ DataTransfer::GetFiles(nsIDOMFileList** aFileList) already_AddRefed<DOMStringList> DataTransfer::Types() { - RefPtr<DOMStringList> types = new DOMStringList(); - if (mItems.Length()) { - bool addFile = false; - const nsTArray<TransferItem>& item = mItems[0]; - for (uint32_t i = 0; i < item.Length(); i++) { - const nsString& format = item[i].mFormat; - types->Add(format); - if (!addFile) { - addFile = format.EqualsASCII(kFileMime) || - format.EqualsASCII("application/x-moz-file-promise"); - } - } - - if (addFile) { - types->Add(NS_LITERAL_STRING("Files")); - } - } - - return types.forget(); + ErrorResult rv; + return MozTypesAt(0, rv); } NS_IMETHODIMP @@ -545,7 +528,7 @@ DataTransfer::GetMozSourceNode(nsIDOMNode** aSourceNode) } already_AddRefed<DOMStringList> -DataTransfer::MozTypesAt(uint32_t aIndex, ErrorResult& aRv) +DataTransfer::MozTypesAt(uint32_t aIndex, ErrorResult& aRv) const { // Only the first item is valid for clipboard events if (aIndex > 0 && @@ -557,10 +540,28 @@ DataTransfer::MozTypesAt(uint32_t aIndex, ErrorResult& aRv) RefPtr<DOMStringList> types = new DOMStringList(); if (aIndex < mItems.Length()) { + bool addFile = false; // note that you can retrieve the types regardless of their principal - nsTArray<TransferItem>& item = mItems[aIndex]; - for (uint32_t i = 0; i < item.Length(); i++) - types->Add(item[i].mFormat); + const nsTArray<TransferItem>& item = mItems[aIndex]; + for (uint32_t i = 0; i < item.Length(); i++) { + const nsString& format = item[i].mFormat; + types->Add(format); + if (!addFile) { + addFile = format.EqualsASCII(kFileMime); + } + } + + if (addFile) { + // If this is a content caller, and a file is in the data transfer, remove + // the non-file types. This prevents alternate text forms of the file + // from being returned. + if (!nsContentUtils::LegacyIsCallerChromeOrNativeCode()) { + types->Clear(); + types->Add(NS_LITERAL_STRING(kFileMime)); + } + + types->Add(NS_LITERAL_STRING("Files")); + } } return types.forget(); @@ -602,12 +603,23 @@ DataTransfer::GetDataAtInternal(const nsAString& aFormat, uint32_t aIndex, return NS_ERROR_DOM_INDEX_SIZE_ERR; } - nsAutoString format; GetRealFormat(aFormat, format); nsTArray<TransferItem>& item = mItems[aIndex]; + // If this is a content caller, and a file is in the data transfer, only + // return the file type. + if (!format.EqualsLiteral(kFileMime) && + !nsContentUtils::IsSystemPrincipal(aSubjectPrincipal)) { + uint32_t count = item.Length(); + for (uint32_t i = 0; i < count; i++) { + if (item[i].mFormat.EqualsLiteral(kFileMime)) { + return NS_OK; + } + } + } + // Check if the caller is allowed to access the drag data. Callers with // chrome privileges can always read the data. During the // drop event, allow retrieving the data except in the case where the diff --git a/dom/events/DataTransfer.h b/dom/events/DataTransfer.h index 2b1f90a..48fbac9 100644 --- a/dom/events/DataTransfer.h +++ b/dom/events/DataTransfer.h @@ -165,7 +165,8 @@ public: } } already_AddRefed<DOMStringList> MozTypesAt(uint32_t aIndex, - mozilla::ErrorResult& aRv); + mozilla::ErrorResult& aRv) const; + void MozClearDataAt(const nsAString& aFormat, uint32_t aIndex, mozilla::ErrorResult& aRv); void MozSetDataAt(JSContext* aCx, const nsAString& aFormat, diff --git a/testing/mochitest/chrome/test_sanityChromeUtils.xul b/testing/mochitest/chrome/test_sanityChromeUtils.xul index ca1915b..f3ac45d 100644 --- a/testing/mochitest/chrome/test_sanityChromeUtils.xul +++ b/testing/mochitest/chrome/test_sanityChromeUtils.xul @@ -65,7 +65,9 @@ var dragfile = [[ { type : "application/x-moz-file", data : testFile, - eqTest : function(actualData, expectedData) {return expectedData.equals(actualData);} } + eqTest : function(actualData, expectedData) {return expectedData.equals(actualData);} }, + { type : "Files", + data : null } ]]; function doOnDrop(aEvent) {

1 0

[tor-launcher/maint-0.2.10] Bug 20185: Avoid using Unix domain socket paths that are too long
by gk＠torproject.org 27 Oct '16

27 Oct '16

commit c916965ec2fe0b29c30414bb3c0ce3bf6ca207c5 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Oct 27 12:02:57 2016 -0400 Bug 20185: Avoid using Unix domain socket paths that are too long Enforce a maximum length of 100 for Unix domain socket paths. If $XDG_RUNTIME_DIR is set, create a unique subdirectory within that directory and place the control and SOCKS sockets there if the resulting paths will not be too long else if the length of <tor-data-dir>/control.socket is less than 100 characters, place both sockets under <tor-data-dir> (this is compatible with the Tor Browser 6.5a3 behavior) else create a unique subdirectory under /tmp and place the sockets there. The unique subdirectory that is created under $XDG_RUNTIME_DIR or /tmp will be named Tor if no such directory exists; otherwise, an integer suffix will be appended until a new, uniquely named directory is found such as /tmp/Tor-1. Also, when starting tor, only include a SocksPort argument if a Unix domain socket path or a host/port is available. --- src/components/tl-process.js | 30 +++-- src/modules/tl-util.jsm | 254 ++++++++++++++++++++++++++++++++++--------- 2 files changed, 223 insertions(+), 61 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 166a8ae..777a253 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -142,7 +142,11 @@ TorProcessService.prototype = this.mObsSvc.notifyObservers(null, "TorProcessExited", null); - if (!this.mIsQuitting) + if (this.mIsQuitting) + { + TorLauncherUtil.cleanupTempDirectories(); + } + else { this.mProtocolSvc.TorCleanupConnection(); @@ -399,15 +403,21 @@ TorProcessService.prototype = // a TCP port and an IPC port (e.g., a Unix domain socket). if (socksPortInfo) { - let socksPortArg = (socksPortInfo.ipcFile) - ? this._ipcPortArg(socksPortInfo.ipcFile) - : socksPortInfo.host + ':' + socksPortInfo.port; - let socksPortFlags = TorLauncherUtil.getCharPref( - "extensions.torlauncher.socks_port_flags"); - if (socksPortFlags) - socksPortArg += ' ' + socksPortFlags; - args.push("SocksPort"); - args.push(socksPortArg); + let socksPortArg; + if (socksPortInfo.ipcFile) + socksPortArg = this._ipcPortArg(socksPortInfo.ipcFile) + else if (socksPortInfo.host && (socksPortInfo.port != 0)) + socksPortArg = socksPortInfo.host + ':' + socksPortInfo.port; + + if (socksPortArg) + { + let socksPortFlags = TorLauncherUtil.getCharPref( + "extensions.torlauncher.socks_port_flags"); + if (socksPortFlags) + socksPortArg += ' ' + socksPortFlags; + args.push("SocksPort"); + args.push(socksPortArg); + } } var pid = this._getpid(); diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index a18f779..313a51b 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -247,6 +247,14 @@ let TorLauncherUtil = // Public } catch (e) {} }, + clearUserPref: function(aPrefName) + { + try + { + TLUtilInternal.mPrefsSvc.clearUserPref(aPrefName); + } catch (e) {} + }, + // Currently, this returns a random permutation of an array, bridgeArray. // Later, we might want to change this function to weight based on the // bridges' bandwidths. @@ -377,22 +385,97 @@ let TorLauncherUtil = // Public if (!aTorFileType) return null; - let isRelativePath = true; + let torFile; // an nsIFile to be returned + let path; // a relative or absolute path that will determine torFile + + let isRelativePath = false; let isUserData = (aTorFileType != "tor") && (aTorFileType != "torrc-defaults"); let isControlIPC = ("control_ipc" == aTorFileType); let isSOCKSIPC = ("socks_ipc" == aTorFileType); let isIPC = isControlIPC || isSOCKSIPC; + let checkIPCPathLen = true; + + const kControlIPCFileName = "control.socket"; + const kSOCKSIPCFileName = "socks.socket"; + let extraIPCPathLen = (isSOCKSIPC) ? 2 : 0; + let ipcFileName; + if (isControlIPC) + ipcFileName = kControlIPCFileName; + else if (isSOCKSIPC) + ipcFileName = kSOCKSIPCFileName; + + // If this is the first request for an IPC path during this browser + // session, remove the old temporary directory. This helps to keep /tmp + // clean if the browser crashes or is killed. + let ipcDirPath; + if (isIPC && TLUtilInternal.mIsFirstIPCPathRequest) + { + this.cleanupTempDirectories(); + TLUtilInternal.mIsFirstIPCPathRequest = false; + } + else + { + // Retrieve path for IPC objects (it may have already been determined). + ipcDirPath = this.getCharPref(TLUtilInternal.kIPCDirPrefName); + } + + // First, check the _path preference for this file type. let prefName = "extensions.torlauncher." + aTorFileType + "_path"; - let path = this.getCharPref(prefName); + path = this.getCharPref(prefName); if (path) { let re = (this.isWindows) ? /^[A-Za-z]:\\/ : /^\//; isRelativePath = !re.test(path); + checkIPCPathLen = false; // always try to use path if provided in pref } - else + else if (isIPC) + { + if (ipcDirPath) + { + // We have already determined where IPC objects will be placed. + torFile = Cc['@mozilla.org/file/local;1'].createInstance(Ci.nsIFile); + torFile.initWithPath(ipcDirPath); + torFile.append(ipcFileName); + checkIPCPathLen = false; // already checked. + } + else + { + // If XDG_RUNTIME_DIR is set, use it as the base directory for IPC + // objects (e.g., Unix domain sockets) -- assuming it is not too long. + let env = Cc["@mozilla.org/process/environment;1"] + .getService(Ci.nsIEnvironment); + if (env.exists("XDG_RUNTIME_DIR")) + { + let ipcDir = TLUtilInternal._createUniqueIPCDir( + env.get("XDG_RUNTIME_DIR")); + if (ipcDir) + { + let f = ipcDir.clone(); + f.append(ipcFileName); + if (TLUtilInternal._isIPCPathLengthOK(f.path, extraIPCPathLen)) + { + torFile = f; + checkIPCPathLen = false; // no need to check again. + + // Store directory path so it can be reused for other IPC objects + // and so it can be removed during exit. + this.setCharPref(TLUtilInternal.kIPCDirPrefName, ipcDir.path); + } + else + { + // too long; remove the directory that we just created. + ipcDir.remove(false); + } + } + } + } + } + + if (!path && !torFile) { - // Get default path. + // No preference and no pre-determined IPC path: use a default path. + isRelativePath = true; if (TLUtilInternal._isUserDataOutsideOfAppDir) { // This block is used for the TorBrowser-Data/ case. @@ -417,10 +500,8 @@ let TorLauncherUtil = // Public path = "Tor/torrc"; else if ("tordatadir" == aTorFileType) path = "Tor"; - else if (isControlIPC) - path = "Tor/control.socket"; - else if (isSOCKSIPC) - path = "Tor/socks.socket"; + else if (isIPC) + path = "Tor/" + ipcFileName; } else // Linux and others. { @@ -432,10 +513,8 @@ let TorLauncherUtil = // Public path = "Tor/torrc"; else if ("tordatadir" == aTorFileType) path = "Tor"; - else if (isControlIPC) - path = "Tor/control.socket"; - else if (isSOCKSIPC) - path = "Tor/socks.socket"; + else if (isIPC) + path = "Tor/" + ipcFileName; } } else if (this.isWindows) @@ -461,67 +540,90 @@ let TorLauncherUtil = // Public path = "Data/Tor/torrc"; else if ("tordatadir" == aTorFileType) path = "Data/Tor"; - else if (isControlIPC) - path = "Data/Tor/control.socket"; - else if (isSOCKSIPC) - path = "Data/Tor/socks.socket"; + else if (isIPC) + path = "Data/Tor/" + ipcFileName; } - } - if (!path) - return null; + if (!path) + return null; + } try { - let f; - if (isRelativePath) + if (path) { - // Turn 'path' into an absolute path. - if (TLUtilInternal._isUserDataOutsideOfAppDir) + if (isRelativePath) { - let baseDir = isUserData ? TLUtilInternal._dataDir - : TLUtilInternal._appDir; - f = baseDir.clone(); + // Turn 'path' into an absolute path. + if (TLUtilInternal._isUserDataOutsideOfAppDir) + { + let baseDir = isUserData ? TLUtilInternal._dataDir + : TLUtilInternal._appDir; + torFile = baseDir.clone(); + } + else + { + torFile = TLUtilInternal._appDir.clone(); + torFile.append("TorBrowser"); + } + torFile.appendRelativePath(path); } else { - f = TLUtilInternal._appDir.clone(); - f.append("TorBrowser"); + torFile = Cc['@mozilla.org/file/local;1'].createInstance(Ci.nsIFile); + torFile.initWithPath(path); } - f.appendRelativePath(path); - } - else - { - f = Cc['@mozilla.org/file/local;1'].createInstance(Ci.nsIFile); - f.initWithPath(path); - } - if (!f.exists() && !isIPC && aCreate) - { - try - { - if ("tordatadir" == aTorFileType) - f.create(f.DIRECTORY_TYPE, 0700); - else - f.create(f.NORMAL_FILE_TYPE, 0600); - } - catch (e) + if (!torFile.exists() && !isIPC && aCreate) { - TorLauncherLogger.safelog(4, "unable to create " + f.path + ": ", e); - return null; + try + { + if ("tordatadir" == aTorFileType) + torFile.create(torFile.DIRECTORY_TYPE, 0700); + else + torFile.create(torFile.NORMAL_FILE_TYPE, 0600); + } + catch (e) + { + TorLauncherLogger.safelog(4, + "unable to create " + torFile.path + ": ", e); + return null; + } } } // If the file exists or an IPC object was requested, normalize the path // and return a file object. The control and SOCKS IPC objects will be // created by tor. - if (f.exists() || isIPC) + if (torFile.exists() || isIPC) { - try { f.normalize(); } catch(e) {} - return f; + try { torFile.normalize(); } catch(e) {} + + // Ensure that the IPC path length is short enough for use by the + // operating system. If not, create and use a unique directory under + // /tmp for all IPC objects. The created directory path is stored in + // a preference so it can be reused for other IPC objects and so it + // can be removed during exit. + if (isIPC && checkIPCPathLen && + !TLUtilInternal._isIPCPathLengthOK(torFile.path, extraIPCPathLen)) + { + torFile = TLUtilInternal._createUniqueIPCDir("/tmp"); + if (!torFile) + { + TorLauncherLogger.log(4, + "failed to create unique directory under /tmp"); + return null; + } + + this.setCharPref(TLUtilInternal.kIPCDirPrefName, torFile.path); + torFile.append(ipcFileName); + } + + return torFile; } - TorLauncherLogger.log(4, aTorFileType + " file not found: " + f.path); + TorLauncherLogger.log(4, aTorFileType + " file not found: " + + torFile.path); } catch(e) { @@ -531,6 +633,22 @@ let TorLauncherUtil = // Public return null; // File not found or error (logged above). }, // getTorFile() + + cleanupTempDirectories: function() + { + try + { + let dirPath = this.getCharPref(TLUtilInternal.kIPCDirPrefName); + this.clearUserPref(TLUtilInternal.kIPCDirPrefName); + if (dirPath) + { + let f = Cc['@mozilla.org/file/local;1'].createInstance(Ci.nsIFile); + f.initWithPath(dirPath); + if (f.exists()) + f.remove(false); // Remove directory if it is empty + } + } catch(e) {} + }, }; @@ -541,6 +659,7 @@ let TLUtilInternal = // Private { kThunderbirdID: "{3550f703-e582-4d05-9a08-453d09bdfdc6}", kInstantbirdID: "{33cb9019-c295-46dd-be21-8c4936574bee}", + kIPCDirPrefName: "extensions.torlauncher.tmp_ipc_dir", mPrefsSvc : null, mStringBundle : null, @@ -550,6 +669,7 @@ let TLUtilInternal = // Private // this._isUserDataOutsideOfAppDir) mAppDir: null, // nsIFile (cached; access via this._appDir) mDataDir: null, // nsIFile (cached; access via this._dataDir) + mIsFirstIPCPathRequest : true, _init: function() { @@ -662,6 +782,38 @@ let TLUtilInternal = // Private return this.mDataDir; }, // get _dataDir + // Return true if aPath is short enough to be used as an IPC object path, + // e.g., for a Unix domain socket path. aExtraLen is the "delta" necessary + // to accommodate other IPC objects that have longer names; it is used to + // account for "control.socket" vs. "socks.socket" (we want to ensure that + // all IPC objects are placed in the same parent directory unless the user + // has set prefs or env vars to explicitly specify the path for an object). + // We enforce a maximum length of 100 because all operating systems allow + // at least 100 characters for Unix domain socket paths. + _isIPCPathLengthOK: function(aPath, aExtraLen) + { + const kMaxIPCPathLen = 100; + return aPath && ((aPath.length + aExtraLen) <= kMaxIPCPathLen); + }, + + // Returns an nsIFile or null if a unique directory could not be created. + _createUniqueIPCDir: function(aBasePath) + { + try + { + let d = Cc['@mozilla.org/file/local;1'].createInstance(Ci.nsIFile); + d.initWithPath(aBasePath); + d.append("Tor"); + d.createUnique(Ci.nsIFile.DIRECTORY_TYPE, 0700); + return d; + } + catch (e) + { + TorLauncherLogger.safelog(4, "_createUniqueIPCDir failed for " + + aBasePath + ": ", e); + return null; + } + }, };

1 0

[tor-launcher/master] Bug 20185: Avoid using Unix domain socket paths that are too long
by gk＠torproject.org 27 Oct '16

27 Oct '16

commit 4dd8f6130f931616cf014e0ded444c30e04c8bad Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Oct 27 12:02:57 2016 -0400 Bug 20185: Avoid using Unix domain socket paths that are too long Enforce a maximum length of 100 for Unix domain socket paths. If $XDG_RUNTIME_DIR is set, create a unique subdirectory within that directory and place the control and SOCKS sockets there if the resulting paths will not be too long else if the length of <tor-data-dir>/control.socket is less than 100 characters, place both sockets under <tor-data-dir> (this is compatible with the Tor Browser 6.5a3 behavior) else create a unique subdirectory under /tmp and place the sockets there. The unique subdirectory that is created under $XDG_RUNTIME_DIR or /tmp will be named Tor if no such directory exists; otherwise, an integer suffix will be appended until a new, uniquely named directory is found such as /tmp/Tor-1. Also, when starting tor, only include a SocksPort argument if a Unix domain socket path or a host/port is available. --- src/components/tl-process.js | 30 +++-- src/modules/tl-util.jsm | 254 ++++++++++++++++++++++++++++++++++--------- 2 files changed, 223 insertions(+), 61 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 844aba1..de71d45 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -142,7 +142,11 @@ TorProcessService.prototype = this.mObsSvc.notifyObservers(null, "TorProcessExited", null); - if (!this.mIsQuitting) + if (this.mIsQuitting) + { + TorLauncherUtil.cleanupTempDirectories(); + } + else { this.mProtocolSvc.TorCleanupConnection(); @@ -395,15 +399,21 @@ TorProcessService.prototype = // a TCP port and an IPC port (e.g., a Unix domain socket). if (socksPortInfo) { - let socksPortArg = (socksPortInfo.ipcFile) - ? this._ipcPortArg(socksPortInfo.ipcFile) - : socksPortInfo.host + ':' + socksPortInfo.port; - let socksPortFlags = TorLauncherUtil.getCharPref( - "extensions.torlauncher.socks_port_flags"); - if (socksPortFlags) - socksPortArg += ' ' + socksPortFlags; - args.push("SocksPort"); - args.push(socksPortArg); + let socksPortArg; + if (socksPortInfo.ipcFile) + socksPortArg = this._ipcPortArg(socksPortInfo.ipcFile) + else if (socksPortInfo.host && (socksPortInfo.port != 0)) + socksPortArg = socksPortInfo.host + ':' + socksPortInfo.port; + + if (socksPortArg) + { + let socksPortFlags = TorLauncherUtil.getCharPref( + "extensions.torlauncher.socks_port_flags"); + if (socksPortFlags) + socksPortArg += ' ' + socksPortFlags; + args.push("SocksPort"); + args.push(socksPortArg); + } } var pid = this._getpid(); diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index a1256fd..2f8d14e 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -251,6 +251,14 @@ let TorLauncherUtil = // Public } catch (e) {} }, + clearUserPref: function(aPrefName) + { + try + { + TLUtilInternal.mPrefsSvc.clearUserPref(aPrefName); + } catch (e) {} + }, + // Currently, this returns a random permutation of an array, bridgeArray. // Later, we might want to change this function to weight based on the // bridges' bandwidths. @@ -397,22 +405,97 @@ let TorLauncherUtil = // Public if (!aTorFileType) return null; - let isRelativePath = true; + let torFile; // an nsIFile to be returned + let path; // a relative or absolute path that will determine torFile + + let isRelativePath = false; let isUserData = (aTorFileType != "tor") && (aTorFileType != "torrc-defaults"); let isControlIPC = ("control_ipc" == aTorFileType); let isSOCKSIPC = ("socks_ipc" == aTorFileType); let isIPC = isControlIPC || isSOCKSIPC; + let checkIPCPathLen = true; + + const kControlIPCFileName = "control.socket"; + const kSOCKSIPCFileName = "socks.socket"; + let extraIPCPathLen = (isSOCKSIPC) ? 2 : 0; + let ipcFileName; + if (isControlIPC) + ipcFileName = kControlIPCFileName; + else if (isSOCKSIPC) + ipcFileName = kSOCKSIPCFileName; + + // If this is the first request for an IPC path during this browser + // session, remove the old temporary directory. This helps to keep /tmp + // clean if the browser crashes or is killed. + let ipcDirPath; + if (isIPC && TLUtilInternal.mIsFirstIPCPathRequest) + { + this.cleanupTempDirectories(); + TLUtilInternal.mIsFirstIPCPathRequest = false; + } + else + { + // Retrieve path for IPC objects (it may have already been determined). + ipcDirPath = this.getCharPref(TLUtilInternal.kIPCDirPrefName); + } + + // First, check the _path preference for this file type. let prefName = "extensions.torlauncher." + aTorFileType + "_path"; - let path = this.getCharPref(prefName); + path = this.getCharPref(prefName); if (path) { let re = (this.isWindows) ? /^[A-Za-z]:\\/ : /^\//; isRelativePath = !re.test(path); + checkIPCPathLen = false; // always try to use path if provided in pref } - else + else if (isIPC) + { + if (ipcDirPath) + { + // We have already determined where IPC objects will be placed. + torFile = Cc['@mozilla.org/file/local;1'].createInstance(Ci.nsIFile); + torFile.initWithPath(ipcDirPath); + torFile.append(ipcFileName); + checkIPCPathLen = false; // already checked. + } + else + { + // If XDG_RUNTIME_DIR is set, use it as the base directory for IPC + // objects (e.g., Unix domain sockets) -- assuming it is not too long. + let env = Cc["@mozilla.org/process/environment;1"] + .getService(Ci.nsIEnvironment); + if (env.exists("XDG_RUNTIME_DIR")) + { + let ipcDir = TLUtilInternal._createUniqueIPCDir( + env.get("XDG_RUNTIME_DIR")); + if (ipcDir) + { + let f = ipcDir.clone(); + f.append(ipcFileName); + if (TLUtilInternal._isIPCPathLengthOK(f.path, extraIPCPathLen)) + { + torFile = f; + checkIPCPathLen = false; // no need to check again. + + // Store directory path so it can be reused for other IPC objects + // and so it can be removed during exit. + this.setCharPref(TLUtilInternal.kIPCDirPrefName, ipcDir.path); + } + else + { + // too long; remove the directory that we just created. + ipcDir.remove(false); + } + } + } + } + } + + if (!path && !torFile) { - // Get default path. + // No preference and no pre-determined IPC path: use a default path. + isRelativePath = true; if (TLUtilInternal._isUserDataOutsideOfAppDir) { // This block is used for the TorBrowser-Data/ case. @@ -437,10 +520,8 @@ let TorLauncherUtil = // Public path = "Tor/torrc"; else if ("tordatadir" == aTorFileType) path = "Tor"; - else if (isControlIPC) - path = "Tor/control.socket"; - else if (isSOCKSIPC) - path = "Tor/socks.socket"; + else if (isIPC) + path = "Tor/" + ipcFileName; } else // Linux and others. { @@ -452,10 +533,8 @@ let TorLauncherUtil = // Public path = "Tor/torrc"; else if ("tordatadir" == aTorFileType) path = "Tor"; - else if (isControlIPC) - path = "Tor/control.socket"; - else if (isSOCKSIPC) - path = "Tor/socks.socket"; + else if (isIPC) + path = "Tor/" + ipcFileName; } } else if (this.isWindows) @@ -481,67 +560,90 @@ let TorLauncherUtil = // Public path = "Data/Tor/torrc"; else if ("tordatadir" == aTorFileType) path = "Data/Tor"; - else if (isControlIPC) - path = "Data/Tor/control.socket"; - else if (isSOCKSIPC) - path = "Data/Tor/socks.socket"; + else if (isIPC) + path = "Data/Tor/" + ipcFileName; } - } - if (!path) - return null; + if (!path) + return null; + } try { - let f; - if (isRelativePath) + if (path) { - // Turn 'path' into an absolute path. - if (TLUtilInternal._isUserDataOutsideOfAppDir) + if (isRelativePath) { - let baseDir = isUserData ? TLUtilInternal._dataDir - : TLUtilInternal._appDir; - f = baseDir.clone(); + // Turn 'path' into an absolute path. + if (TLUtilInternal._isUserDataOutsideOfAppDir) + { + let baseDir = isUserData ? TLUtilInternal._dataDir + : TLUtilInternal._appDir; + torFile = baseDir.clone(); + } + else + { + torFile = TLUtilInternal._appDir.clone(); + torFile.append("TorBrowser"); + } + torFile.appendRelativePath(path); } else { - f = TLUtilInternal._appDir.clone(); - f.append("TorBrowser"); + torFile = Cc['@mozilla.org/file/local;1'].createInstance(Ci.nsIFile); + torFile.initWithPath(path); } - f.appendRelativePath(path); - } - else - { - f = Cc['@mozilla.org/file/local;1'].createInstance(Ci.nsIFile); - f.initWithPath(path); - } - if (!f.exists() && !isIPC && aCreate) - { - try - { - if ("tordatadir" == aTorFileType) - f.create(f.DIRECTORY_TYPE, 0700); - else - f.create(f.NORMAL_FILE_TYPE, 0600); - } - catch (e) + if (!torFile.exists() && !isIPC && aCreate) { - TorLauncherLogger.safelog(4, "unable to create " + f.path + ": ", e); - return null; + try + { + if ("tordatadir" == aTorFileType) + torFile.create(torFile.DIRECTORY_TYPE, 0700); + else + torFile.create(torFile.NORMAL_FILE_TYPE, 0600); + } + catch (e) + { + TorLauncherLogger.safelog(4, + "unable to create " + torFile.path + ": ", e); + return null; + } } } // If the file exists or an IPC object was requested, normalize the path // and return a file object. The control and SOCKS IPC objects will be // created by tor. - if (f.exists() || isIPC) + if (torFile.exists() || isIPC) { - try { f.normalize(); } catch(e) {} - return f; + try { torFile.normalize(); } catch(e) {} + + // Ensure that the IPC path length is short enough for use by the + // operating system. If not, create and use a unique directory under + // /tmp for all IPC objects. The created directory path is stored in + // a preference so it can be reused for other IPC objects and so it + // can be removed during exit. + if (isIPC && checkIPCPathLen && + !TLUtilInternal._isIPCPathLengthOK(torFile.path, extraIPCPathLen)) + { + torFile = TLUtilInternal._createUniqueIPCDir("/tmp"); + if (!torFile) + { + TorLauncherLogger.log(4, + "failed to create unique directory under /tmp"); + return null; + } + + this.setCharPref(TLUtilInternal.kIPCDirPrefName, torFile.path); + torFile.append(ipcFileName); + } + + return torFile; } - TorLauncherLogger.log(4, aTorFileType + " file not found: " + f.path); + TorLauncherLogger.log(4, aTorFileType + " file not found: " + + torFile.path); } catch(e) { @@ -551,6 +653,22 @@ let TorLauncherUtil = // Public return null; // File not found or error (logged above). }, // getTorFile() + + cleanupTempDirectories: function() + { + try + { + let dirPath = this.getCharPref(TLUtilInternal.kIPCDirPrefName); + this.clearUserPref(TLUtilInternal.kIPCDirPrefName); + if (dirPath) + { + let f = Cc['@mozilla.org/file/local;1'].createInstance(Ci.nsIFile); + f.initWithPath(dirPath); + if (f.exists()) + f.remove(false); // Remove directory if it is empty + } + } catch(e) {} + }, }; @@ -561,6 +679,7 @@ let TLUtilInternal = // Private { kThunderbirdID: "{3550f703-e582-4d05-9a08-453d09bdfdc6}", kInstantbirdID: "{33cb9019-c295-46dd-be21-8c4936574bee}", + kIPCDirPrefName: "extensions.torlauncher.tmp_ipc_dir", mPrefsSvc : null, mStringBundle : null, @@ -570,6 +689,7 @@ let TLUtilInternal = // Private // this._isUserDataOutsideOfAppDir) mAppDir: null, // nsIFile (cached; access via this._appDir) mDataDir: null, // nsIFile (cached; access via this._dataDir) + mIsFirstIPCPathRequest : true, _init: function() { @@ -682,6 +802,38 @@ let TLUtilInternal = // Private return this.mDataDir; }, // get _dataDir + // Return true if aPath is short enough to be used as an IPC object path, + // e.g., for a Unix domain socket path. aExtraLen is the "delta" necessary + // to accommodate other IPC objects that have longer names; it is used to + // account for "control.socket" vs. "socks.socket" (we want to ensure that + // all IPC objects are placed in the same parent directory unless the user + // has set prefs or env vars to explicitly specify the path for an object). + // We enforce a maximum length of 100 because all operating systems allow + // at least 100 characters for Unix domain socket paths. + _isIPCPathLengthOK: function(aPath, aExtraLen) + { + const kMaxIPCPathLen = 100; + return aPath && ((aPath.length + aExtraLen) <= kMaxIPCPathLen); + }, + + // Returns an nsIFile or null if a unique directory could not be created. + _createUniqueIPCDir: function(aBasePath) + { + try + { + let d = Cc['@mozilla.org/file/local;1'].createInstance(Ci.nsIFile); + d.initWithPath(aBasePath); + d.append("Tor"); + d.createUnique(Ci.nsIFile.DIRECTORY_TYPE, 0700); + return d; + } + catch (e) + { + TorLauncherLogger.safelog(4, "_createUniqueIPCDir failed for " + + aBasePath + ": ", e); + return null; + } + }, };

1 0

[tor-launcher/maint-0.2.10] Bug 20429: Do not open progress window if TOR_SKIP_LAUNCH=1
by gk＠torproject.org 27 Oct '16

27 Oct '16

commit 8aa78d3a78bbabe01759b63d837b09acdf53be42 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Oct 26 15:00:06 2016 -0400 Bug 20429: Do not open progress window if TOR_SKIP_LAUNCH=1 After saving tor settings, if TOR_SKIP_LAUNCH=1 or if extensions.torlauncher.start_tor is false, avoid opening the progress dialog to monitor bootstrap progress. This avoids displaying a progress window that will not make progress (and the situation was made worse by the fact that clicking Cancel set DisableNetwork=1). Also, leave the network settings dialog open if we fail to set DisableNetwork=0. --- src/chrome/content/network-settings.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 2736f08..dc54445 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -1055,11 +1055,22 @@ function useSettings() { var settings = {}; settings[kTorConfKeyDisableNetwork] = false; - setConfAndReportErrors(settings, null); + let didApply = setConfAndReportErrors(settings, null); + if (!didApply) + return; gProtocolSvc.TorSendCommand("SAVECONF"); gTorProcessService.TorClearBootstrapError(); + // If we are not responsible for starting tor we do not monitor bootstrap + // status, so just close this dialog and return rather than opening the + // progress dialog (which will make no progress). + if (!TorLauncherUtil.shouldStartAndOwnTor) + { + close(); + return; + } + gIsBootstrapComplete = gTorProcessService.TorIsBootstrapDone; if (!gIsBootstrapComplete) openProgressDialog();

1 0

[tor-launcher/maint-0.2.9] Bug 20429: Do not open progress window if TOR_SKIP_LAUNCH=1
by gk＠torproject.org 27 Oct '16

27 Oct '16

commit 2014143e0081170267a34e3a102878999dee6a29 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Oct 26 15:00:06 2016 -0400 Bug 20429: Do not open progress window if TOR_SKIP_LAUNCH=1 After saving tor settings, if TOR_SKIP_LAUNCH=1 or if extensions.torlauncher.start_tor is false, avoid opening the progress dialog to monitor bootstrap progress. This avoids displaying a progress window that will not make progress (and the situation was made worse by the fact that clicking Cancel set DisableNetwork=1). Also, leave the network settings dialog open if we fail to set DisableNetwork=0. --- src/chrome/content/network-settings.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 2736f08..dc54445 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -1055,11 +1055,22 @@ function useSettings() { var settings = {}; settings[kTorConfKeyDisableNetwork] = false; - setConfAndReportErrors(settings, null); + let didApply = setConfAndReportErrors(settings, null); + if (!didApply) + return; gProtocolSvc.TorSendCommand("SAVECONF"); gTorProcessService.TorClearBootstrapError(); + // If we are not responsible for starting tor we do not monitor bootstrap + // status, so just close this dialog and return rather than opening the + // progress dialog (which will make no progress). + if (!TorLauncherUtil.shouldStartAndOwnTor) + { + close(); + return; + } + gIsBootstrapComplete = gTorProcessService.TorIsBootstrapDone; if (!gIsBootstrapComplete) openProgressDialog();

1 0

[tor-launcher/master] Bug 20429: Do not open progress window if TOR_SKIP_LAUNCH=1
by gk＠torproject.org 27 Oct '16

27 Oct '16

commit c12d56470b7164c33b3cb2e48a90dc65151a9a26 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Oct 26 15:00:06 2016 -0400 Bug 20429: Do not open progress window if TOR_SKIP_LAUNCH=1 After saving tor settings, if TOR_SKIP_LAUNCH=1 or if extensions.torlauncher.start_tor is false, avoid opening the progress dialog to monitor bootstrap progress. This avoids displaying a progress window that will not make progress (and the situation was made worse by the fact that clicking Cancel set DisableNetwork=1). Also, leave the network settings dialog open if we fail to set DisableNetwork=0. --- src/chrome/content/network-settings.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index e0d7d1c..5df4e1e 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -1209,11 +1209,22 @@ function useSettings() { var settings = {}; settings[kTorConfKeyDisableNetwork] = false; - setConfAndReportErrors(settings, null); + let didApply = setConfAndReportErrors(settings, null); + if (!didApply) + return; gProtocolSvc.TorSendCommand("SAVECONF"); gTorProcessService.TorClearBootstrapError(); + // If we are not responsible for starting tor we do not monitor bootstrap + // status, so just close this dialog and return rather than opening the + // progress dialog (which will make no progress). + if (!TorLauncherUtil.shouldStartAndOwnTor) + { + close(); + return; + } + gIsBootstrapComplete = gTorProcessService.TorIsBootstrapDone; if (!gIsBootstrapComplete) openProgressDialog();

1 0

[tor-browser/tor-browser-45.4.0esr-6.0-1] fixup! Bug 1070710 - Add mozilla::ViewRegion which assembles a LayoutDeviceIntRegion as NSViews. r=spohl
by gk＠torproject.org 26 Oct '16

26 Oct '16

commit 41f1c54ad978155f964fca1100f0c2eda1bef88a Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Oct 25 23:01:20 2016 -0400 fixup! Bug 1070710 - Add mozilla::ViewRegion which assembles a LayoutDeviceIntRegion as NSViews. r=spohl OSX: Fix a problem where clicking and dragging in the content area of a window would sometimes cause the window to move. This is a fixup for an error introduced while backporting a Mozilla patch for Tor bug 20204. --- widget/cocoa/ViewRegion.mm | 1 - 1 file changed, 1 deletion(-) diff --git a/widget/cocoa/ViewRegion.mm b/widget/cocoa/ViewRegion.mm index 3459849..ee31889 100644 --- a/widget/cocoa/ViewRegion.mm +++ b/widget/cocoa/ViewRegion.mm @@ -56,7 +56,6 @@ ViewRegion::UpdateRegion(const LayoutDeviceIntRegion& aRegion, } [view setNeedsDisplay:YES]; mViews.AppendElement(view); - iter.Next(); } else { // Our new region is made of fewer rects than the old region, so we can // remove this view. We only have a weak reference to it, so removing it

1 0

[tor-browser/tor-browser-45.4.0esr-6.5-1] fixup! Bug 1070710 - Add mozilla::ViewRegion which assembles a LayoutDeviceIntRegion as NSViews. r=spohl
by gk＠torproject.org 26 Oct '16

26 Oct '16

commit a6b4bb9a9d2769e8be110f2f0486b9ec74882575 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Oct 25 23:01:20 2016 -0400 fixup! Bug 1070710 - Add mozilla::ViewRegion which assembles a LayoutDeviceIntRegion as NSViews. r=spohl OSX: Fix a problem where clicking and dragging in the content area of a window would sometimes cause the window to move. This is a fixup for an error introduced while backporting a Mozilla patch for Tor bug 20204. --- widget/cocoa/ViewRegion.mm | 1 - 1 file changed, 1 deletion(-) diff --git a/widget/cocoa/ViewRegion.mm b/widget/cocoa/ViewRegion.mm index 3459849..ee31889 100644 --- a/widget/cocoa/ViewRegion.mm +++ b/widget/cocoa/ViewRegion.mm @@ -56,7 +56,6 @@ ViewRegion::UpdateRegion(const LayoutDeviceIntRegion& aRegion, } [view setNeedsDisplay:YES]; mViews.AppendElement(view); - iter.Next(); } else { // Our new region is made of fewer rects than the old region, so we can // remove this view. We only have a weak reference to it, so removing it

1 0

[tor-browser/tor-browser-45.4.0esr-6.5-1] Bug 1311044 - show error when connection to domain socket is failed; r=bagder
by gk＠torproject.org 25 Oct '16

25 Oct '16

commit b91682cd038d63eb2dbec1303c2ab9a65a43775b Author: Liang-Heng Chen <xeonchen(a)mozilla.com> Date: Wed Oct 19 18:28:02 2016 +0800 Bug 1311044 - show error when connection to domain socket is failed; r=bagder MozReview-Commit-ID: GtqKiMVwQyX --HG-- extra : rebase_source : 04e3b258f06e7d3e196c241c96aa3cc92ec334da --- netwerk/socket/nsSOCKSIOLayer.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/netwerk/socket/nsSOCKSIOLayer.cpp b/netwerk/socket/nsSOCKSIOLayer.cpp index be69725..d20fe7f 100644 --- a/netwerk/socket/nsSOCKSIOLayer.cpp +++ b/netwerk/socket/nsSOCKSIOLayer.cpp @@ -515,10 +515,16 @@ nsSOCKSSocketInfo::ConnectToProxy(PRFileDesc *fd) status = fd->lower->methods->connect(fd->lower, &prProxy, mTimeout); if (status != PR_SUCCESS) { PRErrorCode c = PR_GetError(); + // If EINPROGRESS, return now and check back later after polling if (c == PR_WOULD_BLOCK_ERROR || c == PR_IN_PROGRESS_ERROR) { mState = SOCKS_CONNECTING_TO_PROXY; return status; + } else if (IsHostDomainSocket()) { + LOGERROR(("socks: connect to domain socket failed (%d)", c)); + PR_SetError(PR_CONNECT_REFUSED_ERROR, 0); + mState = SOCKS_FAILED; + return status; } } } while (status != PR_SUCCESS);

1 0

[tor-browser-bundle/master] Bug 20210: in dmg2mar, extract old mar file to copy permissions to the new one
by gk＠torproject.org 21 Oct '16

21 Oct '16

commit 97acdebccac65377317068cdbfae6def9bb67309 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Oct 17 19:23:17 2016 +0200 Bug 20210: in dmg2mar, extract old mar file to copy permissions to the new one 7z does not currently extract file permissions from the dmg files so we also extract the old mar file to copy the permissions. --- tools/dmg2mar | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/tools/dmg2mar b/tools/dmg2mar index 010761e..8eaebe8 100755 --- a/tools/dmg2mar +++ b/tools/dmg2mar @@ -31,6 +31,7 @@ use strict; use IO::CaptureOutput qw(capture_exec); use File::Slurp; +use File::Find; use Parallel::ForkManager; use Cwd; @@ -110,6 +111,27 @@ sub convert_files { my (undef, $err, $success) = capture_exec('7z', 'x', "-o$tmpdir", $file->{filename}); exit_error "Error extracting $file->{filename}: $err" unless $success; + + # 7z does not currently extract file permissions from the dmg files + # so we also extract the old mar file to copy the permissions + # https://trac.torproject.org/projects/tor/ticket/20210 + my $tmpdir_oldmar = File::Temp->newdir(); + my $oldmar = getcwd . '/' . $output; + exit_error "Error extracting $output" + unless system('mar', '-C', $tmpdir_oldmar, '-x', $oldmar) == 0; + my $wanted = sub { + my $file = $File::Find::name; + $file =~ s{^$tmpdir/TorBrowser\.app/}{}; + if (-f "$tmpdir_oldmar/$file") { + my (undef, undef, $mode) = stat("$tmpdir_oldmar/$file"); + chmod $mode, $File::Find::name; + return; + } + chmod 0644, $File::Find::name if -f $File::Find::name; + chmod 0755, $File::Find::name if -d $File::Find::name; + }; + find($wanted, "$tmpdir/TorBrowser.app"); + unlink $output; (undef, $err, $success) = capture_exec('make_full_update.sh', '-q', $output, "$tmpdir/TorBrowser.app");

1 0

[tor-browser-bundle/hardened-builds] Bug 20422: Fall back to SHA256 check for PyCrypto
by gk＠torproject.org 21 Oct '16

21 Oct '16

commit 51f62d0c35e4c0587618f586fcfacae377933497 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 21 13:00:34 2016 +0000 Bug 20422: Fall back to SHA256 check for PyCrypto The subkey that signed PyCrypto back in the days expired. We fall back to the SHA256 check (which we already did in addition to the signature check). --- gitian/fetch-inputs.sh | 6 +++--- gitian/verify-tags.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index c663051..bbd2c88 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -113,11 +113,11 @@ update_git() { ############################################################################## # Get+verify sigs that exist -for i in OPENSSL BINUTILS GCC PYCRYPTO PYTHON_MSI GMP ELFUTILS +for i in OPENSSL BINUTILS GCC PYTHON_MSI GMP ELFUTILS do PACKAGE="${i}_PACKAGE" URL="${i}_URL" - if [ "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o "${i}" == "OPENSSL" ]; then + if [ "${i}" == "PYTHON_MSI" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig" @@ -162,7 +162,7 @@ do get "${!PACKAGE}" "${MIRROR_URL_ASN}${!PACKAGE}" done -for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY GO14 GO STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN +for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY GO14 GO STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN PYCRYPTO do URL="${i}_URL" PACKAGE="${i}_PACKAGE" diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 8277fca..b7c45c4 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -123,11 +123,11 @@ selfrando $SELFRANDO_TAG EOF # Verify signatures on signed packages -for i in OPENSSL BINUTILS GCC PYCRYPTO PYTHON_MSI GMP ELFUTILS +for i in OPENSSL BINUTILS GCC PYTHON_MSI GMP ELFUTILS do PACKAGE="${i}_PACKAGE" URL="${i}_URL" - if [ "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o "${i}" == "OPENSSL" ]; then + if [ "${i}" == "PYTHON_MSI" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig"

1 0

[tor-browser-bundle/maint-6.0] Bug 20422: Fall back to SHA256 check for PyCrypto
by gk＠torproject.org 21 Oct '16

21 Oct '16

commit bfc9d71a999e0902011684610a9dcfb97319ae10 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 21 13:00:34 2016 +0000 Bug 20422: Fall back to SHA256 check for PyCrypto The subkey that signed PyCrypto back in the days expired. We fall back to the SHA256 check (which we already did in addition to the signature check). --- gitian/fetch-inputs.sh | 6 +++--- gitian/verify-tags.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 99b984b..b5adfc2 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -113,11 +113,11 @@ update_git() { ############################################################################## # Get+verify sigs that exist -for i in OPENSSL BINUTILS GCC PYCRYPTO PYTHON_MSI GMP +for i in OPENSSL BINUTILS GCC PYTHON_MSI GMP do PACKAGE="${i}_PACKAGE" URL="${i}_URL" - if [ "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o "${i}" == "OPENSSL" ]; then + if [ "${i}" == "PYTHON_MSI" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig" @@ -162,7 +162,7 @@ do get "${!PACKAGE}" "${MIRROR_URL_ASN}${!PACKAGE}" done -for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY GO STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN +for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY GO STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN PYCRYPTO do URL="${i}_URL" PACKAGE="${i}_PACKAGE" diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index e006fb0..33b54a4 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -125,11 +125,11 @@ noto-fonts $NOTOFONTS_TAG EOF # Verify signatures on signed packages -for i in OPENSSL BINUTILS GCC PYCRYPTO PYTHON_MSI GMP +for i in OPENSSL BINUTILS GCC PYTHON_MSI GMP do PACKAGE="${i}_PACKAGE" URL="${i}_URL" - if [ "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o "${i}" == "OPENSSL" ]; then + if [ "${i}" == "PYTHON_MSI" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig"

1 0

[tor-browser-bundle/master] Bug 20422: Fall back to SHA256 check for PyCrypto
by gk＠torproject.org 21 Oct '16

21 Oct '16

commit d8c56ab1d5db728adddc0376a266ea842f0e4872 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 21 13:00:34 2016 +0000 Bug 20422: Fall back to SHA256 check for PyCrypto The subkey that signed PyCrypto back in the days expired. We fall back to the SHA256 check (which we already did in addition to the signature check). --- gitian/fetch-inputs.sh | 6 +++--- gitian/verify-tags.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index ca43637..50daec0 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -113,11 +113,11 @@ update_git() { ############################################################################## # Get+verify sigs that exist -for i in OPENSSL BINUTILS GCC PYCRYPTO PYTHON_MSI GMP +for i in OPENSSL BINUTILS GCC PYTHON_MSI GMP do PACKAGE="${i}_PACKAGE" URL="${i}_URL" - if [ "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o "${i}" == "OPENSSL" ]; then + if [ "${i}" == "PYTHON_MSI" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig" @@ -162,7 +162,7 @@ do get "${!PACKAGE}" "${MIRROR_URL_ASN}${!PACKAGE}" done -for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY GO14 GO STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN +for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY GO14 GO STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN PYCRYPTO do URL="${i}_URL" PACKAGE="${i}_PACKAGE" diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index baea827..d95b0e0 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -125,11 +125,11 @@ noto-fonts $NOTOFONTS_TAG EOF # Verify signatures on signed packages -for i in OPENSSL BINUTILS GCC PYCRYPTO PYTHON_MSI GMP +for i in OPENSSL BINUTILS GCC PYTHON_MSI GMP do PACKAGE="${i}_PACKAGE" URL="${i}_URL" - if [ "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o "${i}" == "OPENSSL" ]; then + if [ "${i}" == "PYTHON_MSI" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig"

1 0

[tor-launcher/maint-0.2.10] Version bump for a better tag
by gk＠torproject.org 20 Oct '16

20 Oct '16

commit e7a9367be0b0b18c2cfbac774e4edcd7d3bcaaf8 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 15 13:35:37 2016 +0000 Version bump for a better tag --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 96f9a66..06c3413 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.10</em:version> + <em:version>0.2.10.1</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL> <em:updateKey>-</em:updateKey>

1 0

[tor-launcher/maint-0.2.10] Bug 20111: use Unix domain sockets for SOCKS port by default
by gk＠torproject.org 20 Oct '16

20 Oct '16

commit 239131f5747385e832d6d12f30382ce00056591b Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Oct 20 09:59:20 2016 -0400 Bug 20111: use Unix domain sockets for SOCKS port by default New preferences: extensions.torlauncher.socks_port_use_ipc (Boolean; defaults to true) extensions.torlauncher.socks_ipc_path (override default IPC path) extensions.torlauncher.socks_port_flags (SocksPort flags) Also added support for the TOR_SOCKS_IPC_PATH environment variable. Consistently use IPC to refer to Unix domain sockets. Renamed preferences: extensions.torlauncher.control_port_use_socket is now extensions.torlauncher.control_port_use_ipc extensions.torlauncher.control_socket_path is now extensions.torlauncher.control_ipc_path Renamed the TOR_CONTROL_SOCKET env variable to TOR_CONTROL_IPC_PATH. Change _strUnescape() to throw and fix hex and octal unescaping. --- src/components/tl-process.js | 31 ++++- src/components/tl-protocol.js | 248 ++++++++++++++++++++++++++++---------- src/defaults/preferences/prefs.js | 27 +++-- src/modules/tl-util.jsm | 30 +++-- 4 files changed, 252 insertions(+), 84 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 1883013..166a8ae 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -334,8 +334,9 @@ TorProcessService.prototype = var torrcDefaultsFile = TorLauncherUtil.getTorFile("torrc-defaults", false); var hashedPassword = this.mProtocolSvc.TorGetPassword(true); - var controlSocketFile = this.mProtocolSvc.TorGetControlSocketFile(); + var controlIPCFile = this.mProtocolSvc.TorGetControlIPCFile(); var controlPort = this.mProtocolSvc.TorGetControlPort(); + var socksPortInfo = this.mProtocolSvc.TorGetSOCKSPortInfo(); var detailsKey; if (!exeFile) @@ -382,10 +383,10 @@ TorProcessService.prototype = args.push(hashedPassword); // Include a ControlPort argument to support switching between - // a TCP port and a Unix domain socket. + // a TCP port and an IPC port (e.g., a Unix domain socket). let controlPortArg; - if (controlSocketFile) - controlPortArg = "unix:" + controlSocketFile.path; + if (controlIPCFile) + controlPortArg = this._ipcPortArg(controlIPCFile); else if (controlPort) controlPortArg = "" + controlPort; if (controlPortArg) @@ -394,6 +395,21 @@ TorProcessService.prototype = args.push(controlPortArg); } + // Include a SocksPort argument to support switching between + // a TCP port and an IPC port (e.g., a Unix domain socket). + if (socksPortInfo) + { + let socksPortArg = (socksPortInfo.ipcFile) + ? this._ipcPortArg(socksPortInfo.ipcFile) + : socksPortInfo.host + ':' + socksPortInfo.port; + let socksPortFlags = TorLauncherUtil.getCharPref( + "extensions.torlauncher.socks_port_flags"); + if (socksPortFlags) + socksPortArg += ' ' + socksPortFlags; + args.push("SocksPort"); + args.push(socksPortArg); + } + var pid = this._getpid(); if (0 != pid) { @@ -458,6 +474,13 @@ TorProcessService.prototype = } }, // _startTor() + // Return a ControlPort or SocksPort argument for aIPCFile (an nsIFile). + // The result is unix:/path or unix:"/path with spaces" with appropriate + // C-style escaping within the path portion. + _ipcPortArg: function(aIPCFile) + { + return "unix:" + this.mProtocolSvc.TorEscapeString(aIPCFile.path); + }, _controlTor: function() { diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index d394b53..12f3910 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -38,10 +38,10 @@ function TorProtocolService() .getService(Ci.nsIEnvironment); // Determine how Tor Launcher will connect to the Tor control port. // Environment variables get top priority followed by preferences. - if (!isWindows && env.exists("TOR_CONTROL_SOCKET")) + if (!isWindows && env.exists("TOR_CONTROL_IPC_PATH")) { - let socketPath = env.get("TOR_CONTROL_SOCKET"); - this.mControlSocketFile = new FileUtils.File(socketPath); + let ipcPath = env.get("TOR_CONTROL_IPC_PATH"); + this.mControlIPCFile = new FileUtils.File(ipcPath); } else { @@ -51,13 +51,10 @@ function TorProtocolService() if (env.exists("TOR_CONTROL_PORT")) this.mControlPort = parseInt(env.get("TOR_CONTROL_PORT"), 10); - let useSocket = !isWindows && TorLauncherUtil.getBoolPref( - "extensions.torlauncher.control_port_use_socket", true); - if (!this.mControlHost && !this.mControlPort && useSocket) - { - this.mControlSocketFile = TorLauncherUtil.getTorFile("control_socket", - false); - } + let useIPC = !isWindows && TorLauncherUtil.getBoolPref( + "extensions.torlauncher.control_port_use_ipc", true); + if (!this.mControlHost && !this.mControlPort && useIPC) + this.mControlIPCFile = TorLauncherUtil.getTorFile("control_ipc", false); else { if (!this.mControlHost) @@ -75,7 +72,9 @@ function TorProtocolService() // Populate mControlPassword so it is available when starting tor. if (env.exists("TOR_CONTROL_PASSWD")) + { this.mControlPassword = env.get("TOR_CONTROL_PASSWD"); + } else if (env.exists("TOR_CONTROL_COOKIE_AUTH_FILE")) { // TODO: test this code path (TOR_CONTROL_COOKIE_AUTH_FILE). @@ -86,6 +85,117 @@ function TorProtocolService() if (!this.mControlPassword) this.mControlPassword = this._generateRandomPassword(); + + // Determine what kind of SOCKS port Tor and the browser will use. + // On Windows (where Unix domain sockets are not supported), TCP is + // always used. + // + // The following environment variables are supported and take + // precedence over preferences: + // TOR_SOCKS_IPC_PATH (file system path; ignored on Windows) + // TOR_SOCKS_HOST + // TOR_SOCKS_PORT + // + // The following preferences are consulted: + // network.proxy.socks + // network.proxy.socks_port + // extensions.torlauncher.socks_port_use_ipc (Boolean) + // extensions.torlauncher.socks_ipc_path (file system path) + // If extensions.torlauncher.socks_ipc_path is empty, a default + // path is used (<tor-data-directory>/socks.socket). + // + // When using TCP, if a value is not defined via an env variable it is + // taken from the corresponding browser preference if possible. The + // exceptions are: + // If network.proxy.socks contains a file: URL, a default value of + // "127.0.0.1" is used instead. + // If the network.proxy.socks_port value is 0, a default value of + // 9150 is used instead. + // + // Supported scenarios: + // 1. By default, an IPC object at a default path is used. + // 2. If extensions.torlauncher.socks_port_use_ipc is set to false, + // a TCP socket at 127.0.0.1:9150 is used, unless different values + // are set in network.proxy.socks and network.proxy.socks_port. + // 3. If the TOR_SOCKS_IPC_PATH env var is set, an IPC object at that + // path is used (e.g., a Unix domain socket). + // 4. If the TOR_SOCKS_HOST and/or TOR_SOCKS_PORT env vars are set, TCP + // is used. Values not set via env vars will be taken from the + // network.proxy.socks and network.proxy.socks_port prefs as described + // above. + // 5. If extensions.torlauncher.socks_port_use_ipc is true and + // extensions.torlauncher.socks_ipc_path is set, an IPC object at + // the specified path is used. + // 6. Tor Launcher is disabled. Torbutton will respect the env vars if + // present; if not, the values in network.proxy.socks and + // network.proxy.socks_port are used without modification. + + let useIPC; + this.mSOCKSPortInfo = { ipcFile: undefined, host: undefined, port: 0 }; + if (!isWindows && env.exists("TOR_SOCKS_IPC_PATH")) + { + let ipcPath = env.get("TOR_SOCKS_IPC_PATH"); + this.mSOCKSPortInfo.ipcFile = new FileUtils.File(ipcPath); + useIPC = true; + } + else + { + // Check for TCP host and port environment variables. + if (env.exists("TOR_SOCKS_HOST")) + { + this.mSOCKSPortInfo.host = env.get("TOR_SOCKS_HOST"); + useIPC = false; + } + if (env.exists("TOR_SOCKS_PORT")) + { + this.mSOCKSPortInfo.port = parseInt(env.get("TOR_SOCKS_PORT"), 10); + useIPC = false; + } + } + + if (useIPC === undefined) + { + useIPC = !isWindows && TorLauncherUtil.getBoolPref( + "extensions.torlauncher.socks_port_use_ipc", true); + } + + // Fill in missing SOCKS info from prefs. + if (useIPC) + { + if (!this.mSOCKSPortInfo.ipcFile) + { + this.mSOCKSPortInfo.ipcFile = + TorLauncherUtil.getTorFile("socks_ipc", false); + } + } + else + { + if (!this.mSOCKSPortInfo.host) + { + let socksAddr = TorLauncherUtil.getCharPref("network.proxy.socks", + "127.0.0.1"); + let socksAddrHasHost = (socksAddr && !socksAddr.startsWith("file:")); + this.mSOCKSPortInfo.host = socksAddrHasHost ? socksAddr : "127.0.0.1"; + } + + if (!this.mSOCKSPortInfo.port) + { + let socksPort = TorLauncherUtil.getIntPref("network.proxy.socks_port", + 0); + this.mSOCKSPortInfo.port = (socksPort != 0) ? socksPort : 9150; + } + } + + TorLauncherLogger.log(3, "SOCKS port type: " + (useIPC ? "IPC" : "TCP")); + if (useIPC) + { + TorLauncherLogger.log(3, "ipcFile: " + this.mSOCKSPortInfo.ipcFile.path); + } + else + { + TorLauncherLogger.log(3, "SOCKS host: " + this.mSOCKSPortInfo.host); + TorLauncherLogger.log(3, "SOCKS port: " + this.mSOCKSPortInfo.port); + } } catch(e) { @@ -164,12 +274,12 @@ TorProtocolService.prototype = kCmdStatusOK: 250, kCmdStatusEventNotification: 650, - TorGetControlSocketFile: function() + TorGetControlIPCFile: function() { - if (!this.mControlSocketFile) + if (!this.mControlIPCFile) return undefined; - return this.mControlSocketFile.clone(); + return this.mControlIPCFile.clone(); }, TorGetControlPort: function() @@ -184,6 +294,18 @@ TorProtocolService.prototype = return (aPleaseHash) ? this._hashPassword(pw) : pw; }, + TorGetSOCKSPortInfo: function() + { + return this.mSOCKSPortInfo; + }, + + // Escape non-ASCII characters for use within the Tor Control protocol. + // Returns a string. + TorEscapeString: function(aStr) + { + return this._strEscape(aStr); + }, + // NOTE: Many Tor protocol functions return a reply object, which is a // a JavaScript object that has the following fields: // reply.statusCode -- integer, e.g., 250 @@ -373,11 +495,13 @@ TorProtocolService.prototype = else { token = tokenAndVal.substring(0, idx); - var valObj = {}; - if (!this._strUnescape(tokenAndVal.substring(idx + 1), valObj)) - continue; // skip this token/value pair. + try + { + val = this._strUnescape(tokenAndVal.substring(idx + 1)); + } catch (e) {} - val = valObj.result; + if (!val) + continue; // skip this token/value pair. } if ("BOOTSTRAP" == token) @@ -548,8 +672,9 @@ TorProtocolService.prototype = mConsoleSvc: null, mControlPort: null, mControlHost: null, - mControlSocketFile: null, // An nsIFile if using a UNIX domain socket. + mControlIPCFile: null, // An nsIFile if using IPC for control port. mControlPassword: null, // JS string that contains hex-encoded password. + mSOCKSPortInfo: null, // An object that contains ipcFile, host, port. mControlConnection: null, // This is cached and reused. mEventMonitorConnection: null, mEventMonitorBuffer: null, @@ -600,27 +725,28 @@ TorProtocolService.prototype = let sts = Cc["@mozilla.org/network/socket-transport-service;1"] .getService(Ci.nsISocketTransportService); let socket; - if (this.mControlSocketFile) + if (this.mControlIPCFile) { - let exists = this.mControlSocketFile.exists(); + let exists = this.mControlIPCFile.exists(); if (!exists) { - TorLauncherLogger.log(5, "Control port socket does not exist: " + - this.mControlSocketFile.path); + TorLauncherLogger.log(5, "Control port IPC object does not exist: " + + this.mControlIPCFile.path); } else { - let isSpecial = this.mControlSocketFile.isSpecial(); + let isSpecial = this.mControlIPCFile.isSpecial(); if (!isSpecial) { - TorLauncherLogger.log(5, "Control port socket is not a socket: " + - this.mControlSocketFile.path); + TorLauncherLogger.log(5, + "Control port IPC object is not a special file: " + + this.mControlIPCFile.path); } else { - TorLauncherLogger.log(2, "Opening control connection to socket " + - this.mControlSocketFile.path); - socket = sts.createUnixDomainTransport(this.mControlSocketFile); + TorLauncherLogger.log(2, "Opening control connection to " + + this.mControlIPCFile.path); + socket = sts.createUnixDomainTransport(this.mControlIPCFile); } } } @@ -855,14 +981,16 @@ TorProtocolService.prototype = } else { - var valObj = {}; - if (!this._strUnescape(line.substring(prefixLen), valObj)) + try { - TorLauncherLogger.safelog(4, "Invalid string within " + aCmd + + let s = this._strUnescape(line.substring(prefixLen)); + tmpArray.push(s); + } + catch (e) + { + TorLauncherLogger.safelog(4, e + " within " + aCmd + " response: ", line); } - else - tmpArray.push(valObj.result); } } @@ -954,25 +1082,20 @@ TorProtocolService.prototype = // Unescape Tor Control string aStr (removing surrounding "" and \ escapes). // Based on Vidalia's src/common/stringutil.cpp:string_unescape(). - // Returns true if successful and sets aResultObj.result. - _strUnescape: function(aStr, aResultObj) + // Returns the unescaped string. Throws upon failure. + // Within Torbutton, the file modules/utils.js also contains a copy of + // _strUnescape(). + _strUnescape: function(aStr) { - if (!aResultObj) - return false; - if (!aStr) - { - aResultObj.result = aStr; - return true; - } + return aStr; var len = aStr.length; if ((len < 2) || ('"' != aStr.charAt(0)) || ('"' != aStr.charAt(len - 1))) - { - aResultObj.result = aStr; - return true; - } + return aStr; + const kHexRE = /[0-9A-Fa-f]{2}/; + const kOctalRE = /[0-7]{3}/; var rv = ""; var i = 1; var lastCharIndex = len - 2; @@ -982,7 +1105,7 @@ TorProtocolService.prototype = if ('\\' == c) { if (++i > lastCharIndex) - return false; // error: \ without next character. + throw new Error("missing character after \\"); c = aStr.charAt(i); if ('n' == c) @@ -994,24 +1117,26 @@ TorProtocolService.prototype = else if ('x' == c) { if ((i + 2) > lastCharIndex) - return false; // error: not enough hex characters. + throw new Error("not enough hex characters"); - var val = parseInt(aStr.substr(i, 2), 16); - if (isNaN(val)) - return false; // error: invalid hex characters. + let s = aStr.substr(i + 1, 2); + if (!kHexRE.test(s)) + throw new Error("invalid hex character"); + let val = parseInt(s, 16); rv += String.fromCharCode(val); - i += 2; + i += 3; } else if (this._isDigit(c)) { - if ((i + 3) > lastCharIndex) - return false; // error: not enough octal characters. + let s = aStr.substr(i, 3); + if ((i + 2) > lastCharIndex) + throw new Error("not enough octal characters"); - var val = parseInt(aStr.substr(i, 3), 8); - if (isNaN(val)) - return false; // error: invalid octal characters. + if (!kOctalRE.test(s)) + throw new Error("invalid octal character"); + let val = parseInt(s, 8); rv += String.fromCharCode(val); i += 3; } @@ -1022,7 +1147,7 @@ TorProtocolService.prototype = } } else if ('"' == c) - return false; // error: unescaped double quote in middle of string. + throw new Error("unescaped \" within string"); else { rv += c; @@ -1031,10 +1156,7 @@ TorProtocolService.prototype = } // Convert from UTF-8 to Unicode. TODO: is UTF-8 always used in protocol? - rv = decodeURIComponent(escape(rv)); - - aResultObj.result = rv; - return true; + return decodeURIComponent(escape(rv)); }, // _strUnescape() // Returns a random 16 character password, hex-encoded. @@ -1188,6 +1310,8 @@ TorProtocolService.prototype = return rv; }, + // Within Torbutton, the file modules/utils.js also contains a copy of + // _isDigit(). _isDigit: function(aChar) { const kRE = /^\d$/; diff --git a/src/defaults/preferences/prefs.js b/src/defaults/preferences/prefs.js index 0f197de..ea5ea80 100644 --- a/src/defaults/preferences/prefs.js +++ b/src/defaults/preferences/prefs.js @@ -5,17 +5,30 @@ pref("extensions.torlauncher.loglevel", 4); // 1=verbose, 2=debug, 3=info, 4=no pref("extensions.torlauncher.logmethod", 1); // 0=stdout, 1=errorconsole, 2=debuglog pref("extensions.torlauncher.max_tor_log_entries", 1000); -// By default, a Unix domain socket at a default location is used for -// the Tor control port. -// Change control_port_use_socket to false to use a TCP connection -// instead, as defined by control_host and control_port. -// Modify control_socket_path to override the default socket location. If a +// By default, an IPC object (e.g., a Unix domain socket) at a default +// location is used for the Tor control port. +// Change control_port_use_ipc to false to use a TCP connection instead, as +// defined by control_host and control_port. +// Modify control_ipc_path to override the default IPC object location. If a // relative path is used, it is handled like torrc_path (see below). -pref("extensions.torlauncher.control_port_use_socket", true); -pref("extensions.torlauncher.control_socket_path", ""); +pref("extensions.torlauncher.control_port_use_ipc", true); +pref("extensions.torlauncher.control_ipc_path", ""); pref("extensions.torlauncher.control_host", "127.0.0.1"); pref("extensions.torlauncher.control_port", 9151); +// By default, an IPC object (e.g., a Unix domain socket) at a default +// location is used for the Tor SOCKS port. +// Change socks_port_use_ipc to false to use a TCP connection. When a +// TCP connection is used, the host is taken from the network.proxy.socks +// pref and the port is taken from the network.proxy.socks_port pref. +// Modify socks_ipc_path to override the default IPC object location. If a +// relative path is used, it is handled like torrc_path (see below). +// Modify socks_port_flags to use a different set of SocksPort flags (but be +// careful). +pref("extensions.torlauncher.socks_port_use_ipc", true); +pref("extensions.torlauncher.socks_ipc_path", ""); +pref("extensions.torlauncher.socks_port_flags", "IPv6Traffic PreferIPv6 KeepAliveIsolateSOCKSAuth"); + // The tor_path is relative to the application directory. On Linux and // Windows this is the Browser/ directory that contains the firefox // executables, and on Mac OS it is the TorBrowser.app directory. diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index 9709e0e..a18f779 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -368,8 +368,8 @@ let TorLauncherUtil = // Public }, // Returns an nsIFile. - // If aTorFileType is "control_socket", aCreate is ignored and there is - // no requirement that the socket exists. + // If aTorFileType is "control_ipc" or "socks_ipc", aCreate is ignored + // and there is no requirement that the IPC object exists. // For all other file types, null is returned if the file does not exist // and it cannot be created (it will be created if aCreate is true). getTorFile: function(aTorFileType, aCreate) @@ -380,7 +380,9 @@ let TorLauncherUtil = // Public let isRelativePath = true; let isUserData = (aTorFileType != "tor") && (aTorFileType != "torrc-defaults"); - let isControlSocket = ("control_socket" == aTorFileType); + let isControlIPC = ("control_ipc" == aTorFileType); + let isSOCKSIPC = ("socks_ipc" == aTorFileType); + let isIPC = isControlIPC || isSOCKSIPC; let prefName = "extensions.torlauncher." + aTorFileType + "_path"; let path = this.getCharPref(prefName); if (path) @@ -415,8 +417,10 @@ let TorLauncherUtil = // Public path = "Tor/torrc"; else if ("tordatadir" == aTorFileType) path = "Tor"; - else if (isControlSocket) + else if (isControlIPC) path = "Tor/control.socket"; + else if (isSOCKSIPC) + path = "Tor/socks.socket"; } else // Linux and others. { @@ -428,8 +432,10 @@ let TorLauncherUtil = // Public path = "Tor/torrc"; else if ("tordatadir" == aTorFileType) path = "Tor"; - else if (isControlSocket) + else if (isControlIPC) path = "Tor/control.socket"; + else if (isSOCKSIPC) + path = "Tor/socks.socket"; } } else if (this.isWindows) @@ -455,8 +461,10 @@ let TorLauncherUtil = // Public path = "Data/Tor/torrc"; else if ("tordatadir" == aTorFileType) path = "Data/Tor"; - else if (isControlSocket) + else if (isControlIPC) path = "Data/Tor/control.socket"; + else if (isSOCKSIPC) + path = "Data/Tor/socks.socket"; } } @@ -488,7 +496,7 @@ let TorLauncherUtil = // Public f.initWithPath(path); } - if (!f.exists() && !isControlSocket && aCreate) + if (!f.exists() && !isIPC && aCreate) { try { @@ -504,10 +512,10 @@ let TorLauncherUtil = // Public } } - // If the file exists or the control socket was requested, normalize - // the path and return a file object. The control socket will be + // If the file exists or an IPC object was requested, normalize the path + // and return a file object. The control and SOCKS IPC objects will be // created by tor. - if (f.exists() || isControlSocket) + if (f.exists() || isIPC) { try { f.normalize(); } catch(e) {} return f; @@ -518,7 +526,7 @@ let TorLauncherUtil = // Public catch(e) { TorLauncherLogger.safelog(4, "getTorFile " + aTorFileType + - " failed for " + path + ": ", e); + " failed for " + path + ": ", e); } return null; // File not found or error (logged above).

1 0

[tor-launcher/master] Bug 20111: use Unix domain sockets for SOCKS port by default
by gk＠torproject.org 20 Oct '16

20 Oct '16

commit 8ca52414916c3d8bc2a2974017d759901ddc1736 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Oct 20 09:59:20 2016 -0400 Bug 20111: use Unix domain sockets for SOCKS port by default New preferences: extensions.torlauncher.socks_port_use_ipc (Boolean; defaults to true) extensions.torlauncher.socks_ipc_path (override default IPC path) extensions.torlauncher.socks_port_flags (SocksPort flags) Also added support for the TOR_SOCKS_IPC_PATH environment variable. Consistently use IPC to refer to Unix domain sockets. Renamed preferences: extensions.torlauncher.control_port_use_socket is now extensions.torlauncher.control_port_use_ipc extensions.torlauncher.control_socket_path is now extensions.torlauncher.control_ipc_path Renamed the TOR_CONTROL_SOCKET env variable to TOR_CONTROL_IPC_PATH. Change _strUnescape() to throw and fix hex and octal unescaping. --- src/components/tl-process.js | 31 ++++- src/components/tl-protocol.js | 248 ++++++++++++++++++++++++++++---------- src/defaults/preferences/prefs.js | 27 +++-- src/modules/tl-util.jsm | 30 +++-- 4 files changed, 252 insertions(+), 84 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index db074b4..844aba1 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -330,8 +330,9 @@ TorProcessService.prototype = var torrcDefaultsFile = TorLauncherUtil.getTorFile("torrc-defaults", false); var hashedPassword = this.mProtocolSvc.TorGetPassword(true); - var controlSocketFile = this.mProtocolSvc.TorGetControlSocketFile(); + var controlIPCFile = this.mProtocolSvc.TorGetControlIPCFile(); var controlPort = this.mProtocolSvc.TorGetControlPort(); + var socksPortInfo = this.mProtocolSvc.TorGetSOCKSPortInfo(); var detailsKey; if (!exeFile) @@ -378,10 +379,10 @@ TorProcessService.prototype = args.push(hashedPassword); // Include a ControlPort argument to support switching between - // a TCP port and a Unix domain socket. + // a TCP port and an IPC port (e.g., a Unix domain socket). let controlPortArg; - if (controlSocketFile) - controlPortArg = "unix:" + controlSocketFile.path; + if (controlIPCFile) + controlPortArg = this._ipcPortArg(controlIPCFile); else if (controlPort) controlPortArg = "" + controlPort; if (controlPortArg) @@ -390,6 +391,21 @@ TorProcessService.prototype = args.push(controlPortArg); } + // Include a SocksPort argument to support switching between + // a TCP port and an IPC port (e.g., a Unix domain socket). + if (socksPortInfo) + { + let socksPortArg = (socksPortInfo.ipcFile) + ? this._ipcPortArg(socksPortInfo.ipcFile) + : socksPortInfo.host + ':' + socksPortInfo.port; + let socksPortFlags = TorLauncherUtil.getCharPref( + "extensions.torlauncher.socks_port_flags"); + if (socksPortFlags) + socksPortArg += ' ' + socksPortFlags; + args.push("SocksPort"); + args.push(socksPortArg); + } + var pid = this._getpid(); if (0 != pid) { @@ -454,6 +470,13 @@ TorProcessService.prototype = } }, // _startTor() + // Return a ControlPort or SocksPort argument for aIPCFile (an nsIFile). + // The result is unix:/path or unix:"/path with spaces" with appropriate + // C-style escaping within the path portion. + _ipcPortArg: function(aIPCFile) + { + return "unix:" + this.mProtocolSvc.TorEscapeString(aIPCFile.path); + }, _controlTor: function() { diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index d394b53..12f3910 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -38,10 +38,10 @@ function TorProtocolService() .getService(Ci.nsIEnvironment); // Determine how Tor Launcher will connect to the Tor control port. // Environment variables get top priority followed by preferences. - if (!isWindows && env.exists("TOR_CONTROL_SOCKET")) + if (!isWindows && env.exists("TOR_CONTROL_IPC_PATH")) { - let socketPath = env.get("TOR_CONTROL_SOCKET"); - this.mControlSocketFile = new FileUtils.File(socketPath); + let ipcPath = env.get("TOR_CONTROL_IPC_PATH"); + this.mControlIPCFile = new FileUtils.File(ipcPath); } else { @@ -51,13 +51,10 @@ function TorProtocolService() if (env.exists("TOR_CONTROL_PORT")) this.mControlPort = parseInt(env.get("TOR_CONTROL_PORT"), 10); - let useSocket = !isWindows && TorLauncherUtil.getBoolPref( - "extensions.torlauncher.control_port_use_socket", true); - if (!this.mControlHost && !this.mControlPort && useSocket) - { - this.mControlSocketFile = TorLauncherUtil.getTorFile("control_socket", - false); - } + let useIPC = !isWindows && TorLauncherUtil.getBoolPref( + "extensions.torlauncher.control_port_use_ipc", true); + if (!this.mControlHost && !this.mControlPort && useIPC) + this.mControlIPCFile = TorLauncherUtil.getTorFile("control_ipc", false); else { if (!this.mControlHost) @@ -75,7 +72,9 @@ function TorProtocolService() // Populate mControlPassword so it is available when starting tor. if (env.exists("TOR_CONTROL_PASSWD")) + { this.mControlPassword = env.get("TOR_CONTROL_PASSWD"); + } else if (env.exists("TOR_CONTROL_COOKIE_AUTH_FILE")) { // TODO: test this code path (TOR_CONTROL_COOKIE_AUTH_FILE). @@ -86,6 +85,117 @@ function TorProtocolService() if (!this.mControlPassword) this.mControlPassword = this._generateRandomPassword(); + + // Determine what kind of SOCKS port Tor and the browser will use. + // On Windows (where Unix domain sockets are not supported), TCP is + // always used. + // + // The following environment variables are supported and take + // precedence over preferences: + // TOR_SOCKS_IPC_PATH (file system path; ignored on Windows) + // TOR_SOCKS_HOST + // TOR_SOCKS_PORT + // + // The following preferences are consulted: + // network.proxy.socks + // network.proxy.socks_port + // extensions.torlauncher.socks_port_use_ipc (Boolean) + // extensions.torlauncher.socks_ipc_path (file system path) + // If extensions.torlauncher.socks_ipc_path is empty, a default + // path is used (<tor-data-directory>/socks.socket). + // + // When using TCP, if a value is not defined via an env variable it is + // taken from the corresponding browser preference if possible. The + // exceptions are: + // If network.proxy.socks contains a file: URL, a default value of + // "127.0.0.1" is used instead. + // If the network.proxy.socks_port value is 0, a default value of + // 9150 is used instead. + // + // Supported scenarios: + // 1. By default, an IPC object at a default path is used. + // 2. If extensions.torlauncher.socks_port_use_ipc is set to false, + // a TCP socket at 127.0.0.1:9150 is used, unless different values + // are set in network.proxy.socks and network.proxy.socks_port. + // 3. If the TOR_SOCKS_IPC_PATH env var is set, an IPC object at that + // path is used (e.g., a Unix domain socket). + // 4. If the TOR_SOCKS_HOST and/or TOR_SOCKS_PORT env vars are set, TCP + // is used. Values not set via env vars will be taken from the + // network.proxy.socks and network.proxy.socks_port prefs as described + // above. + // 5. If extensions.torlauncher.socks_port_use_ipc is true and + // extensions.torlauncher.socks_ipc_path is set, an IPC object at + // the specified path is used. + // 6. Tor Launcher is disabled. Torbutton will respect the env vars if + // present; if not, the values in network.proxy.socks and + // network.proxy.socks_port are used without modification. + + let useIPC; + this.mSOCKSPortInfo = { ipcFile: undefined, host: undefined, port: 0 }; + if (!isWindows && env.exists("TOR_SOCKS_IPC_PATH")) + { + let ipcPath = env.get("TOR_SOCKS_IPC_PATH"); + this.mSOCKSPortInfo.ipcFile = new FileUtils.File(ipcPath); + useIPC = true; + } + else + { + // Check for TCP host and port environment variables. + if (env.exists("TOR_SOCKS_HOST")) + { + this.mSOCKSPortInfo.host = env.get("TOR_SOCKS_HOST"); + useIPC = false; + } + if (env.exists("TOR_SOCKS_PORT")) + { + this.mSOCKSPortInfo.port = parseInt(env.get("TOR_SOCKS_PORT"), 10); + useIPC = false; + } + } + + if (useIPC === undefined) + { + useIPC = !isWindows && TorLauncherUtil.getBoolPref( + "extensions.torlauncher.socks_port_use_ipc", true); + } + + // Fill in missing SOCKS info from prefs. + if (useIPC) + { + if (!this.mSOCKSPortInfo.ipcFile) + { + this.mSOCKSPortInfo.ipcFile = + TorLauncherUtil.getTorFile("socks_ipc", false); + } + } + else + { + if (!this.mSOCKSPortInfo.host) + { + let socksAddr = TorLauncherUtil.getCharPref("network.proxy.socks", + "127.0.0.1"); + let socksAddrHasHost = (socksAddr && !socksAddr.startsWith("file:")); + this.mSOCKSPortInfo.host = socksAddrHasHost ? socksAddr : "127.0.0.1"; + } + + if (!this.mSOCKSPortInfo.port) + { + let socksPort = TorLauncherUtil.getIntPref("network.proxy.socks_port", + 0); + this.mSOCKSPortInfo.port = (socksPort != 0) ? socksPort : 9150; + } + } + + TorLauncherLogger.log(3, "SOCKS port type: " + (useIPC ? "IPC" : "TCP")); + if (useIPC) + { + TorLauncherLogger.log(3, "ipcFile: " + this.mSOCKSPortInfo.ipcFile.path); + } + else + { + TorLauncherLogger.log(3, "SOCKS host: " + this.mSOCKSPortInfo.host); + TorLauncherLogger.log(3, "SOCKS port: " + this.mSOCKSPortInfo.port); + } } catch(e) { @@ -164,12 +274,12 @@ TorProtocolService.prototype = kCmdStatusOK: 250, kCmdStatusEventNotification: 650, - TorGetControlSocketFile: function() + TorGetControlIPCFile: function() { - if (!this.mControlSocketFile) + if (!this.mControlIPCFile) return undefined; - return this.mControlSocketFile.clone(); + return this.mControlIPCFile.clone(); }, TorGetControlPort: function() @@ -184,6 +294,18 @@ TorProtocolService.prototype = return (aPleaseHash) ? this._hashPassword(pw) : pw; }, + TorGetSOCKSPortInfo: function() + { + return this.mSOCKSPortInfo; + }, + + // Escape non-ASCII characters for use within the Tor Control protocol. + // Returns a string. + TorEscapeString: function(aStr) + { + return this._strEscape(aStr); + }, + // NOTE: Many Tor protocol functions return a reply object, which is a // a JavaScript object that has the following fields: // reply.statusCode -- integer, e.g., 250 @@ -373,11 +495,13 @@ TorProtocolService.prototype = else { token = tokenAndVal.substring(0, idx); - var valObj = {}; - if (!this._strUnescape(tokenAndVal.substring(idx + 1), valObj)) - continue; // skip this token/value pair. + try + { + val = this._strUnescape(tokenAndVal.substring(idx + 1)); + } catch (e) {} - val = valObj.result; + if (!val) + continue; // skip this token/value pair. } if ("BOOTSTRAP" == token) @@ -548,8 +672,9 @@ TorProtocolService.prototype = mConsoleSvc: null, mControlPort: null, mControlHost: null, - mControlSocketFile: null, // An nsIFile if using a UNIX domain socket. + mControlIPCFile: null, // An nsIFile if using IPC for control port. mControlPassword: null, // JS string that contains hex-encoded password. + mSOCKSPortInfo: null, // An object that contains ipcFile, host, port. mControlConnection: null, // This is cached and reused. mEventMonitorConnection: null, mEventMonitorBuffer: null, @@ -600,27 +725,28 @@ TorProtocolService.prototype = let sts = Cc["@mozilla.org/network/socket-transport-service;1"] .getService(Ci.nsISocketTransportService); let socket; - if (this.mControlSocketFile) + if (this.mControlIPCFile) { - let exists = this.mControlSocketFile.exists(); + let exists = this.mControlIPCFile.exists(); if (!exists) { - TorLauncherLogger.log(5, "Control port socket does not exist: " + - this.mControlSocketFile.path); + TorLauncherLogger.log(5, "Control port IPC object does not exist: " + + this.mControlIPCFile.path); } else { - let isSpecial = this.mControlSocketFile.isSpecial(); + let isSpecial = this.mControlIPCFile.isSpecial(); if (!isSpecial) { - TorLauncherLogger.log(5, "Control port socket is not a socket: " + - this.mControlSocketFile.path); + TorLauncherLogger.log(5, + "Control port IPC object is not a special file: " + + this.mControlIPCFile.path); } else { - TorLauncherLogger.log(2, "Opening control connection to socket " + - this.mControlSocketFile.path); - socket = sts.createUnixDomainTransport(this.mControlSocketFile); + TorLauncherLogger.log(2, "Opening control connection to " + + this.mControlIPCFile.path); + socket = sts.createUnixDomainTransport(this.mControlIPCFile); } } } @@ -855,14 +981,16 @@ TorProtocolService.prototype = } else { - var valObj = {}; - if (!this._strUnescape(line.substring(prefixLen), valObj)) + try { - TorLauncherLogger.safelog(4, "Invalid string within " + aCmd + + let s = this._strUnescape(line.substring(prefixLen)); + tmpArray.push(s); + } + catch (e) + { + TorLauncherLogger.safelog(4, e + " within " + aCmd + " response: ", line); } - else - tmpArray.push(valObj.result); } } @@ -954,25 +1082,20 @@ TorProtocolService.prototype = // Unescape Tor Control string aStr (removing surrounding "" and \ escapes). // Based on Vidalia's src/common/stringutil.cpp:string_unescape(). - // Returns true if successful and sets aResultObj.result. - _strUnescape: function(aStr, aResultObj) + // Returns the unescaped string. Throws upon failure. + // Within Torbutton, the file modules/utils.js also contains a copy of + // _strUnescape(). + _strUnescape: function(aStr) { - if (!aResultObj) - return false; - if (!aStr) - { - aResultObj.result = aStr; - return true; - } + return aStr; var len = aStr.length; if ((len < 2) || ('"' != aStr.charAt(0)) || ('"' != aStr.charAt(len - 1))) - { - aResultObj.result = aStr; - return true; - } + return aStr; + const kHexRE = /[0-9A-Fa-f]{2}/; + const kOctalRE = /[0-7]{3}/; var rv = ""; var i = 1; var lastCharIndex = len - 2; @@ -982,7 +1105,7 @@ TorProtocolService.prototype = if ('\\' == c) { if (++i > lastCharIndex) - return false; // error: \ without next character. + throw new Error("missing character after \\"); c = aStr.charAt(i); if ('n' == c) @@ -994,24 +1117,26 @@ TorProtocolService.prototype = else if ('x' == c) { if ((i + 2) > lastCharIndex) - return false; // error: not enough hex characters. + throw new Error("not enough hex characters"); - var val = parseInt(aStr.substr(i, 2), 16); - if (isNaN(val)) - return false; // error: invalid hex characters. + let s = aStr.substr(i + 1, 2); + if (!kHexRE.test(s)) + throw new Error("invalid hex character"); + let val = parseInt(s, 16); rv += String.fromCharCode(val); - i += 2; + i += 3; } else if (this._isDigit(c)) { - if ((i + 3) > lastCharIndex) - return false; // error: not enough octal characters. + let s = aStr.substr(i, 3); + if ((i + 2) > lastCharIndex) + throw new Error("not enough octal characters"); - var val = parseInt(aStr.substr(i, 3), 8); - if (isNaN(val)) - return false; // error: invalid octal characters. + if (!kOctalRE.test(s)) + throw new Error("invalid octal character"); + let val = parseInt(s, 8); rv += String.fromCharCode(val); i += 3; } @@ -1022,7 +1147,7 @@ TorProtocolService.prototype = } } else if ('"' == c) - return false; // error: unescaped double quote in middle of string. + throw new Error("unescaped \" within string"); else { rv += c; @@ -1031,10 +1156,7 @@ TorProtocolService.prototype = } // Convert from UTF-8 to Unicode. TODO: is UTF-8 always used in protocol? - rv = decodeURIComponent(escape(rv)); - - aResultObj.result = rv; - return true; + return decodeURIComponent(escape(rv)); }, // _strUnescape() // Returns a random 16 character password, hex-encoded. @@ -1188,6 +1310,8 @@ TorProtocolService.prototype = return rv; }, + // Within Torbutton, the file modules/utils.js also contains a copy of + // _isDigit(). _isDigit: function(aChar) { const kRE = /^\d$/; diff --git a/src/defaults/preferences/prefs.js b/src/defaults/preferences/prefs.js index 500fe2f..875c300 100644 --- a/src/defaults/preferences/prefs.js +++ b/src/defaults/preferences/prefs.js @@ -9,17 +9,30 @@ pref("extensions.torlauncher.loglevel", 4); // 1=verbose, 2=debug, 3=info, 4=no pref("extensions.torlauncher.logmethod", 1); // 0=stdout, 1=errorconsole, 2=debuglog pref("extensions.torlauncher.max_tor_log_entries", 1000); -// By default, a Unix domain socket at a default location is used for -// the Tor control port. -// Change control_port_use_socket to false to use a TCP connection -// instead, as defined by control_host and control_port. -// Modify control_socket_path to override the default socket location. If a +// By default, an IPC object (e.g., a Unix domain socket) at a default +// location is used for the Tor control port. +// Change control_port_use_ipc to false to use a TCP connection instead, as +// defined by control_host and control_port. +// Modify control_ipc_path to override the default IPC object location. If a // relative path is used, it is handled like torrc_path (see below). -pref("extensions.torlauncher.control_port_use_socket", true); -pref("extensions.torlauncher.control_socket_path", ""); +pref("extensions.torlauncher.control_port_use_ipc", true); +pref("extensions.torlauncher.control_ipc_path", ""); pref("extensions.torlauncher.control_host", "127.0.0.1"); pref("extensions.torlauncher.control_port", 9151); +// By default, an IPC object (e.g., a Unix domain socket) at a default +// location is used for the Tor SOCKS port. +// Change socks_port_use_ipc to false to use a TCP connection. When a +// TCP connection is used, the host is taken from the network.proxy.socks +// pref and the port is taken from the network.proxy.socks_port pref. +// Modify socks_ipc_path to override the default IPC object location. If a +// relative path is used, it is handled like torrc_path (see below). +// Modify socks_port_flags to use a different set of SocksPort flags (but be +// careful). +pref("extensions.torlauncher.socks_port_use_ipc", true); +pref("extensions.torlauncher.socks_ipc_path", ""); +pref("extensions.torlauncher.socks_port_flags", "IPv6Traffic PreferIPv6 KeepAliveIsolateSOCKSAuth"); + // The tor_path is relative to the application directory. On Linux and // Windows this is the Browser/ directory that contains the firefox // executables, and on Mac OS it is the TorBrowser.app directory. diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index 85b5fbe..a1256fd 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -388,8 +388,8 @@ let TorLauncherUtil = // Public }, // Returns an nsIFile. - // If aTorFileType is "control_socket", aCreate is ignored and there is - // no requirement that the socket exists. + // If aTorFileType is "control_ipc" or "socks_ipc", aCreate is ignored + // and there is no requirement that the IPC object exists. // For all other file types, null is returned if the file does not exist // and it cannot be created (it will be created if aCreate is true). getTorFile: function(aTorFileType, aCreate) @@ -400,7 +400,9 @@ let TorLauncherUtil = // Public let isRelativePath = true; let isUserData = (aTorFileType != "tor") && (aTorFileType != "torrc-defaults"); - let isControlSocket = ("control_socket" == aTorFileType); + let isControlIPC = ("control_ipc" == aTorFileType); + let isSOCKSIPC = ("socks_ipc" == aTorFileType); + let isIPC = isControlIPC || isSOCKSIPC; let prefName = "extensions.torlauncher." + aTorFileType + "_path"; let path = this.getCharPref(prefName); if (path) @@ -435,8 +437,10 @@ let TorLauncherUtil = // Public path = "Tor/torrc"; else if ("tordatadir" == aTorFileType) path = "Tor"; - else if (isControlSocket) + else if (isControlIPC) path = "Tor/control.socket"; + else if (isSOCKSIPC) + path = "Tor/socks.socket"; } else // Linux and others. { @@ -448,8 +452,10 @@ let TorLauncherUtil = // Public path = "Tor/torrc"; else if ("tordatadir" == aTorFileType) path = "Tor"; - else if (isControlSocket) + else if (isControlIPC) path = "Tor/control.socket"; + else if (isSOCKSIPC) + path = "Tor/socks.socket"; } } else if (this.isWindows) @@ -475,8 +481,10 @@ let TorLauncherUtil = // Public path = "Data/Tor/torrc"; else if ("tordatadir" == aTorFileType) path = "Data/Tor"; - else if (isControlSocket) + else if (isControlIPC) path = "Data/Tor/control.socket"; + else if (isSOCKSIPC) + path = "Data/Tor/socks.socket"; } } @@ -508,7 +516,7 @@ let TorLauncherUtil = // Public f.initWithPath(path); } - if (!f.exists() && !isControlSocket && aCreate) + if (!f.exists() && !isIPC && aCreate) { try { @@ -524,10 +532,10 @@ let TorLauncherUtil = // Public } } - // If the file exists or the control socket was requested, normalize - // the path and return a file object. The control socket will be + // If the file exists or an IPC object was requested, normalize the path + // and return a file object. The control and SOCKS IPC objects will be // created by tor. - if (f.exists() || isControlSocket) + if (f.exists() || isIPC) { try { f.normalize(); } catch(e) {} return f; @@ -538,7 +546,7 @@ let TorLauncherUtil = // Public catch(e) { TorLauncherLogger.safelog(4, "getTorFile " + aTorFileType + - " failed for " + path + ": ", e); + " failed for " + path + ": ", e); } return null; // File not found or error (logged above).

1 0

[torbutton/master] Bug 20111: use Unix domain sockets for SOCKS port by default
by gk＠torproject.org 20 Oct '16

20 Oct '16

commit f4980a6c647ea780eacc922846e81c0d992cbd13 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Oct 11 15:37:47 2016 -0400 Bug 20111: use Unix domain sockets for SOCKS port by default Retrieve SOCKS port configuration from Tor Launcher if available. Support the TOR_SOCKS_IPC_PATH environment variable. Consistently use IPC to refer to Unix domain sockets. Enhance torbutton_local_tor_check() to correctly handle spaces and escaped characters within the 'GETINFO net/listeners/socks' response. Within startup-observer.js, use Services.jsm, Cc and similar constants, and remove unused code. --- src/chrome/content/tor-circuit-display.js | 12 +-- src/chrome/content/torbutton.js | 64 +++++++++------- src/components/startup-observer.js | 117 +++++++++++++++++++----------- src/modules/tor-control-port.js | 51 +++++++------ src/modules/utils.js | 101 +++++++++++++++++++++++++- 5 files changed, 242 insertions(+), 103 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index f1cf2aa..c58c6d7 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -6,7 +6,7 @@ // with docco.js to produce pretty documentation. // // This script is to be embedded in torbutton.xul. It defines a single global -// function, createTorCircuitDisplay(socketFile, host, port, password), which +// function, createTorCircuitDisplay(ipcFile, host, port, password), which // activates the automatic Tor circuit display for the current tab and any // future tabs. // @@ -16,9 +16,9 @@ /* global document, gBrowser, Components */ // ### Main function -// __createTorCircuitDisplay(socketFile, host, port, password, enablePrefName)__. +// __createTorCircuitDisplay(ipcFile, host, port, password, enablePrefName)__. // The single function that prepares tor circuit display. Connects to a tor -// control port with the given socketFile or host plus port, and password, and +// control port with the given ipcFile or host plus port, and password, and // binds to a named bool pref whose value determines whether the circuit display // is enabled or disabled. let createTorCircuitDisplay = (function () { @@ -312,11 +312,11 @@ let syncDisplayWithSelectedTab = (function() { // ## Main function -// __setupDisplay(socketFile, host, port, password, enablePrefName)__. +// __setupDisplay(ipcFile, host, port, password, enablePrefName)__. // Once called, the Tor circuit display will be started whenever // the "enablePref" is set to true, and stopped when it is set to false. // A reference to this function (called createTorCircuitDisplay) is exported as a global. -let setupDisplay = function (socketFile, host, port, password, enablePrefName) { +let setupDisplay = function (ipcFile, host, port, password, enablePrefName) { let myController = null, stopCollectingIsolationData = null, stop = function() { @@ -330,7 +330,7 @@ let setupDisplay = function (socketFile, host, port, password, enablePrefName) { }, start = function () { if (!myController) { - myController = controller(socketFile, host, port || 9151, password, + myController = controller(ipcFile, host, port || 9151, password, function (err) { // An error has occurred. logger.eclog(5, err); diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index d2824cb..9a8b9e2 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -10,6 +10,7 @@ let { LoadContextInfo } = Cu.import('resource://gre/modules/LoadContextInfo.jsm'); let { Services } = Cu.import("resource://gre/modules/Services.jsm"); let { showDialog } = Cu.import("resource://torbutton/modules/utils.js"); +let { unescapeTorString } = Cu.import("resource://torbutton/modules/utils.js"); const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion"; const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; @@ -33,9 +34,9 @@ var m_tb_window_width = window.outerWidth; var m_tb_tbb = false; -var m_tb_control_socket_file = null; // Set if using a UNIX domain socket. -var m_tb_control_port = null; // Set if not using a socket. -var m_tb_control_host = null; // Set if not using a socket. +var m_tb_control_ipc_file = null; // Set if using IPC (UNIX domain socket). +var m_tb_control_port = null; // Set if using TCP. +var m_tb_control_host = null; // Set if using TCP. var m_tb_control_pass = null; var m_tb_control_desc = null; // For logging. @@ -327,15 +328,15 @@ function torbutton_init() { m_tb_control_pass = tlps.TorGetPassword(false); } catch(e) {} - // Try to get control port socket (an nsIFile) from Tor Launcher, since - // Tor Launcher knows how to handle its own preferences and how to + // Try to get the control port IPC file (an nsIFile) from Tor Launcher, + // since Tor Launcher knows how to handle its own preferences and how to // resolve relative paths. try { - m_tb_control_socket_file = tlps.TorGetControlSocketFile(); + m_tb_control_ipc_file = tlps.TorGetControlIPCFile(); } catch(e) {} - if (m_tb_control_socket_file) { - m_tb_control_desc = m_tb_control_socket_file.path; + if (m_tb_control_ipc_file) { + m_tb_control_desc = m_tb_control_ipc_file.path; } else { if (environ.exists("TOR_CONTROL_PORT")) { m_tb_control_port = environ.get("TOR_CONTROL_PORT"); @@ -438,7 +439,7 @@ function torbutton_init() { torbutton_notify_if_update_needed(); torbutton_update_sync_ui(); - createTorCircuitDisplay(m_tb_control_socket_file, m_tb_control_host, + createTorCircuitDisplay(m_tb_control_ipc_file, m_tb_control_host, m_tb_control_port, m_tb_control_pass, "extensions.torbutton.display_circuit"); @@ -1009,8 +1010,8 @@ function torbutton_send_ctrl_cmd(command) { let sts = Cc["@mozilla.org/network/socket-transport-service;1"] .getService(Ci.nsISocketTransportService); let socket; - if (m_tb_control_socket_file) { - socket = sts.createUnixDomainTransport(m_tb_control_socket_file); + if (m_tb_control_ipc_file) { + socket = sts.createUnixDomainTransport(m_tb_control_ipc_file); } else { socket = sts.createTransport(null, 0, m_tb_control_host, m_tb_control_port, null); @@ -1350,7 +1351,7 @@ function torbutton_do_new_identity() { torbutton_log(3, "New Identity: Sending NEWNYM"); // We only support TBB for newnym. - if (!m_tb_control_pass || (!m_tb_control_socket_file && !m_tb_control_port)) { + if (!m_tb_control_pass || (!m_tb_control_ipc_file && !m_tb_control_port)) { var warning = torbutton_get_property_string("torbutton.popup.no_newnym"); torbutton_log(5, "Torbutton cannot safely newnym. It does not have access to the Tor Control Port."); window.alert(warning); @@ -1508,7 +1509,7 @@ function torbutton_do_tor_check() const kEnvUseTransparentProxy = "TOR_TRANSPROXY"; var env = Cc["@mozilla.org/process/environment;1"] .getService(Ci.nsIEnvironment); - if ((m_tb_control_socket_file || m_tb_control_port) && + if ((m_tb_control_ipc_file || m_tb_control_port) && !env.exists(kEnvUseTransparentProxy) && !env.exists(kEnvSkipControlPortTest) && m_tb_prefs.getBoolPref("extensions.torbutton.local_tor_check")) { @@ -1559,19 +1560,20 @@ function torbutton_local_tor_check() } // Sample response: net/listeners/socks="127.0.0.1:9149" "127.0.0.1:9150" - // First, check for command argument prefix. + // First, check for and remove the command argument prefix. if (0 != resp.indexOf(kCmdArg + '=')) { logUnexpectedResponse(); return false; } + resp = resp.substr(kCmdArg.length + 1); // Retrieve configured proxy settings and check each listener against them. - // When a Unix domain socket is configured, a file URL should be present in - // network.proxy.socks. + // When the SOCKS prefs are set to use IPC (e.g., a Unix domain socket), a + // file URL should be present in network.proxy.socks. // See: https://bugzilla.mozilla.org/show_bug.cgi?id=1211567 let socksAddr = m_tb_prefs.getCharPref("network.proxy.socks"); let socksPort = m_tb_prefs.getIntPref("network.proxy.socks_port"); - let socketPath; + let socksIPCPath; if (socksAddr && socksAddr.startsWith("file:")) { // Convert the file URL to a file path. try { @@ -1579,19 +1581,29 @@ function torbutton_local_tor_check() .getService(Ci.nsIIOService); let fph = ioService.getProtocolHandler("file") .QueryInterface(Ci.nsIFileProtocolHandler); - socketPath = fph.getFileFromURLSpec(socksAddr).path; + socksIPCPath = fph.getFileFromURLSpec(socksAddr).path; } catch (e) { - torbutton_log(5, "Local Tor check: Unix domain socket error: " + e); + torbutton_log(5, "Local Tor check: IPC file error: " + e); return false; } } else { socksAddr = removeBrackets(socksAddr); } - let addrArray = resp.substr(kCmdArg.length + 1).split(' '); + // Split into quoted strings. This code is adapted from utils.splitAtSpaces() + // within tor-control-port.js; someday this code should use the entire + // tor-control-port.js framework. + let addrArray = []; + resp.replace(/((\S*?"(.*?)")+\S*|\S+)/g, function (a, captured) { + addrArray.push(captured); + }); + let foundSocksListener = false; for (let i = 0; !foundSocksListener && (i < addrArray.length); ++i) { - let addr = addrArray[i]; + let addr; + try { addr = unescapeTorString(addrArray[i]); } catch (e) {} + if (!addr) + continue; // Remove double quotes if present. let len = addr.length; @@ -1599,14 +1611,14 @@ function torbutton_local_tor_check() addr = addr.substring(1, len - 1); if (addr.startsWith("unix:")) { - if (!socketPath) + if (!socksIPCPath) continue; // Check against the configured UNIX domain socket proxy. let path = addr.substring(5); - torbutton_log(2, "Tor socks listener (socket): " + path); - foundSocksListener = (socketPath === path); - } else if (!socketPath) { + torbutton_log(2, "Tor socks listener (Unix domain socket): " + path); + foundSocksListener = (socksIPCPath === path); + } else if (!socksIPCPath) { // Check against the configured TCP proxy. We expect addr:port where addr // may be an IPv6 address; that is, it may contain colon characters. // Also, we remove enclosing square brackets before comparing addresses @@ -2088,7 +2100,7 @@ function torbutton_check_protections() // See https://trac.torproject.org/projects/tor/ticket/10353 for more info. document.getElementById("torbutton-cookie-protector").hidden = m_tb_prefs.getBoolPref("browser.privatebrowsing.autostart"); - if (!m_tb_control_pass || (!m_tb_control_socket_file && !m_tb_control_port)) { + if (!m_tb_control_pass || (!m_tb_control_ipc_file && !m_tb_control_port)) { document.getElementById("torbutton-new-identity").disabled = true; } diff --git a/src/components/startup-observer.js b/src/components/startup-observer.js index f083482..6698b0b 100644 --- a/src/components/startup-observer.js +++ b/src/components/startup-observer.js @@ -15,6 +15,13 @@ const Cc = Components.classes; const Ci = Components.interfaces; const Cr = Components.results; +const Cu = Components.utils; + +Cu.import("resource://gre/modules/Services.jsm"); +Cu.import("resource://gre/modules/XPCOMUtils.jsm"); +XPCOMUtils.defineLazyModuleGetter(this, "FileUtils", + "resource://gre/modules/FileUtils.jsm"); + // Module specific constants const kMODULE_NAME = "Startup"; @@ -22,10 +29,9 @@ const kMODULE_CONTRACTID = "@torproject.org/startup-observer;1"; const kMODULE_CID = Components.ID("06322def-6fde-4c06-aef6-47ae8e799629"); function StartupObserver() { - this.logger = Components.classes["@torproject.org/torbutton-logger;1"] - .getService(Components.interfaces.nsISupports).wrappedJSObject; - this._prefs = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefBranch); + this.logger = Cc["@torproject.org/torbutton-logger;1"] + .getService(Ci.nsISupports).wrappedJSObject; + this._prefs = Services.prefs; this.logger.log(3, "Startup Observer created"); var env = Cc["@mozilla.org/process/environment;1"] @@ -61,41 +67,74 @@ StartupObserver.prototype = { // some weird proxy caching code that showed up in FF15. // Otherwise, homepage domain loads fail forever. setProxySettings: function() { + if (!this.is_tbb) + return; + // Bug 1506: Still want to get these env vars - var environ = Components.classes["@mozilla.org/process/environment;1"] - .getService(Components.interfaces.nsIEnvironment); - - if (environ.exists("TOR_SOCKS_PORT")) { - if (this.is_tbb) { - this._prefs.setIntPref('network.proxy.socks_port', - parseInt(environ.get("TOR_SOCKS_PORT"))); - this._prefs.setBoolPref('network.proxy.socks_remote_dns', true); - this._prefs.setIntPref('network.proxy.type', 1); + let environ = Cc["@mozilla.org/process/environment;1"] + .getService(Ci.nsIEnvironment); + if (environ.exists("TOR_TRANSPROXY")) { + this.logger.log(3, "Resetting Tor settings to transproxy"); + this._prefs.setBoolPref("network.proxy.socks_remote_dns", false); + this._prefs.setIntPref("network.proxy.type", 0); + this._prefs.setIntPref("network.proxy.socks_port", 0); + this._prefs.setCharPref("network.proxy.socks", ""); + } else { + // Try to retrieve SOCKS proxy settings from Tor Launcher. + let socksPortInfo; + try { + let tlps = Cc["@torproject.org/torlauncher-protocol-service;1"] + .getService(Ci.nsISupports).wrappedJSObject; + socksPortInfo = tlps.TorGetSOCKSPortInfo(); + } catch(e) {} + + // If Tor Launcher is not available, check environment variables. + if (!socksPortInfo) { + socksPortInfo = { ipcFile: undefined, host: undefined, port: 0 }; + + let isWindows = Services.appinfo.OS === "WINNT"; + if (!isWindows && environ.exists("TOR_SOCKS_IPC_PATH")) { + socksPortInfo.ipcFile = new FileUtils.File( + environ.get("TOR_SOCKS_IPC_PATH")); + } + else + { + if (environ.exists("TOR_SOCKS_HOST")) + socksPortInfo.host = environ.get("TOR_SOCKS_HOST"); + if (environ.exists("TOR_SOCKS_PORT")) + socksPortInfo.port = parseInt(environ.get("TOR_SOCKS_PORT")); + } } - this.logger.log(3, "Reset socks port to "+environ.get("TOR_SOCKS_PORT")); - } - if (environ.exists("TOR_SOCKS_HOST")) { - if (this.is_tbb) { - this._prefs.setCharPref('network.proxy.socks', environ.get("TOR_SOCKS_HOST")); + // Adjust network.proxy prefs. + if (socksPortInfo.ipcFile) { + let fph = Services.io.getProtocolHandler("file") + .QueryInterface(Ci.nsIFileProtocolHandler); + let fileURI = fph.newFileURI(socksPortInfo.ipcFile); + this.logger.log(3, "Reset socks to "+fileURI.spec); + this._prefs.setCharPref("network.proxy.socks", fileURI.spec); + this._prefs.setIntPref("network.proxy.socks_port", 0); + } else { + if (socksPortInfo.host) { + this._prefs.setCharPref("network.proxy.socks", socksPortInfo.host); + this.logger.log(3, "Reset socks host to "+socksPortInfo.host); + } + if (socksPortInfo.port) { + this._prefs.setIntPref("network.proxy.socks_port", + socksPortInfo.port); + this.logger.log(3, "Reset socks port to "+socksPortInfo.port); + } } - } - if (environ.exists("TOR_TRANSPROXY")) { - this.logger.log(3, "Resetting Tor settings to transproxy"); - if (this.is_tbb) { - this._prefs.setBoolPref('network.proxy.socks_remote_dns', false); - this._prefs.setIntPref('network.proxy.type', 0); - this._prefs.setIntPref('network.proxy.socks_port', 0); - this._prefs.setCharPref('network.proxy.socks', ""); + if (socksPortInfo.ipcFile || socksPortInfo.host || socksPortInfo.port) { + this._prefs.setBoolPref("network.proxy.socks_remote_dns", true); + this._prefs.setIntPref("network.proxy.type", 1); } } // Force prefs to be synced to disk - var prefService = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefService); - prefService.savePrefFile(null); - + this._prefs.savePrefFile(null); + this.logger.log(3, "Synced network settings to environment."); }, @@ -109,16 +148,14 @@ StartupObserver.prototype = { } // In all cases, force prefs to be synced to disk - var prefService = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefService); - prefService.savePrefFile(null); + this._prefs.savePrefFile(null); }, QueryInterface: function(iid) { - if (iid.equals(Components.interfaces.nsISupports)) { + if (iid.equals(Ci.nsISupports)) { return this; } - if(iid.equals(Components.interfaces.nsIClassInfo)) { + if(iid.equals(Ci.nsIClassInfo)) { return this; } return this; @@ -141,12 +178,4 @@ StartupObserver.prototype = { }; -/** -* XPCOMUtils.generateNSGetFactory was introduced in Mozilla 2 (Firefox 4). -* XPCOMUtils.generateNSGetModule is for Mozilla 1.9.2 (Firefox 3.6). -*/ -Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); -if (XPCOMUtils.generateNSGetFactory) - var NSGetFactory = XPCOMUtils.generateNSGetFactory([StartupObserver]); -else - var NSGetModule = XPCOMUtils.generateNSGetModule([StartupObserver]); +var NSGetFactory = XPCOMUtils.generateNSGetFactory([StartupObserver]); diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js index f23daed..a7f0434 100644 --- a/src/modules/tor-control-port.js +++ b/src/modules/tor-control-port.js @@ -10,7 +10,7 @@ // let { controller } = Components.utils.import("path/to/tor-control-port.js"); // // See the last function defined in this file: -// controller(socketFile, host, port, password, onError) +// controller(ipcFile, host, port, password, onError) // for usage of the controller function. /* jshint esnext: true */ @@ -42,18 +42,18 @@ log("Loading tor-control-port.js\n"); // I/O utilities namespace let io = {}; -// __io.asyncSocketStreams(socketFile, host, port)__. +// __io.asyncSocketStreams(ipcFile, host, port)__. // Creates a pair of asynchronous input and output streams for a socket at the -// given socketFile or host and port. -io.asyncSocketStreams = function (socketFile, host, port) { +// given ipcFile or host and port. +io.asyncSocketStreams = function (ipcFile, host, port) { let sts = Cc["@mozilla.org/network/socket-transport-service;1"] .getService(Components.interfaces.nsISocketTransportService), UNBUFFERED = Ci.nsITransport.OPEN_UNBUFFERED; // Create an instance of a socket transport. let socketTransport; - if (socketFile) { - socketTransport = sts.createUnixDomainTransport(socketFile); + if (ipcFile) { + socketTransport = sts.createUnixDomainTransport(ipcFile); } else { socketTransport = sts.createTransport(null, 0, host, port, null); } @@ -99,16 +99,15 @@ io.pumpInputStream = function (inputStream, onInputData, onError) { } }, null); }; -// __io.asyncSocket(socketFile, host, port, onInputData, onError)__. -// Creates an asynchronous, text-oriented UNIX domain socket (if socketFile -// is defined) or TCP socket at host:port. +// __io.asyncSocket(ipcFile, host, port, onInputData, onError)__. +// Creates an asynchronous, text-oriented IPC socket (if ipcFile is defined) +// or a TCP socket at host:port. // The onInputData callback should accept a single argument, which will be called // repeatedly, whenever incoming text arrives. Returns a socket object with two methods: // socket.write(text) and socket.close(). onError will be passed the error object // whenever a write fails. -io.asyncSocket = function (socketFile, host, port, onInputData, onError) { - let [inputStream, outputStream] = io.asyncSocketStreams(socketFile, host, - port), +io.asyncSocket = function (ipcFile, host, port, onInputData, onError) { + let [inputStream, outputStream] = io.asyncSocketStreams(ipcFile, host, port), pendingWrites = []; // Run an input stream pump to send incoming data to the onInputData callback. io.pumpInputStream(inputStream, onInputData, onError); @@ -253,8 +252,8 @@ io.matchRepliesToCommands = function (asyncSend, dispatcher) { }); }; -// __io.controlSocket(socketFile, host, port, password, onError)__. -// Instantiates and returns a socket to a tor ControlPort at socketFile or +// __io.controlSocket(ipcFile, host, port, password, onError)__. +// Instantiates and returns a socket to a tor ControlPort at ipcFile or // host:port, authenticating with the given password. onError is called with an // error object as its single argument whenever an error occurs. Example: // @@ -269,11 +268,11 @@ io.matchRepliesToCommands = function (asyncSend, dispatcher) { // socket.removeNotificationCallback(callback); // // Close the socket permanently // socket.close(); -io.controlSocket = function (socketFile, host, port, password, onError) { +io.controlSocket = function (ipcFile, host, port, password, onError) { // Produce a callback dispatcher for Tor messages. let mainDispatcher = io.callbackDispatcher(), // Open the socket and convert format to Tor messages. - socket = io.asyncSocket(socketFile, host, port, + socket = io.asyncSocket(ipcFile, host, port, io.onDataFromOnLine( io.onLineFromOnMessage(mainDispatcher.pushMessage)), onError), @@ -620,12 +619,12 @@ let tor = {}; // redundant instantiation of control sockets. tor.controllerCache = {}; -// __tor.controller(socketFile, host, port, password, onError)__. -// Creates a tor controller at the given socketFile or host and port, with the +// __tor.controller(ipcFile, host, port, password, onError)__. +// Creates a tor controller at the given ipcFile or host and port, with the // given password. // onError returns asynchronously whenever a connection error occurs. -tor.controller = function (socketFile, host, port, password, onError) { - let socket = io.controlSocket(socketFile, host, port, password, onError), +tor.controller = function (ipcFile, host, port, password, onError) { + let socket = io.controlSocket(ipcFile, host, port, password, onError), isOpen = true; return { getInfo : key => info.getInfo(socket, key), getConf : key => info.getConf(socket, key), @@ -638,11 +637,11 @@ tor.controller = function (socketFile, host, port, password, onError) { // ## Export -// __controller(socketFile, host, port, password, onError)__. +// __controller(ipcFile, host, port, password, onError)__. // Instantiates and returns a controller object connected to a tor ControlPort -// on socketFile or at host:port, authenticating with the given password, if +// on ipcFile or at host:port, authenticating with the given password, if // the controller doesn't yet exist. Otherwise returns the existing controller -// to the given socketFile or host:port. +// to the given ipcFile or host:port. // onError is called with an error object as its single argument whenever // an error occurs. Example: // @@ -653,13 +652,13 @@ tor.controller = function (socketFile, host, port, password, onError) { // let replyPromise = c.getInfo("ip-to-country/16.16.16.16"); // // Close the controller permanently // c.close(); -var controller = function (socketFile, host, port, password, onError) { - let dest = (socketFile) ? "unix:" + socketFile.path : host + ":" + port, +var controller = function (ipcFile, host, port, password, onError) { + let dest = (ipcFile) ? "unix:" + ipcFile.path : host + ":" + port, maybeController = tor.controllerCache[dest]; return (tor.controllerCache[dest] = (maybeController && maybeController.isOpen()) ? maybeController : - tor.controller(socketFile, host, port, password, onError)); + tor.controller(ipcFile, host, port, password, onError)); }; // Export the controller function for external use. diff --git a/src/modules/utils.js b/src/modules/utils.js index 514ef51..b303485 100644 --- a/src/modules/utils.js +++ b/src/modules/utils.js @@ -74,5 +74,104 @@ var showDialog = function (parent, url, name, features) { } }; +// ## Tor control protocol utility functions + +let _torControl = { + // Unescape Tor Control string aStr (removing surrounding "" and \ escapes). + // Based on Vidalia's src/common/stringutil.cpp:string_unescape(). + // Returns the unescaped string. Throws upon failure. + // Within Tor Launcher, the file components/tl-protocol.js also contains a + // copy of _strUnescape(). + _strUnescape: function(aStr) + { + if (!aStr) + return aStr; + + var len = aStr.length; + if ((len < 2) || ('"' != aStr.charAt(0)) || ('"' != aStr.charAt(len - 1))) + return aStr; + + const kHexRE = /[0-9A-Fa-f]{2}/; + const kOctalRE = /[0-7]{3}/; + var rv = ""; + var i = 1; + var lastCharIndex = len - 2; + while (i <= lastCharIndex) + { + var c = aStr.charAt(i); + if ('\\' == c) + { + if (++i > lastCharIndex) + throw new Error("missing character after \\"); + + c = aStr.charAt(i); + if ('n' == c) + rv += '\n'; + else if ('r' == c) + rv += '\r'; + else if ('t' == c) + rv += '\t'; + else if ('x' == c) + { + if ((i + 2) > lastCharIndex) + throw new Error("not enough hex characters"); + + let s = aStr.substr(i + 1, 2); + if (!kHexRE.test(s)) + throw new Error("invalid hex characters"); + + let val = parseInt(s, 16); + rv += String.fromCharCode(val); + i += 3; + } + else if (this._isDigit(c)) + { + let s = aStr.substr(i, 3); + if ((i + 2) > lastCharIndex) + throw new Error("not enough octal characters"); + + if (!kOctalRE.test(s)) + throw new Error("invalid octal characters"); + + let val = parseInt(s, 8); + rv += String.fromCharCode(val); + i += 3; + } + else // "\\" and others + { + rv += c; + ++i; + } + } + else if ('"' == c) + throw new Error("unescaped \" within string"); + else + { + rv += c; + ++i; + } + } + + // Convert from UTF-8 to Unicode. TODO: is UTF-8 always used in protocol? + return decodeURIComponent(escape(rv)); + }, // _strUnescape() + + // Within Tor Launcher, the file components/tl-protocol.js also contains a + // copy of _isDigit(). + _isDigit: function(aChar) + { + const kRE = /^\d$/; + return aChar && kRE.test(aChar); + }, +}; // _torControl + +// __unescapeTorString(str, resultObj)__. +// Unescape Tor Control string str (removing surrounding "" and \ escapes). +// Returns the unescaped string. Throws upon failure. +var unescapeTorString = function(str) { + return _torControl._strUnescape(str); +}; + // Export utility functions for external use. -let EXPORTED_SYMBOLS = ["bindPrefAndInit", "getPrefValue", "getEnv", "showDialog"]; +let EXPORTED_SYMBOLS = ["bindPrefAndInit", "getPrefValue", "getEnv", + "showDialog", "unescapeTorString"];

1 0

[torbutton/master] Bug 20394: Remove obsolete code
by gk＠torproject.org 20 Oct '16

20 Oct '16

commit 70e5f3b26c7e4d22158b02757681170ac0daadf5 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Oct 18 11:29:27 2016 -0700 Bug 20394: Remove obsolete code --- src/chrome/content/contents.rdf | 50 ------------------------------------ src/chrome/content/torbutton.js | 23 ++--------------- src/chrome/content/torbutton_util.js | 8 +----- src/chrome/skin/contents.rdf | 45 -------------------------------- 4 files changed, 3 insertions(+), 123 deletions(-) diff --git a/src/chrome/content/contents.rdf b/src/chrome/content/contents.rdf deleted file mode 100644 index c7afa3a..0000000 --- a/src/chrome/content/contents.rdf +++ /dev/null @@ -1,50 +0,0 @@ - -<?xml version="1.0"?> - -<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:chrome="http://www.mozilla.org/rdf/chrome#"> - - <Seq about="urn:mozilla:package:root"> - <li resource="urn:mozilla:package:torbutton"/> - </Seq> - - <Description about="urn:mozilla:package:torbutton" - chrome:athor="Scott Squires" - chrome:displayName="Torbutton" - chrome:extension="true" - chrome:name="torbutton"> - </Description> - - <Seq about="urn:mozilla:overlays"> -  - <li resource="chrome://browser/content/browser.xul"/> - <li resource="chrome://browser/content/pref/pref-connection.xul"/> -  - <li resource="chrome://messenger/content/messenger.xul"/> - <li resource="chrome://messenger/content/messengercompose/messengercompose.xul"/> -  - <li resource="chrome://torbutton/content/torbutton.xul"/> - </Seq> - -  - <Seq about="chrome://browser/content/browser.xul"> - <li>chrome://torbutton/content/torbutton.xul</li> - </Seq> - <Seq about="chrome://browser/content/pref/pref-connection.xul"> - <li>chrome://torbutton/content/pref-connection.xul</li> - </Seq> - -  - <Seq about="chrome://messenger/content/messenger.xul"> - <li>chrome://torbutton/content/torbutton_tb.xul</li> - </Seq> - <Seq about="chrome://messenger/content/messengercompose/messengercompose.xul"> - <li>chrome://torbutton/content/torbutton_tb.xul</li> - </Seq> - -  - <Seq about="chrome://torbutton/content/torbutton.xul"> - <li>chrome://torbutton/content/popup.xul</li> - </Seq> - -</RDF> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 3c05047..d2824cb 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1,4 +1,4 @@ -// Bug 1506 P0-P5: This is the main Torbutton overlay file. Much needs to be +// Bug 1506 P1-P5: This is the main Torbutton overlay file. Much needs to be // preserved here, but in an ideal world, most of this code should perhaps be // moved into an XPCOM service, and much can also be tossed. See also // individual 1506 comments for details. @@ -2110,25 +2110,6 @@ function torbutton_open_prefs_dialog() { torbutton_log(2, 'opened preferences window'); } -// Bug 1506 P0: Support code for checking Firefox versions. Not needed. -function torbutton_gecko_compare(aVersion) { - var ioService = Components.classes["@mozilla.org/network/io-service;1"] - .getService(Components.interfaces.nsIIOService); - var httpProtocolHandler = ioService.getProtocolHandler("http") - .QueryInterface(Components.interfaces.nsIHttpProtocolHandler); - var versionComparator = null; - - if ("nsIVersionComparator" in Components.interfaces) { - versionComparator = Components.classes["@mozilla.org/xpcom/version-comparator;1"] - .getService(Components.interfaces.nsIVersionComparator); - } else { - versionComparator = Components.classes["@mozilla.org/updates/version-checker;1"] - .getService(Components.interfaces.nsIVersionChecker); - } - var geckoVersion = httpProtocolHandler.misc.match(/rv:([0-9.]+)/)[1]; - return versionComparator.compare(aVersion, geckoVersion); -} - // -------------- HISTORY & COOKIES --------------------- // Bug 1506 P4: Used by New Identity if cookie protections are @@ -2321,7 +2302,7 @@ function torbutton_do_startup() } } -// Bug 1506 P0: Perform version check when a new tab is opened. +// Perform version check when a new tab is opened. function torbutton_new_tab(event) { // listening for new tabs diff --git a/src/chrome/content/torbutton_util.js b/src/chrome/content/torbutton_util.js index f1263f1..e6de768 100644 --- a/src/chrome/content/torbutton_util.js +++ b/src/chrome/content/torbutton_util.js @@ -1,4 +1,4 @@ -// Bug 1506 P0-P3: These utility functions might be useful, but +// Bug 1506 P1-P3: These utility functions might be useful, but // you probably just want to rewrite them or use the underlying // code directly. I don't see any of them as essential for 1506, // really. @@ -8,12 +8,6 @@ var m_tb_torlog = Components.classes["@torproject.org/torbutton-logger;1"] var m_tb_string_bundle = torbutton_get_stringbundle(); -// Bug 1506 P0: Use the log service directly -function torbutton_eclog(nLevel, sMsg) { - m_tb_torlog.eclog(nLevel, sMsg); - return true; -} - function torbutton_safelog(nLevel, sMsg, scrub) { m_tb_torlog.safe_log(nLevel, sMsg, scrub); return true; diff --git a/src/chrome/skin/contents.rdf b/src/chrome/skin/contents.rdf deleted file mode 100644 index 53bde17..0000000 --- a/src/chrome/skin/contents.rdf +++ /dev/null @@ -1,45 +0,0 @@ - -<?xml version="1.0"?> - -<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:chrome="http://www.mozilla.org/rdf/chrome#"> - - <Seq about="urn:mozilla:skin:root"> - <li resource="urn:mozilla:skin:classic/1.0"/> - </Seq> - - <Description about="urn:mozilla:skin:classic/1.0"> - <chrome:packages> - <Seq about="urn:mozilla:skin:classic/1.0:packages"> - <li resource="urn:mozilla:skin:classic/1.0:torbutton"/> - </Seq> - </chrome:packages> - </Description> - - <Seq about="urn:mozilla:stylesheets"> - <li resource="chrome://global/content/customizeToolbar.xul"/> -  - <li resource="chrome://browser/content/browser.xul"/> -  - <li resource="chrome://messenger/content/messenger.xul"/> - <li resource="chrome://messenger/content/messengercompose/messengercompose.xul"/> - </Seq> - - <Seq about="chrome://global/content/customizeToolbar.xul"> - <li>chrome://torbutton/skin/torbutton.css</li> - </Seq> - -  - <Seq about="chrome://browser/content/browser.xul"> - <li>chrome://torbutton/skin/torbutton.css</li> - </Seq> - -  - <Seq about="chrome://messenger/content/messenger.xul"> - <li>chrome://torbutton/skin/torbutton.css</li> - </Seq> - <Seq about="chrome://messenger/content/messengercompose/messengercompose.xul"> - <li>chrome://torbutton/skin/torbutton.css</li> - </Seq> - -</RDF>

1 0

[tor-browser/tor-browser-45.4.0esr-6.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 19 Oct '16

19 Oct '16

commit 62d6468cedbdd1ae08b1e4a7192184c3aa92137c Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Oct 18 18:10:41 2016 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Fixes #20399 by removing obsolete preferences related to our font fingerprinting defense. --- browser/app/profile/000-tor-browser.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 13af485..1f1db9e 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -112,8 +112,6 @@ pref("webgl.disable-extensions", true); pref("webgl.disable-fail-if-major-performance-caveat", true); pref("dom.battery.enabled", false); // fingerprinting due to differing OS implementations pref("dom.network.enabled",false); // fingerprinting due to differing OS implementations -pref("browser.display.max_font_attempts",10); -pref("browser.display.max_font_count",10); pref("gfx.downloadable_fonts.fallback_delay", -1); pref("general.appname.override", "Netscape"); pref("general.appversion.override", "5.0 (Windows)");

1 0

[torbutton/master] Bug 20399: Remove obsolete font attempt prefs
by gk＠torproject.org 19 Oct '16

19 Oct '16

commit 2d88aa4d7239c3d386c69396c8d0d40ddd23a952 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Oct 18 17:23:45 2016 -0700 Bug 20399: Remove obsolete font attempt prefs --- src/chrome/content/torbutton.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 5b03ba0..3c05047 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1746,12 +1746,6 @@ function torbutton_update_fingerprinting_prefs() { if (m_tb_tbb) { if (mode) { - // Use TBB pref defaults for these two. - if(m_tb_prefs.prefHasUserValue("browser.display.max_font_attempts")) - m_tb_prefs.clearUserPref("browser.display.max_font_attempts"); - if(m_tb_prefs.prefHasUserValue("browser.display.max_font_count")) - m_tb_prefs.clearUserPref("browser.display.max_font_count"); - // Governed also by the spoof_english dialog.. if (m_tb_prefs.getBoolPref("extensions.torbutton.spoof_english")) { m_tb_prefs.setCharPref("intl.accept_languages", "en-US, en"); @@ -1762,9 +1756,6 @@ function torbutton_update_fingerprinting_prefs() { m_tb_prefs.setBoolPref("javascript.use_us_english_locale", false); } } else { - m_tb_prefs.setIntPref("browser.display.max_font_attempts",-1); - m_tb_prefs.setIntPref("browser.display.max_font_count",-1); - if(m_tb_prefs.prefHasUserValue("intl.accept_languages")) m_tb_prefs.clearUserPref("intl.accept_languages"); }

1 0

[torbutton/master] Bug 20388: Consolidate Services.prefs references
by gk＠torproject.org 18 Oct '16

18 Oct '16

commit 2cef75462d4a7f640b4586c0cd50b6679b9fc7ae Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Oct 17 14:21:36 2016 -0700 Bug 20388: Consolidate Services.prefs references --- src/chrome/content/torbutton.js | 76 ++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 47 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index fa4009a..5b03ba0 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -18,9 +18,10 @@ const k_tb_tor_check_failed_topic = "Torbutton:TorCheckFailed"; const k_tb_tor_resize_warn_pref = "extensions.torbutton.startup_resize_period" +var m_tb_prefs = Services.prefs; + // status var m_tb_wasinited = false; -var m_tb_prefs = false; var m_tb_plugin_string = false; var m_tb_is_main_window = false; var m_tb_hidden_browser = false; @@ -50,16 +51,12 @@ var torbutton_window_pref_observer = { register: function() { - var pref_service = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefBranchInternal); - this._branch = pref_service.QueryInterface(Components.interfaces.nsIPrefBranchInternal); - this._branch.addObserver("extensions.torbutton", this, false); + m_tb_prefs.addObserver("extensions.torbutton", this, false); }, unregister: function() { - if (!this._branch) return; - this._branch.removeObserver("extensions.torbutton", this); + m_tb_prefs.removeObserver("extensions.torbutton", this); }, // topic: what event occurred @@ -84,21 +81,18 @@ var torbutton_unique_pref_observer = register: function() { this.forced_ua = false; - var pref_service = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefBranchInternal); - this._branch = pref_service.QueryInterface(Components.interfaces.nsIPrefBranchInternal); - this._branch.addObserver("extensions.torbutton", this, false); - this._branch.addObserver("network.cookie", this, false); - this._branch.addObserver("browser.privatebrowsing.autostart", this, false); - this._branch.addObserver("javascript", this, false); - this._branch.addObserver("gfx", this, false); - this._branch.addObserver("noscript", this, false); - this._branch.addObserver("media", this, false); - this._branch.addObserver("mathml", this, false); - this._branch.addObserver("svg", this, false); - this._branch.addObserver("plugin.disable", this, false); - this._branch.addObserver("privacy.thirdparty.isolate", this, false); - this._branch.addObserver("privacy.resistFingerprinting", this, false); + m_tb_prefs.addObserver("extensions.torbutton", this, false); + m_tb_prefs.addObserver("network.cookie", this, false); + m_tb_prefs.addObserver("browser.privatebrowsing.autostart", this, false); + m_tb_prefs.addObserver("javascript", this, false); + m_tb_prefs.addObserver("gfx", this, false); + m_tb_prefs.addObserver("noscript", this, false); + m_tb_prefs.addObserver("media", this, false); + m_tb_prefs.addObserver("mathml", this, false); + m_tb_prefs.addObserver("svg", this, false); + m_tb_prefs.addObserver("plugin.disable", this, false); + m_tb_prefs.addObserver("privacy.thirdparty.isolate", this, false); + m_tb_prefs.addObserver("privacy.resistFingerprinting", this, false); // We observe xpcom-category-entry-added for plugins w/ Gecko-Content-Viewers var observerService = Cc["@mozilla.org/observer-service;1"]. @@ -108,16 +102,15 @@ var torbutton_unique_pref_observer = unregister: function() { - if (!this._branch) return; - this._branch.removeObserver("extensions.torbutton", this); - this._branch.removeObserver("network.cookie", this); - this._branch.removeObserver("browser.privatebrowsing.autostart", this); - this._branch.removeObserver("javascript", this); - this._branch.removeObserver("gfx", this); - this._branch.removeObserver("noscript", this); - this._branch.removeObserver("media", this); - this._branch.removeObserver("mathml", this); - this._branch.removeObserver("svg", this); + m_tb_prefs.removeObserver("extensions.torbutton", this); + m_tb_prefs.removeObserver("network.cookie", this); + m_tb_prefs.removeObserver("browser.privatebrowsing.autostart", this); + m_tb_prefs.removeObserver("javascript", this); + m_tb_prefs.removeObserver("gfx", this); + m_tb_prefs.removeObserver("noscript", this); + m_tb_prefs.removeObserver("media", this); + m_tb_prefs.removeObserver("mathml", this); + m_tb_prefs.removeObserver("svg", this); var observerService = Cc["@mozilla.org/observer-service;1"]. getService(Ci.nsIObserverService); @@ -281,9 +274,6 @@ function torbutton_init() { } m_tb_wasinited = true; - m_tb_prefs = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefBranch); - // Determine if we are running inside Tor Browser. var cur_version; try { @@ -1342,9 +1332,7 @@ function torbutton_do_new_identity() { torbutton_log(3, "New Identity: Syncing prefs"); // Force prefs to be synced to disk - var prefService = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefService); - prefService.savePrefFile(null); + m_tb_prefs.savePrefFile(null); torbutton_log(3, "New Identity: Clearing permissions"); @@ -1750,9 +1738,7 @@ function torbutton_update_disk_prefs() { } catch (e) {} // Force prefs to be synced to disk - var prefService = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefService); - prefService.savePrefFile(null); + m_tb_prefs.savePrefFile(null); } function torbutton_update_fingerprinting_prefs() { @@ -1797,9 +1783,7 @@ function torbutton_update_fingerprinting_prefs() { // XXX: How do we undo timezone? // Force prefs to be synced to disk - var prefService = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefService); - prefService.savePrefFile(null); + m_tb_prefs.savePrefFile(null); } function torbutton_update_thirdparty_prefs() { @@ -1815,9 +1799,7 @@ function torbutton_update_thirdparty_prefs() { m_tb_prefs.setBoolPref("security.enable_tls_session_tickets", !isolate); // Force prefs to be synced to disk - var prefService = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefService); - prefService.savePrefFile(null); + m_tb_prefs.savePrefFile(null); } var torbutton_sec_ml_bool_prefs = {

1 0

[tor-browser-bundle/master] Bug 20184: OS X builds are still not reproducible
by gk＠torproject.org 18 Oct '16

18 Oct '16

commit 04a9af0eb1e6466ce6a7007a46d73fb7a38442e8 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Oct 9 11:12:43 2016 +0000 Bug 20184: OS X builds are still not reproducible We ecountered on some machines failures to reproduce OS X builds. The investigation seems to indicate that our old toolchain plays a crucial role in this. This patch replaces this old toolchain with a more modern clang/cctools for building the tor part of the bundle. Resorting to `faketime` again was necessary to cope with inserted timestamps. --- gitian/descriptors/mac/gitian-tor.yml | 44 +++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index f2f4b01..ee1d848 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -4,19 +4,21 @@ distro: "debian" suites: - "wheezy" architectures: -- "i386" +- "amd64" packages: - "unzip" - "automake" +- "faketime" - "zip" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor.git" "dir": "tor" files: -- "versions" +- "clang-linux64-wheezy-utils.zip" +- "cctools.tar.gz" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" -- "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" +- "versions" - "dzip.sh" - "openssl-mac64-utils.zip" - "libevent-mac64-utils.zip" @@ -33,35 +35,47 @@ script: | fi export TZ=UTC export LC_ALL=C - export REFERENCE_DATETIME + export FAKETIME=$REFERENCE_DATETIME umask 0022 # mkdir -p $INSTDIR/bin/ mkdir -p $TORBINDIR/ mkdir -p $TORCONFIGDIR/ mkdir -p $OUTDIR/ - # - # dpkg requires sbin directories in the PATH - export PATH="/usr/sbin:/sbin:$PATH" - sudo dpkg -i *.deb - tar xaf multiarch-darwin*tar.xz - export PATH="$PATH:$HOME/build/apple-osx/bin/" + + # Extracting and copying all the necessary utilities and libraries. We still + # need the 10.6 SDK if we want to support OSX 10.6. + ar x apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb + tar xaf data.tar.gz + tar xaf cctools.tar.gz + unzip clang-linux64-wheezy-utils.zip unzip -d $INSTDIR openssl-mac64-utils.zip unzip -d $INSTDIR libevent-mac64-utils.zip cp $INSTDIR/libevent/lib/libevent-*.dylib $TORBINDIR/ LIBEVENT_FILE=`basename $INSTDIR/libevent/lib/libevent-*.dylib` + # Setting the proper flags and variables + # ld needs libLTO.so from llvm + export LD_LIBRARY_PATH="/home/debian/build/clang/lib" + export PATH="/home/debian/build/cctools/bin:$PATH" + CROSS_CCTOOLS_PATH="/home/debian/build/cctools" + CROSS_SYSROOT="/home/debian/build/usr/lib/apple/SDKs/MacOSX10.6.sdk" + FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT" + export CC="/home/debian/build/clang/bin/clang $FLAGS" + export CXX="/home/debian/build/clang/bin/clang++ $FLAGS" + export CPP="/home/debian/build/clang/bin/clang $FLAGS -E" + export LLVMCONFIG="/home/debian/build/clang/bin/llvm-config" + export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-dead_strip" + # Building tor - # XXX Clean up these flags? - export CFLAGS="-m64 -I${INSTDIR}/openssl/include -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" - export LDFLAGS="-m64 -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" cd tor git update-index --refresh -q mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src ./autogen.sh find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - ./configure --enable-static-openssl --disable-asciidoc --host=i686-apple-darwin11 --with-libevent-dir=$INSTDIR/libevent --with-openssl-dir=$INSTDIR/openssl --prefix=$INSTDIR + ./configure --enable-static-openssl --disable-asciidoc --host=x86_64-apple-darwin10 --with-libevent-dir=$INSTDIR/libevent --with-openssl-dir=$INSTDIR/openssl --prefix=$INSTDIR + export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 make $MAKEOPTS make install cd $INSTDIR @@ -69,7 +83,7 @@ script: | cp share/tor/geoip $TORCONFIGDIR/ cp share/tor/geoip6 $TORCONFIGDIR/ cd $TORBINDIR/ - i686-apple-darwin11-install_name_tool -change $INSTDIR/libevent/lib/$LIBEVENT_FILE @executable_path/$LIBEVENT_FILE tor + x86_64-apple-darwin10-install_name_tool -change $INSTDIR/libevent/lib/$LIBEVENT_FILE @executable_path/$LIBEVENT_FILE tor # Grabbing the result cd $INSTDIR

1 0

[torbutton/master] Bug 18093: Remove 'Restore Defaults' button
by gk＠torproject.org 17 Oct '16

17 Oct '16

commit 7a0efdf6a99969007792d418a6bbfd5e0da4b3cf Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Oct 6 21:58:50 2016 -0700 Bug 18093: Remove 'Restore Defaults' button --- src/chrome/content/preferences.js | 57 ------------------------------------ src/chrome/content/preferences.xul | 4 +-- src/chrome/content/torbutton_util.js | 24 --------------- src/chrome/locale/en/torbutton.dtd | 1 - 4 files changed, 1 insertion(+), 85 deletions(-) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index 28f5955..1d85cde 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -54,63 +54,6 @@ function torbutton_prefs_save(doc) { } } -function torbutton_prefs_reset_defaults() { - var o_torprefs = torbutton_get_prefbranch('extensions.torbutton.'); - var tmpcnt = new Object(); - var children; - var i; - var loglevel = o_torprefs.getIntPref("loglevel"); - var logmthd = o_torprefs.getIntPref("logmethod"); - - torbutton_log(3, "Starting Pref reset"); - - // 1. Clear torbutton settings - // 2. Clear browser proxy settings - // 3. Reset Security Slider settings - - // XXX Warning: The only reason this works is because of Firefox's - // threading model. As soon as a pref is changed, all observers - // are notified by that same thread, immediately. Since torbutton's - // security state is driven by proxy pref observers, this - // causes everything to be reset in a linear order. If firefox - // ever makes pref observers asynchonous, this will all break. - - children = o_torprefs.getChildList("" , tmpcnt); - for(i = 0; i < children.length; i++) { - if(o_torprefs.prefHasUserValue(children[i])) - o_torprefs.clearUserPref(children[i]); - } - - // Keep logging the same. - o_torprefs.setIntPref("loglevel", loglevel); - o_torprefs.setIntPref("logmethod", logmthd); - - torbutton_log(3, "Resetting browser prefs"); - - // Reset browser prefs that torbutton touches just in case - // they get horked. Better everything gets set back to default - // than some arcane pref gets wedged with no clear way to fix it. - // Technical users who tuned these by themselves will be able to fix it. - // It's the non-technical ones we should make it easy for - torbutton_reset_browser_prefs(); - - // Resetting the Security Slider preferences - var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"] - .getService(Components.interfaces.nsIWindowMediator); - var win = wm.getMostRecentWindow("navigator:browser"); - o_torprefs.setBoolPref('security_custom', false); - o_torprefs.setIntPref('security_slider', 4); - win.torbutton_update_security_slider(); - - torbutton_log(4, "Preferences reset to defaults"); - torbutton_prefs_init(window.document); - - // In all cases, force prefs to be synced to disk - var prefService = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefService); - prefService.savePrefFile(null); -} - function torbutton_toggle_slider(doc, pos) { doc.getElementById("torbutton_sec_slider").value = pos; // Make sure the custom checkbox is unchecked as the user seems to want one diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index 62f649f..574932e 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -8,9 +8,7 @@ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml" title="&torbutton.prefs.security_settings;" - buttons="accept,cancel,extra1" - buttonlabelextra1="&torbutton.prefs.restore_defaults;" - ondialogextra1="torbutton_prefs_reset_defaults();" + buttons="accept,cancel" persist="screenX screenY width height" onload="torbutton_prefs_init(document)" align="stretch" diff --git a/src/chrome/content/torbutton_util.js b/src/chrome/content/torbutton_util.js index 1558ced..f1263f1 100644 --- a/src/chrome/content/torbutton_util.js +++ b/src/chrome/content/torbutton_util.js @@ -52,30 +52,6 @@ function torbutton_get_prefbranch(branch_name) { return o_branch; } -// Bug 1506 P3: This would be a semi-polite thing to do on uninstall -// for pure Firefox users. The most polite thing would be to save -// all their original prefs.. But meh? -function torbutton_reset_browser_prefs() { - var o_all_prefs = torbutton_get_prefbranch(''); - var prefs = ["network.http.sendSecureXSiteReferrer", - "network.http.sendRefererHeader", "dom.storage.enabled", - "extensions.update.enabled", "app.update.enabled", - "app.update.auto", "browser.search.update", - "browser.cache.memory.enable", "network.http.use-cache", - "browser.cache.disk.enable", "browser.safebrowsing.enabled", - "browser.send_pings", "browser.safebrowsing.remoteLookups", - "network.security.ports.banned", "browser.search.suggest.enabled", - "security.enable_java", "browser.history_expire_days", - "browser.download.manager.retention", "browser.formfill.enable", - "signon.rememberSignons", "plugin.disable_full_page_plugin_for_types", - "browser.bookmarks.livemark_refresh_seconds", - "network.cookie.lifetimePolicy" ]; - for(var i = 0; i < prefs.length; i++) { - if(o_all_prefs.prefHasUserValue(prefs[i])) - o_all_prefs.clearUserPref(prefs[i]); - } -} - // load localization strings function torbutton_get_stringbundle() { diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 0ea18e5..56f663e 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -12,7 +12,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.security_settings "Security Settings"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host">

1 0

[tor-browser-bundle/master] Revert "Bug 13893: Make Tor Browser compatible with EMET"
by gk＠torproject.org 17 Oct '16

17 Oct '16

commit 48b0c33bf651baaaa972e81490b3896dd332437e Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 17 11:52:19 2016 +0000 Revert "Bug 13893: Make Tor Browser compatible with EMET" This reverts commit 0348263efd1cb8a9eca8737f3dc7734ef75e0966. Firefox is not ready for GCC 6 yet. See #20381 for further details. --- gitian/descriptors/windows/gitian-utils.yml | 7 - gitian/patches/gcc_62_1.patch | 23 - gitian/patches/gcc_62_2.patch | 1198 --------------------------- gitian/versions.alpha | 6 +- gitian/versions.nightly | 6 +- 5 files changed, 6 insertions(+), 1234 deletions(-) diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index d3598e2..9c31834 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -35,8 +35,6 @@ files: - "nsis.tar.bz2" - "nsis-debian.tar.xz" - "nsis-missing-unistd-include.patch" -- "gcc_62_1.patch" -- "gcc_62_2.patch" script: | INSTDIR="$HOME/install" source versions @@ -81,11 +79,6 @@ script: | mkdir gcc cd gcc tar -xjvf ../gcc.tar.bz2 - cd gcc-* - # Workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77459. - patch -p1 < ~/build/gcc_62_1.patch - patch -p1 < ~/build/gcc_62_2.patch - cd .. # We don't want to link against msvcrt.dll due to bug 9084. i686-w64-mingw32-g++ -dumpspecs > ~/build/msvcr100.spec sed 's/msvcrt/msvcr100/' -i ~/build/msvcr100.spec diff --git a/gitian/patches/gcc_62_1.patch b/gitian/patches/gcc_62_1.patch deleted file mode 100644 index 7ca36d8..0000000 --- a/gitian/patches/gcc_62_1.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 1ec6206ea80ceb5df843ea0bc4ef04d9ab17257e Mon Sep 17 00:00:00 2001 -From: Georg Koppen <gk(a)torproject.org> -Date: Wed, 14 Sep 2016 12:53:19 +0000 -Subject: [PATCH 1/2] Revert "2015-09-17 Catherine Moore - <clm(a)codesourcery.com>" - -This reverts commit a63a17505346bb3a91ce3de6fe238264c4d849ac. - -diff --git a/libstdc++-v3/src/c++11/debug.cc b/libstdc++-v3/src/c++11/debug.cc -index f25304c..308802e 100644 ---- a/libstdc++-v3/src/c++11/debug.cc -+++ b/libstdc++-v3/src/c++11/debug.cc -@@ -32,7 +32,6 @@ - #include <debug/safe_local_iterator.h> - - #include <cassert> --#include <cstdio> - - #include <algorithm> // for std::min - #include <functional> // for _Hash_impl --- -2.9.3 - diff --git a/gitian/patches/gcc_62_2.patch b/gitian/patches/gcc_62_2.patch deleted file mode 100644 index 7dbd826..0000000 --- a/gitian/patches/gcc_62_2.patch +++ /dev/null @@ -1,1198 +0,0 @@ -From 0fbc32fdb5e0119877b0fd608d8855af0e4e376e Mon Sep 17 00:00:00 2001 -From: Georg Koppen <gk(a)torproject.org> -Date: Wed, 14 Sep 2016 12:54:30 +0000 -Subject: [PATCH 2/2] =?UTF-8?q?Revert=20"2015-09-17=20=20Fran=C3=A7ois=20D?= - =?UTF-8?q?umont=20=20<fdumont(a)gcc.gnu.org>"?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This reverts commit 426075db14da88357dd104345b5edea369f1d5c6. - -diff --git a/libstdc++-v3/include/debug/formatter.h b/libstdc++-v3/include/debug/formatter.h -index 72db612..7d4f027 100644 ---- a/libstdc++-v3/include/debug/formatter.h -+++ b/libstdc++-v3/include/debug/formatter.h -@@ -132,13 +132,6 @@ namespace __gnu_debug - - class _Error_formatter - { -- // Tags denoting the type of parameter for construction -- struct _Is_iterator { }; -- struct _Is_iterator_value_type { }; -- struct _Is_sequence { }; -- struct _Is_instance { }; -- -- public: - /// Whether an iterator is constant, mutable, or unknown - enum _Constness - { -@@ -160,6 +153,13 @@ namespace __gnu_debug - __last_state - }; - -+ // Tags denoting the type of parameter for construction -+ struct _Is_iterator { }; -+ struct _Is_iterator_value_type { }; -+ struct _Is_sequence { }; -+ struct _Is_instance { }; -+ -+ public: - // A parameter that may be referenced by an error message - struct _Parameter - { -@@ -375,16 +375,15 @@ namespace __gnu_debug - - void - _M_print_field(const _Error_formatter* __formatter, -- const char* __name) const _GLIBCXX_DEPRECATED; -+ const char* __name) const; - - void -- _M_print_description(const _Error_formatter* __formatter) -- const _GLIBCXX_DEPRECATED; -+ _M_print_description(const _Error_formatter* __formatter) const; - }; - - template<typename _Iterator> -- _Error_formatter& -- _M_iterator(const _Iterator& __it, const char* __name = 0) -+ const _Error_formatter& -+ _M_iterator(const _Iterator& __it, const char* __name = 0) const - { - if (_M_num_parameters < std::size_t(__max_parameters)) - _M_parameters[_M_num_parameters++] = _Parameter(__it, __name, -@@ -393,59 +392,57 @@ namespace __gnu_debug - } - - template<typename _Iterator> -- _Error_formatter& -+ const _Error_formatter& - _M_iterator_value_type(const _Iterator& __it, -- const char* __name = 0) -+ const char* __name = 0) const - { -- if (_M_num_parameters < __max_parameters) -+ if (_M_num_parameters < std::size_t(__max_parameters)) - _M_parameters[_M_num_parameters++] = - _Parameter(__it, __name, _Is_iterator_value_type()); - return *this; - } - -- _Error_formatter& -- _M_integer(long __value, const char* __name = 0) -+ const _Error_formatter& -+ _M_integer(long __value, const char* __name = 0) const - { -- if (_M_num_parameters < __max_parameters) -+ if (_M_num_parameters < std::size_t(__max_parameters)) - _M_parameters[_M_num_parameters++] = _Parameter(__value, __name); - return *this; - } - -- _Error_formatter& -- _M_string(const char* __value, const char* __name = 0) -+ const _Error_formatter& -+ _M_string(const char* __value, const char* __name = 0) const - { -- if (_M_num_parameters < __max_parameters) -+ if (_M_num_parameters < std::size_t(__max_parameters)) - _M_parameters[_M_num_parameters++] = _Parameter(__value, __name); - return *this; - } - - template<typename _Sequence> -- _Error_formatter& -- _M_sequence(const _Sequence& __seq, const char* __name = 0) -+ const _Error_formatter& -+ _M_sequence(const _Sequence& __seq, const char* __name = 0) const - { -- if (_M_num_parameters < __max_parameters) -+ if (_M_num_parameters < std::size_t(__max_parameters)) - _M_parameters[_M_num_parameters++] = _Parameter(__seq, __name, - _Is_sequence()); - return *this; - } - - template<typename _Type> -- _Error_formatter& -- _M_instance(const _Type& __inst, const char* __name = 0) -+ const _Error_formatter& -+ _M_instance(const _Type& __inst, const char* __name = 0) const - { -- if (_M_num_parameters < __max_parameters) -+ if (_M_num_parameters < std::size_t(__max_parameters)) - _M_parameters[_M_num_parameters++] = _Parameter(__inst, __name, - _Is_instance()); - return *this; - } - -- _Error_formatter& -- _M_message(const char* __text) -+ const _Error_formatter& -+ _M_message(const char* __text) const - { _M_text = __text; return *this; } - -- // Kept const qualifier for backward compatibility, to keep the same -- // exported symbol. -- _Error_formatter& -+ const _Error_formatter& - _M_message(_Debug_msg_id __id) const throw (); - - _GLIBCXX_NORETURN void -@@ -453,38 +450,40 @@ namespace __gnu_debug - - template<typename _Tp> - void -- _M_format_word(char*, int, const char*, _Tp) -- const throw () _GLIBCXX_DEPRECATED; -+ _M_format_word(char*, int, const char*, _Tp) const throw (); - - void -- _M_print_word(const char* __word) const _GLIBCXX_DEPRECATED; -+ _M_print_word(const char* __word) const; - - void -- _M_print_string(const char* __string) const _GLIBCXX_DEPRECATED; -+ _M_print_string(const char* __string) const; - - private: -- _Error_formatter(const char* __file, unsigned int __line) -- : _M_file(__file), _M_line(__line), _M_num_parameters(0), _M_text(0) -- { } -+ _Error_formatter(const char* __file, std::size_t __line) -+ : _M_file(__file), _M_line(__line), _M_num_parameters(0), _M_text(0), -+ _M_max_length(78), _M_column(1), _M_first_line(true), _M_wordwrap(false) -+ { _M_get_max_length(); } - - void -- _M_get_max_length() const throw () _GLIBCXX_DEPRECATED; -+ _M_get_max_length() const throw (); - - enum { __max_parameters = 9 }; - - const char* _M_file; -- unsigned int _M_line; -- _Parameter _M_parameters[__max_parameters]; -- unsigned int _M_num_parameters; -- const char* _M_text; -+ std::size_t _M_line; -+ mutable _Parameter _M_parameters[__max_parameters]; -+ mutable std::size_t _M_num_parameters; -+ mutable const char* _M_text; -+ mutable std::size_t _M_max_length; -+ enum { _M_indent = 4 } ; -+ mutable std::size_t _M_column; -+ mutable bool _M_first_line; -+ mutable bool _M_wordwrap; - - public: -- static _Error_formatter& -- _M_at(const char* __file, unsigned int __line) -- { -- static _Error_formatter __formatter(__file, __line); -- return __formatter; -- } -+ static _Error_formatter -+ _M_at(const char* __file, std::size_t __line) -+ { return _Error_formatter(__file, __line); } - }; - } // namespace __gnu_debug - -diff --git a/libstdc++-v3/src/c++11/debug.cc b/libstdc++-v3/src/c++11/debug.cc -index 308802e..8f7eaa3 100644 ---- a/libstdc++-v3/src/c++11/debug.cc -+++ b/libstdc++-v3/src/c++11/debug.cc -@@ -22,19 +22,18 @@ - // see the files COPYING3 and COPYING.RUNTIME respectively. If not, see - // <http://www.gnu.org/licenses/>. - --#include <bits/move.h> --#include <bits/stl_iterator_base_types.h> -- --#include <debug/formatter.h> -+#include <debug/debug.h> - #include <debug/safe_base.h> - #include <debug/safe_unordered_base.h> - #include <debug/safe_iterator.h> - #include <debug/safe_local_iterator.h> -- -+#include <algorithm> - #include <cassert> -- --#include <algorithm> // for std::min --#include <functional> // for _Hash_impl -+#include <cstring> -+#include <cctype> -+#include <cstdio> -+#include <cstdlib> -+#include <functional> - - #include <cxxabi.h> // for __cxa_demangle - -@@ -525,123 +524,37 @@ namespace __gnu_debug - - namespace - { -- using _Error_formatter = __gnu_debug::_Error_formatter; -- using _Parameter = __gnu_debug::_Error_formatter::_Parameter; -- -- template<typename _Tp> -- int -- format_word(char* buf, int n, const char* fmt, _Tp s) -- { return std::min(__builtin_snprintf(buf, n, fmt, s), n - 1); } -- -- void -- get_max_length(std::size_t& max_length) -- { -- const char* nptr = std::getenv("GLIBCXX_DEBUG_MESSAGE_LENGTH"); -- if (nptr) -- { -- char* endptr; -- const unsigned long ret = std::strtoul(nptr, &endptr, 0); -- if (*nptr != '\0' && *endptr == '\0') -- max_length = ret; -- } -- } -- -- struct PrintContext -- { -- PrintContext() -- : _M_max_length(78), _M_column(1), _M_first_line(true), _M_wordwrap(false) -- { get_max_length(_M_max_length); } -- -- std::size_t _M_max_length; -- enum { _M_indent = 4 } ; -- std::size_t _M_column; -- bool _M_first_line; -- bool _M_wordwrap; -- }; -- -- void -- print_word(PrintContext& ctx, const char* word, -- std::ptrdiff_t count = -1) -- { -- size_t length = count >= 0 ? count : __builtin_strlen(word); -- if (length == 0) -- return; -- -- // Consider first '\n' at begining cause it impacts column. -- if (word[0] == '\n') -- { -- fprintf(stderr, "\n"); -- ctx._M_column = 1; -- ++word; -- --length; -- -- if (length == 0) -- return; -- } -- -- size_t visual_length -- = isspace(word[length - 1]) ? length - 1 : length; -- if (visual_length == 0 -- || !ctx._M_wordwrap -- || (ctx._M_column + visual_length < ctx._M_max_length) -- || (visual_length >= ctx._M_max_length && ctx._M_column == 1)) -- { -- // If this isn't the first line, indent -- if (ctx._M_column == 1 && !ctx._M_first_line) -- { -- char spacing[ctx._M_indent + 1]; -- for (int i = 0; i < ctx._M_indent; ++i) -- spacing[i] = ' '; -- spacing[ctx._M_indent] = '\0'; -- fprintf(stderr, "%s", spacing); -- ctx._M_column += ctx._M_indent; -- } -- -- int written = fprintf(stderr, "%s", word); -- -- if (word[length - 1] == '\n') -- { -- ctx._M_first_line = false; -- ctx._M_column = 1; -- } -- else -- ctx._M_column += written; -- } -- else -- { -- print_word(ctx, "\n", 1); -- print_word(ctx, word, count); -- } -- } -- - void -- print_type(PrintContext& ctx, -- const type_info* info, -- const char* unknown_name) -+ print_type(const __gnu_debug::_Error_formatter* __formatter, -+ const type_info* __info, -+ const char* __unknown_name) - { -- if (!info) -- print_word(ctx, unknown_name); -+ if (!__info) -+ __formatter->_M_print_word(__unknown_name); - else - { -- int status; -- char* demangled_name = -- __cxxabiv1::__cxa_demangle(info->name(), NULL, NULL, &status); -- print_word(ctx, status == 0 ? demangled_name : info->name()); -- free(demangled_name); -+ int __status; -+ char* __demangled_name = -+ __cxxabiv1::__cxa_demangle(__info->name(), NULL, NULL, &__status); -+ __formatter->_M_print_word(__status == 0 -+ ? __demangled_name : __info->name()); -+ free(__demangled_name); - } - } - - bool -- print_field(PrintContext& ctx, -- const char* name, const _Parameter::_Type& type) -+ print_field( -+ const __gnu_debug::_Error_formatter* __formatter, -+ const char* __name, -+ const __gnu_debug::_Error_formatter::_Parameter::_Type& __variant) - { -- if (__builtin_strcmp(name, "name") == 0) -+ if (strcmp(__name, "name") == 0) - { -- assert(type._M_name); -- print_word(ctx, type._M_name); -+ assert(__variant._M_name); -+ __formatter->_M_print_word(__variant._M_name); - } -- else if (__builtin_strcmp(name, "type") == 0) -- print_type(ctx, type._M_type, "<unknown type>"); -+ else if (strcmp(__name, "type") == 0) -+ print_type(__formatter, __variant._M_type, "<unknown type>"); - else - return false; - -@@ -649,17 +562,21 @@ namespace - } - - bool -- print_field(PrintContext& ctx, -- const char* name, const _Parameter::_Instance& inst) -+ print_field( -+ const __gnu_debug::_Error_formatter* __formatter, -+ const char* __name, -+ const __gnu_debug::_Error_formatter::_Parameter::_Instance& __variant) - { -- const _Parameter::_Type& type = inst; -- if (print_field(ctx, name, type)) -+ const __gnu_debug::_Error_formatter::_Parameter::_Type& __type = __variant; -+ if (print_field(__formatter, __name, __type)) - { } -- else if (__builtin_strcmp(name, "address") == 0) -+ else if (strcmp(__name, "address") == 0) - { -- char buf[64]; -- int ret = __builtin_sprintf(buf, "%p", inst._M_address); -- print_word(ctx, buf, ret); -+ const int __bufsize = 64; -+ char __buf[__bufsize]; -+ __formatter->_M_format_word(__buf, __bufsize, "%p", -+ __variant._M_address); -+ __formatter->_M_print_word(__buf); - } - else - return false; -@@ -668,390 +585,278 @@ namespace - } - - void -- print_field(PrintContext& ctx, const _Parameter& param, const char* name) -- { -- assert(param._M_kind != _Parameter::__unused_param); -- const int bufsize = 64; -- char buf[bufsize]; -- -- const auto& variant = param._M_variant; -- switch (param._M_kind) -- { -- case _Parameter::__iterator: -- { -- const auto& iterator = variant._M_iterator; -- if (print_field(ctx, name, iterator)) -- { } -- else if (__builtin_strcmp(name, "constness") == 0) -- { -- static const char* -- constness_names[_Error_formatter::__last_constness] = -- { -- "<unknown>", -- "constant", -- "mutable" -- }; -- print_word(ctx, constness_names[iterator._M_constness]); -- } -- else if (__builtin_strcmp(name, "state") == 0) -- { -- static const char* -- state_names[_Error_formatter::__last_state] = -- { -- "<unknown>", -- "singular", -- "dereferenceable (start-of-sequence)", -- "dereferenceable", -- "past-the-end", -- "before-begin" -- }; -- print_word(ctx, state_names[iterator._M_state]); -- } -- else if (__builtin_strcmp(name, "sequence") == 0) -- { -- assert(iterator._M_sequence); -- int written = __builtin_sprintf(buf, "%p", iterator._M_sequence); -- print_word(ctx, buf, written); -- } -- else if (__builtin_strcmp(name, "seq_type") == 0) -- print_type(ctx, iterator._M_seq_type, "<unknown seq_type>"); -- else -- assert(false); -- } -- break; -- -- case _Parameter::__sequence: -- if (!print_field(ctx, name, variant._M_sequence)) -- assert(false); -- break; -- -- case _Parameter::__integer: -- if (__builtin_strcmp(name, "name") == 0) -- { -- assert(variant._M_integer._M_name); -- print_word(ctx, variant._M_integer._M_name); -- } -- else -- assert(false); -- break; -- -- case _Parameter::__string: -- if (__builtin_strcmp(name, "name") == 0) -- { -- assert(variant._M_string._M_name); -- print_word(ctx, variant._M_string._M_name); -- } -- else -- assert(false); -- break; -- -- case _Parameter::__instance: -- if (!print_field(ctx, name, variant._M_instance)) -- assert(false); -- break; -- -- case _Parameter::__iterator_value_type: -- if (!print_field(ctx, name, variant._M_iterator_value_type)) -- assert(false); -- break; -- -- default: -- assert(false); -- break; -- } -- } -- -- void -- print_description(PrintContext& ctx, const _Parameter::_Type& type) -+ print_description( -+ const __gnu_debug::_Error_formatter* __formatter, -+ const __gnu_debug::_Error_formatter::_Parameter::_Type& __variant) - { -- if (type._M_name) -+ if (__variant._M_name) - { -- const int bufsize = 64; -- char buf[bufsize]; -- int written -- = format_word(buf, bufsize, "\"%s\"", type._M_name); -- print_word(ctx, buf, written); -+ const int __bufsize = 64; -+ char __buf[__bufsize]; -+ __formatter->_M_format_word(__buf, __bufsize, "\"%s\"", -+ __variant._M_name); -+ __formatter->_M_print_word(__buf); - } - -- print_word(ctx, " {\n"); -+ __formatter->_M_print_word(" {\n"); - -- if (type._M_type) -+ if (__variant._M_type) - { -- print_word(ctx, " type = "); -- print_type(ctx, type._M_type, "<unknown type>"); -- print_word(ctx, ";\n"); -+ __formatter->_M_print_word(" type = "); -+ print_type(__formatter, __variant._M_type, "<unknown type>"); -+ __formatter->_M_print_word(";\n"); - } - } - -+ - void -- print_description(PrintContext& ctx, const _Parameter::_Instance& inst) -+ print_description( -+ const __gnu_debug::_Error_formatter* __formatter, -+ const __gnu_debug::_Error_formatter::_Parameter::_Instance& __variant) - { -- const int bufsize = 64; -- char buf[bufsize]; -+ const int __bufsize = 64; -+ char __buf[__bufsize]; - -- if (inst._M_name) -+ if (__variant._M_name) - { -- int written -- = format_word(buf, bufsize, "\"%s\" ", inst._M_name); -- print_word(ctx, buf, written); -+ __formatter->_M_format_word(__buf, __bufsize, "\"%s\" ", -+ __variant._M_name); -+ __formatter->_M_print_word(__buf); - } - -- int written -- = __builtin_sprintf(buf, "@ 0x%p {\n", inst._M_address); -- print_word(ctx, buf, written); -+ __formatter->_M_format_word(__buf, __bufsize, "@ 0x%p {\n", -+ __variant._M_address); -+ __formatter->_M_print_word(__buf); - -- if (inst._M_type) -+ if (__variant._M_type) - { -- print_word(ctx, " type = "); -- print_type(ctx, inst._M_type, "<unknown type>"); -+ __formatter->_M_print_word(" type = "); -+ print_type(__formatter, __variant._M_type, "<unknown type>"); - } - } -+} - -+namespace __gnu_debug -+{ - void -- print_description(PrintContext& ctx, const _Parameter& param) -+ _Error_formatter::_Parameter:: -+ _M_print_field(const _Error_formatter* __formatter, const char* __name) const - { -- const int bufsize = 128; -- char buf[bufsize]; -+ assert(this->_M_kind != _Parameter::__unused_param); -+ const int __bufsize = 64; -+ char __buf[__bufsize]; - -- const auto& variant = param._M_variant; -- switch (param._M_kind) -- { -- case _Parameter::__iterator: -+ switch (_M_kind) -+ { -+ case __iterator: -+ if (print_field(__formatter, __name, _M_variant._M_iterator)) -+ { } -+ else if (strcmp(__name, "constness") == 0) - { -- const auto& ite = variant._M_iterator; -- -- print_word(ctx, "iterator "); -- print_description(ctx, ite); -- -- if (ite._M_type) -- { -- if (ite._M_constness != _Error_formatter::__unknown_constness) -- { -- print_word(ctx, " ("); -- print_field(ctx, param, "constness"); -- print_word(ctx, " iterator)"); -- } -- -- print_word(ctx, ";\n"); -- } -- -- if (ite._M_state != _Error_formatter::__unknown_state) -+ static const char* __constness_names[__last_constness] = - { -- print_word(ctx, " state = "); -- print_field(ctx, param, "state"); -- print_word(ctx, ";\n"); -- } -- -- if (ite._M_sequence) -+ "<unknown>", -+ "constant", -+ "mutable" -+ }; -+ __formatter->_M_print_word(__constness_names[_M_variant. -+ _M_iterator. -+ _M_constness]); -+ } -+ else if (strcmp(__name, "state") == 0) -+ { -+ static const char* __state_names[__last_state] = - { -- print_word(ctx, " references sequence "); -- if (ite._M_seq_type) -- { -- print_word(ctx, "with type '"); -- print_field(ctx, param, "seq_type"); -- print_word(ctx, "' "); -- } -- -- int written -- = __builtin_sprintf(buf, "@ 0x%p\n", ite._M_sequence); -- print_word(ctx, buf, written); -- } -- -- print_word(ctx, "}\n", 2); -+ "<unknown>", -+ "singular", -+ "dereferenceable (start-of-sequence)", -+ "dereferenceable", -+ "past-the-end", -+ "before-begin" -+ }; -+ __formatter->_M_print_word(__state_names[_M_variant. -+ _M_iterator._M_state]); - } -- break; -- -- case _Parameter::__sequence: -- print_word(ctx, "sequence "); -- print_description(ctx, variant._M_sequence); -- -- if (variant._M_sequence._M_type) -- print_word(ctx, ";\n", 2); -- -- print_word(ctx, "}\n", 2); -- break; -- -- case _Parameter::__instance: -- print_word(ctx, "instance "); -- print_description(ctx, variant._M_instance); -- -- if (variant._M_instance._M_type) -- print_word(ctx, ";\n", 2); -- -- print_word(ctx, "}\n", 2); -- break; -- -- case _Parameter::__iterator_value_type: -- print_word(ctx, "iterator::value_type "); -- print_description(ctx, variant._M_iterator_value_type); -- print_word(ctx, "}\n", 2); -- break; -- -- default: -- break; -- } -+ else if (strcmp(__name, "sequence") == 0) -+ { -+ assert(_M_variant._M_iterator._M_sequence); -+ __formatter->_M_format_word(__buf, __bufsize, "%p", -+ _M_variant._M_iterator._M_sequence); -+ __formatter->_M_print_word(__buf); -+ } -+ else if (strcmp(__name, "seq_type") == 0) -+ print_type(__formatter, _M_variant._M_iterator._M_seq_type, -+ "<unknown seq_type>"); -+ else -+ assert(false); -+ break; -+ case __sequence: -+ if (!print_field(__formatter, __name, _M_variant._M_sequence)) -+ assert(false); -+ break; -+ case __integer: -+ if (strcmp(__name, "name") == 0) -+ { -+ assert(_M_variant._M_integer._M_name); -+ __formatter->_M_print_word(_M_variant._M_integer._M_name); -+ } -+ else -+ assert(false); -+ break; -+ case __string: -+ if (strcmp(__name, "name") == 0) -+ { -+ assert(_M_variant._M_string._M_name); -+ __formatter->_M_print_word(_M_variant._M_string._M_name); -+ } -+ else -+ assert(false); -+ break; -+ case __instance: -+ if (!print_field(__formatter, __name, _M_variant._M_instance)) -+ assert(false); -+ break; -+ case __iterator_value_type: -+ if (!print_field(__formatter, __name, _M_variant._M_iterator_value_type)) -+ assert(false); -+ break; -+ default: -+ assert(false); -+ break; -+ } - } - - void -- print_string(PrintContext& ctx, const char* string, -- const _Parameter* parameters, std::size_t num_parameters) -+ _Error_formatter::_Parameter:: -+ _M_print_description(const _Error_formatter* __formatter) const - { -- const char* start = string; -- const int bufsize = 128; -- char buf[bufsize]; -- int bufindex = 0; -+ const int __bufsize = 128; -+ char __buf[__bufsize]; - -- while (*start) -+ switch (_M_kind) - { -- if (isspace(*start)) -- { -- buf[bufindex++] = *start++; -- buf[bufindex] = '\0'; -- print_word(ctx, buf, bufindex); -- bufindex = 0; -- continue; -- } -+ case __iterator: -+ __formatter->_M_print_word("iterator "); -+ print_description(__formatter, _M_variant._M_iterator); - -- if (*start != '%') -+ if (_M_variant._M_iterator._M_type) - { -- // Normal char. -- buf[bufindex++] = *start++; -- continue; -- } -- -- if (*++start == '%') -- { -- // Escaped '%' -- buf[bufindex++] = *start++; -- continue; -+ if (_M_variant._M_iterator._M_constness != __unknown_constness) -+ { -+ __formatter->_M_print_word(" ("); -+ _M_print_field(__formatter, "constness"); -+ __formatter->_M_print_word(" iterator)"); -+ } -+ __formatter->_M_print_word(";\n"); - } - -- // We are on a parameter property reference, we need to flush buffer -- // first. -- if (bufindex != 0) -+ if (_M_variant._M_iterator._M_state != __unknown_state) - { -- buf[bufindex] = '\0'; -- print_word(ctx, buf, bufindex); -- bufindex = 0; -+ __formatter->_M_print_word(" state = "); -+ _M_print_field(__formatter, "state"); -+ __formatter->_M_print_word(";\n"); - } - -- // Get the parameter number -- assert(*start >= '1' && *start <= '9'); -- size_t param_index = *start - '0' - 1; -- assert(param_index < num_parameters); -- const auto& param = parameters[param_index]; -- -- // '.' separates the parameter number from the field -- // name, if there is one. -- ++start; -- if (*start != '.') -+ if (_M_variant._M_iterator._M_sequence) - { -- assert(*start == ';'); -- ++start; -- if (param._M_kind == _Parameter::__integer) -+ __formatter->_M_print_word(" references sequence "); -+ if (_M_variant._M_iterator._M_seq_type) - { -- int written -- = __builtin_sprintf(buf, "%ld", -- param._M_variant._M_integer._M_value); -- print_word(ctx, buf, written); -+ __formatter->_M_print_word("with type `"); -+ _M_print_field(__formatter, "seq_type"); -+ __formatter->_M_print_word("' "); - } -- else if (param._M_kind == _Parameter::__string) -- print_string(ctx, param._M_variant._M_string._M_value, -- parameters, num_parameters); -- continue; -- } - -- // Extract the field name we want -- const int max_field_len = 16; -- char field[max_field_len]; -- int field_idx = 0; -- ++start; -- while (*start != ';') -- { -- assert(*start); -- assert(field_idx < max_field_len - 1); -- field[field_idx++] = *start++; -+ __formatter->_M_format_word(__buf, __bufsize, "@ 0x%p\n", -+ _M_variant._M_iterator._M_sequence); -+ __formatter->_M_print_word(__buf); - } -- ++start; -- field[field_idx] = '\0'; - -- print_field(ctx, param, field); -- } -+ __formatter->_M_print_word("}\n"); -+ break; -+ case __sequence: -+ __formatter->_M_print_word("sequence "); -+ print_description(__formatter, _M_variant._M_sequence); - -- // Might need to flush. -- if (bufindex) -- { -- buf[bufindex] = '\0'; -- print_word(ctx, buf, bufindex); -+ if (_M_variant._M_sequence._M_type) -+ __formatter->_M_print_word(";\n"); -+ -+ __formatter->_M_print_word("}\n"); -+ break; -+ case __instance: -+ __formatter->_M_print_word("instance "); -+ print_description(__formatter, _M_variant._M_instance); -+ -+ if (_M_variant._M_instance._M_type) -+ __formatter->_M_print_word(";\n"); -+ -+ __formatter->_M_print_word("}\n"); -+ break; -+ case __iterator_value_type: -+ __formatter->_M_print_word("iterator::value_type "); -+ print_description(__formatter, _M_variant._M_iterator_value_type); -+ __formatter->_M_print_word("}\n"); -+ break; -+ default: -+ break; - } - } --} - --namespace __gnu_debug --{ -- _Error_formatter& -+ const _Error_formatter& - _Error_formatter::_M_message(_Debug_msg_id __id) const throw () -- { -- return const_cast<_Error_formatter*>(this) -- ->_M_message(_S_debug_messages[__id]); -- } -+ { return this->_M_message(_S_debug_messages[__id]); } - - void - _Error_formatter::_M_error() const - { -- const int bufsize = 128; -- char buf[bufsize]; -+ const int __bufsize = 128; -+ char __buf[__bufsize]; - - // Emit file & line number information -- bool go_to_next_line = false; -- PrintContext ctx; -+ _M_column = 1; -+ _M_wordwrap = false; - if (_M_file) - { -- int written = format_word(buf, bufsize, "%s:", _M_file); -- print_word(ctx, buf, written); -- go_to_next_line = true; -+ _M_format_word(__buf, __bufsize, "%s:", _M_file); -+ _M_print_word(__buf); -+ _M_column += strlen(__buf); - } - - if (_M_line > 0) - { -- int written = __builtin_sprintf(buf, "%u:", _M_line); -- print_word(ctx, buf, written); -- go_to_next_line = true; -+ _M_format_word(__buf, __bufsize, "%u:", _M_line); -+ _M_print_word(__buf); -+ _M_column += strlen(__buf); - } - -- if (go_to_next_line) -- print_word(ctx, "\n", 1); -- -- if (ctx._M_max_length) -- ctx._M_wordwrap = true; -- -- print_word(ctx, "Error: "); -+ if (_M_max_length) -+ _M_wordwrap = true; -+ _M_print_word("error: "); - - // Print the error message - assert(_M_text); -- print_string(ctx, _M_text, _M_parameters, _M_num_parameters); -- print_word(ctx, ".\n", 2); -+ _M_print_string(_M_text); -+ _M_print_word(".\n"); - - // Emit descriptions of the objects involved in the operation -- ctx._M_first_line = true; -- ctx._M_wordwrap = false; -- bool has_header = false; -- for (unsigned int i = 0; i < _M_num_parameters; ++i) -+ _M_wordwrap = false; -+ bool __has_noninteger_parameters = false; -+ for (unsigned int __i = 0; __i < _M_num_parameters; ++__i) - { -- switch (_M_parameters[i]._M_kind) -+ switch (_M_parameters[__i]._M_kind) - { - case _Parameter::__iterator: - case _Parameter::__sequence: - case _Parameter::__instance: - case _Parameter::__iterator_value_type: -- if (!has_header) -+ if (!__has_noninteger_parameters) - { -- print_word(ctx, "\nObjects involved in the operation:\n"); -- has_header = true; -+ _M_first_line = true; -+ _M_print_word("\nObjects involved in the operation:\n"); -+ __has_noninteger_parameters = true; - } -- print_description(ctx, _M_parameters[i]); -+ _M_parameters[__i]._M_print_description(this); - break; -- - default: - break; - } -@@ -1060,39 +865,172 @@ namespace __gnu_debug - abort(); - } - -- // Deprecated methods kept for backward compatibility. -- void -- _Error_formatter::_Parameter::_M_print_field( -- const _Error_formatter*, const char*) const -- { } -- -- void -- _Error_formatter::_Parameter::_M_print_description(const _Error_formatter*) const -- { } -- - template<typename _Tp> - void -- _Error_formatter::_M_format_word(char*, int, const char*, _Tp) -- const throw () -- { } -+ _Error_formatter::_M_format_word(char* __buf, -+ int __n __attribute__ ((__unused__)), -+ const char* __fmt, _Tp __s) const throw () -+ { -+#ifdef _GLIBCXX_USE_C99 -+ std::snprintf(__buf, __n, __fmt, __s); -+#else -+ std::sprintf(__buf, __fmt, __s); -+#endif -+ } - - void -- _Error_formatter::_M_print_word(const char*) const -- { } -+ _Error_formatter::_M_print_word(const char* __word) const -+ { -+ if (!_M_wordwrap) -+ { -+ fprintf(stderr, "%s", __word); -+ return; -+ } -+ -+ size_t __length = strlen(__word); -+ if (__length == 0) -+ return; -+ -+ size_t __visual_length -+ = __word[__length - 1] == '\n' ? __length - 1 : __length; -+ if (__visual_length == 0 -+ || (_M_column + __visual_length < _M_max_length) -+ || (__visual_length >= _M_max_length && _M_column == 1)) -+ { -+ // If this isn't the first line, indent -+ if (_M_column == 1 && !_M_first_line) -+ { -+ char __spacing[_M_indent + 1]; -+ for (int i = 0; i < _M_indent; ++i) -+ __spacing[i] = ' '; -+ __spacing[_M_indent] = '\0'; -+ fprintf(stderr, "%s", __spacing); -+ _M_column += _M_indent; -+ } -+ -+ fprintf(stderr, "%s", __word); -+ -+ if (__word[__length - 1] == '\n') -+ { -+ _M_first_line = false; -+ _M_column = 1; -+ } -+ else -+ _M_column += __length; -+ } -+ else -+ { -+ _M_print_word("\n"); -+ _M_print_word(__word); -+ } -+ } - - void -- _Error_formatter::_M_print_string(const char*) const -- { } -+ _Error_formatter:: -+ _M_print_string(const char* __string) const -+ { -+ const char* __start = __string; -+ const char* __finish = __start; -+ const int __bufsize = 128; -+ char __buf[__bufsize]; -+ -+ while (*__start) -+ { -+ if (*__start != '%') -+ { -+ // [__start, __finish) denotes the next word -+ __finish = __start; -+ while (isalnum(*__finish)) -+ ++__finish; -+ if (__start == __finish) -+ ++__finish; -+ if (isspace(*__finish)) -+ ++__finish; -+ -+ const ptrdiff_t __len = __finish - __start; -+ assert(__len < __bufsize); -+ memcpy(__buf, __start, __len); -+ __buf[__len] = '\0'; -+ _M_print_word(__buf); -+ __start = __finish; -+ -+ // Skip extra whitespace -+ while (*__start == ' ') -+ ++__start; -+ -+ continue; -+ } -+ -+ ++__start; -+ assert(*__start); -+ if (*__start == '%') -+ { -+ _M_print_word("%"); -+ ++__start; -+ continue; -+ } -+ -+ // Get the parameter number -+ assert(*__start >= '1' && *__start <= '9'); -+ size_t __param_index = *__start - '0' - 1; -+ assert(__param_index < _M_num_parameters); -+ const auto& __param = _M_parameters[__param_index]; -+ -+ // '.' separates the parameter number from the field -+ // name, if there is one. -+ ++__start; -+ if (*__start != '.') -+ { -+ assert(*__start == ';'); -+ ++__start; -+ __buf[0] = '\0'; -+ if (__param._M_kind == _Parameter::__integer) -+ { -+ _M_format_word(__buf, __bufsize, "%ld", -+ __param._M_variant._M_integer._M_value); -+ _M_print_word(__buf); -+ } -+ else if (__param._M_kind == _Parameter::__string) -+ _M_print_string(__param._M_variant._M_string._M_value); -+ continue; -+ } -+ -+ // Extract the field name we want -+ enum { __max_field_len = 16 }; -+ char __field[__max_field_len]; -+ int __field_idx = 0; -+ ++__start; -+ while (*__start != ';') -+ { -+ assert(*__start); -+ assert(__field_idx < __max_field_len-1); -+ __field[__field_idx++] = *__start++; -+ } -+ ++__start; -+ __field[__field_idx] = 0; -+ -+ __param._M_print_field(this, __field); -+ } -+ } - - void - _Error_formatter::_M_get_max_length() const throw () -- { } -+ { -+ const char* __nptr = std::getenv("GLIBCXX_DEBUG_MESSAGE_LENGTH"); -+ if (__nptr) -+ { -+ char* __endptr; -+ const unsigned long __ret = std::strtoul(__nptr, &__endptr, 0); -+ if (*__nptr != '\0' && *__endptr == '\0') -+ _M_max_length = __ret; -+ } -+ } - - // Instantiations. - template - void - _Error_formatter::_M_format_word(char*, int, const char*, -- const void*) const; -+ const void*) const; - - template - void -@@ -1101,10 +1039,10 @@ namespace __gnu_debug - template - void - _Error_formatter::_M_format_word(char*, int, const char*, -- std::size_t) const; -+ std::size_t) const; - - template - void - _Error_formatter::_M_format_word(char*, int, const char*, -- const char*) const; -+ const char*) const; - } // namespace __gnu_debug --- -2.9.3 - diff --git a/gitian/versions.alpha b/gitian/versions.alpha index f0b32d9..898e781 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -25,7 +25,7 @@ LIBEVENT_TAG=release-2.0.22-stable CMAKE_TAG=v2.8.12.2 LLVM_TAG=8f188e0ea735ac9383a65a0d1c846eb790c2ec74 # r247539 CLANG_TAG=592b43b609b42cffd1531a700c140e10766bf049 # r247539 -MINGW_TAG=4e270fefffda8f8123c0d64b77a6855dc3c732b1 # fix Fx compilation +MINGW_TAG=a0cd5afeb60be3be0860e9a203314c10485bb9b8 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 LIBFTE_TAG=85ef8ae58dbf0d02ea26b627e343784b5574c428 # sketch master with fix @@ -49,7 +49,7 @@ GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 -GCC_VER=6.2.0 +GCC_VER=5.1.0 CLANG_VER=r247539 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 @@ -117,7 +117,7 @@ GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a -GCC_HASH=9944589fc722d3e66308c0ce5257788ebd7872982a718aa2516123940671b7c5 +GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 20c4ae4..f6dbb68 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -32,7 +32,7 @@ LIBEVENT_TAG=release-2.0.22-stable CMAKE_TAG=v2.8.12.2 LLVM_TAG=8f188e0ea735ac9383a65a0d1c846eb790c2ec74 # r247539 CLANG_TAG=592b43b609b42cffd1531a700c140e10766bf049 # r247539 -MINGW_TAG=4e270fefffda8f8123c0d64b77a6855dc3c732b1 # fix Fx compilation +MINGW_TAG=a0cd5afeb60be3be0860e9a203314c10485bb9b8 PYPTLIB_TAG=master OBFSPROXY_TAG=master LIBFTE_TAG=master @@ -56,7 +56,7 @@ GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 -GCC_VER=6.2.0 +GCC_VER=5.1.0 CLANG_VER=r247539 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 @@ -124,7 +124,7 @@ GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a -GCC_HASH=9944589fc722d3e66308c0ce5257788ebd7872982a718aa2516123940671b7c5 +GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da

1 0