- tbb-commits - lists.torproject.org

[tor-launcher/master] Mozilla ripped out nsIPrefBranchInternal
by gk＠torproject.org 23 May '18

23 May '18

commit a2a42c64de4322f96a77451e64e839ada353eda7 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Feb 23 19:56:38 2018 +0000 Mozilla ripped out nsIPrefBranchInternal Apparently nsIPrefBranchInternal was a trivial subclass of nsIPrefBranch, so we simply switch which class we use. https://bugzilla.mozilla.org/show_bug.cgi?id=1374847 --- src/modules/tl-logger.jsm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/tl-logger.jsm b/src/modules/tl-logger.jsm index 19168d2..a2ea404 100644 --- a/src/modules/tl-logger.jsm +++ b/src/modules/tl-logger.jsm @@ -1,4 +1,4 @@ -// Copyright (c) 2013, The Tor Project, Inc. +// Copyright (c) 2018, The Tor Project, Inc. // See LICENSE for licensing information. // TODO: Based on torbutton-logger.js (pull in copyright and license?) // @@ -108,8 +108,8 @@ let TLLoggerInternal = // Private { // Register observer var prefs = Cc["@mozilla.org/preferences-service;1"] - .getService(Ci.nsIPrefBranchInternal) - .QueryInterface(Ci.nsIPrefBranchInternal); + .getService(Ci.nsIPrefBranch) + .QueryInterface(Ci.nsIPrefBranch); prefs.addObserver("extensions.torlauncher", this, false); this.mLogLevel = TorLauncherUtil.getIntPref(

1 0

[tor-launcher/master] Fix deprecated octal literals
by gk＠torproject.org 23 May '18

23 May '18

commit c5cf235c8f530ef5dc64eea3bb404ca0d48eb0a8 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Feb 23 19:50:01 2018 +0000 Fix deprecated octal literals See https://bugzilla.mozilla.org/show_bug.cgi?id=1263074 --- src/components/tl-process.js | 2 +- src/modules/tl-util.jsm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 74d5f41..8d3efb7 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -978,7 +978,7 @@ TorProcessService.prototype = let stream = Cc["@mozilla.org/network/safe-file-output-stream;1"] .createInstance(Ci.nsIFileOutputStream); stream.init(aFile, 0x02 | 0x08 | 0x20, /* WRONLY CREATE TRUNCATE */ - 0600, 0); + 0o600, 0); stream.write(data, data.length); stream.QueryInterface(Ci.nsISafeOutputStream).finish(); } diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index a79e2bd..d669112 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -658,9 +658,9 @@ let TorLauncherUtil = // Public try { if ("tordatadir" == aTorFileType) - torFile.create(torFile.DIRECTORY_TYPE, 0700); + torFile.create(torFile.DIRECTORY_TYPE, 0o700); else - torFile.create(torFile.NORMAL_FILE_TYPE, 0600); + torFile.create(torFile.NORMAL_FILE_TYPE, 0o600); } catch (e) { @@ -883,7 +883,7 @@ let TLUtilInternal = // Private let d = Cc['@mozilla.org/file/local;1'].createInstance(Ci.nsIFile); d.initWithPath(aBasePath); d.append("Tor"); - d.createUnique(Ci.nsIFile.DIRECTORY_TYPE, 0700); + d.createUnique(Ci.nsIFile.DIRECTORY_TYPE, 0o700); return d; } catch (e)

1 0

[tor-launcher/master] Mozilla dropped support for Ci.nsIProgrammingLanguage.JAVASCRIPT
by gk＠torproject.org 23 May '18

23 May '18

commit 9fa37a1fbf6ed9f004f70cccac762a0e4ed454b3 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Feb 23 19:44:18 2018 +0000 Mozilla dropped support for Ci.nsIProgrammingLanguage.JAVASCRIPT See https://bugzilla.mozilla.org/show_bug.cgi?id=1149830#c18 --- src/components/tl-process.js | 3 +-- src/components/tl-protocol.js | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 53c9919..74d5f41 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -1,4 +1,4 @@ -// Copyright (c) 2017, The Tor Project, Inc. +// Copyright (c) 2018, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -272,7 +272,6 @@ TorProcessService.prototype = contractID: this.kContractID, classDescription: this.kServiceName, classID: this.kClassID, - implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT, flags: Ci.nsIClassInfo.DOM_OBJECT, // nsIFactory implementation. diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index ab33bd3..79b327e 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -256,7 +256,6 @@ TorProtocolService.prototype = contractID: this.kContractID, classDescription: this.kServiceName, classID: this.kClassID, - implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT, flags: Ci.nsIClassInfo.DOM_OBJECT, // nsIFactory implementation.

1 0

[tor-browser-build/master] Bug 26054: Make sure to create incrementals from previously signed MAR files
by gk＠torproject.org 23 May '18

23 May '18

commit 0bfae091fa18b6bca05de2cac42bacac47381876 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon May 21 15:54:31 2018 +0200 Bug 26054: Make sure to create incrementals from previously signed MAR files --- tools/update-responses/update_responses | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index bf2415d..1df35b3 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -209,6 +209,10 @@ sub create_incremental_mar { my $tmpdir = get_tmpdir($config); extract_mar(mar_filename($config, $appname, $from_version, $os, $lang), "$tmpdir/A"); extract_mar(mar_filename($config, $appname, $new_version, $os, $lang), "$tmpdir/B"); + # bug 26054: make sure previous macOS version is code signed + if (($os eq 'osx64') && ! -f "$tmpdir/A/Contents/_CodeSignature/CodeResources") { + exit_error "Missing code signature in $from_version while creating $mar_file"; + } if ($ENV{CHECK_CODESIGNATURE_EXISTS}) { unless (-f "$tmpdir/A/Contents/_CodeSignature/CodeResources" && -f "$tmpdir/B/Contents/_CodeSignature/CodeResources") {

1 0

[tor-browser-build/master] Bug 26059: Use signed directory when generating incremental mars
by gk＠torproject.org 23 May '18

23 May '18

commit ae1c8fd96fdb9f3208a84cca6ec9c8d546ada459 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon May 21 13:14:13 2018 +0200 Bug 26059: Use signed directory when generating incremental mars We update the update_responses script to be able to specify a different $releases_dir for each version. When generating incremental mars, this allows us to set the default releases_dir to {alpha,release}/signed and the current version's releases_dir to {alpha,release}/unsigned. --- Makefile | 4 ++-- projects/release/config | 4 ++++ projects/release/update_responses_config.yml | 5 ++++- tools/update-responses/update_responses | 27 ++++++++++++++++----------- 4 files changed, 26 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 2707d41..4c21a83 100644 --- a/Makefile +++ b/Makefile @@ -111,13 +111,13 @@ signtag-alpha: submodule-update $(rbm) build release --step signtag --target alpha incrementals-release: submodule-update - $(rbm) build release --step update_responses_config --target release + $(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals tools/update-responses/download_missing_versions release tools/update-responses/gen_incrementals release $(rbm) build release --step hash_incrementals --target release incrementals-alpha: submodule-update - $(rbm) build release --step update_responses_config --target alpha + $(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals tools/update-responses/download_missing_versions alpha tools/update-responses/gen_incrementals alpha $(rbm) build release --step hash_incrementals --target alpha diff --git a/projects/release/config b/projects/release/config index e48fb01..2aba446 100644 --- a/projects/release/config +++ b/projects/release/config @@ -73,6 +73,10 @@ targets: var: signed_status: signed + create_unsigned_incrementals: + var: + create_unsigned_incrementals: 1 + input_files: # Release diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index 01c6950..1a9b0cf 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -5,7 +5,7 @@ appname_bundle_osx: TorBrowser appname_bundle_linux: tor-browser appname_bundle_win32: torbrowser-install appname_bundle_win64: torbrowser-install-win64 -releases_dir: [% path(c('output_dir')) %]/[% c("var/signed_status") %] +releases_dir: [% path(c('output_dir')) %]/signed download: archive_url: https://archive.torproject.org/tor-package-archive/torbrowser gpg_keyring: ../../keyring/torbrowser.gpg @@ -25,6 +25,9 @@ channels: [% pc('firefox', 'var/torbrowser_update_channel') %]: [% c("var/torbrowser_version") %] versions: [% c("var/torbrowser_version") %]: +[% IF c("var/create_unsigned_incrementals") -%] + releases_dir: [% path(c('output_dir')) %]/unsigned +[% END -%] platformVersion: [% pc('firefox', 'var/firefox_platform_version') %] detailsURL: https://blog.torproject.org/tor-browser-[% c("var/torbrowser_version") FILTER remove('\.') %]-released incremental_from: diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 658f451..bf2415d 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -92,7 +92,7 @@ sub get_version_files { return if $config->{versions}{$version}{files}; my $appname = $config->{appname_marfile}; my $files = {}; - my $vdir = "$releases_dir/$version"; + my $vdir = version_dir($config, $version); my $download_url = "$config->{download}{mars_url}/$version"; opendir(my $d, $vdir) or exit_error "Error opening directory $vdir"; foreach my $file (readdir $d) { @@ -126,7 +126,7 @@ sub get_version_files { sub get_version_downloads { my ($config, $version) = @_; my $downloads = {}; - my $vdir = "$releases_dir/$version"; + my $vdir = version_dir($config, $version); my $download_url = "$config->{download}{bundles_url}/$version"; opendir(my $d, $vdir) or exit_error "Error opening directory $vdir"; foreach my $file (readdir $d) { @@ -179,15 +179,15 @@ sub extract_mar { } sub mar_filename { - my ($appname, $version, $os, $lang) = @_; - "$releases_dir/$version/$appname-$os-${version}_$lang.mar"; + my ($config, $appname, $version, $os, $lang) = @_; + version_dir($config, $version) . "/$appname-$os-${version}_$lang.mar"; } sub create_incremental_mar { my ($config, $pm, $from_version, $new_version, $os, $lang) = @_; my $appname = $config->{appname_marfile}; my $mar_file = "$appname-$os-${from_version}-${new_version}_$lang.incremental.mar"; - my $mar_file_path = "$releases_dir/$new_version/$mar_file"; + my $mar_file_path = version_dir($config, $new_version) . '/' . $mar_file; if ($ENV{MAR_SKIP_EXISTING} && -f $mar_file_path) { print "Skipping $mar_file\n"; return; @@ -207,8 +207,8 @@ sub create_incremental_mar { }; return if $pm->start($finished_file); my $tmpdir = get_tmpdir($config); - extract_mar(mar_filename($appname, $from_version, $os, $lang), "$tmpdir/A"); - extract_mar(mar_filename($appname, $new_version, $os, $lang), "$tmpdir/B"); + extract_mar(mar_filename($config, $appname, $from_version, $os, $lang), "$tmpdir/A"); + extract_mar(mar_filename($config, $appname, $new_version, $os, $lang), "$tmpdir/B"); if ($ENV{CHECK_CODESIGNATURE_EXISTS}) { unless (-f "$tmpdir/A/Contents/_CodeSignature/CodeResources" && -f "$tmpdir/B/Contents/_CodeSignature/CodeResources") { @@ -250,6 +250,11 @@ sub get_config { // $config->{$name}; } +sub version_dir { + my ($config, $version) = @_; + return get_config($config, $version, 'any', 'releases_dir') . "/$version"; +} + sub channel_to_version { my ($config, @channels) = @_; return values %{$config->{channels}} unless @channels; @@ -270,7 +275,7 @@ sub get_buildinfos { next unless $files->{$os}{$lang}{complete}; my $tmpdir = get_tmpdir($config); extract_mar( - mar_filename($config->{appname_marfile}, $version, $os, $lang), + mar_filename($config, $config->{appname_marfile}, $version, $os, $lang), "$tmpdir"); my $appfile = "$tmpdir/application.ini" if -f "$tmpdir/application.ini"; $appfile = "$tmpdir/Contents/Resources/application.ini" @@ -423,7 +428,7 @@ my $martools_tmpdir; sub extract_martools { my ($config, $version) = @_; my $osname = osname; - my $marzip = "$releases_dir/$version/mar-tools-$osname.zip"; + my $marzip = version_dir($config, $version) . "/mar-tools-$osname.zip"; $martools_tmpdir = get_tmpdir($config); my $old_cwd = getcwd; chdir $martools_tmpdir; @@ -523,7 +528,7 @@ sub check_update_responses_channel { sub download_version { my ($config, $version) = @_; my $tmpdir = get_tmpdir($config); - my $destdir = "$releases_dir/$version"; + my $destdir = version_dir($config, $version); my $urldir = "$config->{download}{archive_url}/$version"; print "Downloading version $version\n"; foreach my $file (qw(sha256sums-signed-build.txt sha256sums-signed-build.txt.asc)) { @@ -576,7 +581,7 @@ sub download_missing_versions { my $cversion = $config->{channels}{$channel}; next unless $config->{versions}{$cversion}{incremental_from}; foreach my $version (@{$config->{versions}{$cversion}{incremental_from}}) { - next if -d "$releases_dir/$version"; + next if -d version_dir($config, $version); download_version($config, $version); } }

1 0

[torbutton/master] Bug 24309: Fix identity popup dimensions
by gk＠torproject.org 23 May '18

23 May '18

commit 8057989d2d37edcce8cc3bf04e6a145d19440be6 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue May 22 10:04:37 2018 -0700 Bug 24309: Fix identity popup dimensions On some OSes relay lines are wrapping and the doorhanger is sometimes rendering too small to show everything inside. We avoid the line wrapping and resize the identity popup where needed. --- src/chrome/content/tor-circuit-display.js | 43 +++++++++++++++++++++++++++++++ src/chrome/skin/tor-circuit-display.css | 1 + 2 files changed, 44 insertions(+) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index cbea569..5bd02bc 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -392,6 +392,44 @@ let setupGuardNote = function () { learnMoreString]]); }; +// __ensureCorrectPopupDimensions()__. +// Make sure the identity popup always displays with the correct height. +let ensureCorrectPopupDimensions = function () { + let setDimensions = () => { + setTimeout(() => { + let view = document.querySelector("#identity-popup-multiView .panel-viewcontainer"); + let stack = document.querySelector("#identity-popup-multiView .panel-viewstack"); + let view2 = document.getElementById("identity-popup-mainView"); + if (view && stack && view2) { + let newWidth = Math.max(...[...view2.children].map(el => el.clientWidth)) + 10; + let newHeight = stack.clientHeight; + stack.setAttribute("width", newWidth); + view2.style.minWidth = view2.style.maxWidth = newWidth + "px"; + view.setAttribute("width", newWidth); + view.setAttribute("height", newHeight); + } + }, 0); + }; + let removeDimensions = () => { + let view = document.querySelector("#identity-popup-multiView .panel-viewcontainer"); + let stack = document.querySelector("#identity-popup-multiView .panel-viewstack"); + let view2 = document.getElementById("identity-popup-mainView"); + if (view && stack && view2) { + view.removeAttribute("width"); + view.removeAttribute("height"); + stack.removeAttribute("width"); + view2.style.minWidth = view2.style.maxWidth = ""; + } + }; + let popupMenu = document.getElementById("identity-popup"); + popupMenu.addEventListener("popupshowing", setDimensions); + popupMenu.addEventListener("popuphiding", removeDimensions); + return () => { + popupMenu.removeEventListener("popupshowing", setDimensions); + popupMenu.removeEventListener("popuphiding", removeDimensions); + }; +}; + // ## Main function // __setupDisplay(ipcFile, host, port, password, enablePrefName)__. @@ -403,6 +441,7 @@ let setupDisplay = function (ipcFile, host, port, password, enablePrefName) { let myController = null, stopCollectingIsolationData = null, stopCollectingBrowserCredentials = null, + stopEnsuringCorrectPopupDimensions = null, stop = function() { syncDisplayWithSelectedTab(false); if (myController) { @@ -412,6 +451,9 @@ let setupDisplay = function (ipcFile, host, port, password, enablePrefName) { if (stopCollectingBrowserCredentials) { stopCollectingBrowserCredentials(); } + if (stopEnsuringCorrectPopupDimensions) { + stopEnsuringCorrectPopupDimensions(); + } myController = null; } }, @@ -428,6 +470,7 @@ let setupDisplay = function (ipcFile, host, port, password, enablePrefName) { syncDisplayWithSelectedTab(true); stopCollectingIsolationData = collectIsolationData(myController, updateCircuitDisplay); stopCollectingBrowserCredentials = collectBrowserCredentials(); + stopEnsuringCorrectPopupDimensions = ensureCorrectPopupDimensions(); } }; try { diff --git a/src/chrome/skin/tor-circuit-display.css b/src/chrome/skin/tor-circuit-display.css index 71c283c..640d595 100644 --- a/src/chrome/skin/tor-circuit-display.css +++ b/src/chrome/skin/tor-circuit-display.css @@ -62,6 +62,7 @@ ul#circuit-display-nodes li { background-repeat: no-repeat; list-style: none; padding-inline-start: 1.5em; + white-space: nowrap; } ul#circuit-display-nodes li:-moz-locale-dir(rtl) {

1 0

[torbutton/master] Fix two typos
by gk＠torproject.org 22 May '18

22 May '18

commit a3447ddb13c279e7e4c384610b98a045e7f932bb Author: Georg Koppen <gk(a)torproject.org> Date: Tue May 22 08:40:01 2018 +0000 Fix two typos --- src/chrome/content/tor-circuit-display.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index cb43499..cbea569 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -282,13 +282,13 @@ let xmlTree = function xmlTree (ns, data) { // __htmlTree(data)__. // Takes a data structure representing html elements like // [tag, { attr-key: attr-value }, ...html-children] -// and return nested html element objects. +// and returns nested html element objects. let htmlTree = data => xmlTree("http://www.w3.org/1999/xhtml", data); // __appendHtml(parent, data)__. // Takes a data structure representing html elements like // [tag, { attr-key: attr-value }, ...html-children] -// and append nested html element objects to the parent element. +// and appends nested html element objects to the parent element. let appendHtml = (parent, data) => parent.appendChild(htmlTree(data)); // __circuitCircuitData()__.

1 0

[torbutton/master] Bug 24309: Move circuit display to the identity popup.
by gk＠torproject.org 22 May '18

22 May '18

commit 26d4ce95369819a1aeefd30fd52f670fc589b5ea Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Apr 12 15:36:44 2018 -0700 Bug 24309: Move circuit display to the identity popup. New circuit display design by Antonela Debiasi. The new design includes a "Guard" indicator, a "Load New Circuit" button, new Photon-compatible style. --- src/chrome.manifest | 1 + src/chrome/content/popup.xul | 12 -- src/chrome/content/tor-circuit-display.js | 130 +++++++++++++++------ src/chrome/content/tor-circuit-display.xul | 34 ++++++ src/chrome/locale/en/torbutton.dtd | 3 +- src/chrome/locale/en/torbutton.properties | 5 +- src/chrome/skin/relay.svg | 10 ++ src/chrome/skin/tor-circuit-display.css | 176 ++++++++++++++++------------- 8 files changed, 247 insertions(+), 124 deletions(-) diff --git a/src/chrome.manifest b/src/chrome.manifest index 65f55a9..f72fffa 100644 --- a/src/chrome.manifest +++ b/src/chrome.manifest @@ -15,6 +15,7 @@ overlay chrome://browser/content/aboutDialog.xul chrome://torbutton/content/abou # UI customization overlay chrome://browser/content/baseMenuOverlay.xul chrome://torbutton/content/menu-overlay.xul overlay about:preferences chrome://torbutton/content/privacy-prefs-overlay.xul +overlay chrome://browser/content/browser.xul chrome://torbutton/content/tor-circuit-display.xul # Strings for the about:tbupdate page override chrome://browser/locale/aboutTBUpdate.dtd chrome://torbutton/locale/aboutTBUpdate.dtd diff --git a/src/chrome/content/popup.xul b/src/chrome/content/popup.xul index 9447b70..b088a82 100644 --- a/src/chrome/content/popup.xul +++ b/src/chrome/content/popup.xul @@ -1,6 +1,5 @@ <?xml version="1.0"?> <?xml-stylesheet href="chrome://torbutton/skin/torbutton.css" type="text/css"?> -<?xml-stylesheet href="chrome://torbutton/skin/tor-circuit-display.css" type="text/css"?> <!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/torbutton.dtd"> @@ -51,17 +50,6 @@ insertafter="context-stop" oncommand="torbutton_check_for_update()"/> </vbox> - <vbox id="circuit-display-container"> - <div id="circuit-display" xmlns="http://www.w3.org/1999/xhtml" dir="auto"> - <p id="title">&torbutton.circuit_display.title;</p> - <p id="domain">(example.com)</p> - <ul id="circuit-nodes" dir="auto"> - <li>example A</li> - <li>example B</li> - <li>example C</li> - </ul> - </div> - </vbox> </hbox> </panel> </overlay> diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index b5c24f8..cb43499 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -215,7 +215,7 @@ let regionBundle = Services.strings.createBundle( // Convert a country code to a localized country name. // Example: `'de'` -> `'Deutschland'` in German locale. let localizedCountryNameFromCode = function (countryCode) { - if (typeof(countryCode) === "undefined") return undefined; + if (!countryCode) return uiString("unknown_country"); try { return regionBundle.GetStringFromName(countryCode.toLowerCase()); } catch (e) { @@ -249,7 +249,7 @@ let nodeLines = function (nodeData) { (country ? " (" + country + ")" : "")) : // For each non-bridge relay, show its host country and IP. - (country || uiString("unknown_country")) + + country + // As we don't have a bridge, show the IP address // of the node. Use unicode escapes to ensure that // parentheses behave properly in both left-to-right @@ -260,46 +260,90 @@ let nodeLines = function (nodeData) { return result; }; -// __onionSiteRelayLine__. -// When we have an onion site, we simply show the word '(relay)'. -let onionSiteRelayLine = "<li class='relay'>(" + uiString("relay") + ")</li>"; +// __xmlTree(ns, data)__. +// Takes an xml namespace, ns, and a +// data structure representing xml elements like +// [tag, { attr-key: attr-value }, ...xml-children] +// and returns nested xml element objects. +let xmlTree = function xmlTree (ns, data) { + let [type, attrs, ...children] = data; + let element = document.createElementNS(ns, type); + for (let [key, val] of Object.entries(attrs)) { + element.setAttribute(key, val); + } + for (let child of children) { + if (child !== null && child !== undefined) { + element.append(typeof child === "string" ? child : xmlTree(ns, child)); + } + } + return element; +}; + +// __htmlTree(data)__. +// Takes a data structure representing html elements like +// [tag, { attr-key: attr-value }, ...html-children] +// and return nested html element objects. +let htmlTree = data => xmlTree("http://www.w3.org/1999/xhtml", data); + +// __appendHtml(parent, data)__. +// Takes a data structure representing html elements like +// [tag, { attr-key: attr-value }, ...html-children] +// and append nested html element objects to the parent element. +let appendHtml = (parent, data) => parent.appendChild(htmlTree(data)); + +// __circuitCircuitData()__. +// Obtains the circuit used by the given browser. +let currentCircuitData = function (browser) { + if (browser) { + let credentials = browserToCredentialsMap.get(browser); + if (credentials) { + let [SOCKS_username, SOCKS_password] = credentials; + let nodeData = credentialsToNodeDataMap[`${SOCKS_username}|${SOCKS_password}`]; + let domain = SOCKS_username; + return { domain, nodeData }; + } + } + return { domain: null, nodeData: null }; +}; // __updateCircuitDisplay()__. // Updates the Tor circuit display, showing the current domain // and the relay nodes for that domain. let updateCircuitDisplay = function () { - let selectedBrowser = gBrowser.selectedBrowser; - if (selectedBrowser) { - let credentials = browserToCredentialsMap.get(selectedBrowser), - nodeData = null; - if (credentials) { - let [SOCKS_username, SOCKS_password] = credentials; - // Check if we have anything to show for these credentials. - nodeData = credentialsToNodeDataMap[SOCKS_username + "|" + SOCKS_password]; - if (nodeData) { - // Update the displayed domain. - let domain = SOCKS_username; - document.getElementById("domain").innerHTML = "(" + domain + "):"; - // Update the displayed information for the relay nodes. - let lines = nodeLines(nodeData), - nodeInnerHTML = "<li>" + uiString("this_browser") + "</li>"; - for (let line of lines) { - nodeInnerHTML += "<li>" + line + "</li>"; - } - nodeInnerHTML += domain.endsWith(".onion") ? - (onionSiteRelayLine + - onionSiteRelayLine + - onionSiteRelayLine + - "<li>" + uiString("onion_site") + "</li>") : - "<li>" + uiString("internet") + "</li>"; - document.getElementById("circuit-nodes").innerHTML = nodeInnerHTML; + let { domain, nodeData } = currentCircuitData(gBrowser.selectedBrowser); + if (domain && nodeData) { + // Update the displayed information for the relay nodes. + let nodeHtmlList = document.getElementById("circuit-display-nodes"); + let li = (...data) => appendHtml(nodeHtmlList, ["li", {}, ...data]); + nodeHtmlList.innerHTML = ""; + li(uiString("this_browser")); + for (let i = 0; i < nodeData.length; ++i) { + let relayText; + if (nodeData[i].type === "bridge") { + relayText = uiString("tor_bridge") + + ((nodeData[i].bridgeType !== "vanilla") ? `: ${nodeData[i].bridgeType}` : ""); + } else { + relayText = localizedCountryNameFromCode(nodeData[i].countryCode); } - } else { - logger.eclog(5, "no SOCKS credentials found for current document."); + li(relayText, " ", + ["span", { class: "circuit-ip-address" }, nodeData[i].ip], " ", + (i === 0 && nodeData[0].type !== "bridge") ? + ["span", { class: "circuit-guard-info" }, uiString("guard")] : null); } + if (domain.endsWith(".onion")) { + for (let i = 0; i < 3; ++i) { + li(uiString("relay")); + } + } + li(domain); + // Hide the note about guards if we are using a bridge. + document.getElementById("circuit-guard-note-container").style.display = + (nodeData[0].type === "bridge") ? "none" : "block"; + } else { // Only show the Tor circuit if we have credentials and node data. - showCircuitDisplay(credentials && nodeData); + logger.eclog(5, "no SOCKS credentials found for current document."); } + showCircuitDisplay(domain && nodeData); }; // __syncDisplayWithSelectedTab(syncOn)__. @@ -314,7 +358,7 @@ let syncDisplayWithSelectedTab = (function() { } } }; return function (syncOn) { - let popupMenu = document.getElementById("torbutton-context-menu"); + let popupMenu = document.getElementById("identity-popup"); if (syncOn) { // Update the circuit display just before the popup menu is shown. popupMenu.addEventListener("popupshowing", updateCircuitDisplay); @@ -331,6 +375,23 @@ let syncDisplayWithSelectedTab = (function() { }; })(); +// __setupGuardNote()__. +// Call once to show the Guard note as intended. +let setupGuardNote = function () { + let guardNote = document.getElementById("circuit-guard-note-container"); + let guardNoteString = uiString("guard_note"); + let learnMoreString = uiString("learn_more"); + let [noteBefore, name, noteAfter] = guardNoteString.split(/[\[\]]/); + let localeCode = torbutton_get_general_useragent_locale(); + appendHtml(guardNote, + ["div", {}, + noteBefore, ["span", {class: "circuit-guard-name"}, name], + noteAfter, " ", + ["span", {onclick: `gBrowser.selectedTab = gBrowser.addTab('https://tb-manual.torproject.org/${localeCode}');`, + class: "circuit-link"}, + learnMoreString]]); +}; + // ## Main function // __setupDisplay(ipcFile, host, port, password, enablePrefName)__. @@ -338,6 +399,7 @@ let syncDisplayWithSelectedTab = (function() { // 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 (ipcFile, host, port, password, enablePrefName) { + setupGuardNote(); let myController = null, stopCollectingIsolationData = null, stopCollectingBrowserCredentials = null, diff --git a/src/chrome/content/tor-circuit-display.xul b/src/chrome/content/tor-circuit-display.xul new file mode 100644 index 0000000..b4d4ac7 --- /dev/null +++ b/src/chrome/content/tor-circuit-display.xul @@ -0,0 +1,34 @@ +<?xml version="1.0"?> +<?xml-stylesheet href="chrome://torbutton/skin/tor-circuit-display.css" type="text/css"?> + +<!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/torbutton.dtd"> + +<overlay id="circuit-display-overlay" + xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + xmlns:html="http://www.w3.org/1999/xhtml"> + <panelview id="identity-popup-mainView"> +  + <xul:hbox id="circuit-display-container" + class="identity-popup-section" + insertafter="identity-popup-security"> + <xul:vbox id="circuit-display-content" flex="1"> + <xul:label id="circuit-display-headline" + class="identity-popup-headline" + value="&torbutton.circuit_display.title;"/> + <html:ul id="circuit-display-nodes" dir="auto"> + <li>example A</li> + <li>example B</li> + <li>example C</li> + </html:ul> + </xul:vbox> + <xul:vbox id="circuit-reload-content" flex="1"> + <html:button id="circuit-reload-button" + onclick="torbutton_new_circuit()"> + &torbutton.circuit_display.new_circuit; + </html:button> + <xul:hbox id="circuit-guard-note-container"> + </xul:hbox> + </xul:vbox> + </xul:hbox> + </panelview> +</overlay> diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 7ccad6a..a0ef5f9 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -47,4 +47,5 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play."> -<!ENTITY torbutton.circuit_display.title "Tor circuit for this site"> +<!ENTITY torbutton.circuit_display.title "Tor Circuit"> +<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties index 2391e69..468a532 100644 --- a/src/chrome/locale/en/torbutton.properties +++ b/src/chrome/locale/en/torbutton.properties @@ -2,9 +2,12 @@ torbutton.circuit_display.internet = Internet torbutton.circuit_display.ip_unknown = IP unknown torbutton.circuit_display.onion_site = Onion site torbutton.circuit_display.this_browser = This browser -torbutton.circuit_display.relay = relay +torbutton.circuit_display.relay = Relay torbutton.circuit_display.tor_bridge = Bridge torbutton.circuit_display.unknown_country = Unknown country +torbutton.circuit_display.guard = Guard +torbutton.circuit_display.guard_note = Your [Guard] node may not change. +torbutton.circuit_display.learn_more = Learn more torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. torbutton.panel.tooltip.disabled = Click to enable Tor torbutton.panel.tooltip.enabled = Click to disable Tor diff --git a/src/chrome/skin/relay.svg b/src/chrome/skin/relay.svg new file mode 100644 index 0000000..b2f5f16 --- /dev/null +++ b/src/chrome/skin/relay.svg @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> +  + <title>relay</title> + <desc>Created with Sketch.</desc> + <defs></defs> + <g id="Artboard" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="translate(-448.000000, -65.000000)"> + <path d="M462.904942,71.0268217 L467.575247,74.1403583 C468.095041,73.9073638 468.671277,73.7777778 469.277778,73.7777778 C471.57895,73.7777778 473.444444,75.6432726 473.444444,77.9444444 C473.444444,80.2456163 471.57895,82.1111111 469.277778,82.1111111 C468.296528,82.1111111 467.394661,81.7717448 466.682726,81.2041667 L462.234549,83.9842882 C462.366276,84.5801474 462.366276,85.197587 462.234549,85.7934462 L466.682726,88.5735677 C467.394661,88.006033 468.296528,87.6666667 469.277778,87.6666667 C471.57895,87.6666667 473.444444,89.5321615 473.444444,91.8333333 C473.444444,94.1345052 471.57895,96 469.277778,96 C466.976606,96 465.111111,94.1345052 465.111111,91.8333333 C465.111023,91.5291178 465.144147,91.2258017 465.209896,90.928776 L460.761719,88.1486545 C460.049783,88.7161892 459.147917,89.0555556 458.166667,89.0555556 C455.865495,89.0555556 454,87.1900608 454,84.8888889 C454,82.587717 455.865495,80.7222222 458.166667,80.7222222 C459.147917,80.7222222 460.049783,81.0615885 46 0.761719,81.6291233 L465.209896,78.8490017 C465.145399,78.5577257 465.111111,78.2551215 465.111111,77.9444444 C465.111111,77.2224682 465.29474,76.5433776 465.617841,75.95133 L461.36038,73.1130222 C460.739536,73.5327021 459.990981,73.7777778 459.185185,73.7777778 C457.037411,73.7777778 455.296296,72.0366629 455.296296,69.8888889 C455.296296,67.7411149 457.037411,66 459.185185,66 C461.332959,66 463.074074,67.7411149 463.074074,69.8888889 C463.074074,70.2848045 463.01491,70.6669018 462.904942,71.0268217 Z" id="Line-2" fill="#000000" fill-rule="nonzero"></path> + </g> +</svg> \ No newline at end of file diff --git a/src/chrome/skin/tor-circuit-display.css b/src/chrome/skin/tor-circuit-display.css index d3b5edc..71c283c 100644 --- a/src/chrome/skin/tor-circuit-display.css +++ b/src/chrome/skin/tor-circuit-display.css @@ -4,110 +4,134 @@ a domain, and a bulleted list. Each bullet in the circuit node list is supposed to represent a Tor circuit node, and lines drawn between them to represent Tor network inter-relay connections. - -CSS for line between bullets is derived in part from https://jsfiddle.net/5JP8Q/ */ -/* The circuit-display div encloses all other HTML elements. - Color the background to make circuit display distinct - from the rest of the popup. */ -div#circuit-display { - background-color: #e8f4f4; - font-family: Arial; - width: 100%; - height: 100%; - padding: 8px; - /* Magically keep popup menu from clipping div: */ - display: table-cell; + +#circuit-display-content { + background-image: url(chrome://torbutton/skin/relay.svg); + background-position: 1em 1em; + background-repeat: no-repeat; + background-size: 24px auto; + background-color: rgba(255,255,255,0.4); + background-blend-mode: lighten; cursor: default; + padding: 0.5em 0px 0.5em; + padding-inline-end: 1em; + padding-inline-start: calc(2em + 24px); + width: 100%; } -/* Format the title text. */ -div#circuit-display p#title { - font-size: 15px; - font-weight: bold; - color: #2c26a7; - margin: 0; +#circuit-display-content:-moz-locale-dir(rtl) { + background-position: calc(100% - 1em) 1em; +} + +#circuit-reload-content { + background-color: #f7f7f7; + cursor: default; + padding: 1em 0px 1em; + padding-inline-end: 3em; + padding-inline-start: calc(2em + 24px); + width: 100%; } /* Format the domain text. */ -div#circuit-display p#domain { - font-size: 13px; - color: black; - margin: 4px; +#circuit-display-domain { + opacity: 0.8; +} + +#circuit-div { + position: relative; + margin-inline-start: 6px; } /* Format the circuit node list. */ -ul#circuit-nodes { - font-family: Arial; - font-size: 14px; - color: black; - margin-top: 8px; - padding-left: 8px; - padding-right: 8px; -} - -/* Hide default bullets, and position pseudoelements (our new bullets) relative - to the list items. */ -ul#circuit-nodes li { +ul#circuit-display-nodes { + /* font-family: Arial; */ + font-size: 16px; + line-height: 26px; + /* color: black;*/ + margin-top: 4px; + margin-bottom: 2px; + padding-inline-start: 4px; +} + +/* Hide default bullets, and draw our own bullets */ +ul#circuit-display-nodes li { + background-image: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20width%3D%2715%27%20height%3D%2740%27%3E%3Cg%20style%3D%27stroke%3A%234a4a4a%3Bstroke-width%3A3px%3Bfill%3Awhite%3B%27%3E%3Cline%20x1%3D%2750%25%27%20y1%3D%270%25%27%20x2%3D%2750%25%27%20y2%3D%27100%25%27%2F%3E%3Ccircle%20cx%3D%2750%25%27%20cy%3D%2750%25%27%20r%3D%274.5%27%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A"); + background-position: left center; + background-repeat: no-repeat; list-style: none; - position:relative; + padding-inline-start: 1.5em; } -/* Pad the list item text at left or right to be tastefully - separated from bullets. */ -ul#circuit-nodes li:-moz-dir(ltr) { - padding-left: 18px; +ul#circuit-display-nodes li:-moz-locale-dir(rtl) { + background-position: right center; } -ul#circuit-nodes li:-moz-dir(rtl) { - padding-right: 18px; + +ul#circuit-display-nodes li:first-child { + background-image: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20width%3D%2715%27%20height%3D%2740%27%3E%3Cg%20style%3D%27stroke%3A%234a4a4a%3Bstroke-width%3A3px%3Bfill%3Awhite%3B%27%3E%3Cline%20x1%3D%2750%25%27%20y1%3D%2750%25%27%20x2%3D%2750%25%27%20y2%3D%27100%25%27%2F%3E%3Ccircle%20cx%3D%2750%25%27%20cy%3D%2750%25%27%20r%3D%274.5%27%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A"); +} + +ul#circuit-display-nodes li:last-child { + background-image: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20width%3D%2715%27%20height%3D%2740%27%3E%3Cg%20style%3D%27stroke%3A%234a4a4a%3Bstroke-width%3A3px%3Bfill%3Awhite%3B%27%3E%3Cline%20x1%3D%2750%25%27%20y1%3D%270%25%27%20x2%3D%2750%25%27%20y2%3D%2750%25%27%2F%3E%3Ccircle%20cx%3D%2750%25%27%20cy%3D%2750%25%27%20r%3D%274.5%27%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A"); +} + +.circuit-guard-help { + -moz-context-properties: fill, stroke; + fill: #6200a4; + stroke: #6200a4; +} + +.circuit-ip-address { + font-size: 80%; + opacity: 0.4; + padding-inline-start: 3px; } -/* Drawn bullets, centered vertically for each list item. */ -ul#circuit-nodes li:after { - /* bullets */ - content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20width%3D%2711%27%20height%3D%2711%27%3E%3Ccircle%20cx%3D%275.5%27%20cy%3D%275.5%27%20r%3D%274%27%20style%3D%27stroke%3A%20%23195021%3B%20stroke-width%3A%202px%3B%20fill%3A%20white%3B%27%2F%3E%3C%2Fsvg%3E"); - position: absolute; - top: 1px; +.circuit-guard-info { + font-size: 80%; + font-weight: bold; + color: #6200a4; + padding-inline-start: 3px; } -/* Move the bullets to the far left or right, - depending on text directionality. */ -ul#circuit-nodes li:-moz-dir(ltr):after { - left: 0px; +#circuit-reload-button { + background-color: #0060df; + border-radius: 3px; + border: none; + color: white; + cursor: pointer; + font-size: 18px; + padding: 10px; } -ul#circuit-nodes li:-moz-dir(rtl):after { - right: 0px; + +#circuit-reload-button:hover { + background-color: #0058cf; } -/* Draw a connecting vertical line through the bullets. */ -ul#circuit-nodes li:before { - content: ""; - position: absolute; - border-left: 3px solid #4d363a; - height: 100%; - width: 0px; +#circuit-reload-button:active { + background-color: #0050bf; } -/* Position lines through the middle of the bullet. */ -ul#circuit-nodes li:-moz-dir(ltr):before { - left: 4px; +#circuit-guard-note-container { + margin-top: 10px; } -ul#circuit-nodes li:-moz-dir(rtl):before { - right: 4px; + +#circuit-guard-note-container div { + margin-left: 3px; + margin-right: 3px; } -/* Shorten the first list item's line so that it starts under the bullet. */ -ul#circuit-nodes li:first-child:before { - top: 50%; +.circuit-guard-name { + font-weight: bold; + color: #6200a4; } -/* Shorten the last list item's line so that it ends under the bullet. */ -ul#circuit-nodes li:last-child:before { - height: 50%; +.circuit-link { + cursor: pointer; + color: #0000ee; } -/* Onion site relay node text should be gray. */ -ul#circuit-nodes li.relay { - color: gray; -} \ No newline at end of file +.circuit-link:hover { + text-decoration: underline; +}

1 0

[tor-launcher/master] Bug 20890: Increase control port connection timeout
by gk＠torproject.org 17 May '18

17 May '18

commit 9aa5fd46cb33528150400a9b94c14ad5e9b7d4ee Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed May 16 14:17:16 2018 -0400 Bug 20890: Increase control port connection timeout On slow computers, it can take longer than 30 seconds for Tor Launcher to connect to the tor control port. Increase the timeout to 5 minutes. --- src/components/tl-process.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 53c9919..2bf5a4c 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -38,8 +38,8 @@ TorProcessService.prototype = kWizardProgressPageID: "progress", kInitialControlConnDelayMS: 25, - kMaxControlConnRetryMS: 500, - kControlConnTimeoutMS: 30000, // Wait at most 30 seconds for tor to start. + kMaxControlConnRetryMS: 2000, // Retry at least every 2 seconds. + kControlConnTimeoutMS: 5*60*1000, // Wait at most 5 minutes for tor to start. kStatusUnknown: 0, // Tor process status. kStatusStarting: 1,

1 0

[tor-browser-build/maint-7.5] Bug 26098: Remove amazon-meek
by gk＠torproject.org 16 May '18

16 May '18

commit efa9901ec57d0d78aa1f8034a922da4f792c0ee0 Author: Sina Rabbani <srabbani(a)cymru.com> Date: Tue May 15 13:46:06 2018 -0400 Bug 26098: Remove amazon-meek --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index a3f5326..ad34891 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -41,7 +41,6 @@ pref("extensions.torlauncher.default_bridge.obfs4.25", "obfs4 85.31.186.98:443 0 pref("extensions.torlauncher.default_bridge.obfs4.26", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.27", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0"); -pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2cly7j4zqgua7.cloudfront.net/ front=a0.awsstatic.com"); -pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com"); +pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com"); pref("extensions.torlauncher.default_bridge.snowflake.1", "snowflake 0.0.3.0:1 2B280B23E1107BB62ABFC40DDCC8824814F80A72");

1 0