October 2014 - tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Put the *.dmg files in the sha256sums.txt, too.
by gk＠torproject.org 09 Oct '14

09 Oct '14

commit 482b8d3f2e84e74ef29c24ab8f66739d1cd3cb0b Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 9 16:15:58 2014 +0000 Put the *.dmg files in the sha256sums.txt, too. --- tools/continuous-builds/build-tbb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index d46fd30..5153c9b 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -44,7 +44,7 @@ if [ $status = done ]; then echo "$0: renaming $DESTDIR -> $NEWDESTDIR" | tee -a $logfile mv $DESTDIR $NEWDESTDIR cd $NEWDESTDIR || exit 3 - sha256sum *.tar.xz *.zip *.exe > sha256sums.txt + sha256sum *.tar.xz *.dmg *.exe > sha256sums.txt gpg -a --clearsign --local-user $PGPKEYID sha256sums.txt || exit 2 cd .. D=$(basename $NEWDESTDIR)

1 0

[tor-browser-bundle/master] Bug 13359: Revert LD_LIBRARY_PATH + move libstdc++.
by gk＠torproject.org 09 Oct '14

09 Oct '14

commit fb0ffbecae5c102230ee6b789dcc02c11b862689 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Oct 8 21:35:50 2014 +0000 Bug 13359: Revert LD_LIBRARY_PATH + move libstdc++. Amending the LD_LIBRARY_PATH in our start script breaks the update from a Tor Browser with the older value to a Tor Browser requiring the new one. We therefore move the libstdc++ to the directory with the libraries tor depends upon and LD_LIBRARY_PATH used to point to and change the LD_LIBRARY_PATH value back to the old one. --- RelativeLink/RelativeLink.sh | 2 +- gitian/descriptors/linux/gitian-firefox.yml | 2 -- gitian/descriptors/linux/gitian-tor.yml | 16 ++++++++++++++++ 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/RelativeLink/RelativeLink.sh b/RelativeLink/RelativeLink.sh index 88f9f8e..e75482a 100755 --- a/RelativeLink/RelativeLink.sh +++ b/RelativeLink/RelativeLink.sh @@ -215,7 +215,7 @@ if [ $SYSARCHITECTURE -ne $TORARCHITECTURE ]; then exit 1 fi -LD_LIBRARY_PATH="${HOME}:${HOME}/TorBrowser/Tor/" +LD_LIBRARY_PATH="${HOME}/TorBrowser/Tor/" export LD_LIBRARY_PATH function setControlPortPasswd() { diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 27ba077..5f96b6e 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -155,8 +155,6 @@ script: | strip $LIB objcopy --add-gnu-debuglink=./Debug/$LIB $LIB done - # We need to copy the libstdc++.so.6 for older Linux distros. - cp $INSTDIR/gcc/lib$ARCH/libstdc++.so.6 Browser # ~/build/re-dzip.sh Browser/omni.ja ~/build/re-dzip.sh Browser/webapprt/omni.ja diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index aad9368..e678203 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -32,6 +32,8 @@ files: - "openssl-linux64-utils.zip" - "libevent-linux32-utils.zip" - "libevent-linux64-utils.zip" +- "gcc-linux32-utils.zip" +- "gcc-linux64-utils.zip" script: | INSTDIR="$HOME/install" source versions @@ -53,9 +55,23 @@ script: | mkdir -p $INSTDIR/Debug/Tor/ unzip -d $INSTDIR openssl-linux$GBUILD_BITS-utils.zip unzip -d $INSTDIR libevent-linux$GBUILD_BITS-utils.zip + unzip -d $INSTDIR gcc-linux$GBUILD_BITS-utils.zip cp $INSTDIR/openssl/lib/libssl.so.1.0.0 $INSTDIR/Tor/ cp $INSTDIR/openssl/lib/libcrypto.so.1.0.0 $INSTDIR/Tor/ cp $INSTDIR/libevent/lib/libevent-2.0.so.5 $INSTDIR/Tor/ + # We need to copy the libstdc++.so.6 for Tor Browser on older Linux distros. + # Copying it into /Browser, which feels more natural, and amending + # LD_LIBRARY_PATH breaks updates from a Tor Browser with the old + # LD_LIBRARY_PATH value to the Tor Browser with the newer one. Thus, we copy + # the libstdc++ into the directory with the libs tor depends on, too. See bug + # 13359 for further details. + ARCH="" + if [ $GBUILD_BITS == "64" ]; + then + ARCH="64" + fi + cp $INSTDIR/gcc/lib$ARCH/libstdc++.so.6 $INSTDIR/Tor/ + chmod 700 $INSTDIR/Tor/*so* # This is needed to make RPATH unavailable. See bug 9150. export LD_LIBRARY_PATH="$INSTDIR/Tor/"

1 0

[tor-browser/tor-browser-31.1.1esr-4.x-1] Merge remote-tracking branch 'gk/bug_13027' into tor-browser-31.1.1esr-4.x-1
by mikeperry＠torproject.org 09 Oct '14

09 Oct '14

commit aed7442860ce3919eaec9f9d99da89195903b5d9 Merge: 8daaea3 30f92a2 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Oct 8 23:55:46 2014 -0700 Merge remote-tracking branch 'gk/bug_13027' into tor-browser-31.1.1esr-4.x-1 dom/base/Navigator.cpp | 61 ++++++++++--------- dom/base/Navigator.h | 13 +++-- dom/workers/Navigator.cpp | 47 ++++++++++++++- dom/workers/Navigator.h | 37 ++++-------- dom/workers/RuntimeService.cpp | 104 ++++++++++++++++++++++++++++++++- dom/workers/RuntimeService.h | 12 ++++ dom/workers/WorkerScope.cpp | 4 ++ dom/workers/test/bug1060621_worker.js | 2 + dom/workers/test/bug1062920_worker.js | 6 ++ dom/workers/test/chrome.ini | 2 + dom/workers/test/mochitest.ini | 11 ++++ dom/workers/test/test_bug1060621.html | 30 ++++++++++ dom/workers/test/test_bug1062920.html | 61 +++++++++++++++++++ dom/workers/test/test_bug1062920.xul | 68 +++++++++++++++++++++ 14 files changed, 394 insertions(+), 64 deletions(-)

1 0

[tor-browser/tor-browser-31.1.1esr-4.x-1] Bug 13027: Backport of Navigator.* spoofing patch.
by mikeperry＠torproject.org 09 Oct '14

09 Oct '14

commit 30f92a25d4f0629285d9f64c6ce090dfda3a252f Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 6 12:02:39 2014 +0000 Bug 13027: Backport of Navigator.* spoofing patch. It turned out Web Workers ignored general.*.override values which got fixed by Mozilla with https://hg.mozilla.org/mozilla-central/rev/b0b831a03d9ch https://hg.mozilla.org/mozilla-central/rev/eeb169601087 (bug 1062920 and 1060621). This is an ESR 31 specific backport which was at least partly necessary due to the big worker related patchset (bug 949325) which landed in Firefox 32. --- dom/base/Navigator.cpp | 61 ++++++++++--------- dom/base/Navigator.h | 13 +++-- dom/workers/Navigator.cpp | 47 ++++++++++++++- dom/workers/Navigator.h | 37 ++++-------- dom/workers/RuntimeService.cpp | 104 ++++++++++++++++++++++++++++++++- dom/workers/RuntimeService.h | 12 ++++ dom/workers/WorkerScope.cpp | 4 ++ dom/workers/test/bug1060621_worker.js | 2 + dom/workers/test/bug1062920_worker.js | 6 ++ dom/workers/test/chrome.ini | 2 + dom/workers/test/mochitest.ini | 11 ++++ dom/workers/test/test_bug1060621.html | 30 ++++++++++ dom/workers/test/test_bug1062920.html | 61 +++++++++++++++++++ dom/workers/test/test_bug1062920.xul | 68 +++++++++++++++++++++ 14 files changed, 394 insertions(+), 64 deletions(-) diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp index 0f03ad3..135550e 100644 --- a/dom/base/Navigator.cpp +++ b/dom/base/Navigator.cpp @@ -337,13 +337,13 @@ Navigator::GetAppCodeName(nsAString& aAppCodeName) NS_IMETHODIMP Navigator::GetAppVersion(nsAString& aAppVersion) { - return NS_GetNavigatorAppVersion(aAppVersion); + return GetAppVersion(aAppVersion, /* aUsePrefOverriddenValue */ true); } NS_IMETHODIMP Navigator::GetAppName(nsAString& aAppName) { - NS_GetNavigatorAppName(aAppName); + AppName(aAppName, /* aUsePrefOverriddenValue */ true); return NS_OK; } @@ -406,7 +406,7 @@ Navigator::GetLanguage(nsAString& aLanguage) NS_IMETHODIMP Navigator::GetPlatform(nsAString& aPlatform) { - return NS_GetNavigatorPlatform(aPlatform); + return GetPlatform(aPlatform, /* aUsePrefOverriddenValue */ true); } NS_IMETHODIMP @@ -2356,29 +2356,12 @@ Navigator::GetWindowFromGlobal(JSObject* aGlobal) return win.forget(); } -} // namespace dom -} // namespace mozilla - nsresult -NS_GetNavigatorUserAgent(nsAString& aUserAgent) +Navigator::GetPlatform(nsAString& aPlatform, bool aUsePrefOverriddenValue) { - nsresult rv; - - nsCOMPtr<nsIHttpProtocolHandler> - service(do_GetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "http", &rv)); - NS_ENSURE_SUCCESS(rv, rv); - - nsAutoCString ua; - rv = service->GetUserAgent(ua); - CopyASCIItoUTF16(ua, aUserAgent); - - return rv; -} + MOZ_ASSERT(NS_IsMainThread()); -nsresult -NS_GetNavigatorPlatform(nsAString& aPlatform) -{ - if (!nsContentUtils::IsCallerChrome()) { + if (aUsePrefOverriddenValue && !nsContentUtils::IsCallerChrome()) { const nsAdoptingString& override = mozilla::Preferences::GetString("general.platform.override"); @@ -2417,10 +2400,11 @@ NS_GetNavigatorPlatform(nsAString& aPlatform) return rv; } -nsresult -NS_GetNavigatorAppVersion(nsAString& aAppVersion) + +/* static */ nsresult +Navigator::GetAppVersion(nsAString& aAppVersion, bool aUsePrefOverriddenValue) { - if (!nsContentUtils::IsCallerChrome()) { + if (aUsePrefOverriddenValue && !nsContentUtils::IsCallerChrome()) { const nsAdoptingString& override = mozilla::Preferences::GetString("general.appversion.override"); @@ -2452,10 +2436,10 @@ NS_GetNavigatorAppVersion(nsAString& aAppVersion) return rv; } -void -NS_GetNavigatorAppName(nsAString& aAppName) +/* static */ void +Navigator::AppName(nsAString& aAppName, bool aUsePrefOverriddenValue) { - if (!nsContentUtils::IsCallerChrome()) { + if (aUsePrefOverriddenValue && !nsContentUtils::IsCallerChrome()) { const nsAdoptingString& override = mozilla::Preferences::GetString("general.appname.override"); @@ -2467,3 +2451,22 @@ NS_GetNavigatorAppName(nsAString& aAppName) aAppName.AssignLiteral("Netscape"); } + +} // namespace dom +} // namespace mozilla + +nsresult +NS_GetNavigatorUserAgent(nsAString& aUserAgent) +{ + nsresult rv; + + nsCOMPtr<nsIHttpProtocolHandler> + service(do_GetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "http", &rv)); + NS_ENSURE_SUCCESS(rv, rv); + + nsAutoCString ua; + rv = service->GetUserAgent(ua); + CopyASCIItoUTF16(ua, aUserAgent); + + return rv; +} diff --git a/dom/base/Navigator.h b/dom/base/Navigator.h index a4cbf42..8eb9b09 100644 --- a/dom/base/Navigator.h +++ b/dom/base/Navigator.h @@ -46,8 +46,6 @@ class nsIDOMMozIccManager; // Navigator: Script "navigator" object //***************************************************************************** -void NS_GetNavigatorAppName(nsAString& aAppName); - namespace mozilla { namespace dom { @@ -156,6 +154,15 @@ public: // The XPCOM GetDoNotTrack is ok Geolocation* GetGeolocation(ErrorResult& aRv); battery::BatteryManager* GetBattery(ErrorResult& aRv); + + static void AppName(nsAString& aAppName, bool aUsePrefOverriddenValue); + + static nsresult GetPlatform(nsAString& aPlatform, + bool aUsePrefOverriddenValue); + + static nsresult GetAppVersion(nsAString& aAppVersion, + bool aUsePrefOverriddenValue); + already_AddRefed<Promise> GetDataStores(const nsAString &aName, ErrorResult& aRv); bool Vibrate(uint32_t aDuration); @@ -361,7 +368,5 @@ private: } // namespace mozilla nsresult NS_GetNavigatorUserAgent(nsAString& aUserAgent); -nsresult NS_GetNavigatorPlatform(nsAString& aPlatform); -nsresult NS_GetNavigatorAppVersion(nsAString& aAppVersion); #endif // mozilla_dom_Navigator_h diff --git a/dom/workers/Navigator.cpp b/dom/workers/Navigator.cpp index 9db904f..f2604cd 100644 --- a/dom/workers/Navigator.cpp +++ b/dom/workers/Navigator.cpp @@ -8,6 +8,7 @@ #include "mozilla/dom/WorkerNavigatorBinding.h" #include "RuntimeService.h" +#include "WorkerPrivate.h" BEGIN_WORKERS_NAMESPACE @@ -26,9 +27,7 @@ WorkerNavigator::Create(bool aOnLine) rts->GetNavigatorProperties(); nsRefPtr<WorkerNavigator> navigator = - new WorkerNavigator(properties.mAppName, properties.mAppVersion, - properties.mPlatform, properties.mUserAgent, - aOnLine); + new WorkerNavigator(properties, aOnLine); return navigator.forget(); } @@ -39,4 +38,46 @@ WorkerNavigator::WrapObject(JSContext* aCx) return WorkerNavigatorBinding_workers::Wrap(aCx, this); } +void +WorkerNavigator::GetAppName(nsString& aAppName) const +{ + WorkerPrivate* workerPrivate = GetCurrentThreadWorkerPrivate(); + MOZ_ASSERT(workerPrivate); + + if (!mProperties.mAppNameOverridden.IsEmpty() && + !workerPrivate->UsesSystemPrincipal()) { + aAppName = mProperties.mAppNameOverridden; + } else { + aAppName = mProperties.mAppName; + } +} + +void +WorkerNavigator::GetAppVersion(nsString& aAppVersion) const +{ + WorkerPrivate* workerPrivate = GetCurrentThreadWorkerPrivate(); + MOZ_ASSERT(workerPrivate); + + if (!mProperties.mAppVersionOverridden.IsEmpty() && + !workerPrivate->UsesSystemPrincipal()) { + aAppVersion = mProperties.mAppVersionOverridden; + } else { + aAppVersion = mProperties.mAppVersion; + } +} + +void +WorkerNavigator::GetPlatform(nsString& aPlatform) const +{ + WorkerPrivate* workerPrivate = GetCurrentThreadWorkerPrivate(); + MOZ_ASSERT(workerPrivate); + + if (!mProperties.mPlatformOverridden.IsEmpty() && + !workerPrivate->UsesSystemPrincipal()) { + aPlatform = mProperties.mPlatformOverridden; + } else { + aPlatform = mProperties.mPlatform; + } +} + END_WORKERS_NAMESPACE diff --git a/dom/workers/Navigator.h b/dom/workers/Navigator.h index e5183b3..3b4fb31 100644 --- a/dom/workers/Navigator.h +++ b/dom/workers/Navigator.h @@ -7,6 +7,7 @@ #define mozilla_dom_workers_navigator_h__ #include "Workers.h" +#include "RuntimeService.h" #include "nsString.h" #include "nsWrapperCache.h" @@ -14,21 +15,14 @@ BEGIN_WORKERS_NAMESPACE class WorkerNavigator MOZ_FINAL : public nsWrapperCache { - nsString mAppName; - nsString mAppVersion; - nsString mPlatform; - nsString mUserAgent; + typedef struct RuntimeService::NavigatorProperties NavigatorProperties; + + NavigatorProperties mProperties; bool mOnline; - WorkerNavigator(const nsAString& aAppName, - const nsAString& aAppVersion, - const nsAString& aPlatform, - const nsAString& aUserAgent, + WorkerNavigator(const NavigatorProperties& aProperties, bool aOnline) - : mAppName(aAppName) - , mAppVersion(aAppVersion) - , mPlatform(aPlatform) - , mUserAgent(aUserAgent) + : mProperties(aProperties) , mOnline(aOnline) { MOZ_COUNT_CTOR(WorkerNavigator); @@ -59,24 +53,17 @@ public: { aAppCodeName.AssignLiteral("Mozilla"); } - void GetAppName(nsString& aAppName) const - { - aAppName = mAppName; - } + void GetAppName(nsString& aAppName) const; - void GetAppVersion(nsString& aAppVersion) const - { - aAppVersion = mAppVersion; - } + void GetAppVersion(nsString& aAppVersion) const; + + void GetPlatform(nsString& aPlatform) const; - void GetPlatform(nsString& aPlatform) const - { - aPlatform = mPlatform; - } void GetProduct(nsString& aProduct) const { aProduct.AssignLiteral("Gecko"); } + bool TaintEnabled() const { return false; @@ -84,7 +71,7 @@ public: void GetUserAgent(nsString& aUserAgent) const { - aUserAgent = mUserAgent; + aUserAgent = mProperties.mUserAgent; } bool OnLine() const diff --git a/dom/workers/RuntimeService.cpp b/dom/workers/RuntimeService.cpp index b34cba3..7eaf007 100644 --- a/dom/workers/RuntimeService.cpp +++ b/dom/workers/RuntimeService.cpp @@ -110,6 +110,10 @@ static_assert(MAX_WORKERS_PER_DOMAIN >= 1, #define CC_REQUEST_OBSERVER_TOPIC "child-cc-request" #define MEMORY_PRESSURE_OBSERVER_TOPIC "memory-pressure" +#define PREF_GENERAL_APPNAME_OVERRIDE "general.appname.override" +#define PREF_GENERAL_APPVERSION_OVERRIDE "general.appversion.override" +#define PREF_GENERAL_PLATFORM_OVERRIDE "general.platform.override" + #define BROADCAST_ALL_WORKERS(_func, ...) \ PR_BEGIN_MACRO \ AssertIsOnMainThread(); \ @@ -981,6 +985,48 @@ private: } }; +void +AppNameOverrideChanged(const char* /* aPrefName */, void* /* aClosure */) +{ + AssertIsOnMainThread(); + + const nsAdoptingString& override = + mozilla::Preferences::GetString(PREF_GENERAL_APPNAME_OVERRIDE); + + RuntimeService* runtime = RuntimeService::GetService(); + if (runtime) { + runtime->UpdateAppNameOverridePreference(override); + } +} + +void +AppVersionOverrideChanged(const char* /* aPrefName */, void* /* aClosure */) +{ + AssertIsOnMainThread(); + + const nsAdoptingString& override = + mozilla::Preferences::GetString(PREF_GENERAL_APPVERSION_OVERRIDE); + + RuntimeService* runtime = RuntimeService::GetService(); + if (runtime) { + runtime->UpdateAppVersionOverridePreference(override); + } +} + +void +PlatformOverrideChanged(const char* /* aPrefName */, void* /* aClosure */) +{ + AssertIsOnMainThread(); + + const nsAdoptingString& override = + mozilla::Preferences::GetString(PREF_GENERAL_PLATFORM_OVERRIDE); + + RuntimeService* runtime = RuntimeService::GetService(); + if (runtime) { + runtime->UpdatePlatformOverridePreference(override); + } +} + } /* anonymous namespace */ class RuntimeService::WorkerThread MOZ_FINAL : public nsThread @@ -1347,15 +1393,25 @@ RuntimeService::RegisterWorker(JSContext* aCx, WorkerPrivate* aWorkerPrivate) } else { if (!mNavigatorPropertiesLoaded) { - NS_GetNavigatorAppName(mNavigatorProperties.mAppName); - if (NS_FAILED(NS_GetNavigatorAppVersion(mNavigatorProperties.mAppVersion)) || - NS_FAILED(NS_GetNavigatorPlatform(mNavigatorProperties.mPlatform)) || + Navigator::AppName(mNavigatorProperties.mAppName, + false /* aUsePrefOverriddenValue */); + if (NS_FAILED(Navigator::GetAppVersion(mNavigatorProperties.mAppVersion, + false /* aUsePrefOverriddenValue */)) || + NS_FAILED(Navigator::GetPlatform(mNavigatorProperties.mPlatform, + false /* aUsePrefOverriddenValue */)) || NS_FAILED(NS_GetNavigatorUserAgent(mNavigatorProperties.mUserAgent))) { JS_ReportError(aCx, "Failed to load navigator strings!"); UnregisterWorker(aCx, aWorkerPrivate); return false; } + mNavigatorProperties.mAppNameOverridden = + mozilla::Preferences::GetString(PREF_GENERAL_APPNAME_OVERRIDE); + mNavigatorProperties.mAppVersionOverridden = + mozilla::Preferences::GetString(PREF_GENERAL_APPVERSION_OVERRIDE); + mNavigatorProperties.mPlatformOverridden = + mozilla::Preferences::GetString(PREF_GENERAL_PLATFORM_OVERRIDE); + mNavigatorPropertiesLoaded = true; } @@ -1696,6 +1752,18 @@ RuntimeService::Init() PREF_WORKERS_OPTIONS_PREFIX, nullptr)) || NS_FAILED(Preferences::RegisterCallbackAndCall( + AppNameOverrideChanged, + PREF_GENERAL_APPNAME_OVERRIDE, + nullptr)) || + NS_FAILED(Preferences::RegisterCallbackAndCall( + AppVersionOverrideChanged, + PREF_GENERAL_APPVERSION_OVERRIDE, + nullptr)) || + NS_FAILED(Preferences::RegisterCallbackAndCall( + PlatformOverrideChanged, + PREF_GENERAL_PLATFORM_OVERRIDE, + nullptr)) || + NS_FAILED(Preferences::RegisterCallbackAndCall( JSVersionChanged, PREF_WORKERS_LATEST_JS_VERSION, nullptr))) { @@ -1841,6 +1909,15 @@ RuntimeService::Cleanup() if (NS_FAILED(Preferences::UnregisterCallback(JSVersionChanged, PREF_WORKERS_LATEST_JS_VERSION, nullptr)) || + NS_FAILED(Preferences::UnregisterCallback(AppNameOverrideChanged, + PREF_GENERAL_APPNAME_OVERRIDE, + nullptr)) || + NS_FAILED(Preferences::UnregisterCallback(AppVersionOverrideChanged, + PREF_GENERAL_APPVERSION_OVERRIDE, + nullptr)) || + NS_FAILED(Preferences::UnregisterCallback(PlatformOverrideChanged, + PREF_GENERAL_PLATFORM_OVERRIDE, + nullptr)) || NS_FAILED(Preferences::UnregisterCallback(LoadRuntimeAndContextOptions, PREF_JS_OPTIONS_PREFIX, nullptr)) || @@ -2235,6 +2312,27 @@ RuntimeService::UpdateAllWorkerRuntimeAndContextOptions() } void +RuntimeService::UpdateAppNameOverridePreference(const nsAString& aValue) +{ + AssertIsOnMainThread(); + mNavigatorProperties.mAppNameOverridden = aValue; +} + +void +RuntimeService::UpdateAppVersionOverridePreference(const nsAString& aValue) +{ + AssertIsOnMainThread(); + mNavigatorProperties.mAppVersionOverridden = aValue; +} + +void +RuntimeService::UpdatePlatformOverridePreference(const nsAString& aValue) +{ + AssertIsOnMainThread(); + mNavigatorProperties.mPlatformOverridden = aValue; +} + +void RuntimeService::UpdateAllWorkerPreference(WorkerPreference aPref, bool aValue) { BROADCAST_ALL_WORKERS(UpdatePreference, aPref, aValue); diff --git a/dom/workers/RuntimeService.h b/dom/workers/RuntimeService.h index 9f81fd3..625b577 100644 --- a/dom/workers/RuntimeService.h +++ b/dom/workers/RuntimeService.h @@ -103,8 +103,11 @@ public: struct NavigatorProperties { nsString mAppName; + nsString mAppNameOverridden; nsString mAppVersion; + nsString mAppVersionOverridden; nsString mPlatform; + nsString mPlatformOverridden; nsString mUserAgent; }; @@ -186,6 +189,15 @@ public: } void + UpdateAppNameOverridePreference(const nsAString& aValue); + + void + UpdateAppVersionOverridePreference(const nsAString& aValue); + + void + UpdatePlatformOverridePreference(const nsAString& aValue); + + void UpdateAllWorkerRuntimeAndContextOptions(); void diff --git a/dom/workers/WorkerScope.cpp b/dom/workers/WorkerScope.cpp index 04d8f92..77e0978 100644 --- a/dom/workers/WorkerScope.cpp +++ b/dom/workers/WorkerScope.cpp @@ -52,11 +52,15 @@ NS_IMPL_CYCLE_COLLECTION_CLASS(WorkerGlobalScope) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(WorkerGlobalScope, DOMEventTargetHelper) tmp->mWorkerPrivate->AssertIsOnWorkerThread(); + NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mLocation) + NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mNavigator) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(WorkerGlobalScope, DOMEventTargetHelper) tmp->mWorkerPrivate->AssertIsOnWorkerThread(); + NS_IMPL_CYCLE_COLLECTION_UNLINK(mLocation) + NS_IMPL_CYCLE_COLLECTION_UNLINK(mNavigator) NS_IMPL_CYCLE_COLLECTION_UNLINK_END NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(WorkerGlobalScope, diff --git a/dom/workers/test/bug1060621_worker.js b/dom/workers/test/bug1060621_worker.js new file mode 100644 index 0000000..a0fcd3f --- /dev/null +++ b/dom/workers/test/bug1060621_worker.js @@ -0,0 +1,2 @@ +navigator.foobar = 42; +postMessage('done'); diff --git a/dom/workers/test/bug1062920_worker.js b/dom/workers/test/bug1062920_worker.js new file mode 100644 index 0000000..d3df388 --- /dev/null +++ b/dom/workers/test/bug1062920_worker.js @@ -0,0 +1,6 @@ +postMessage({ appCodeName: navigator.appCodeName, + appName: navigator.appName, + appVersion: navigator.appVersion, + platform: navigator.platform, + userAgent: navigator.userAgent, + product: navigator.product }); diff --git a/dom/workers/test/chrome.ini b/dom/workers/test/chrome.ini index 2420141..c4acacb 100644 --- a/dom/workers/test/chrome.ini +++ b/dom/workers/test/chrome.ini @@ -18,6 +18,7 @@ support-files = jsm_url_worker.js workersDisabled_worker.js file_url.jsm + bug1062920_worker.js [test_bug883784.jsm] [test_bug883784.xul] @@ -36,3 +37,4 @@ support-files = [test_fileSubWorker.xul] [test_workersDisabled.xul] [test_url.xul] +[test_bug1062920.xul] diff --git a/dom/workers/test/mochitest.ini b/dom/workers/test/mochitest.ini index 5107604..0275195 100644 --- a/dom/workers/test/mochitest.ini +++ b/dom/workers/test/mochitest.ini @@ -73,6 +73,8 @@ support-files = subdir/relativeLoad_sub_worker.js subdir/relativeLoad_sub_worker2.js subdir/relativeLoad_sub_import.js + bug1060621_worker.js + bug1062920_worker.js [test_404.html] [test_atob.html] @@ -155,3 +157,12 @@ skip-if = buildapp == 'b2g' || e10s skip-if = (os == "win") || (os == "mac") || toolkit == 'android' || e10s #bug 798220 [test_url_exceptions.html] [test_urlSearchParams.html] +<<<<<<< HEAD +<<<<<<< HEAD +======= +[test_bug1060621.html] +[test_bug1062920.html] +>>>>>>> Bug 1062920 - WorkerNavigator strings should honor general.*.override prefs. r=khuey, a=sledru +======= +[test_bug1060621.html] +>>>>>>> Bug 1060621 - WorkerScope should CC mLocation and mNavigator. r=bz, a=sledru diff --git a/dom/workers/test/test_bug1060621.html b/dom/workers/test/test_bug1060621.html new file mode 100644 index 0000000..758bf99 --- /dev/null +++ b/dom/workers/test/test_bug1060621.html @@ -0,0 +1,30 @@ + +<!DOCTYPE HTML> +<html> +<head> + <title>Test for URLSearchParams object in workers</title> + <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> + <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" /> +</head> +<body> +<p id="display"></p> +<div id="content" style="display: none"></div> +<pre id="test"></pre> +<script class="testbody" type="text/javascript"> + + var worker = new Worker("bug1060621_worker.js"); + + worker.onmessage = function(event) { + ok(true, "The operation is done. We should not leak."); + SimpleTest.finish(); + }; + + SimpleTest.waitForExplicitFinish(); + +</script> +</pre> +</body> +</html> diff --git a/dom/workers/test/test_bug1062920.html b/dom/workers/test/test_bug1062920.html new file mode 100644 index 0000000..f3afca9 --- /dev/null +++ b/dom/workers/test/test_bug1062920.html @@ -0,0 +1,61 @@ + +<!DOCTYPE HTML> +<html> +<head> + <title>Test for navigator property override</title> + <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> + <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" /> +</head> +<body> +<p id="display"></p> +<div id="content" style="display: none"></div> +<pre id="test"></pre> +<script class="testbody" type="text/javascript"> + + function checkValues() { + var worker = new Worker("bug1062920_worker.js"); + + worker.onmessage = function(event) { + is(event.data.appCodeName, navigator.appCodeName, "appCodeName should match"); + is(event.data.appName, navigator.appName, "appName should match"); + is(event.data.appVersion, navigator.appVersion, "appVersion should match"); + is(event.data.platform, navigator.platform, "platform should match"); + is(event.data.userAgent, navigator.userAgent, "userAgent should match"); + is(event.data.product, navigator.product, "product should match"); + runTests(); + }; + } + + function replaceAndCheckValues() { + SpecialPowers.pushPrefEnv({"set": [ + ["general.appname.override", "appName overridden"], + ["general.appversion.override", "appVersion overridden"], + ["general.platform.override", "platform overridden"] + ]}, checkValues); + } + + var tests = [ + checkValues, + replaceAndCheckValues + ]; + + function runTests() { + if (tests.length == 0) { + SimpleTest.finish(); + return; + } + + var test = tests.shift(); + test(); + } + + SimpleTest.waitForExplicitFinish(); + runTests(); + +</script> +</pre> +</body> +</html> diff --git a/dom/workers/test/test_bug1062920.xul b/dom/workers/test/test_bug1062920.xul new file mode 100644 index 0000000..a98d930 --- /dev/null +++ b/dom/workers/test/test_bug1062920.xul @@ -0,0 +1,68 @@ +<?xml version="1.0"?> + +<window title="DOM Worker Threads Test" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> + + <script type="application/javascript" + src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/> + <script type="application/javascript" + src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"/> + <script type="application/javascript" src="dom_worker_helper.js"/> + + <script type="application/javascript"> + + function checkValues() { + var worker = new Worker("bug1062920_worker.js"); + + worker.onmessage = function(event) { + is(event.data.appCodeName, navigator.appCodeName, "appCodeName should match"); + is(event.data.appName, navigator.appName, "appName should match"); + isnot(event.data.appName, "appName overridden", "appName is not overridden"); + is(event.data.appVersion, navigator.appVersion, "appVersion should match"); + isnot(event.data.appVersion, "appVersion overridden", "appVersion is not overridden"); + is(event.data.platform, navigator.platform, "platform should match"); + isnot(event.data.platform, "platform overridden", "platform is not overridden"); + is(event.data.userAgent, navigator.userAgent, "userAgent should match"); + is(event.data.product, navigator.product, "product should match"); + runTests(); + }; + } + + function replaceAndCheckValues() { + SpecialPowers.pushPrefEnv({"set": [ + ["general.appname.override", "appName overridden"], + ["general.appversion.override", "appVersion overridden"], + ["general.platform.override", "platform overridden"] + ]}, checkValues); + } + + var tests = [ + checkValues, + replaceAndCheckValues + ]; + + function runTests() { + if (tests.length == 0) { + SimpleTest.finish(); + return; + } + + var test = tests.shift(); + test(); + } + + SimpleTest.waitForExplicitFinish(); + runTests(); + + </script> + + <body xmlns="http://www.w3.org/1999/xhtml"> + <p id="display"></p> + <div id="content" style="display:none;"></div> + <pre id="test"></pre> + </body> + <label id="test-result"/> +</window>

1 0

[tor-browser/tor-browser-31.1.1esr-4.x-1] Merge remote-tracking branch 'brade/bug13016' into tor-browser-31.1.1esr-4.x-1
by mikeperry＠torproject.org 09 Oct '14

09 Oct '14

commit 8daaea30f4141b4c5b19ef5bcf362969542ee21f Merge: f52b2a0 bbc88ab Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Oct 8 23:53:50 2014 -0700 Merge remote-tracking branch 'brade/bug13016' into tor-browser-31.1.1esr-4.x-1 layout/style/nsComputedDOMStyle.cpp | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor-browser/tor-browser-31.1.1esr-4.x-1] Bug 13016: Hide CSS -moz-osx-font-smoothing values.
by mikeperry＠torproject.org 09 Oct '14

09 Oct '14

commit bbc88abb9221a0126668a3d1150a805418c019a7 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Oct 8 17:13:11 2014 -0400 Bug 13016: Hide CSS -moz-osx-font-smoothing values. This patch prevents non-Chrome callers from using getComputedStyle() to retrieve values for the -moz-osx-font-smoothing CSS property. That property can be used to detect whether the preference layout.css.osx-font-smoothing.enabled is true of false (by default, it is true on Mac OS and false elsewhere). --- layout/style/nsComputedDOMStyle.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/layout/style/nsComputedDOMStyle.cpp b/layout/style/nsComputedDOMStyle.cpp index 1f69934..9099113 100644 --- a/layout/style/nsComputedDOMStyle.cpp +++ b/layout/style/nsComputedDOMStyle.cpp @@ -1488,6 +1488,9 @@ nsComputedDOMStyle::DoGetFontSizeAdjust() CSSValue* nsComputedDOMStyle::DoGetOSXFontSmoothing() { + if (!nsContentUtils::IsCallerChrome()) + return nullptr; + nsROCSSPrimitiveValue* val = new nsROCSSPrimitiveValue; val->SetIdent(nsCSSProps::ValueToKeywordEnum(StyleFont()->mFont.smoothing, nsCSSProps::kFontSmoothingKTable));

1 0

[tor-browser/tor-browser-31.1.1esr-4.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 09 Oct '14

09 Oct '14

commit f52b2a0e1b8aaa88b2c64b6dee7290dd92113d89 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Oct 8 18:47:29 2014 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Bug #13346: disable "slow to start" warning. --- browser/app/profile/000-tor-browser.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 0a16f35..e0eb834 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -12,6 +12,12 @@ pref("browser.startup.homepage_override.mstone", "ignore"); pref("startup.homepage_welcome_url", ""); pref("startup.homepage_override_url", ""); +// Disable "Slow startup" warnings and associated disk history +// (bug #13346) +pref("browser.slowStartup.notificationDisabled", true); +pref("browser.slowStartup.maxSamples", 0); +pref("browser.slowStartup.samples", 0); + // Disk activity: Disable Browsing History Storage pref("browser.privatebrowsing.autostart", true); pref("browser.cache.disk.enable", false);

1 0

[tor-browser/tor-browser-31.1.1esr-4.x-1] Bug 13356: symlinks missing after complete update.
by mikeperry＠torproject.org 08 Oct '14

08 Oct '14

commit 5630a27f53486655c14eae06276989f4e10632ef Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Oct 7 17:17:08 2014 -0400 Bug 13356: symlinks missing after complete update. Include the symlink remove and add directives in the updatev2.manifest file that is used by 4.0-alpha-3 browsers (as well as in the updatev3.manifest file that is used by ESR31-based browsers). --- tools/update-packaging/common.sh | 4 +++- tools/update-packaging/make_full_update.sh | 4 ++-- tools/update-packaging/make_incremental_update.sh | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/update-packaging/common.sh b/tools/update-packaging/common.sh index ecdc5dd..7f93a21 100755 --- a/tools/update-packaging/common.sh +++ b/tools/update-packaging/common.sh @@ -115,9 +115,11 @@ make_add_if_not_instruction() { make_addsymlink_instruction() { link="$1" target="$2" - filev3="$3" + filev2="$3" + filev3="$4" verbose_notice " addsymlink: $link -> $target" + echo "addsymlink \"$link\" \"$target\"" >> "$filev2" echo "addsymlink \"$link\" \"$target\"" >> "$filev3" } diff --git a/tools/update-packaging/make_full_update.sh b/tools/update-packaging/make_full_update.sh index 77c3de3..b5813f2 100755 --- a/tools/update-packaging/make_full_update.sh +++ b/tools/update-packaging/make_full_update.sh @@ -124,12 +124,12 @@ for ((i=0; $i<$num_files; i=$i+1)); do done notice "" -notice "Adding symlink add instructions to file 'updatev3.manifest'" +notice "Adding symlink add instructions to update manifests" num_symlinks=${#symlinks[*]} for ((i=0; $i<$num_symlinks; i=$i+1)); do link="${symlinks[$i]}" target="${symlink_targets[$i]}" - make_addsymlink_instruction "$link" "$target" "$updatemanifestv3" + make_addsymlink_instruction "$link" "$target" "$updatemanifestv2" "$updatemanifestv3" done # Append remove instructions for any dead files. diff --git a/tools/update-packaging/make_incremental_update.sh b/tools/update-packaging/make_incremental_update.sh index fb5313f..60c5a4b 100755 --- a/tools/update-packaging/make_incremental_update.sh +++ b/tools/update-packaging/make_incremental_update.sh @@ -249,11 +249,12 @@ done # Remove and re-add symlinks notice "" -notice "Adding symlink remove/add instructions to file 'updatev3.manifest'" +notice "Adding symlink remove/add instructions to update manifests" num_oldsymlinks=${#oldsymlinks[*]} for ((i=0; $i<$num_oldsymlinks; i=$i+1)); do link="${oldsymlinks[$i]}" verbose_notice " remove: $link" + echo "remove \"$link\"" >> "$updatemanifestv2" echo "remove \"$link\"" >> "$updatemanifestv3" done @@ -261,7 +262,7 @@ num_newsymlinks=${#newsymlinks[*]} for ((i=0; $i<$num_newsymlinks; i=$i+1)); do link="${newsymlinks[$i]}" target="${newsymlink_targets[$i]}" - make_addsymlink_instruction "$link" "$target" "$updatemanifestv3" + make_addsymlink_instruction "$link" "$target" "$updatemanifestv2" "$updatemanifestv3" done # Newly added files

1 0

[tor-browser/tor-browser-31.1.1esr-4.x-1] Merge remote-tracking branch 'brade/bug4234-esr31-fixup-01' into tor-browser-31.1.1esr-4.x-1
by mikeperry＠torproject.org 08 Oct '14

08 Oct '14

commit 30bdf17443a32c902f623af4de0736adb3976b25 Merge: 58b604e 5630a27 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Oct 8 14:23:52 2014 -0700 Merge remote-tracking branch 'brade/bug4234-esr31-fixup-01' into tor-browser-31.1.1esr-4.x-1 tools/update-packaging/common.sh | 4 +++- tools/update-packaging/make_full_update.sh | 4 ++-- tools/update-packaging/make_incremental_update.sh | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-)

1 0

[tor-browser/tor-browser-31.1.1esr-4.x-1] Bug 13025: Lie about screen orientation.
by mikeperry＠torproject.org 08 Oct '14

08 Oct '14

commit 58b604e6fc832bf4044c9ab951eba6cf9767ad67 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Oct 7 11:37:12 2014 +0000 Bug 13025: Lie about screen orientation. In a non-chrome context we give 'landscape-primary' back if asked about the screen orientation. --- dom/base/nsScreen.cpp | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/dom/base/nsScreen.cpp b/dom/base/nsScreen.cpp index 76674da..7b80f8e 100644 --- a/dom/base/nsScreen.cpp +++ b/dom/base/nsScreen.cpp @@ -174,22 +174,26 @@ nsScreen::Notify(const hal::ScreenConfiguration& aConfiguration) void nsScreen::GetMozOrientation(nsString& aOrientation) { - switch (mOrientation) { - case eScreenOrientation_PortraitPrimary: - aOrientation.AssignLiteral("portrait-primary"); - break; - case eScreenOrientation_PortraitSecondary: - aOrientation.AssignLiteral("portrait-secondary"); - break; - case eScreenOrientation_LandscapePrimary: + if (!IsChrome()) { aOrientation.AssignLiteral("landscape-primary"); - break; - case eScreenOrientation_LandscapeSecondary: - aOrientation.AssignLiteral("landscape-secondary"); - break; - case eScreenOrientation_None: - default: - MOZ_CRASH("Unacceptable mOrientation value"); + } else { + switch (mOrientation) { + case eScreenOrientation_PortraitPrimary: + aOrientation.AssignLiteral("portrait-primary"); + break; + case eScreenOrientation_PortraitSecondary: + aOrientation.AssignLiteral("portrait-secondary"); + break; + case eScreenOrientation_LandscapePrimary: + aOrientation.AssignLiteral("landscape-primary"); + break; + case eScreenOrientation_LandscapeSecondary: + aOrientation.AssignLiteral("landscape-secondary"); + break; + case eScreenOrientation_None: + default: + MOZ_CRASH("Unacceptable mOrientation value"); + } } }

1 0