- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-52.1.1esr-7.0-1] Bug 21972: about:support is partially broken
by gk＠torproject.org 30 May '17

30 May '17

commit 8bd3ef487932654d78bfab848b65fb04b0094e3b Author: Georg Koppen <gk(a)torproject.org> Date: Mon May 29 13:31:07 2017 +0000 Bug 21972: about:support is partially broken --- toolkit/modules/Troubleshoot.jsm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/toolkit/modules/Troubleshoot.jsm b/toolkit/modules/Troubleshoot.jsm index cc545b4..364d5e1 100644 --- a/toolkit/modules/Troubleshoot.jsm +++ b/toolkit/modules/Troubleshoot.jsm @@ -469,8 +469,11 @@ var … [View More]

1 0

[tor-browser/tor-browser-52.1.0esr-7.0-2] Bug 21972: about:support is partially broken
by gk＠torproject.org 30 May '17

30 May '17

commit 4fef8cc56573a8513479bfb821406e7e8dfffcc5 Author: Georg Koppen <gk(a)torproject.org> Date: Mon May 29 13:31:07 2017 +0000 Bug 21972: about:support is partially broken --- toolkit/modules/Troubleshoot.jsm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/toolkit/modules/Troubleshoot.jsm b/toolkit/modules/Troubleshoot.jsm index cc545b4..364d5e1 100644 --- a/toolkit/modules/Troubleshoot.jsm +++ b/toolkit/modules/Troubleshoot.jsm @@ -469,8 +469,11 @@ var … [View More]

1 0

[tor-browser/tor-browser-52.1.0esr-7.0-2] squash! Bug 18821: Disable libmdns for Android and Desktop
by gk＠torproject.org 30 May '17

30 May '17

commit a979fd68b78a17814bde3544b7d8896c6089cf6e Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 24 13:45:47 2017 +0000 squash! Bug 18821: Disable libmdns for Android and Desktop Bug 21861: Disable additional mDNS code to avoid proxy bypasses --- dom/presentation/provider/moz.build | 16 ---------------- mobile/android/installer/package-manifest.in | 4 ---- netwerk/dns/mdns/libmdns/moz.build | 16 ---------------- 3 files changed, 36 deletions(… [View More]-) diff --git a/dom/presentation/provider/moz.build b/dom/presentation/provider/moz.build index 18428b5..7f82700 100644 --- a/dom/presentation/provider/moz.build +++ b/dom/presentation/provider/moz.build @@ -12,8 +12,6 @@ EXTRA_COMPONENTS += [ UNIFIED_SOURCES += [ 'DeviceProviderHelpers.cpp', 'DisplayDeviceProvider.cpp', - 'MulticastDNSDeviceProvider.cpp', - 'PresentationDeviceProviderModule.cpp', ] EXTRA_JS_MODULES.presentation += [ @@ -22,19 +20,5 @@ EXTRA_JS_MODULES.presentation += [ 'StateMachineHelper.jsm', ] -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': - EXTRA_COMPONENTS += [ - # For android presentation device - 'AndroidCastDeviceProvider.js', - 'AndroidCastDeviceProvider.manifest', - # for TV 2.5 device backward capability - 'LegacyPresentationControlService.js', - 'LegacyProviders.manifest', - ] - - UNIFIED_SOURCES += [ - 'LegacyMDNSDeviceProvider.cpp', - ] - include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul' diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in index 417d34a..025094c 100644 --- a/mobile/android/installer/package-manifest.in +++ b/mobile/android/installer/package-manifest.in @@ -404,10 +404,6 @@ @BINPATH@/components/PresentationNetworkHelper.manifest @BINPATH@/components/PresentationDataChannelSessionTransport.js @BINPATH@/components/PresentationDataChannelSessionTransport.manifest -@BINPATH@/components/LegacyProviders.manifest -@BINPATH@/components/LegacyPresentationControlService.js -@BINPATH@/components/AndroidCastDeviceProvider.manifest -@BINPATH@/components/AndroidCastDeviceProvider.js @BINPATH@/components/TVSimulatorService.js @BINPATH@/components/TVSimulatorService.manifest diff --git a/netwerk/dns/mdns/libmdns/moz.build b/netwerk/dns/mdns/libmdns/moz.build index f14e411..422621f 100644 --- a/netwerk/dns/mdns/libmdns/moz.build +++ b/netwerk/dns/mdns/libmdns/moz.build @@ -22,22 +22,6 @@ if (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['ANDROID_VERSION'] >= '16' ] -else: - EXTRA_JS_MODULES += [ - 'fallback/DataReader.jsm', - 'fallback/DataWriter.jsm', - 'fallback/DNSPacket.jsm', - 'fallback/DNSRecord.jsm', - 'fallback/DNSResourceRecord.jsm', - 'fallback/DNSTypes.jsm', - 'fallback/MulticastDNS.jsm', - ] - - if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': - EXTRA_JS_MODULES += [ - 'MulticastDNSAndroid.jsm', - ] - UNIFIED_SOURCES += [ 'nsDNSServiceInfo.cpp', 'nsMulticastDNSModule.cpp', [View Less]

1 0

[tor-browser/tor-browser-52.1.1esr-7.0-1] squash! Bug 18821: Disable libmdns for Android and Desktop
by gk＠torproject.org 30 May '17

30 May '17

commit 0da4a7dc08b0c9b4fa6c454da210e8c3c3ae6197 Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 24 13:45:47 2017 +0000 squash! Bug 18821: Disable libmdns for Android and Desktop Bug 21861: Disable additional mDNS code to avoid proxy bypasses --- dom/presentation/provider/moz.build | 16 ---------------- mobile/android/installer/package-manifest.in | 4 ---- netwerk/dns/mdns/libmdns/moz.build | 16 ---------------- 3 files changed, 36 deletions(… [View More]-) diff --git a/dom/presentation/provider/moz.build b/dom/presentation/provider/moz.build index 18428b5..7f82700 100644 --- a/dom/presentation/provider/moz.build +++ b/dom/presentation/provider/moz.build @@ -12,8 +12,6 @@ EXTRA_COMPONENTS += [ UNIFIED_SOURCES += [ 'DeviceProviderHelpers.cpp', 'DisplayDeviceProvider.cpp', - 'MulticastDNSDeviceProvider.cpp', - 'PresentationDeviceProviderModule.cpp', ] EXTRA_JS_MODULES.presentation += [ @@ -22,19 +20,5 @@ EXTRA_JS_MODULES.presentation += [ 'StateMachineHelper.jsm', ] -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': - EXTRA_COMPONENTS += [ - # For android presentation device - 'AndroidCastDeviceProvider.js', - 'AndroidCastDeviceProvider.manifest', - # for TV 2.5 device backward capability - 'LegacyPresentationControlService.js', - 'LegacyProviders.manifest', - ] - - UNIFIED_SOURCES += [ - 'LegacyMDNSDeviceProvider.cpp', - ] - include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul' diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in index 417d34a..025094c 100644 --- a/mobile/android/installer/package-manifest.in +++ b/mobile/android/installer/package-manifest.in @@ -404,10 +404,6 @@ @BINPATH@/components/PresentationNetworkHelper.manifest @BINPATH@/components/PresentationDataChannelSessionTransport.js @BINPATH@/components/PresentationDataChannelSessionTransport.manifest -@BINPATH@/components/LegacyProviders.manifest -@BINPATH@/components/LegacyPresentationControlService.js -@BINPATH@/components/AndroidCastDeviceProvider.manifest -@BINPATH@/components/AndroidCastDeviceProvider.js @BINPATH@/components/TVSimulatorService.js @BINPATH@/components/TVSimulatorService.manifest diff --git a/netwerk/dns/mdns/libmdns/moz.build b/netwerk/dns/mdns/libmdns/moz.build index f14e411..422621f 100644 --- a/netwerk/dns/mdns/libmdns/moz.build +++ b/netwerk/dns/mdns/libmdns/moz.build @@ -22,22 +22,6 @@ if (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['ANDROID_VERSION'] >= '16' ] -else: - EXTRA_JS_MODULES += [ - 'fallback/DataReader.jsm', - 'fallback/DataWriter.jsm', - 'fallback/DNSPacket.jsm', - 'fallback/DNSRecord.jsm', - 'fallback/DNSResourceRecord.jsm', - 'fallback/DNSTypes.jsm', - 'fallback/MulticastDNS.jsm', - ] - - if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': - EXTRA_JS_MODULES += [ - 'MulticastDNSAndroid.jsm', - ] - UNIFIED_SOURCES += [ 'nsDNSServiceInfo.cpp', 'nsMulticastDNSModule.cpp', [View Less]

1 0

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

29 May '17

commit c1a5e1abf6ee05b0b1d3b1462b3c9e1c180b153e Author: Georg Koppen <gk(a)torproject.org> Date: Mon May 29 09:10:13 2017 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. Fixes bug 21323. We are using Mixed Content Blocking now in Tor Browser as the advantages of doing so seem to outweigh the downsides. --- browser/app/profile/000-tor-browser.js | 1 - 1 file changed, 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/… [View More]

1 0

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

29 May '17

commit 29b34b444229fd09fcf7741a206230385e843fde Author: Georg Koppen <gk(a)torproject.org> Date: Mon May 29 09:10:13 2017 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. Fixes bug 21323. We are using Mixed Content Blocking now in Tor Browser as the advantages of doing so seem to outweigh the downsides. --- browser/app/profile/000-tor-browser.js | 1 - 1 file changed, 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/… [View More]

1 0

[tor-browser/tor-browser-52.1.1esr-7.0-1] fixup! Bug 5282: Randomize HTTP request order and pipeline depth.
by gk＠torproject.org 29 May '17

29 May '17

commit e404251e7a4e86981a33be035e7fdb0b7ed42c3b Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sat May 27 00:22:17 2017 -0700 fixup! Bug 5282: Randomize HTTP request order and pipeline depth. Use format specifiers for unsigned long integers. --- netwerk/protocol/http/nsHttpPipeline.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/netwerk/protocol/http/nsHttpPipeline.cpp b/netwerk/protocol/http/nsHttpPipeline.cpp index 207c55b..… [View More]

1 0

[tor-browser/tor-browser-52.1.0esr-7.0-2] fixup! Bug 5282: Randomize HTTP request order and pipeline depth.
by gk＠torproject.org 29 May '17

29 May '17

commit 7aa5a5c8565273ea41a0c003160226f3229373f6 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sat May 27 00:22:17 2017 -0700 fixup! Bug 5282: Randomize HTTP request order and pipeline depth. Use format specifiers for unsigned long integers. --- netwerk/protocol/http/nsHttpPipeline.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/netwerk/protocol/http/nsHttpPipeline.cpp b/netwerk/protocol/http/nsHttpPipeline.cpp index 207c55b..… [View More]

1 0

[tor-browser/tor-browser-52.1.0esr-7.0-2] Bug 21684: Don't expose navigator.AddonManager to content
by gk＠torproject.org 29 May '17

29 May '17

commit e5da14c4ae6e3917928b3004bca7bd49e972089e Author: Georg Koppen <gk(a)torproject.org> Date: Fri May 26 19:18:32 2017 +0000 Bug 21684: Don't expose navigator.AddonManager to content With https://bugzilla.mozilla.org/show_bug.cgi?id=1245571 support for websites to learn about installed add-ons landed. Currently, this is only enabled for AMO related sites but we don't think this functionality is something we want for Tor Browser as it might aid in … [View More]fingerprinting users. The patch does not outright disable access to the API. Privileged code is still able to use it if needed. This should help with usability issues should they arise while mitigating possible fingerprinting and security problems by having this API available to content. This fixes bug 21684 by deleting the whitelist of URLs shipped with Firefox 52. --- toolkit/mozapps/extensions/AddonManagerWebAPI.cpp | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/toolkit/mozapps/extensions/AddonManagerWebAPI.cpp b/toolkit/mozapps/extensions/AddonManagerWebAPI.cpp index ca33f3a..45326fd 100644 --- a/toolkit/mozapps/extensions/AddonManagerWebAPI.cpp +++ b/toolkit/mozapps/extensions/AddonManagerWebAPI.cpp @@ -20,25 +20,10 @@ using namespace mozilla::dom; static bool IsValidHost(const nsACString& host) { - if (host.Equals("addons.mozilla.org") || - host.Equals("discovery.addons.mozilla.org") || - host.Equals("testpilot.firefox.com")) { - return true; - } - - // When testing allow access to the developer sites. - if (Preferences::GetBool("extensions.webapi.testing", false)) { - if (host.LowerCaseEqualsLiteral("addons.allizom.org") || - host.LowerCaseEqualsLiteral("discovery.addons.allizom.org") || - host.LowerCaseEqualsLiteral("addons-dev.allizom.org") || - host.LowerCaseEqualsLiteral("discovery.addons-dev.allizom.org") || - host.LowerCaseEqualsLiteral("testpilot.stage.mozaws.net") || - host.LowerCaseEqualsLiteral("testpilot.dev.mozaws.net") || - host.LowerCaseEqualsLiteral("example.com")) { - return true; - } - } - + // We don't want to allow content to get information about the state of the + // extensions a user has installed. This might aid in fingerprinting. And + // allowing content at all access to this kind of information seems + // potentially risky from a security point as well. Fixes bug 21684. return false; } [View Less]

1 0

[tor-browser/tor-browser-52.1.1esr-7.0-1] Bug 21684: Don't expose navigator.AddonManager to content
by gk＠torproject.org 29 May '17

29 May '17

commit 9de9d5a74472423e5a7e5754f5d93b2d89103dfe Author: Georg Koppen <gk(a)torproject.org> Date: Fri May 26 19:18:32 2017 +0000 Bug 21684: Don't expose navigator.AddonManager to content With https://bugzilla.mozilla.org/show_bug.cgi?id=1245571 support for websites to learn about installed add-ons landed. Currently, this is only enabled for AMO related sites but we don't think this functionality is something we want for Tor Browser as it might aid in … [View More]fingerprinting users. The patch does not outright disable access to the API. Privileged code is still able to use it if needed. This should help with usability issues should they arise while mitigating possible fingerprinting and security problems by having this API available to content. This fixes bug 21684 by deleting the whitelist of URLs shipped with Firefox 52. --- toolkit/mozapps/extensions/AddonManagerWebAPI.cpp | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/toolkit/mozapps/extensions/AddonManagerWebAPI.cpp b/toolkit/mozapps/extensions/AddonManagerWebAPI.cpp index ca33f3a..45326fd 100644 --- a/toolkit/mozapps/extensions/AddonManagerWebAPI.cpp +++ b/toolkit/mozapps/extensions/AddonManagerWebAPI.cpp @@ -20,25 +20,10 @@ using namespace mozilla::dom; static bool IsValidHost(const nsACString& host) { - if (host.Equals("addons.mozilla.org") || - host.Equals("discovery.addons.mozilla.org") || - host.Equals("testpilot.firefox.com")) { - return true; - } - - // When testing allow access to the developer sites. - if (Preferences::GetBool("extensions.webapi.testing", false)) { - if (host.LowerCaseEqualsLiteral("addons.allizom.org") || - host.LowerCaseEqualsLiteral("discovery.addons.allizom.org") || - host.LowerCaseEqualsLiteral("addons-dev.allizom.org") || - host.LowerCaseEqualsLiteral("discovery.addons-dev.allizom.org") || - host.LowerCaseEqualsLiteral("testpilot.stage.mozaws.net") || - host.LowerCaseEqualsLiteral("testpilot.dev.mozaws.net") || - host.LowerCaseEqualsLiteral("example.com")) { - return true; - } - } - + // We don't want to allow content to get information about the state of the + // extensions a user has installed. This might aid in fingerprinting. And + // allowing content at all access to this kind of information seems + // potentially risky from a security point as well. Fixes bug 21684. return false; } [View Less]

1 0

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

25 May '17

commit b9bff8b465284d1ad0a95ca19e2318b4e200f63f Author: Georg Koppen <gk(a)torproject.org> Date: Tue May 23 09:08:40 2017 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. For now we disable WebGL2 due to fingerprinting concerns. We could think about restricting its features to a minimal mode as well in order to make at least some use of it. This is the task for bug 22333, though. --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 … [View More]

1 0

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

25 May '17

commit 2931426f6f8f2541ca6e5b43c62a61ab8bc9eec4 Author: Georg Koppen <gk(a)torproject.org> Date: Tue May 23 09:08:40 2017 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. For now we disable WebGL2 due to fingerprinting concerns. We could think about restricting its features to a minimal mode as well in order to make at least some use of it. This is the task for bug 22333, though. --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 … [View More]

1 0

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

25 May '17

commit f59a7bc0288dcf5efaa71ebe8f591d7edea7b7b7 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 … [View More]

1 0

[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 … [View More]

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/… [View More]

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/… [View More]

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.… [View More]

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 … [View More]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) [View Less]

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/… [View More]

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-… [View More]

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 -… [View More]

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 … [View More]

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 … [View More]

1 0

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

22 May '17

commit e948ae5d404321a1ed0316ffb97baf45ee0163a5 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 … [View More]

1 0

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

22 May '17

commit ba7cbd186c5692267ba80eb6a998c7abab2a76a9 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 … [View More]

1 0