February 2020 - tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 33215: Android Toolchain: Add NDK bin path to system path
by boklm＠torproject.org 27 Feb '20

27 Feb '20

commit 5acb463da2e24eaf5cea5b78e42facb86d9f5d67 Author: sisbell <shane.isbell(a)gmail.com> Date: Mon Feb 10 14:33:46 2020 -0800 Bug 33215: Android Toolchain: Add NDK bin path to system path --- projects/android-toolchain/config | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index 8c9c822..f4f9ecf 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -15,6 +15,7 @@ var: export GRADLE_HOME=/var/tmp/dist/[% project %]/gradle export ANDROID_HOME=$ANDROID_SDK_HOME export GRADLE_USER_HOME=$GRADLE_HOME + export PATH=$PATH:$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/bin google_repo: https://dl.google.com/android/repository input_files: - project: container-image

1 0

[tor-browser-build/master] Merge remote-tracking branch 'sisbell/bug-33215'
by boklm＠torproject.org 27 Feb '20

27 Feb '20

commit 457b60475f388bfb381abe3796d881fd5dbe7153 Merge: 37eb08f 5acb463 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Feb 27 22:58:45 2020 +0100 Merge remote-tracking branch 'sisbell/bug-33215' projects/android-toolchain/config | 1 + 1 file changed, 1 insertion(+)

1 0

[tor-browser-build/master] Bug 32436: Add lucetc project for RLBox
by boklm＠torproject.org 27 Feb '20

27 Feb '20

commit 37eb08fc9643749d4bfe602b6aca5dc1dcefcaf5 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jan 12 20:39:47 2020 +0000 Bug 32436: Add lucetc project for RLBox --- projects/lucetc/build | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ projects/lucetc/config | 35 +++++++++++++++++++++++++++++++++++ projects/rust/config | 10 ++++++++-- 3 files changed, 91 insertions(+), 2 deletions(-) diff --git a/projects/lucetc/build b/projects/lucetc/build new file mode 100644 index 0000000..0157cc9 --- /dev/null +++ b/projects/lucetc/build @@ -0,0 +1,48 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +distdir=/var/tmp/dist +builddir=/var/tmp/build/[% project %] + +mkdir -p $distdir +tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/wasi-sysroot') %] +export PATH="/var/tmp/dist/cmake/bin:/var/tmp/dist/clang/bin:/var/tmp/dist/binutils/bin:/var/tmp/dist/rust/bin:$PATH" +export CC=$distdir/clang/bin/clang +export CFLAGS="-L$distdir/clang/lib" +export CXXFLAGS=$CFLAGS +export CXX=$distdir/clang/bin/clang++ +export AR=$distdir/clang/bin/llvm-ar +export RUSTFLAGS="-C linker=$CXX -C link-arg=$CXXFLAGS" +export LUCET_PREFIX=$distdir/[% project %] +export WASI_SYSROOT=$distdir/wasi-sysroot + +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz + +# Now prepare the offline build +# Move the directory for hardcoding the path in .cargo/config +mv /var/tmp/build/[% project %]-[% c('version') %] $builddir +tar -C $builddir -xjf lucetc-vendor.tar.bz2 +cd $builddir +# .cargo exists already, let's just add to it +cat >> .cargo/config << 'EOF' + +[source.crates-io] +replace-with = "vendored-sources" + +[source.vendored-sources] +directory = "/var/tmp/build/lucetc/vendor" +EOF + +make -j[% c("buildconf/num_procs") %] build +make install + +cd $distdir +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/lucetc/config b/projects/lucetc/config new file mode 100644 index 0000000..647d83f --- /dev/null +++ b/projects/lucetc/config @@ -0,0 +1,35 @@ +# vim: filetype=yaml sw=2 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' +version: '[% c("abbrev") %]' +git_hash: 5c22392b5b1aaa60e915c75e92b57391e1e61e6d +git_url: https://github.com/PLSysSec/lucet_sandbox_compiler/ +git_submodule: 1 + +var: + container: + use_container: 1 + +input_files: + - project: container-image + # Our clang still needs GCC parts (libstdc++ for instance) so we include that + # one here even though compilation gets done solely by clang. + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + - name: cmake + project: cmake + - name: clang + project: clang + - name: binutils + project: binutils + - name: rust + project: rust + input_file_var: + # lucetc needs Rust >= 1.36.0 + rust_version: 1.36.0 + prev_version: 1.35.0 + - name: wasi-sysroot + project: wasi-sysroot + # `cargo vendor vendor` in the `lucetc-sandbox-compiler` directory has vendored + # the sources. + - URL: https://people.torproject.org/~gk/mirrors/sources/lucetc-vendor.tar.bz2 + sha256sum: 5a7802834d0d4b9210f323cf69cc305946f22dba4ddaf2c4c0eb6d3621da2c2a diff --git a/projects/rust/config b/projects/rust/config index 848ccd0..13aad3e 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -1,9 +1,15 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -version: 1.34.2 +version: '[% c("input_file_var/rust_version") %]' -var: +# those values can be changed from the input_files section of other +# projects. See projects/lucetc/config and bug 32436. +input_file_var: + rust_version: 1.34.2 prev_version: 1.33.0 + +var: + prev_version: '[% c("input_file_var/prev_version") %]' container: use_container: 1

1 0

[tor-browser-build/master] Bug 32437: Add wasi-sysroot project for RLBox
by boklm＠torproject.org 26 Feb '20

26 Feb '20

commit e8574bbde076ba917f4d3fd3e71c6c7ee10716c4 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jan 12 20:38:10 2020 +0000 Bug 32437: Add wasi-sysroot project for RLBox --- projects/ninja/build | 21 +++++++++++++++++++++ projects/ninja/config | 16 ++++++++++++++++ projects/wasi-sysroot/build | 32 ++++++++++++++++++++++++++++++++ projects/wasi-sysroot/config | 28 ++++++++++++++++++++++++++++ projects/wasi-sysroot/no-git.patch | 28 ++++++++++++++++++++++++++++ 5 files changed, 125 insertions(+) diff --git a/projects/ninja/build b/projects/ninja/build new file mode 100644 index 0000000..6500ca7 --- /dev/null +++ b/projects/ninja/build @@ -0,0 +1,21 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir=/var/tmp/dist/[% project %] +[% IF c("var/linux") %] + [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'), + hardened_gcc => 0 }) %] +[% END -%] +[% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %] +mkdir /var/tmp/build +tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz +cd /var/tmp/build/[% project %]-[% c('version') %] + +./configure.py --bootstrap + +mkdir $distdir +cp ninja $distdir +cd /var/tmp/dist +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/ninja/config b/projects/ninja/config new file mode 100644 index 0000000..8615511 --- /dev/null +++ b/projects/ninja/config @@ -0,0 +1,16 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/ninja-build/ninja.git +git_hash: b25c08bda4949192c69cea4cee057887341a2ffc #v1.9.0 +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +var: + container: + use_container: 1 + +input_files: + - project: container-image + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + enable: '[% c("var/linux") %]' + - name: python + project: python diff --git a/projects/wasi-sysroot/build b/projects/wasi-sysroot/build new file mode 100644 index 0000000..5ea885c --- /dev/null +++ b/projects/wasi-sysroot/build @@ -0,0 +1,32 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +# We need a link to our GCC, otherwise the system cc gets used which points to +# /usr/bin/gcc. +[% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'), + hardened_gcc => 0 }) %] +ln -s gcc /var/tmp/dist/gcc/bin/cc + +distdir=/var/tmp/dist +builddir=/var/tmp/build/[% project %] +mkdir -p $distdir +tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/ninja') %] +export PATH=/var/tmp/dist/binutils/bin:/var/tmp/dist/cmake/bin:/var/tmp/dist/ninja:$PATH + +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz + +mv /var/tmp/build/[% project %]-[% c('version') %] $builddir +cd $builddir +# We have no .git in our tar ball but the Makefile depends on that. Just +# hard-code the version for now. +patch -p1 < $rootdir/no-git.patch + +make -j[% c("buildconf/num_procs") %] PREFIX=$distdir/[% project %] + +cd $distdir +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/wasi-sysroot/config b/projects/wasi-sysroot/config new file mode 100644 index 0000000..512769b --- /dev/null +++ b/projects/wasi-sysroot/config @@ -0,0 +1,28 @@ +# vim: filetype=yaml sw=2 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' +version: '[% c("abbrev") %]' +git_hash: 87b7a019472770f08d49cf3b558867dc76ea74eb +git_url: https://github.com/CraneStation/wasi-sdk +git_submodule: 1 + +var: + container: + use_container: 1 + +targets: + linux: + var: + arch_deps: + - patch + +input_files: + - project: container-image + - name: gcc + project: gcc + - name: binutils + project: binutils + - name: cmake + project: cmake + - name: ninja + project: ninja + - filename: no-git.patch diff --git a/projects/wasi-sysroot/no-git.patch b/projects/wasi-sysroot/no-git.patch new file mode 100644 index 0000000..27c3446 --- /dev/null +++ b/projects/wasi-sysroot/no-git.patch @@ -0,0 +1,28 @@ +From 55a106779cd012f9cf5d6f46a7a3523de9ba93c3 Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Sat, 7 Dec 2019 16:12:42 +0000 +Subject: [PATCH] No .git in our tarball + + +diff --git a/Makefile b/Makefile +index f09a901..dc114cb 100644 +--- a/Makefile ++++ b/Makefile +@@ -6,11 +6,11 @@ LLVM_PROJ_DIR?=$(ROOT_DIR)/src/llvm-project + PREFIX?=/opt/wasi-sdk + + CLANG_VERSION=$(shell ./llvm_version.sh $(LLVM_PROJ_DIR)) +-VERSION:=$(shell ./version.sh) +-DEBUG_PREFIX_MAP=-fdebug-prefix-map=$(ROOT_DIR)=wasisdk://v$(VERSION) ++#VERSION:=$(shell ./version.sh) ++DEBUG_PREFIX_MAP=-fdebug-prefix-map=$(ROOT_DIR)=wasisdk://v8.1g5225b05436ce + + default: build +- @echo "Use -fdebug-prefix-map=$(ROOT_DIR)=wasisdk://v$(VERSION)" ++ @echo "Use -fdebug-prefix-map=$(ROOT_DIR)=wasisdk://v8.1g5225b05436ce" + + clean: + rm -rf build $(PREFIX) +-- +2.24.0 +

1 0

[tor-browser-build/master] Release preparations for 9.5a6
by sysrqb＠torproject.org 21 Feb '20

21 Feb '20

commit 02ad765bc59ad20ed2016489826a9edd1e0ad069 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Feb 21 21:58:37 2020 +0000 Release preparations for 9.5a6 Versions bump and Changelog update --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 14 ++++++++++++++ projects/tor-launcher/config | 2 +- rbm.conf | 5 +++-- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 45a33a0..d101697 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build3' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 51405b3..bdddb44 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,17 @@ +Tor Browser 9.5a6 -- February 27 2020 + * All Platforms + * Translations update + * Windows + OS X + Linux + * Update Tor Launcher to 0.2.21.2 + * Translations update + * Bug 19757: Support on-disk storage of v3 client auth keys + * Bug 19757: Support on-disk storage of v3 client auth keys + * Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT + * Bug 32658: Create a new MAR signing key + * Build System + * All Platforms + * Bug 33380: Add *.json to sha256sums-unsigned-build.txt + Tor Browser 9.5a5 -- February 12 2020 * All Platforms * Update Firefox to 68.5.0esr diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index fec0612..f96c10f 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.21.1 +version: 0.2.21.2 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index f5f35c1..97b7850 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,11 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '9.5a5' - torbrowser_build: 'build2' + torbrowser_version: '9.5a6' + torbrowser_build: 'build1' torbrowser_incremental_from: - 9.5a4 + - 9.5a5 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] Fold in stable changelog for 9.0.5
by sysrqb＠torproject.org 21 Feb '20

21 Feb '20

commit ff2a021d1d39acf3f2983d971834c56c61393511 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Feb 21 20:13:10 2020 +0000 Fold in stable changelog for 9.0.5 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 72bb219..51405b3 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -27,6 +27,23 @@ Tor Browser 9.5a5 -- February 12 2020 * OS X * Bug 33200: Fix permissions on bookmarks.html +Tor Browser 9.0.5 -- February 11 2020 + * All Platforms + * Update Firefox to 68.5.0esr + * Bump NoScript to 11.0.13 + * Bug 32053: Fix LLVM reproducibility issues + * Bug 32255: Missing ORIGIN header breaks CORS + * Bug 32891: Add new default bridges + * Windows + OS X + Linux + * Bump Tor to 0.4.2.6 + * Windows + * Bug 32132: Re-enable jemalloc for Windows users + * Build System + * All Platforms + * Bug 32739: Bump clang to 8.0.1 + * OS X + * Bug 33200: Fix permissions on bookmarks.html + Tor Browser 9.5a4 -- January 10 2020 * All Platforms * Update Firefox to 68.4.1esr

1 0

[tor-browser/tor-browser-68.5.0esr-9.5-1] fixup! Pick up latest Torbutton code
by sysrqb＠torproject.org 21 Feb '20

21 Feb '20

commit 9e9300163c9074f9b12691d42aefc489e27729ef Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Feb 21 21:26:14 2020 +0000 fixup! Pick up latest Torbutton code --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index f87cd0af7462..078ae18e5f1c 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit f87cd0af7462faab1d349e28e7b17c76274624b0 +Subproject commit 078ae18e5f1cbf888e7c86c8aecaa383a727bf0d

1 0

[tor-browser/tor-browser-68.5.0esr-9.5-1] squash! Bug 30237: Add v3 onion services client authentication prompt
by sysrqb＠torproject.org 21 Feb '20

21 Feb '20

commit aed69dc95387429e18b18ad578fb78d4a83d91f2 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Feb 13 15:06:38 2020 -0500 squash! Bug 30237: Add v3 onion services client authentication prompt Also fixes bug 19757: Add a "Remember this key" checkbox to the client auth prompt. Add an "Onion Services Authentication" section within the about:preferences "Privacy & Security section" to allow viewing and removal of v3 onion client auth keys that have been stored on disk. --- .../onionservices/content/authPopup.inc.xul | 2 + .../onionservices/content/authPreferences.css | 20 ++ .../onionservices/content/authPreferences.inc.xul | 20 ++ .../onionservices/content/authPreferences.js | 63 +++++ .../components/onionservices/content/authPrompt.js | 40 ++-- .../components/onionservices/content/authUtil.jsm | 27 ++- .../onionservices/content/savedKeysDialog.js | 259 +++++++++++++++++++++ .../onionservices/content/savedKeysDialog.xul | 42 ++++ browser/components/onionservices/jar.mn | 4 + .../preferences/in-content/preferences.xul | 1 + .../components/preferences/in-content/privacy.js | 7 + .../components/preferences/in-content/privacy.xul | 2 + browser/modules/TorStrings.jsm | 15 +- 13 files changed, 477 insertions(+), 25 deletions(-) diff --git a/browser/components/onionservices/content/authPopup.inc.xul b/browser/components/onionservices/content/authPopup.inc.xul index d327e4c6a88d..bd0ec3aa0b00 100644 --- a/browser/components/onionservices/content/authPopup.inc.xul +++ b/browser/components/onionservices/content/authPopup.inc.xul @@ -9,6 +9,8 @@ <html:div> <html:input id="tor-clientauth-notification-key" type="password"/> <html:div id="tor-clientauth-warning"/> + <checkbox id="tor-clientauth-persistkey-checkbox" + label="&torbutton.onionServices.authPrompt.persistCheckboxLabel;"/> </html:div> </popupnotificationcontent> </popupnotification> diff --git a/browser/components/onionservices/content/authPreferences.css b/browser/components/onionservices/content/authPreferences.css new file mode 100644 index 000000000000..b3fb79b26ddc --- /dev/null +++ b/browser/components/onionservices/content/authPreferences.css @@ -0,0 +1,20 @@ +/* Copyright (c) 2020, The Tor Project, Inc. */ + +#torOnionServiceKeys-overview-container { + margin-right: 30px; +} + +#onionservices-savedkeys-tree treechildren::-moz-tree-cell-text { + font-size: 80%; +} + +#onionservices-savedkeys-errorContainer { + margin-top: 4px; + min-height: 3em; +} + +#onionservices-savedkeys-errorIcon { + margin-right: 4px; + list-style-image: url("chrome://browser/skin/warning.svg"); + visibility: hidden; +} diff --git a/browser/components/onionservices/content/authPreferences.inc.xul b/browser/components/onionservices/content/authPreferences.inc.xul new file mode 100644 index 000000000000..0b6ce98efa31 --- /dev/null +++ b/browser/components/onionservices/content/authPreferences.inc.xul @@ -0,0 +1,20 @@ +# Copyright (c) 2020, The Tor Project, Inc. + +<groupbox id="torOnionServiceKeys" orient="vertical" + data-category="panePrivacy" hidden="true"> + <label><html:h2 id="torOnionServiceKeys-header"/></label> + <hbox> + <description id="torOnionServiceKeys-overview-container" flex="1"> + <html:span id="torOnionServiceKeys-overview" + class="tail-with-learn-more"/> + <label id="torOnionServiceKeys-learnMore" class="learnMore text-link" + is="text-link"/> + </description> + <vbox align="end"> + <button id="torOnionServiceKeys-savedKeys" + is="highlightable-button" + class="accessory-button" + oncommand="OnionServicesAuthPreferences.onViewSavedKeys()"/> + </vbox> + </hbox> +</groupbox> diff --git a/browser/components/onionservices/content/authPreferences.js b/browser/components/onionservices/content/authPreferences.js new file mode 100644 index 000000000000..c388fbee6b3e --- /dev/null +++ b/browser/components/onionservices/content/authPreferences.js @@ -0,0 +1,63 @@ +// Copyright (c) 2020, The Tor Project, Inc. + +"use strict"; + +ChromeUtils.defineModuleGetter( + this, + "TorStrings", + "resource:///modules/TorStrings.jsm" +); + +/* + Onion Services Client Authentication Preferences Code + + Code to handle init and update of onion services authentication section + in about:preferences#privacy +*/ + +const OnionServicesAuthPreferences = { + selector: { + groupBox: "#torOnionServiceKeys", + header: "#torOnionServiceKeys-header", + overview: "#torOnionServiceKeys-overview", + learnMore: "#torOnionServiceKeys-learnMore", + savedKeysButton: "#torOnionServiceKeys-savedKeys", + }, + + init() { + // populate XUL with localized strings + this._populateXUL(); + }, + + _populateXUL() { + const groupbox = document.querySelector(this.selector.groupBox); + + let elem = groupbox.querySelector(this.selector.header); + elem.textContent = TorStrings.onionServices.authPreferences.header; + + elem = groupbox.querySelector(this.selector.overview); + elem.textContent = TorStrings.onionServices.authPreferences.overview; + + elem = groupbox.querySelector(this.selector.learnMore); + elem.setAttribute("value", TorStrings.onionServices.learnMore); + elem.setAttribute("href", TorStrings.onionServices.learnMoreURL); + + elem = groupbox.querySelector(this.selector.savedKeysButton); + elem.setAttribute( + "label", + TorStrings.onionServices.authPreferences.savedKeys + ); + }, + + onViewSavedKeys() { + gSubDialog.open( + "chrome://browser/content/onionservices/savedKeysDialog.xul" + ); + }, +}; // OnionServicesAuthPreferences + +Object.defineProperty(this, "OnionServicesAuthPreferences", { + value: OnionServicesAuthPreferences, + enumerable: true, + writable: false, +}); diff --git a/browser/components/onionservices/content/authPrompt.js b/browser/components/onionservices/content/authPrompt.js index 2d4ebcafd688..f7a10e75158a 100644 --- a/browser/components/onionservices/content/authPrompt.js +++ b/browser/components/onionservices/content/authPrompt.js @@ -56,14 +56,14 @@ const OnionAuthPrompt = (function() { }; this._prompt = PopupNotifications.show(this._browser, - OnionAuthUtil.string.notificationID, "", - OnionAuthUtil.string.anchorID, + OnionAuthUtil.domid.notification, "", + OnionAuthUtil.domid.anchor, mainAction, [cancelAction], options); }, _onPromptShowing(aWarningMessage) { let xulDoc = this._browser.ownerDocument; - let descElem = xulDoc.getElementById(OnionAuthUtil.string.descriptionID); + let descElem = xulDoc.getElementById(OnionAuthUtil.domid.description); if (descElem) { // Handle replacement of the onion name within the localized // string ourselves so we can show the onion name as bold text. @@ -89,7 +89,7 @@ const OnionAuthPrompt = (function() { span.textContent = prefix; descElem.appendChild(span); span = xulDoc.createElementNS(kHTMLNS, "span"); - span.id = OnionAuthUtil.string.onionNameSpanID; + span.id = OnionAuthUtil.domid.onionNameSpan; span.textContent = this._onionName; descElem.appendChild(span); span = xulDoc.createElementNS(kHTMLNS, "span"); @@ -98,13 +98,17 @@ const OnionAuthPrompt = (function() { } // Set "Learn More" label and href. - let learnMoreElem = xulDoc.getElementById(OnionAuthUtil.string.learnMoreID); + let learnMoreElem = xulDoc.getElementById(OnionAuthUtil.domid.learnMore); if (learnMoreElem) { learnMoreElem.setAttribute("value", TorStrings.onionServices.learnMore); learnMoreElem.setAttribute("href", TorStrings.onionServices.learnMoreURL); } this._showWarning(aWarningMessage); + let checkboxElem = this._getCheckboxElement(); + if (checkboxElem) { + checkboxElem.checked = false; + } }, _onPromptShown() { @@ -170,7 +174,9 @@ const OnionAuthPrompt = (function() { this.show(controllerFailureMsg); }); let onionAddr = this._onionName.toLowerCase().replace(/\.onion$/, ""); - torController.onionAuthAdd(onionAddr, base64key) + let checkboxElem = this._getCheckboxElement(); + let isPermanent = (checkboxElem && checkboxElem.checked); + torController.onionAuthAdd(onionAddr, base64key, isPermanent) .then(aResponse => { // Success! Reload the page. this._browser.messageManager.sendAsyncMessage("Browser:Reload", {}); @@ -189,19 +195,24 @@ const OnionAuthPrompt = (function() { _onCancel() { // Arrange for an error page to be displayed. this._browser.messageManager.sendAsyncMessage( - OnionAuthUtil.string.authPromptCanceledMessage, + OnionAuthUtil.message.authPromptCanceled, {failedURI: this._failedURI.spec}); }, _getKeyElement() { let xulDoc = this._browser.ownerDocument; - return xulDoc.getElementById(OnionAuthUtil.string.keyElementID); + return xulDoc.getElementById(OnionAuthUtil.domid.keyElement); + }, + + _getCheckboxElement() { + let xulDoc = this._browser.ownerDocument; + return xulDoc.getElementById(OnionAuthUtil.domid.checkboxElement); }, _showWarning(aWarningMessage) { let xulDoc = this._browser.ownerDocument; let warningElem = - xulDoc.getElementById(OnionAuthUtil.string.warningElementID); + xulDoc.getElementById(OnionAuthUtil.domid.warningElement); let keyElem = this._getKeyElement(); if (warningElem) { if (aWarningMessage) { @@ -225,9 +236,12 @@ const OnionAuthPrompt = (function() { let base64key; if (aKeyString.length == 52) { // The key is probably base32-encoded. Attempt to decode. + // Although base32 specifies uppercase letters, we accept lowercase + // as well because users may type in lowercase or copy a key out of + // a tor onion-auth file (which uses lowercase). let rawKey; try { - rawKey = CommonUtils.decodeBase32(aKeyString); + rawKey = CommonUtils.decodeBase32(aKeyString.toUpperCase()); } catch (e) {} if (rawKey) try { @@ -247,17 +261,17 @@ const OnionAuthPrompt = (function() { let retval = { init() { - Services.obs.addObserver(this, OnionAuthUtil.string.authPromptTopic); + Services.obs.addObserver(this, OnionAuthUtil.topic.authPrompt); }, uninit() { - Services.obs.removeObserver(this, OnionAuthUtil.string.authPromptTopic); + Services.obs.removeObserver(this, OnionAuthUtil.topic.authPrompt); }, // aSubject is the DOM Window or browser where the prompt should be shown. // aData contains the .onion name. observe(aSubject, aTopic, aData) { - if (aTopic != OnionAuthUtil.string.authPromptTopic) { + if (aTopic != OnionAuthUtil.topic.authPrompt) { return; } diff --git a/browser/components/onionservices/content/authUtil.jsm b/browser/components/onionservices/content/authUtil.jsm index 8547fba83a62..e9446f51cfcb 100644 --- a/browser/components/onionservices/content/authUtil.jsm +++ b/browser/components/onionservices/content/authUtil.jsm @@ -9,20 +9,25 @@ var EXPORTED_SYMBOLS = [ var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const OnionAuthUtil = { - string: { - authPromptTopic: "tor-onion-services-auth-prompt", - authPromptCanceledMessage: "Tor:OnionServicesAuthPromptCanceled", - anchorID: "tor-clientauth-notification-icon", - notificationID: "tor-clientauth", - descriptionID: "tor-clientauth-notification-desc", - learnMoreID: "tor-clientauth-notification-learnmore", - onionNameSpanID: "tor-clientauth-notification-onionname", - keyElementID: "tor-clientauth-notification-key", - warningElementID: "tor-clientauth-warning", + topic: { + authPrompt: "tor-onion-services-auth-prompt", + }, + message: { + authPromptCanceled: "Tor:OnionServicesAuthPromptCanceled", + }, + domid: { + anchor: "tor-clientauth-notification-icon", + notification: "tor-clientauth", + description: "tor-clientauth-notification-desc", + learnMore: "tor-clientauth-notification-learnmore", + onionNameSpan: "tor-clientauth-notification-onionname", + keyElement: "tor-clientauth-notification-key", + warningElement: "tor-clientauth-warning", + checkboxElement: "tor-clientauth-persistkey-checkbox", }, addCancelMessageListener(aTabContent, aDocShell) { - aTabContent.addMessageListener(this.string.authPromptCanceledMessage, + aTabContent.addMessageListener(this.message.authPromptCanceled, (aMessage) => { let failedURI = Services.io.newURI(aMessage.data.failedURI); aDocShell.displayLoadError(Cr.NS_ERROR_CONNECTION_REFUSED, failedURI, diff --git a/browser/components/onionservices/content/savedKeysDialog.js b/browser/components/onionservices/content/savedKeysDialog.js new file mode 100644 index 000000000000..b1376bbabe85 --- /dev/null +++ b/browser/components/onionservices/content/savedKeysDialog.js @@ -0,0 +1,259 @@ +// Copyright (c) 2020, The Tor Project, Inc. + +"use strict"; + +ChromeUtils.defineModuleGetter( + this, + "TorStrings", + "resource:///modules/TorStrings.jsm" +); + +ChromeUtils.defineModuleGetter( + this, + "controller", + "resource://torbutton/modules/tor-control-port.js" +); + +var gOnionServicesSavedKeysDialog = { + selector: { + dialog: "#onionservices-savedkeys-dialog", + intro: "#onionservices-savedkeys-intro", + tree: "#onionservices-savedkeys-tree", + onionSiteCol: "#onionservices-savedkeys-siteCol", + onionKeyCol: "#onionservices-savedkeys-keyCol", + errorIcon: "#onionservices-savedkeys-errorIcon", + errorMessage: "#onionservices-savedkeys-errorMessage", + removeButton: "#onionservices-savedkeys-remove", + removeAllButton: "#onionservices-savedkeys-removeall", + }, + + _tree: undefined, + _isBusy: false, // true when loading data, deleting a key, etc. + + // Public functions (called from outside this file). + async deleteSelectedKeys() { + this._setBusyState(true); + + const indexesToDelete = []; + const count = this._tree.view.selection.getRangeCount(); + for (let i = 0; i < count; ++i) { + const minObj = {}; + const maxObj = {}; + this._tree.view.selection.getRangeAt(i, minObj, maxObj); + for (let idx = minObj.value; idx <= maxObj.value; ++idx) { + indexesToDelete.push(idx); + } + } + + if (indexesToDelete.length > 0) { + const controllerFailureMsg = + TorStrings.onionServices.authPreferences.failedToRemoveKey; + try { + const torController = controller(aError => { + this._showError(controllerFailureMsg); + }); + + // Remove in reverse index order to avoid issues caused by index changes. + for (let i = indexesToDelete.length - 1; i >= 0; --i) { + await this._deleteOneKey(torController, indexesToDelete[i]); + } + } catch (e) { + if (e.torMessage) { + this._showError(e.torMessage); + } else { + this._showError(controllerFailureMsg); + } + } + } + + this._setBusyState(false); + }, + + async deleteAllKeys() { + this._tree.view.selection.selectAll(); + await this.deleteSelectedKeys(); + }, + + updateButtonsState() { + const haveSelection = this._tree.view.selection.getRangeCount() > 0; + const dialog = document.querySelector(this.selector.dialog); + const removeSelectedBtn = dialog.querySelector(this.selector.removeButton); + removeSelectedBtn.disabled = this._isBusy || !haveSelection; + const removeAllBtn = dialog.querySelector(this.selector.removeAllButton); + removeAllBtn.disabled = this._isBusy || this.rowCount === 0; + }, + + // Private functions. + _onLoad() { + document.mozSubdialogReady = this._init(); + }, + + async _init() { + await this._populateXUL(); + + window.addEventListener("keypress", this._onWindowKeyPress.bind(this)); + + // We don't use await here because we want _loadSavedKeys() to run + // in the background and not block loading of this dialog. + this._loadSavedKeys(); + }, + + async _populateXUL() { + const dialog = document.querySelector(this.selector.dialog); + const authPrefStrings = TorStrings.onionServices.authPreferences; + dialog.setAttribute("title", authPrefStrings.dialogTitle); + + let elem = dialog.querySelector(this.selector.intro); + elem.textContent = authPrefStrings.dialogIntro; + + elem = dialog.querySelector(this.selector.onionSiteCol); + elem.setAttribute("label", authPrefStrings.onionSite); + + elem = dialog.querySelector(this.selector.onionKeyCol); + elem.setAttribute("label", authPrefStrings.onionKey); + + elem = dialog.querySelector(this.selector.removeButton); + elem.setAttribute("label", authPrefStrings.remove); + + elem = dialog.querySelector(this.selector.removeAllButton); + elem.setAttribute("label", authPrefStrings.removeAll); + + this._tree = dialog.querySelector(this.selector.tree); + }, + + async _loadSavedKeys() { + const controllerFailureMsg = + TorStrings.onionServices.authPreferences.failedToGetKeys; + this._setBusyState(true); + + try { + this._tree.view = this; + + const torController = controller(aError => { + this._showError(controllerFailureMsg); + }); + + const keyInfoList = await torController.onionAuthViewKeys(); + if (keyInfoList) { + // Filter out temporary keys. + this._keyInfoList = keyInfoList.filter(aKeyInfo => { + if (!aKeyInfo.Flags) { + return false; + } + + const flags = aKeyInfo.Flags.split(","); + return flags.includes("Permanent"); + }); + + // Sort by the .onion address. + this._keyInfoList.sort((aObj1, aObj2) => { + const hsAddr1 = aObj1.hsAddress.toLowerCase(); + const hsAddr2 = aObj2.hsAddress.toLowerCase(); + if (hsAddr1 < hsAddr2) { + return -1; + } + return hsAddr1 > hsAddr2 ? 1 : 0; + }); + } + + // Render the tree content. + this._tree.rowCountChanged(0, this.rowCount); + } catch (e) { + if (e.torMessage) { + this._showError(e.torMessage); + } else { + this._showError(controllerFailureMsg); + } + } + + this._setBusyState(false); + }, + + // This method may throw; callers should catch errors. + async _deleteOneKey(aTorController, aIndex) { + const keyInfoObj = this._keyInfoList[aIndex]; + await aTorController.onionAuthRemove(keyInfoObj.hsAddress); + this._tree.view.selection.clearRange(aIndex, aIndex); + this._keyInfoList.splice(aIndex, 1); + this._tree.rowCountChanged(aIndex + 1, -1); + }, + + _setBusyState(aIsBusy) { + this._isBusy = aIsBusy; + this.updateButtonsState(); + }, + + _onWindowKeyPress(event) { + if (event.keyCode === KeyEvent.DOM_VK_ESCAPE) { + window.close(); + } else if (event.keyCode === KeyEvent.DOM_VK_DELETE) { + this.deleteSelectedKeys(); + } + }, + + _showError(aMessage) { + const dialog = document.querySelector(this.selector.dialog); + const errorIcon = dialog.querySelector(this.selector.errorIcon); + errorIcon.style.visibility = aMessage ? "visible" : "hidden"; + const errorDesc = dialog.querySelector(this.selector.errorMessage); + errorDesc.textContent = aMessage ? aMessage : ""; + }, + + // XUL tree widget view implementation. + get rowCount() { + return this._keyInfoList ? this._keyInfoList.length : 0; + }, + + getCellText(aRow, aCol) { + let val = ""; + if (this._keyInfoList && aRow < this._keyInfoList.length) { + const keyInfo = this._keyInfoList[aRow]; + if (aCol.id.endsWith("-siteCol")) { + val = keyInfo.hsAddress; + } else if (aCol.id.endsWith("-keyCol")) { + val = keyInfo.typeAndKey; + // Omit keyType because it is always "x25519". + const idx = val.indexOf(":"); + if (idx > 0) { + val = val.substring(idx + 1); + } + } + } + + return val; + }, + + isSeparator(index) { + return false; + }, + + isSorted() { + return false; + }, + + isContainer(index) { + return false; + }, + + setTree(tree) {}, + + getImageSrc(row, column) {}, + + getCellValue(row, column) {}, + + cycleHeader(column) {}, + + getRowProperties(row) { + return ""; + }, + + getColumnProperties(column) { + return ""; + }, + + getCellProperties(row, column) { + return ""; + }, +}; + +window.addEventListener("load", () => gOnionServicesSavedKeysDialog._onLoad()); diff --git a/browser/components/onionservices/content/savedKeysDialog.xul b/browser/components/onionservices/content/savedKeysDialog.xul new file mode 100644 index 000000000000..3db9bb05ea82 --- /dev/null +++ b/browser/components/onionservices/content/savedKeysDialog.xul @@ -0,0 +1,42 @@ +<?xml version="1.0"?> + + +<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css" type="text/css"?> +<?xml-stylesheet href="chrome://browser/content/onionservices/authPreferences.css" type="text/css"?> + +<window id="onionservices-savedkeys-dialog" + windowtype="OnionServices:SavedKeys" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + style="width: 45em;"> + + <script src="chrome://browser/content/onionservices/savedKeysDialog.js"/> + + <vbox id="onionservices-savedkeys" class="contentPane" flex="1"> + <label id="onionservices-savedkeys-intro" + control="onionservices-savedkeys-tree"/> + <separator class="thin"/> + <tree id="onionservices-savedkeys-tree" flex="1" hidecolumnpicker="true" + width="750" + style="height: 20em;" + onselect="gOnionServicesSavedKeysDialog.updateButtonsState();"> + <treecols> + <treecol id="onionservices-savedkeys-siteCol" flex="1" persist="width"/> + <splitter class="tree-splitter"/> + <treecol id="onionservices-savedkeys-keyCol" flex="1" persist="width"/> + </treecols> + <treechildren/> + </tree> + <hbox id="onionservices-savedkeys-errorContainer" align="baseline" flex="1"> + <image id="onionservices-savedkeys-errorIcon"/> + <description id="onionservices-savedkeys-errorMessage" flex="1"/> + </hbox> + <separator class="thin"/> + <hbox id="onionservices-savedkeys-buttons"> + <button id="onionservices-savedkeys-remove" disabled="true" + oncommand="gOnionServicesSavedKeysDialog.deleteSelectedKeys();"/> + <button id="onionservices-savedkeys-removeall" + oncommand="gOnionServicesSavedKeysDialog.deleteAllKeys();"/> + </hbox> + </vbox> +</window> diff --git a/browser/components/onionservices/jar.mn b/browser/components/onionservices/jar.mn index 06cf2df6e7ac..583ab77bc6d8 100644 --- a/browser/components/onionservices/jar.mn +++ b/browser/components/onionservices/jar.mn @@ -1,4 +1,8 @@ browser.jar: + content/browser/onionservices/authPreferences.css (content/authPreferences.css) + content/browser/onionservices/authPreferences.js (content/authPreferences.js) content/browser/onionservices/authPrompt.js (content/authPrompt.js) content/browser/onionservices/authUtil.jsm (content/authUtil.jsm) content/browser/onionservices/onionservices.css (content/onionservices.css) + content/browser/onionservices/savedKeysDialog.js (content/savedKeysDialog.js) + content/browser/onionservices/savedKeysDialog.xul (content/savedKeysDialog.xul) diff --git a/browser/components/preferences/in-content/preferences.xul b/browser/components/preferences/in-content/preferences.xul index 7a01443ab048..30915e3d358f 100644 --- a/browser/components/preferences/in-content/preferences.xul +++ b/browser/components/preferences/in-content/preferences.xul @@ -15,6 +15,7 @@ <?xml-stylesheet href="chrome://browser/skin/preferences/in-content/search.css"?> <?xml-stylesheet href="chrome://browser/skin/preferences/in-content/containers.css"?> <?xml-stylesheet href="chrome://browser/skin/preferences/in-content/privacy.css"?> +<?xml-stylesheet href="chrome://browser/content/onionservices/authPreferences.css"?> <?xml-stylesheet href="chrome://browser/content/securitylevel/securityLevelPreferences.css"?> <?xml-stylesheet href="chrome://browser/content/torpreferences/torPreferences.css"?> diff --git a/browser/components/preferences/in-content/privacy.js b/browser/components/preferences/in-content/privacy.js index 297d07fadf1f..ee86b4158d7c 100644 --- a/browser/components/preferences/in-content/privacy.js +++ b/browser/components/preferences/in-content/privacy.js @@ -62,6 +62,12 @@ XPCOMUtils.defineLazyGetter(this, "AlertsServiceDND", function() { } }); +XPCOMUtils.defineLazyScriptGetter( + this, + ["OnionServicesAuthPreferences"], + "chrome://browser/content/onionservices/authPreferences.js" +); + // TODO: module import via ChromeUtils.defineModuleGetter XPCOMUtils.defineLazyScriptGetter( this, @@ -369,6 +375,7 @@ var gPrivacyPane = { this.trackingProtectionReadPrefs(); this.networkCookieBehaviorReadPrefs(); this._initTrackingProtectionExtensionControl(); + OnionServicesAuthPreferences.init(); this._initSecurityLevel(); Services.telemetry.setEventRecordingEnabled("pwmgr", true); diff --git a/browser/components/preferences/in-content/privacy.xul b/browser/components/preferences/in-content/privacy.xul index 013fe147bc82..e807ac69f1f1 100644 --- a/browser/components/preferences/in-content/privacy.xul +++ b/browser/components/preferences/in-content/privacy.xul @@ -468,6 +468,8 @@ </hbox> </groupbox> +#include ../../onionservices/content/authPreferences.inc.xul +  <groupbox id="formAutofillGroupBox" diff --git a/browser/modules/TorStrings.jsm b/browser/modules/TorStrings.jsm index f68d60cf1343..e9a8b3969297 100644 --- a/browser/modules/TorStrings.jsm +++ b/browser/modules/TorStrings.jsm @@ -329,7 +329,7 @@ var TorStrings = { }; let retval = { - learnMore: getString("torPreferences.learnMore", "Learn More"), + learnMore: getString("learnMore", "Learn more"), learnMoreURL: `https://2019.www.torproject.org/docs/tor-manual-dev.html.${getLocale()}#_client_authorization`, authPrompt: { description: @@ -341,6 +341,19 @@ var TorStrings = { failedToSetKey: getString("authPrompt.failedToSetKey", "Failed to set key"), }, + authPreferences: { + header: getString("authPreferences.header", "Onion Services Authentication"), + overview: getString("authPreferences.overview", "Some onion services require that you identify yourself with a key"), + savedKeys: getString("authPreferences.savedKeys", "Saved Keys"), + dialogTitle: getString("authPreferences.dialogTitle", "Onion Services Keys"), + dialogIntro: getString("authPreferences.dialogIntro", "Keys for the following onionsites are stored on your computer"), + onionSite: getString("authPreferences.onionSite", "Onionsite"), + onionKey: getString("authPreferences.onionKey", "Key"), + remove: getString("authPreferences.remove", "Remove"), + removeAll: getString("authPreferences.removeAll", "Remove All"), + failedToGetKeys: getString("authPreferences.failedToGetKeys", "Failed to get keys"), + failedToRemoveKey: getString("authPreferences.failedToRemoveKey", "Failed to remove key"), + }, }; return retval;

1 0

[tor-launcher/master] Bug 19757: Support on-disk storage of v3 client auth keys
by sysrqb＠torproject.org 21 Feb '20

21 Feb '20

commit 6ceda2e5565702f13933b83653c1951789fc0252 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Dec 4 09:48:08 2019 -0500 Bug 19757: Support on-disk storage of v3 client auth keys Create a client-auth directory within the Tor data directory and use it. --- src/components/tl-process.js | 7 ++++++- src/modules/tl-util.jsm | 13 ++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 49abc0a..1cad103 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -1,4 +1,4 @@ -// Copyright (c) 2018, The Tor Project, Inc. +// Copyright (c) 2020, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -372,6 +372,7 @@ TorProcessService.prototype = // Get the Tor data directory first so it is created before we try to // construct paths to files that will be inside it. var dataDir = TorLauncherUtil.getTorFile("tordatadir", true); + var onionAuthDir = TorLauncherUtil.getTorFile("toronionauthdir", true); var exeFile = TorLauncherUtil.getTorFile("tor", false); var torrcFile = TorLauncherUtil.getTorFile("torrc", true); var torrcDefaultsFile = @@ -388,6 +389,8 @@ TorProcessService.prototype = detailsKey = "torrc_missing"; else if (!dataDir) detailsKey = "datadir_missing"; + else if (!onionAuthDir) + detailsKey = "onionauthdir_missing"; else if (!hashedPassword) detailsKey = "password_hash_missing"; @@ -418,6 +421,8 @@ TorProcessService.prototype = args.push(torrcFile.path); args.push("DataDirectory"); args.push(dataDir.path); + args.push("ClientOnionAuthDir"); + args.push(onionAuthDir.path); args.push("GeoIPFile"); args.push(geoipFile.path); args.push("GeoIPv6File"); diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index c54acb9..b721372 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -1,4 +1,4 @@ -// Copyright (c) 2019, The Tor Project, Inc. +// Copyright (c) 2020, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -571,6 +571,8 @@ let TorLauncherUtil = // Public path = "Tor\\torrc"; else if ("tordatadir" == aTorFileType) path = "Tor"; + else if ("toronionauthdir" == aTorFileType) + path = "Tor\\onion-auth"; else if ("pt-profiles-dir" == aTorFileType) path = "Tor\\PluggableTransports"; } @@ -586,6 +588,8 @@ let TorLauncherUtil = // Public path = "Tor/torrc"; else if ("tordatadir" == aTorFileType) path = "Tor"; + else if ("toronionauthdir" == aTorFileType) + path = "Tor/onion-auth"; else if ("pt-profiles-dir" == aTorFileType) path = "Tor/PluggableTransports"; else if (isIPC) @@ -603,6 +607,8 @@ let TorLauncherUtil = // Public path = "Tor/torrc"; else if ("tordatadir" == aTorFileType) path = "Tor"; + else if ("toronionauthdir" == aTorFileType) + path = "Tor/onion-auth"; else if ("pt-profiles-dir" == aTorFileType) path = "Tor/PluggableTransports"; else if (isIPC) @@ -622,6 +628,8 @@ let TorLauncherUtil = // Public path = "Data\\Tor\\torrc"; else if ("tordatadir" == aTorFileType) path = "Data\\Tor"; + else if ("toronionauthdir" == aTorFileType) + path = "Data\\Tor\\onion-auth"; else if ("pt-profiles-dir" == aTorFileType) path = "Data\\Browser"; } @@ -638,6 +646,8 @@ let TorLauncherUtil = // Public path = "Data/Tor/torrc"; else if ("tordatadir" == aTorFileType) path = "Data/Tor"; + else if ("toronionauthdir" == aTorFileType) + path = "Data/Tor/onion-auth"; else if ("pt-profiles-dir" == aTorFileType) path = "Data/Browser"; else if (isIPC) @@ -683,6 +693,7 @@ let TorLauncherUtil = // Public try { if (("tordatadir" == aTorFileType) || + ("toronionauthdir" == aTorFileType) || ("pt-profiles-dir" == aTorFileType)) { torFile.create(torFile.DIRECTORY_TYPE, 0o700);

1 0

[tor-launcher/master] Translations update
by sysrqb＠torproject.org 21 Feb '20

21 Feb '20

commit cb34de3fc8d80049c6bd526e56efc6df75b3a621 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Feb 21 20:54:43 2020 +0000 Translations update --- src/chrome/locale/ja/torlauncher.properties | 2 +- src/chrome/locale/sv-SE/network-settings.dtd | 4 ++-- src/chrome/locale/vi/network-settings.dtd | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/chrome/locale/ja/torlauncher.properties b/src/chrome/locale/ja/torlauncher.properties index c452259..38ef19a 100644 --- a/src/chrome/locale/ja/torlauncher.properties +++ b/src/chrome/locale/ja/torlauncher.properties @@ -4,7 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited_during_startup=Tor が起動中に終了しました。これは、torrc ファイルの誤りや、Tor または他のプログラムのバグ、もしくはハードウェアの故障に起因しているかもしれません。問題を解決して Tor を再起動するまで、Tor Browser は起動されません。 -torlauncher.tor_exited=Tor が突然終了しました。原因はおそらく Tor 自体のバグか、他の常駐プログラムか、あるいはハードウェアーが問題です。Tor を再起動するまで、Tor ブラウザーはウェブサイトに一切接続できません。再起動しても解決されない場合、Tor ログファイルをサポートチームに送信してください。 +torlauncher.tor_exited=Tor が突然終了しました。原因はおそらく Tor 自体のバグか、他の常駐プログラムか、あるいはハードウェアーが問題です。Tor を再起動するまで、 Tor Browser はウェブサイトに一切接続できません。再起動しても解決されない場合、Tor ログファイルをサポートチームに送信してください。 torlauncher.tor_exited2=Tor を再起動しても、あなたのブラウザータブはそのまま残ります。 torlauncher.tor_controlconn_failed=Torのコントロールポートに接続出来ませんでした。 torlauncher.tor_failed_to_start=Torは開始出来ませんでした。 diff --git a/src/chrome/locale/sv-SE/network-settings.dtd b/src/chrome/locale/sv-SE/network-settings.dtd index a31aa57..05823df 100644 --- a/src/chrome/locale/sv-SE/network-settings.dtd +++ b/src/chrome/locale/sv-SE/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Klicka på "Anslut" för att ansluta till Tor."> -<!ENTITY torSettings.configurePrompt "Klicka "Konfigurera" för att justera nätverks inställningar ifall du är i ett land som censurerar Tor( som Egypten, Kina och Turkiet) eller ifall du ansluter från ett privat nätverk som kräver en proxy."> +<!ENTITY torSettings.configurePrompt "Klicka på "Konfigurera" för att justera nätverksinställningar om du är i ett land som censurerar Tor (som Egypten, Kina eller Turkiet) eller om du ansluter från ett privat nätverk som kräver en proxy."> <!ENTITY torSettings.configure "Konfigurera"> <!ENTITY torSettings.connect "Anslut"> @@ -26,7 +26,7 @@ <!ENTITY torsettings.optional "Valfritt"> <!ENTITY torsettings.useProxy.checkbox "Jag använder en proxy för att ansluta till internet"> -<!ENTITY torsettings.useProxy.type "Proxy-typ"> +<!ENTITY torsettings.useProxy.type "Proxytyp"> <!ENTITY torsettings.useProxy.type.placeholder "Välj en proxytyp"> <!ENTITY torsettings.useProxy.address "Adress"> <!ENTITY torsettings.useProxy.address.placeholder "IP-adress eller värdnamn"> diff --git a/src/chrome/locale/vi/network-settings.dtd b/src/chrome/locale/vi/network-settings.dtd index aa31765..51e7992 100644 --- a/src/chrome/locale/vi/network-settings.dtd +++ b/src/chrome/locale/vi/network-settings.dtd @@ -64,7 +64,7 @@  <!ENTITY torPreferences.categoryTitle "Tor"> <!ENTITY torPreferences.torSettings "Cài đặt Tor"> -<!ENTITY torPreferences.torSettingsDescription "Tor Browser dẫn lưu lượng của bạn qua mạng Tor, vận hành bởi hàng ngàn tình nguyện viên khắp thế giới." > +<!ENTITY torPreferences.torSettingsDescription "Trình duyệt Tor dẫn lưu lượng của bạn qua mạng Tor, vận hành bởi hàng ngàn tình nguyện viên khắp thế giới." > <!ENTITY torPreferences.learnMore "Tìm hiểu thêm"> <!ENTITY torPreferences.bridges "Cầu Nối"> <!ENTITY torPreferences.bridgesDescription "Cầu nối giúp bạn truy cập mạng Tor ở những nơi mạng Tor bị chặn. Tùy vào vị trí của bạn mà một cầu nối có thể hoạt động tốt hơn cầu nối khác."> @@ -72,7 +72,7 @@ <!ENTITY torPreferences.requestNewBridge "Yêu cầu Cầu nối mới..."> <!ENTITY torPreferences.provideBridge "Cung cấp cầu nối"> <!ENTITY torPreferences.advanced "Nâng cao"> -<!ENTITY torPreferences.advancedDescription "Cài đặt cách Tor Browser kết nối tới internet."> +<!ENTITY torPreferences.advancedDescription "Cài đặt cách trình duyệt Tor kết nối tới internet."> <!ENTITY torPreferences.firewallPortsPlaceholder "Giá trị ngăn cách bởi dấu phẩy"> <!ENTITY torPreferences.requestBridgeDialogTitle "Yêu cầu cầu nối"> <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Đang kết nối tới BridgeDB. Vui lòng đợi.">

1 0