May 2017 - tbb-commits - lists.torproject.org

[tor-browser/tor-browser-52.1.1esr-7.0-1] Bug 22320: Use pref name 'referer.hideOnionSource' everywhere
by gk＠torproject.org 25 May '17

25 May '17

commit 326e9aedfec184325ae95059d12e6b674bfa9013 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed May 24 12:49:27 2017 -0700 Bug 22320: Use pref name 'referer.hideOnionSource' everywhere Correcting my mistake in https://bugzilla.mozilla.org/show_bug.cgi?id=1305144 --- modules/libpref/init/all.js | 2 +- netwerk/protocol/http/nsHttpHandler.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index 983c93a..b79cc3a 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -1450,7 +1450,7 @@ pref("network.http.accept.default", "text/html,application/xhtml+xml,application pref("network.http.sendRefererHeader", 2); // false=real referer, true=spoof referer (use target URI as referer) pref("network.http.referer.spoofSource", false); -// false=allow onion referer, true=hide onion referer (use target URI as referer) +// false=allow onion referer, true=hide onion referer (use empty referer) pref("network.http.referer.hideOnionSource", false); // 0=full URI, 1=scheme+host+port+path, 2=scheme+host+port pref("network.http.referer.trimmingPolicy", 0); diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp index 13c4d3f..4276c71 100644 --- a/netwerk/protocol/http/nsHttpHandler.cpp +++ b/netwerk/protocol/http/nsHttpHandler.cpp @@ -1075,8 +1075,8 @@ nsHttpHandler::PrefsChanged(nsIPrefBranch *prefs, const char *pref) mSpoofReferrerSource = cVar; } - if (PREF_CHANGED(HTTP_PREF("referer.spoofOnionSource"))) { - rv = prefs->GetBoolPref(HTTP_PREF("referer.spoofOnionSource"), &cVar); + if (PREF_CHANGED(HTTP_PREF("referer.hideOnionSource"))) { + rv = prefs->GetBoolPref(HTTP_PREF("referer.hideOnionSource"), &cVar); if (NS_SUCCEEDED(rv)) mHideOnionReferrerSource = cVar; }

1 0

[tor-browser/tor-browser-52.1.0esr-7.0-2] Bug 21431: Clean-up system extensions shipped in Firefox 52
by gk＠torproject.org 24 May '17

24 May '17

commit 6b8a66553b3aa4a518dc4448baf11099a8df22cd Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue May 23 17:05:29 2017 -0400 Bug 21431: Clean-up system extensions shipped in Firefox 52 Only ship the e10srollout system extension and pdfjs. --- browser/extensions/moz.build | 10 ---------- browser/locales/Makefile.in | 1 - 2 files changed, 11 deletions(-) diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build index 9b01ed0..71fda56 100644 --- a/browser/extensions/moz.build +++ b/browser/extensions/moz.build @@ -5,16 +5,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. DIRS += [ - 'aushelper', 'e10srollout', 'pdfjs', - 'pocket', - 'webcompat', ] - -# Only include the following system add-ons if building Aurora or Nightly -if 'a' in CONFIG['GRE_MILESTONE']: - DIRS += [ - 'flyweb', - 'formautofill', - ] diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in index 6b0455b..e178dfe 100644 --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in @@ -99,7 +99,6 @@ libs-%: @$(MAKE) -C ../../toolkit/locales libs-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)' @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* - @$(MAKE) -C ../extensions/pocket/locale AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -C ../../devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)' @$(MAKE) -B searchplugins AB_CD=$* XPI_NAME=locale-$*

1 0

[tor-browser/tor-browser-52.1.1esr-7.0-1] Bug 21431: Clean-up system extensions shipped in Firefox 52
by gk＠torproject.org 24 May '17

24 May '17

commit 475734012b70c7515a2a105ea6584136cee57bf6 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue May 23 17:05:29 2017 -0400 Bug 21431: Clean-up system extensions shipped in Firefox 52 Only ship the e10srollout system extension and pdfjs. --- browser/extensions/moz.build | 10 ---------- browser/locales/Makefile.in | 1 - 2 files changed, 11 deletions(-) diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build index 9b01ed0..71fda56 100644 --- a/browser/extensions/moz.build +++ b/browser/extensions/moz.build @@ -5,16 +5,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. DIRS += [ - 'aushelper', 'e10srollout', 'pdfjs', - 'pocket', - 'webcompat', ] - -# Only include the following system add-ons if building Aurora or Nightly -if 'a' in CONFIG['GRE_MILESTONE']: - DIRS += [ - 'flyweb', - 'formautofill', - ] diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in index 6b0455b..e178dfe 100644 --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in @@ -99,7 +99,6 @@ libs-%: @$(MAKE) -C ../../toolkit/locales libs-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)' @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* - @$(MAKE) -C ../extensions/pocket/locale AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -C ../../devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)' @$(MAKE) -B searchplugins AB_CD=$* XPI_NAME=locale-$*

1 0

[tor-browser-bundle/master] Revert "Bug 21779: Non-admin users can't access Tor Browser on macOS."
by gk＠torproject.org 24 May '17

24 May '17

commit 082738a4bd83943d97e084fa04045e481772b998 Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 24 07:43:18 2017 +0000 Revert "Bug 21779: Non-admin users can't access Tor Browser on macOS." This reverts commit f27d2cab4ed80a4c7b4f594b593b6b90f6148a82. The problem was the script for recreating the .dmg files after the code-signing set the permissions wrong. No need to fix anything in the bundle descriptor. --- gitian/descriptors/mac/gitian-bundle.yml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 54ce237..a2c8408 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -303,11 +303,7 @@ script: | rm -f precomplete python $MARTOOLS/createprecomplete.py popd - - # Ensure that files and directories are accessible by non-admin users - # if the app bundle is placed in /Applications. See bug 21779. - chmod -R o+rX ~/build/$TORBROWSER_NAME.app - + # # Create full MAR file and disk image. MAR_FILE=tor-browser-osx${GBUILD_BITS}-${TORBROWSER_VERSION}_${PKG_LOCALE}.mar MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE ~/build/$TORBROWSER_NAME.app @@ -345,12 +341,7 @@ script: | rm -f precomplete python $MARTOOLS/createprecomplete.py popd - - # Ensure that files and directories are accessible by non-admin users - # if the app bundle is placed in /Applications. See bug 21779. - chmod -R o+rX ~/build/dmg/$DEST.app - - # Create full MAR file and disk image. + # MAR_FILE=tor-browser-osx${GBUILD_BITS}-${TORBROWSER_VERSION}_$LANG.mar MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE ~/build/dmg/$DEST.app # Rename the Japanese bundle to not confuse users

1 0

[tor-launcher/master] Bug 22283: Linux 7.0a4 broken after update
by gk＠torproject.org 23 May '17

23 May '17

commit 123a3ed987bef91c006957394da0465132954b3f Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue May 23 11:57:08 2017 -0400 Bug 22283: Linux 7.0a4 broken after update Improve our torrc fixup code to remove all ControlPort and SocksPort lines that contain a Unix domain socket, and execute the fixup one more time. This corrects a problem where the torrc of alpha channel users who transitioned from Unix domain sockets to TCP was left with ControlPort and SocksPort lines that contained bad paths (the parent directory for the Unix domain socket did not exist). --- src/components/tl-process.js | 51 ++++++++++++-------------------------------- 1 file changed, 14 insertions(+), 37 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 3db394e..ca38e9c 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -99,15 +99,16 @@ TorProcessService.prototype = } else if (TorLauncherUtil.shouldStartAndOwnTor) { - // If we have not already done so, perform a one-time fixup to remove - // any ControlPort and SocksPort lines from the user's torrc file that - // will conflict with the arguments we plan to pass when starting tor. - // See bug 20761. + // If we have not already done so, remove any ControlPort and + // SocksPort lines from the user's torrc file that may conflict + // with the arguments we plan to pass when starting tor. + // See bugs 20761 and 22283. + const kTorrcFixupVersion = 2; const kTorrcFixupPref = "extensions.torlauncher.torrc_fixup_version"; - if ((TorLauncherUtil.getIntPref(kTorrcFixupPref, 0) < 1) - && this._fixupTorrc()) + if ((TorLauncherUtil.getIntPref(kTorrcFixupPref, 0) + < kTorrcFixupVersion) && this._fixupTorrc()) { - TorLauncherUtil.setIntPref(kTorrcFixupPref, 1); + TorLauncherUtil.setIntPref(kTorrcFixupPref, kTorrcFixupVersion); } this._startTor(); @@ -839,12 +840,8 @@ TorProcessService.prototype = let matchResult = aLine.match(/\s*\+*controlport\s+(.*)/i); if (matchResult) { - if (controlIPCFile) - { - removeLine = this._valueContainsFilePath(matchResult[1], - controlIPCFile); - } - else + removeLine = this._valueIsUnixDomainSocket(matchResult[1]); + if (!removeLine && !controlIPCFile) { removeLine = this._valueContainsPort(matchResult[1], controlPort); @@ -857,12 +854,8 @@ TorProcessService.prototype = matchResult = aLine.match(/\s*\+*socksport\s+(.*)/i); if (matchResult) { - if (socksPortInfo.ipcFile) - { - removeLine = this._valueContainsFilePath(matchResult[1], - socksPortInfo.ipcFile); - } - else + removeLine = this._valueIsUnixDomainSocket(matchResult[1]); + if (!removeLine && !socksPortInfo.ipcFile) { removeLine = this._valueContainsPort(matchResult[1], socksPortInfo.port); @@ -1059,7 +1052,7 @@ TorProcessService.prototype = return lines; }, - _valueContainsFilePath: function(aValue, aFile) + _valueIsUnixDomainSocket: function(aValue) { // Handle several cases: // "unix:/path options" @@ -1068,23 +1061,7 @@ TorProcessService.prototype = if (aValue.startsWith('"')) aValue = this.mProtocolSvc.TorUnescapeString(aValue); - let path; - let matchResult = aValue.match(/^unix:("[^"]*")/); - if (matchResult) - path = this.mProtocolSvc.TorUnescapeString(matchResult[1]); - else - { - matchResult = aValue.match(/^unix:(\S*)/); - if (matchResult) - path = matchResult[1]; - } - - if (!path) - return false; - - let file = Cc['@mozilla.org/file/local;1'].createInstance(Ci.nsIFile); - file.initWithPath(path); - return file.equals(aFile); + return aValue.startsWith("unix:"); }, _valueContainsPort: function(aValue, aPort)

1 0

[tor-browser-bundle/master] fixup! Bug 16285: Remove clearkey related library stripping
by gk＠torproject.org 23 May '17

23 May '17

commit c18c6f80c49d7da97d006d3fd5201b11f1312bbc Author: Georg Koppen <gk(a)torproject.org> Date: Tue May 23 09:50:12 2017 +0000 fixup! Bug 16285: Remove clearkey related library stripping --- gitian/descriptors/linux/gitian-firefox.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index b68dba7..ae0d14f 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -94,6 +94,7 @@ script: | export LD_LIBRARY_PATH=$INSTDIR/gcc/lib$ARCH # mkdir -p $INSTDIR/Browser/ + mkdir -p $INSTDIR/Debug/Browser/ cd tor-browser # run get-moz-build-date before removing .git, which is used to get the year

1 0

[tor-browser-bundle/master] Bug 16285: Remove clearkey related library stripping
by gk＠torproject.org 23 May '17

23 May '17

commit e8d869e142439436104b8b1f8b807406fd68e104 Author: Georg Koppen <gk(a)torproject.org> Date: Tue May 23 09:01:45 2017 +0000 Bug 16285: Remove clearkey related library stripping We don't ship the clearkey DRM system yet, thus we don't need to strip the respective binaries. --- gitian/descriptors/linux/gitian-firefox.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index a3bc37f..b68dba7 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -94,7 +94,6 @@ script: | export LD_LIBRARY_PATH=$INSTDIR/gcc/lib$ARCH # mkdir -p $INSTDIR/Browser/ - mkdir -p $INSTDIR/Debug/Browser/gmp-clearkey/0.1 cd tor-browser # run get-moz-build-date before removing .git, which is used to get the year @@ -150,7 +149,7 @@ script: | # Strip and generate debuginfo for the firefox binary that we keep, all *.so # files, the plugin-container, and the updater (see ticket #10126) cd $INSTDIR - for LIB in Browser/*.so Browser/firefox Browser/plugin-container Browser/gmp-clearkey/0.1/*.so Browser/updater + for LIB in Browser/*.so Browser/firefox Browser/plugin-container Browser/updater do objcopy --only-keep-debug $LIB Debug/$LIB strip $LIB

1 0

[tor-browser/tor-browser-52.1.0esr-7.0-2] Bug 16285: Exclude ClearKey system for now
by gk＠torproject.org 22 May '17

22 May '17

commit 46d6d3a534c8f8c56194415c0839a4a90d17049b Author: Georg Koppen <gk(a)torproject.org> Date: Mon May 22 12:44:40 2017 +0000 Bug 16285: Exclude ClearKey system for now In the past the ClearKey system had not been compiled when specifying --disable-eme. But that changed and it is even bundled nowadays (see: Mozilla's bug 1300654). We don't want to ship it right now as the use case for it is not really visible while the code had security vulnerabilities in the past. --- browser/installer/package-manifest.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index 43c89a9..1233249 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -814,8 +814,8 @@ bin/libfreebl_32int64_3.so ; media -@RESPATH@/gmp-clearkey/0.1/@DLL_PREFIX@clearkey@DLL_SUFFIX@ -@RESPATH@/gmp-clearkey/0.1/clearkey.info +;@RESPATH@/gmp-clearkey/0.1/@DLL_PREFIX@clearkey@DLL_SUFFIX@ +;@RESPATH@/gmp-clearkey/0.1/clearkey.info ; gfx #ifdef XP_WIN

1 0

[tor-browser/tor-browser-52.1.0esr-7.0-2] fixup! TB3: Tor Browser's official .mozconfigs.
by gk＠torproject.org 22 May '17

22 May '17

commit 62546181d759aaf44216e6f32a79c89e55335c4e Author: Georg Koppen <gk(a)torproject.org> Date: Mon May 22 12:41:17 2017 +0000 fixup! TB3: Tor Browser's official .mozconfigs. Make EME comment clearer for ESR52. --- .mozconfig | 2 +- .mozconfig-mac | 3 +-- .mozconfig-mingw | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.mozconfig b/.mozconfig index cde5b49..4eeb339 100755 --- a/.mozconfig +++ b/.mozconfig @@ -23,7 +23,7 @@ ac_add_options --disable-debug ac_add_options --disable-maintenance-service ac_add_options --disable-crashreporter ac_add_options --disable-webrtc -# Let's not compile EME at least until we can enable ClearKey and only Clearkey. +# Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme #ac_add_options --disable-ctypes ac_add_options --enable-jemalloc=4 diff --git a/.mozconfig-mac b/.mozconfig-mac index 7088e48..844ee2e 100644 --- a/.mozconfig-mac +++ b/.mozconfig-mac @@ -49,7 +49,6 @@ ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc ac_add_options --disable-tests -# Let's not compile EME at least until we can enable ClearKey and only Clearkey. -# (Apart from that there is no Adobe CRM module for OS X right now) +# Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme # ac_add_options --disable-ctypes diff --git a/.mozconfig-mingw b/.mozconfig-mingw index de86c49b..af30573 100644 --- a/.mozconfig-mingw +++ b/.mozconfig-mingw @@ -21,7 +21,7 @@ ac_add_options --enable-verify-mar # We can't build the sandbox code with mingw-w64: # https://bugzilla.mozilla.org/show_bug.cgi?id=1042426 ac_add_options --disable-sandbox -# EME is not running without sandbox. Thus, don't compile it in the first place. +# Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service

1 0

[tor-browser/tor-browser-52.1.0esr-7.0-2] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 22 May '17

22 May '17

commit 726b6d699e101570b14e3eb091ec94e9d5ee1946 Author: Georg Koppen <gk(a)torproject.org> Date: Mon May 22 12:52:09 2017 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. Adapt preferences to take new EME related ones into account. --- browser/app/profile/000-tor-browser.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 7b0ad71..53d1ac2 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -228,12 +228,15 @@ pref("media.gmp-manager.url.override", "data:text/plain,"); // server. There is a local fallback that must be blocked now as well. See: // https://bugzilla.mozilla.org/show_bug.cgi?id=1267495. pref("media.gmp-manager.updateEnabled", false); -// EME prefs: Strictly speaking these prefs don't need to be set as we are -// using the --disable-eme compile flag. However, in order to not confuse users, -// who might stumble upon them while looking into about:config, we set them to -// 'false' communicating that EME is really disabled. +// Mozilla is relying on preferences to make sure no DRM blob is downloaded and +// run. Even though those prefs should be set correctly by specifying +// --disable-eme (which we do), we disable all of them here as well for defense +// in depth. pref("browser.eme.ui.enabled", false); +pref("media.gmp-eme-adobe.visible", false); pref("media.gmp-eme-adobe.enabled", false); +pref("media.gmp-widevinecdm.visible", false); +pref("media.gmp-widevinecdm.enabled", false); pref("media.eme.enabled", false); pref("media.eme.apiVisible", false); // WebIDE can bypass proxy settings for remote debugging. It also downloads

1 0