- tbb-commits - lists.torproject.org

[torbutton/master] Merge remote-tracking branch 'gk/bug_26058'
by gk＠torproject.org 21 Jun '18

21 Jun '18

commit 824e6df6e8177fabcb33dac06142332add64a7dd Merge: 46c71b6 72aacbd Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 21 20:28:06 2018 +0000 Merge remote-tracking branch 'gk/bug_26058' src/chrome/content/torbutton.js | 16 ---------------- src/defaults/preferences/preferences.js | 1 - 2 files changed, 17 deletions(-)

1 0

[torbutton/master] Revert "Bug 18743: Pref to hide 'Sign in to Sync' button in hamburger menu"
by gk＠torproject.org 21 Jun '18

21 Jun '18

commit 72aacbd7178d50abf2c95c43ce907e65b95ddb1c Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 15 12:33:21 2018 +0000 Revert "Bug 18743: Pref to hide 'Sign in to Sync' button in hamburger menu" This reverts commit d127873b498fb83e4f608b82a8d382df25183dd3. --- src/chrome/content/torbutton.js | 16 ---------------- src/defaults/preferences/preferences.js | 1 - 2 files changed, 17 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 7f750bc..b56a628 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -175,9 +175,6 @@ var torbutton_unique_pref_observer = case "privacy.firstparty.isolate": torbutton_update_isolation_prefs(); break; - case "extensions.torbutton.hide_sync_ui": - torbutton_update_sync_ui(); - break; } } } @@ -404,7 +401,6 @@ function torbutton_init() { torbutton_update_toolbutton(); torbutton_notify_if_update_needed(); - torbutton_update_sync_ui(); createTorCircuitDisplay(m_tb_control_ipc_file, m_tb_control_host, m_tb_control_port, m_tb_control_pass, @@ -2339,18 +2335,6 @@ function torbutton_is_homepage_url(aURI) return (urls.indexOf(aURI.spec) >= 0); } -// Check if "extensions.torbutton.hide_sync_ui" is enabled, and if so, -// hide the "Sign in to Sync" button on the hamburger menu. -function torbutton_update_sync_ui() -{ - try { - document.getElementById("PanelUI-footer-fxa").style.display = - getBoolPref("extensions.torbutton.hide_sync_ui") ? "none" : ""; - } catch (e) { - torbutton_log(5, 'Error updating the Sync UI: ' + e); - } -} - // Update the NoScript button to reflect any changes to noscript prefs function torbutton_update_noscript_button() { diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index f61cb89..5cfb0eb 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -6,7 +6,6 @@ pref("extensions.torbutton.logmethod",1); // 0=stdout, 1=errorconsole, 2=debuglo pref("extensions.torbutton.display_circuit", true); pref("extensions.torbutton(a)torproject.org.description", "chrome://torbutton/locale/torbutton.properties"); pref("extensions.torbutton.updateNeeded", false); -pref("extensions.torbutton.hide_sync_ui", true); // Tor check and proxy prefs pref("extensions.torbutton.test_enabled",true);

1 0

[tor-launcher/master] Bug 20628: Add locales bn-BD, da, he, sv, zh-TW
by gk＠torproject.org 21 Jun '18

21 Jun '18

commit f34580ab7e70487e5c97c67969326111ac00d074 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Jun 21 01:37:46 2018 -0700 Bug 20628: Add locales bn-BD, da, he, sv, zh-TW --- src/chrome/content/network-settings.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index f86402d..0e18b29 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -304,10 +304,13 @@ function populateLocaleList(aLangPackAddons) let knownLanguages = { "en-US" : "English", "ar" : "\u0627\u0644\u0639\u0631\u0628\u064a\u0629", + "bn-BD" : "\u09ac\u09be\u0982\u09b2\u09be", + "da" : "Dansk", "de" : "Deutsch", "es-ES" : "Espa\u00f1ol", "fa" : "\u0641\u0627\u0631\u0633\u06cc", "fr" : "Fran\u00e7ais", + "he" : "\u05e2\u05d1\u05e8\u05d9\u05ea", "it" : "Italiano", "ja" : "\u65e5\u672c\u8a9e", "ko" : "\ud55c\uad6d\uc5b4", @@ -315,9 +318,11 @@ function populateLocaleList(aLangPackAddons) "pl" : "Polski", "pt-PT" : "Portugu\u00eas (Europeu)", "ru" : "\u0420\u0443\u0441\u0441\u043a\u0438\u0439", + "sv" : "Svenska", "tr" : "T\u00fcrk\u00e7e", "vi" : "Ti\u1ebfng Vi\u1ec7t", - "zh-CN" : "\u7b80\u4f53\u5b57" + "zh-CN" : "\u7b80\u4f53\u5b57", + "zh-TW" : "\u6b63\u9ad4\u5b57" }; // Retrieve the current locale so we can select it within the list by default.

1 0

[torbutton/master] Bug 20628: Add locales bn-BD, da, he, sv, zh-TW
by gk＠torproject.org 21 Jun '18

21 Jun '18

commit 46c71b6a528e70386fb8165f7d1507615d1a2a47 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Jun 21 01:04:05 2018 -0700 Bug 20628: Add locales bn-BD, da, he, sv, zh-TW --- trans_tools/import-translations.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh index 83c2b6a..736d62f 100755 --- a/trans_tools/import-translations.sh +++ b/trans_tools/import-translations.sh @@ -2,14 +2,14 @@ # This var comes from the TBB locale list. # XXX: Find some way to keep this, tor-launcher, and Tor Browser in sync -BUNDLE_LOCALES="ar de es fa fr it ko nl pl pt-BR ru tr vi zh-CN" +BUNDLE_LOCALES="ar bn-BD da de es fa fr he it ja ko nl pl pt-BR ru sv tr vi zh-CN zh-TW" # XXX: Basque (eu) by request in #10687. # This is not used for official builds, but should remain # so Basque XPIs can be build independently. We can do # this for other languages too, if anyone requests this # and translations are available. -BUNDLE_LOCALES="$BUNDLE_LOCALES eu ja sv da" +BUNDLE_LOCALES="$BUNDLE_LOCALES eu" LOCALE_DIR=../src/chrome/locale

1 0

[tor-browser-build/master] Fold in older changelogs
by gk＠torproject.org 21 Jun '18

21 Jun '18

commit 6402ea66ab8ccc58870f09222a71caceeed4e41d Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 21 19:03:17 2018 +0000 Fold in older changelogs --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 089cbad..4438a9d 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,13 @@ +Tor Browser 8.0a8 -- June 10 2018 + * All platforms + * Update Firefox to 52.8.1esr + * Bug 26098: Remove amazon-meek + +Tor Browser 7.5.5 -- June 10 2018 + * All platforms + * Update Firefox to 52.8.1esr + * Bug 26098: Remove amazon-meek + Tor Browser 8.0a7 -- May 9 2018 * All platforms * Update Firefox to 52.8.0esr @@ -14,6 +24,17 @@ Tor Browser 8.0a7 -- May 9 2018 * Linux * Bug 26010: Change Snowflake rendezvous to use the Azure domain front +Tor Browser 7.5.4 -- May 9 2018 + * All platforms + * Update Firefox to 52.8.0esr + * Update HTTPS Everywhere to 2018.4.11 + * Update NoScript to 5.1.8.5 + * Bug 23439: Exempt .onion domains from mixed content warnings + * Bug 22614: Make e10s/non-e10s Tor Browsers indistinguishable + * Bug 22659: Changes to `intl.accept.languages` get overwritten after restart + * Bug 25973: Backport off-by-one fix (bug 1352073) + * Bug 25020: Add a tbb_version.json file + Tor Browser 8.0a6 -- April 19 2018 * All platforms * Update Tor to 0.3.3.5-rc

1 0

[tor-browser-build/maint-7.5] Picking up a -build2 from Mozilla
by gk＠torproject.org 21 Jun '18

21 Jun '18

commit e2e0f83294692b6ff271ba073ad9ffa25fa5d02a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 21 18:48:05 2018 +0000 Picking up a -build2 from Mozilla --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 2 +- rbm.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 4e42939..04cd7dd 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index cfafe70..0ed39da 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-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 079c216..31b9cc1 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '7.5.6' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 7.5.4 - 7.5.5

1 0

[tor-browser-build/master] Bug 26440: move vaulted vars to a separate directory
by gk＠torproject.org 21 Jun '18

21 Jun '18

commit 2baf11975323cffae6a993fb5a2f57236f7c880d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jun 21 16:27:50 2018 +0200 Bug 26440: move vaulted vars to a separate directory --- tools/ansible/boklm-tbb-nightly-build.yml | 2 ++ .../ansible/{group_vars => vaulted_vars}/boklm-tbb-nightly/dma-auth.yml | 0 2 files changed, 2 insertions(+) diff --git a/tools/ansible/boklm-tbb-nightly-build.yml b/tools/ansible/boklm-tbb-nightly-build.yml index 2fe48cd..dd9e1dc 100644 --- a/tools/ansible/boklm-tbb-nightly-build.yml +++ b/tools/ansible/boklm-tbb-nightly-build.yml @@ -6,3 +6,5 @@ - role: tbb-nightly-build - role: unattended-upgrades - role: mta + vars_files: + - vaulted_vars/boklm-tbb-nightly/dma-auth.yml diff --git a/tools/ansible/group_vars/boklm-tbb-nightly/dma-auth.yml b/tools/ansible/vaulted_vars/boklm-tbb-nightly/dma-auth.yml similarity index 100% rename from tools/ansible/group_vars/boklm-tbb-nightly/dma-auth.yml rename to tools/ansible/vaulted_vars/boklm-tbb-nightly/dma-auth.yml

1 0

[tor-browser-build/master] Bug 23384: Add user sukhbir on build-sunet-a.torproject.net
by boklm＠torproject.org 21 Jun '18

21 Jun '18

commit 9638ce481f00edd72e5f307cde29978e66a5d24f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jun 21 15:50:27 2018 +0200 Bug 23384: Add user sukhbir on build-sunet-a.torproject.net --- tools/ansible/roles/tbb-team/defaults/main.yml | 1 + tools/ansible/roles/tbb-team/files/sukhbir.pub | 1 + 2 files changed, 2 insertions(+) diff --git a/tools/ansible/roles/tbb-team/defaults/main.yml b/tools/ansible/roles/tbb-team/defaults/main.yml index 1445fce..8bf2e66 100644 --- a/tools/ansible/roles/tbb-team/defaults/main.yml +++ b/tools/ansible/roles/tbb-team/defaults/main.yml @@ -6,3 +6,4 @@ tbb_team_members: - gk - mcs - mikeperry + - sukhbir diff --git a/tools/ansible/roles/tbb-team/files/sukhbir.pub b/tools/ansible/roles/tbb-team/files/sukhbir.pub new file mode 100644 index 0000000..3277487 --- /dev/null +++ b/tools/ansible/roles/tbb-team/files/sukhbir.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCs5gQrS9m8H4qiR+Q0BT85jIHFgSb3ns2l1M1JWgWyI5eZvXCxIq1G9xI+HOp86mHA2XX7uWSCKWiWM1lt4UnM4jHm5thC2MEsKVqHaHF7s+lXq2uhybUma2fxXdYc9AM/TxujKKJ6U5qIkqLsX3HF5tQtEKY2lgPXgXNpldfX/IhtBWOfmRGTH5iu1hBIhhMAz31lTcYR4AOpcSeeMGRhYEka5RrH492OLfCVxphtlRtXm4CtAL4NpNe/cMZnntqprJJAjRJC71gU3OpT5a2zKKctN/5wTwAWpR1URXrQK4Mu37angYhjR/698iTJVAv2XxEgkB+NUCse98cIMUj5 sukhbir.in(a)gmail.com

1 0

[tor-browser-build/master] Bug 26438: Use non-sandbox background and .DS_Store again
by boklm＠torproject.org 21 Jun '18

21 Jun '18

commit 8b91968072326cf32da011b2c8bd3bbef14e4ef4 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 21 08:44:02 2018 +0000 Bug 26438: Use non-sandbox background and .DS_Store again --- .../Bundle-Data/mac-applications.dmg/.DS_Store | Bin 12292 -> 12292 bytes .../mac-applications.dmg/.background/background.png | Bin 49906 -> 50020 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/mac-applications.dmg/.DS_Store b/projects/tor-browser/Bundle-Data/mac-applications.dmg/.DS_Store index 6eeec47..aeb3104 100644 Binary files a/projects/tor-browser/Bundle-Data/mac-applications.dmg/.DS_Store and b/projects/tor-browser/Bundle-Data/mac-applications.dmg/.DS_Store differ diff --git a/projects/tor-browser/Bundle-Data/mac-applications.dmg/.background/background.png b/projects/tor-browser/Bundle-Data/mac-applications.dmg/.background/background.png index a4358cf..94e4584 100644 Binary files a/projects/tor-browser/Bundle-Data/mac-applications.dmg/.background/background.png and b/projects/tor-browser/Bundle-Data/mac-applications.dmg/.background/background.png differ

1 0

[tor-browser-build/master] Bug 26438: Remove seatbelt profiles for macOS
by boklm＠torproject.org 21 Jun '18

21 Jun '18

commit 767dd879b91584d5828998804ab1ee45499ca640 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 21 07:45:40 2018 +0000 Bug 26438: Remove seatbelt profiles for macOS Starting with content sandboxing being enabled our seatbelt profiles have been broken (see: #22000). We should remove them for now to avoid a broken experience in the alphas. --- .../tor-browser/Bundle-Data/mac-sandbox/.DS_Store | Bin 6148 -> 0 bytes .../tor-browser/Bundle-Data/mac-sandbox/README.txt | 29 ----- .../mac-sandbox/start-browser-with-sandbox | 24 ---- .../Bundle-Data/mac-sandbox/start-tor-with-sandbox | 42 ------- projects/tor-browser/Bundle-Data/mac-sandbox/tb.sb | 122 --------------------- .../tor-browser/Bundle-Data/mac-sandbox/tor.sb | 64 ----------- projects/tor-browser/build | 5 - 7 files changed, 286 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/mac-sandbox/.DS_Store b/projects/tor-browser/Bundle-Data/mac-sandbox/.DS_Store deleted file mode 100644 index 6c49e24..0000000 Binary files a/projects/tor-browser/Bundle-Data/mac-sandbox/.DS_Store and /dev/null differ diff --git a/projects/tor-browser/Bundle-Data/mac-sandbox/README.txt b/projects/tor-browser/Bundle-Data/mac-sandbox/README.txt deleted file mode 100644 index 47d6e5c..0000000 --- a/projects/tor-browser/Bundle-Data/mac-sandbox/README.txt +++ /dev/null @@ -1,29 +0,0 @@ -Experimental Sandboxed Tor Browser for OS X - -Requirements: - Mac OS 10.9 or newer. - A willingness to run shell commands from Terminal. - -Follow these steps to use the sandbox profiles: - -1. Copy this folder ("Sandboxed Tor Browser") to a local drive, but do not - put it in /Applications. -2. Copy the TorBrowser app into your "Sandboxed Tor Browser" folder. -3. Open Terminal. -4. Run start-tor-with-sandbox and wait for Tor bootstrapping to finish. -5. Run start-browser-with-sandbox. - -Known Issues: - -You will need to manually kill start-tor-with-sandbox or the tor.real -process after you exit the browser. - -The browser has full access to the Tor control port. Ideally, access -would be limited to the things that are necessary for New Identity and -for the circuit display features. - -Printing does not work. - -The built-in updater will not work. - -Files can only be downloaded or saved to ~/Downloads. diff --git a/projects/tor-browser/Bundle-Data/mac-sandbox/start-browser-with-sandbox b/projects/tor-browser/Bundle-Data/mac-sandbox/start-browser-with-sandbox deleted file mode 100755 index 31d4218..0000000 --- a/projects/tor-browser/Bundle-Data/mac-sandbox/start-browser-with-sandbox +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -# TODO: assumes not in /Applications -# TODO: assumes app is in TorBrowser.app - -BASEDIR="`dirname \"$0\"`" -BASEDIR="`(cd \"$BASEDIR\" && pwd)`" -TORBROWSER_APP_DIR="$BASEDIR/TorBrowser.app" -TORBROWSER_DATA_DIR="$BASEDIR/TorBrowser-Data" -TOR_DATA_DIR="$TORBROWSER_DATA_DIR/Tor" -SOCKETDIR="/tmp/Tor" - -export TOR_SKIP_LAUNCH=1 -export TOR_CONTROL_IPC_PATH="$SOCKETDIR/control.socket" -export TOR_SOCKS_IPC_PATH="$SOCKETDIR/socks.socket" -export TOR_CONTROL_COOKIE_AUTH_FILE="$TOR_DATA_DIR/control_auth_cookie" -SB_PROFILE="`pwd`/tb.sb" -cd "$TORBROWSER_APP_DIR" -sandbox-exec -f "$SB_PROFILE" \ - -D "HOME_DIR=$HOME" \ - -D "CURRENT_DIR=$BASEDIR" \ - -D "TORBROWSER_APP_DIR=$TORBROWSER_APP_DIR" \ - -D "TORBROWSER_DATA_DIR=$TORBROWSER_DATA_DIR" \ - "./Contents/MacOS/firefox" diff --git a/projects/tor-browser/Bundle-Data/mac-sandbox/start-tor-with-sandbox b/projects/tor-browser/Bundle-Data/mac-sandbox/start-tor-with-sandbox deleted file mode 100755 index ec7f15e..0000000 --- a/projects/tor-browser/Bundle-Data/mac-sandbox/start-tor-with-sandbox +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -# TODO: assumes not in /Applications -# TODO: assumes /tmp/Tor is not used by anyone else. -# TODO: assumes app is in TorBrowser.app - -set -e - -BASEDIR="`dirname \"$0\"`" -BASEDIR="`(cd \"$BASEDIR\" && pwd)`" -TOR_DATA_DIR="$BASEDIR/TorBrowser-Data/Tor" -TOR_STATIC_DATA_DIR="$BASEDIR/TorBrowser.app/Contents/Resources/TorBrowser/Tor" -TOR_BIN_DIR="$BASEDIR/TorBrowser.app/Contents/MacOS/Tor" -TORRC="$TOR_DATA_DIR/torrc" -SOCKETDIR="/tmp/Tor" - -# Compiled Python modules require a compatible Python, which means 32-bit 2.6. -export VERSIONER_PYTHON_VERSION=2.6 -export DYLD_LIBRARY_PATH=.:$DYLD_LIBRARY_PATH - -mkdir -p "$TOR_DATA_DIR" -if [ ! -e "$TORRC" ]; then - touch "$TORRC" -fi - -if [ ! -e "$SOCKETDIR" ]; then - mkdir -p "$SOCKETDIR" - chmod 700 "$SOCKETDIR" -fi - -TOR="$TOR_BIN_DIR/tor.real" -sandbox-exec -f tor.sb -D "TOR_DATA_DIR=$TOR_DATA_DIR" \ - -D "TOR_STATIC_DATA_DIR=$TOR_STATIC_DATA_DIR" \ - -D "TOR_BIN_DIR=$TOR_BIN_DIR" "$TOR" \ - --defaults-torrc "$TOR_STATIC_DATA_DIR/torrc-defaults" \ - -f "$TORRC" \ - CookieAuthentication 1 \ - DataDirectory "$TOR_DATA_DIR" \ - GeoIPFile "$TOR_STATIC_DATA_DIR/geoip" \ - GeoIPv6File "$TOR_STATIC_DATA_DIR/geoip6" \ - ControlPort "unix:$SOCKETDIR/control.socket" \ - SocksPort "unix:$SOCKETDIR/socks.socket" diff --git a/projects/tor-browser/Bundle-Data/mac-sandbox/tb.sb b/projects/tor-browser/Bundle-Data/mac-sandbox/tb.sb deleted file mode 100644 index 385e914..0000000 --- a/projects/tor-browser/Bundle-Data/mac-sandbox/tb.sb +++ /dev/null @@ -1,122 +0,0 @@ -(version 1) - -;; Parameters: -;; HOME_DIR the user's home directory -;; CURRENT_DIR the current working directory -;; TORBROWSER_APP_DIR the TorBrowser.app directory -;; TORBROWSER_DATA_DIR the TorBrowser-Data directory - -;; TODO: can see all dirs but can download/save only in Downloads (no error reported though!) -;; TODO: printing does not work (Save to PDF does). - -(deny default) - -(define (home-path aSubPath) - (path (string-append (param "HOME_DIR") aSubPath))) - -(define (home-subpath aSubPath) - (subpath (string-append (param "HOME_DIR") aSubPath))) - -(define (torbrowser-data-dir-path aSubPath) - (path (string-append (param "TORBROWSER_DATA_DIR") aSubPath))) - -(define (torbrowser-data-dir-subpath aSubPath) - (subpath (string-append (param "TORBROWSER_DATA_DIR") aSubPath))) - -(define (torbrowser-app-dir-path aSubPath) - (subpath (string-append (param "TORBROWSER_APP_DIR") aSubPath))) - -(allow file-read* - (path "/Library/Preferences/com.apple.HIToolbox.plist") - (path "/Library/Preferences/com.apple.ViewBridge.plist") - (path "/Library/Preferences/.GlobalPreferences.plist") - (path "/dev/random") - (path "/dev/urandom") - (path "/dev/dtracehelper") - (path "/private/etc/localtime") - (path "/private/etc/passwd") - (path "/private/tmp") - (path "/private/var/tmp") - (path (param "HOME_DIR")) - (subpath "/Library/Audio") - (subpath "/Library/Fonts") - (subpath "/System") - (subpath "/private/var/folders") - (subpath "/usr/lib") - (subpath "/usr/share") - (home-subpath "/Downloads") - (home-subpath "/Library/Input Methods") - (home-subpath "/Library/Keyboard Layouts") - (home-subpath "/Library/Preferences") - (torbrowser-app-dir-path "") - (torbrowser-data-dir-path "") - (torbrowser-data-dir-subpath "/Browser") - (torbrowser-data-dir-path "/Tor/control_auth_cookie") -) - -(allow file-read-metadata - (home-path "/Desktop") - (home-path "/Library") - (home-path "/Library/Saved Application State") - (path (param "CURRENT_DIR")) - (path "/") - (path "/Applications") - (path "/Users") - (path "/etc") - (path "/home") - (path "/net") - (path "/private/var/db/.AppleSetupDone") - (path "/tmp") - (path "/var") - (torbrowser-data-dir-path "/Tor/control.socket") - (torbrowser-data-dir-path "/Tor/socks.socket") - (path-regex "/private/tmp/Tor[-0-9]*/control.socket") - (path-regex "/private/tmp/Tor[-0-9]*/socks.socket") -) - -(allow file-write-data file-ioctl - (path "/dev/dtracehelper") -) - -(allow file-write* - (home-subpath "/Downloads") - (home-path "/Library/Preferences/.GlobalPreferences.plist") - (torbrowser-data-dir-subpath "/Browser") - (subpath "/private/var/folders") - (path-regex (string-append "^" (param "HOME_DIR") "/Library/Preferences/org.mozilla.tor")) - (path "/Library/Preferences/.GlobalPreferences.plist") -) - -(allow iokit-open) - -(allow ipc-posix-shm - (ipc-posix-name "apple.shm.notification_center") - (ipc-posix-name-regex "^/tmp/com.apple.csseed") - (ipc-posix-name-regex "^CFPBS:") - (ipc-posix-name-regex "^apple\.cfprefs\.") - (ipc-posix-name-regex "^apple\.shm\.cfprefs\.") - (ipc-posix-name-regex "^AudioIO") -) - -(allow mach-lookup) - -(allow mach-register - (local-name "com.apple.CFPasteboardClient") - (local-name "com.apple.axserver") - (local-name "com.apple.coredrag") - (local-name "com.apple.tsm.portname") -) - -(allow network-outbound - (path "/private/var/run/cupsd") - (torbrowser-data-dir-path "/Tor/control.socket") - (torbrowser-data-dir-path "/Tor/socks.socket") - (path-regex "/private/tmp/Tor[-0-9]*/control.socket") - (path-regex "/private/tmp/Tor[-0-9]*/socks.socket") -) - -(allow process-exec* - (torbrowser-app-dir-path "/Contents/MacOS/firefox") -) - -(allow sysctl-read) diff --git a/projects/tor-browser/Bundle-Data/mac-sandbox/tor.sb b/projects/tor-browser/Bundle-Data/mac-sandbox/tor.sb deleted file mode 100644 index 40abc9c..0000000 --- a/projects/tor-browser/Bundle-Data/mac-sandbox/tor.sb +++ /dev/null @@ -1,64 +0,0 @@ -(version 1) - -;; Parameters: -;; TOR_DATA_DIR directory that contains writeable config, e.g, torrc -;; TOR_STATIC_DATA_DIR directory for read-only config, e.g., torrc-defaults -;; TOR_BIN_DIR directory that contains tor binaries, e.g., tor.real - -(deny default) - -(allow file-read* file-write-data file-ioctl - (path "/dev/dtracehelper") -) - -(allow file-read* - (subpath (param "TOR_BIN_DIR")) - (subpath "/usr/local") - (subpath (param "TOR_DATA_DIR")) - (subpath (param "TOR_STATIC_DATA_DIR")) - (subpath (param "TOR_BIN_DIR")) - (path-regex "/private/tmp/Tor[-0-9]*") -) - -(allow file-read-data - (path "/dev/random") - (path "/dev/srandom") - (path "/dev/urandom") - (subpath "/usr/share") -) - -(allow file-read-metadata - (path "/etc") - (path "/private/etc/localtime") - (path "/tmp") - (subpath "/usr/lib") -) - -(allow file-write* - (subpath (param "TOR_DATA_DIR")) -) - -(allow ipc-posix-shm-read-data - (ipc-posix-name "apple.shm.notification_center") -) - -(allow mach-lookup - (global-name "com.apple.system.notification_center") -) - -(allow network-inbound file-write* - (path (string-append (param "TOR_DATA_DIR") "/control.socket")) - (path (string-append (param "TOR_DATA_DIR") "/socks.socket")) - (path-regex "/private/tmp/Tor[-0-9]*/control.socket") - (path-regex "/private/tmp/Tor[-0-9]*/socks.socket") -) - -(allow network-outbound - (remote tcp "*:*") -) - -(allow process-exec - (path (string-append (param "TOR_BIN_DIR") "/tor.real")) -) - -(allow sysctl-read) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 65c752b..1c98c35 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -105,11 +105,6 @@ tar -C "$TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %]" -xf [% c('input_files mv "$TBDIR/$TORBINPATH/tor" "$TBDIR/$TORBINPATH/tor.real" cp Bundle-Data/mac-tor.sh "$TBDIR/$TORCONFIGPATH/tor" - [% IF ! c("var/release") -%] - SANDBOX_FOLDER="$TB_STAGE_DIR/Sandboxed Tor Browser" - mv Bundle-Data/mac-sandbox "$SANDBOX_FOLDER" - [% END -%] - tar -C Bundle-Data/mac-applications.dmg -c . | tar -C $TB_STAGE_DIR -x [% END %]

1 0