diff --git a/browser/app/moz.build b/browser/app/moz.build index 434167c996..e18a16aee0 100644 --- a/browser/app/moz.build +++ b/browser/app/moz.build @@ -174,3 +174,6 @@ for icon in ("firefox", "document", "newwindow", "newtab", "pbmode", "document_p CONFIG["MOZ_BRANDING_DIRECTORY"], icon, ) + +# DOM Mask +LOCAL_INCLUDES += ["/omegacfg"] \ No newline at end of file diff --git a/dom/base/Element.cpp b/dom/base/Element.cpp index 807cb4ec25..3df0e0f70f 100644 --- a/dom/base/Element.cpp +++ b/dom/base/Element.cpp @@ -12,6 +12,7 @@ #include "mozilla/dom/Element.h" #include "mozilla/dom/ElementInlines.h" +#include "MaskConfig.hpp" #include #include @@ -984,6 +985,18 @@ nsRect Element::GetClientAreaRect() { Document* doc = OwnerDoc(); nsPresContext* presContext = doc->GetPresContext(); + if (doc->GetBodyElement() == this) { + if (auto conf = MaskConfig::GetInt32Rect( + "document.body.clientLeft", "document.body.clientTop", + "document.body.clientWidth", "document.body.clientHeight")) { + if (conf.has_value()) { + auto values = conf.value(); + return nsRect(values[0] * 60, values[1] * 60, values[2] * 60, + values[3] * 60); + } + } + } + // We can avoid a layout flush if this is the scrolling element of the // document, we have overlay scrollbars, and we aren't embedded in another // document diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp index 8e577bd9fd..3ed748a75f 100644 --- a/dom/base/Navigator.cpp +++ b/dom/base/Navigator.cpp @@ -8,6 +8,7 @@ #include "base/basictypes.h" #include "Navigator.h" +#include "MaskConfig.hpp" #include "nsIXULAppInfo.h" #include "nsPluginArray.h" #include "nsMimeTypeArray.h" @@ -267,6 +268,8 @@ void Navigator::Invalidate() { void Navigator::GetUserAgent(nsAString& aUserAgent, CallerType aCallerType, ErrorResult& aRv) const { + if (auto value = MaskConfig::GetString("navigator.userAgent")) + return aUserAgent.Assign(NS_ConvertUTF8toUTF16(value.value())); nsCOMPtr window; if (mWindow) { @@ -293,6 +296,8 @@ void Navigator::GetUserAgent(nsAString& aUserAgent, CallerType aCallerType, } void Navigator::GetAppCodeName(nsAString& aAppCodeName, ErrorResult& aRv) { + if (auto value = MaskConfig::GetString("navigator.appCodeName")) + return aAppCodeName.Assign(NS_ConvertUTF8toUTF16(value.value())); nsresult rv; nsCOMPtr service( @@ -314,6 +319,8 @@ void Navigator::GetAppCodeName(nsAString& aAppCodeName, ErrorResult& aRv) { void Navigator::GetAppVersion(nsAString& aAppVersion, CallerType aCallerType, ErrorResult& aRv) const { + if (auto value = MaskConfig::GetString("navigator.appVersion")) + return aAppVersion.Assign(NS_ConvertUTF8toUTF16(value.value())); nsCOMPtr doc = mWindow->GetExtantDoc(); nsresult rv = GetAppVersion( @@ -325,6 +332,8 @@ void Navigator::GetAppVersion(nsAString& aAppVersion, CallerType aCallerType, } void Navigator::GetAppName(nsAString& aAppName) const { + if (auto value = MaskConfig::GetString("navigator.appName")) + return aAppName.Assign(NS_ConvertUTF8toUTF16(value.value())); aAppName.AssignLiteral("Netscape"); } @@ -350,6 +359,15 @@ void Navigator::GetAcceptLanguages(const nsString* aLanguageOverride, aLanguages.Clear(); + if (std::vector maskValues = + MaskConfig::GetStringList("navigator.languages"); + !maskValues.empty()) { + for (const auto& lang : maskValues) { + aLanguages.AppendElement(NS_ConvertUTF8toUTF16(lang)); + } + return; + } + // E.g. "de-de, en-us,en". nsAutoString acceptLang; if (aLanguageOverride && aLanguageOverride->Length()) @@ -400,6 +418,8 @@ void Navigator::GetAcceptLanguages(const nsString* aLanguageOverride, * Full details above in GetAcceptLanguages. */ void Navigator::GetLanguage(nsAString& aLanguage) { + if (auto value = MaskConfig::GetString("navigator.language")) + return aLanguage.Assign(NS_ConvertUTF8toUTF16(value.value())); nsTArray languages; GetLanguages(languages); MOZ_ASSERT(languages.Length() >= 1); @@ -423,6 +443,8 @@ void Navigator::GetLanguages(nsTArray& aLanguages) { void Navigator::GetPlatform(nsAString& aPlatform, CallerType aCallerType, ErrorResult& aRv) const { + if (auto value = MaskConfig::GetString("navigator.platform")) + return aPlatform.Assign(NS_ConvertUTF8toUTF16(value.value())); if (mWindow) { BrowsingContext* bc = mWindow->GetBrowsingContext(); nsString customPlatform; @@ -449,6 +471,8 @@ void Navigator::GetPlatform(nsAString& aPlatform, CallerType aCallerType, void Navigator::GetOscpu(nsAString& aOSCPU, CallerType aCallerType, ErrorResult& aRv) const { if (aCallerType != CallerType::System) { + if (auto value = MaskConfig::GetString("navigator.oscpu")) + return aOSCPU.Assign(NS_ConvertUTF8toUTF16(value.value())); // If fingerprinting resistance is on, we will spoof this value. See // nsRFPService.h for details about spoofed values. if (nsContentUtils::ShouldResistFingerprinting(GetDocShell(), @@ -488,10 +512,14 @@ void Navigator::GetVendor(nsAString& aVendor) { aVendor.Truncate(); } void Navigator::GetVendorSub(nsAString& aVendorSub) { aVendorSub.Truncate(); } void Navigator::GetProduct(nsAString& aProduct) { + if (auto value = MaskConfig::GetString("navigator.product")) + return aProduct.Assign(NS_ConvertUTF8toUTF16(value.value())); aProduct.AssignLiteral("Gecko"); } void Navigator::GetProductSub(nsAString& aProductSub) { + if (auto value = MaskConfig::GetString("navigator.productSub")) + return aProductSub.Assign(NS_ConvertUTF8toUTF16(value.value())); // Legacy build date hardcoded for backward compatibility (bug 776376) aProductSub.AssignLiteral(LEGACY_UA_GECKO_TRAIL); } @@ -517,7 +545,11 @@ nsPluginArray* Navigator::GetPlugins(ErrorResult& aRv) { return mPlugins; } -bool Navigator::PdfViewerEnabled() { return !StaticPrefs::pdfjs_disabled(); } +bool Navigator::PdfViewerEnabled() { + if (auto value = MaskConfig::GetBool("pdfViewerEnabled"); value.has_value()) + return value.value(); + return !StaticPrefs::pdfjs_disabled(); +} Permissions* Navigator::GetPermissions(ErrorResult& aRv) { if (!mWindow) { @@ -543,6 +575,9 @@ StorageManager* Navigator::Storage() { } bool Navigator::CookieEnabled() { + if (auto value = MaskConfig::GetBool("navigator.cookieEnabled"); + value.has_value()) + return value.value(); // Check whether an exception overrides the global cookie behavior // Note that the code for getting the URI here matches that in // nsHTMLDocument::SetCookie. @@ -589,6 +624,8 @@ bool Navigator::CookieEnabled() { } bool Navigator::OnLine() { + if (auto value = MaskConfig::GetBool("navigator.onLine"); value.has_value()) + return value.value(); if (mWindow) { // Check if this tab is set to be offline. BrowsingContext* bc = mWindow->GetBrowsingContext(); @@ -603,6 +640,8 @@ bool Navigator::OnLine() { void Navigator::GetBuildID(nsAString& aBuildID, CallerType aCallerType, ErrorResult& aRv) const { if (aCallerType != CallerType::System) { + if (auto value = MaskConfig::GetString("navigator.buildID")) + return aBuildID.Assign(NS_ConvertUTF8toUTF16(value.value())); // If fingerprinting resistance is on, we will spoof this value. See // nsRFPService.h for details about spoofed values. if (nsContentUtils::ShouldResistFingerprinting( @@ -659,6 +698,8 @@ void Navigator::GetBuildID(nsAString& aBuildID, CallerType aCallerType, } void Navigator::GetDoNotTrack(nsAString& aResult) { + if (auto value = MaskConfig::GetString("navigator.doNotTrack")) + return aResult.Assign(NS_ConvertUTF8toUTF16(value.value())); bool doNotTrack = StaticPrefs::privacy_donottrackheader_enabled(); if (!doNotTrack) { nsCOMPtr loadContext = do_GetInterface(mWindow); @@ -673,6 +714,9 @@ void Navigator::GetDoNotTrack(nsAString& aResult) { } bool Navigator::GlobalPrivacyControl() { + if (auto value = MaskConfig::GetBool("navigator.globalPrivacyControl"); + value.has_value()) + return value.value(); bool gpcStatus = StaticPrefs::privacy_globalprivacycontrol_enabled(); if (!gpcStatus) { nsCOMPtr loadContext = do_GetInterface(mWindow); @@ -684,6 +728,8 @@ bool Navigator::GlobalPrivacyControl() { } uint64_t Navigator::HardwareConcurrency() { + if (auto value = MaskConfig::GetUint64("navigator.hardwareConcurrency")) + return value.value(); workerinternals::RuntimeService* rts = workerinternals::RuntimeService::GetOrCreateService(); if (!rts) { @@ -882,6 +928,8 @@ bool Navigator::Vibrate(const nsTArray& aPattern) { //***************************************************************************** uint32_t Navigator::MaxTouchPoints(CallerType aCallerType) { + if (auto value = MaskConfig::GetUint32("navigator.maxTouchPoints")) + return value.value(); nsIDocShell* docshell = GetDocShell(); BrowsingContext* bc = docshell ? docshell->GetBrowsingContext() : nullptr; diff --git a/dom/base/moz.build b/dom/base/moz.build index 114402c4a1..55daeabe7a 100644 --- a/dom/base/moz.build +++ b/dom/base/moz.build @@ -641,3 +641,6 @@ GeneratedFile( "/servo/components/style/properties/counted_unknown_properties.py", ], ) + +# DOM Mask +LOCAL_INCLUDES += ["/omegacfg"] \ No newline at end of file diff --git a/dom/base/nsGlobalWindowInner.cpp b/dom/base/nsGlobalWindowInner.cpp index 3678ebc59c..03a72fe242 100644 --- a/dom/base/nsGlobalWindowInner.cpp +++ b/dom/base/nsGlobalWindowInner.cpp @@ -5,6 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "nsGlobalWindowInner.h" +#include "MaskConfig.hpp" #include #include @@ -3410,6 +3411,8 @@ void nsGlobalWindowInner::SetName(const nsAString& aName, } double nsGlobalWindowInner::GetInnerWidth(ErrorResult& aError) { + if (auto value = MaskConfig::GetDouble("window.innerWidth")) + return value.value(); FORWARD_TO_OUTER_OR_THROW(GetInnerWidthOuter, (aError), aError, 0); } @@ -3421,6 +3424,8 @@ nsresult nsGlobalWindowInner::GetInnerWidth(double* aWidth) { } double nsGlobalWindowInner::GetInnerHeight(ErrorResult& aError) { + if (auto value = MaskConfig::GetDouble("window.innerHeight")) + return value.value(); // We ignore aCallerType; we only have that argument because some other things // called by GetReplaceableWindowCoord need it. If this ever changes, fix // nsresult nsGlobalWindowInner::GetInnerHeight(double* aInnerWidth) @@ -3437,12 +3442,16 @@ nsresult nsGlobalWindowInner::GetInnerHeight(double* aHeight) { int32_t nsGlobalWindowInner::GetOuterWidth(CallerType aCallerType, ErrorResult& aError) { + if (auto value = MaskConfig::GetInt32("window.outerWidth")) + return value.value(); FORWARD_TO_OUTER_OR_THROW(GetOuterWidthOuter, (aCallerType, aError), aError, 0); } int32_t nsGlobalWindowInner::GetOuterHeight(CallerType aCallerType, ErrorResult& aError) { + if (auto value = MaskConfig::GetInt32("window.outerHeight")) + return value.value(); FORWARD_TO_OUTER_OR_THROW(GetOuterHeightOuter, (aCallerType, aError), aError, 0); } @@ -3457,11 +3466,13 @@ double nsGlobalWindowInner::ScreenEdgeSlopY() const { int32_t nsGlobalWindowInner::GetScreenX(CallerType aCallerType, ErrorResult& aError) { + if (auto value = MaskConfig::GetInt32("window.screenX")) return value.value(); FORWARD_TO_OUTER_OR_THROW(GetScreenXOuter, (aCallerType, aError), aError, 0); } int32_t nsGlobalWindowInner::GetScreenY(CallerType aCallerType, ErrorResult& aError) { + if (auto value = MaskConfig::GetInt32("window.screenY")) return value.value(); FORWARD_TO_OUTER_OR_THROW(GetScreenYOuter, (aCallerType, aError), aError, 0); } @@ -3495,6 +3506,8 @@ static nsPresContext* GetPresContextForRatio(Document* aDoc) { double nsGlobalWindowInner::GetDevicePixelRatio(CallerType aCallerType, ErrorResult& aError) { ENSURE_ACTIVE_DOCUMENT(aError, 0.0); + if (auto value = MaskConfig::GetDouble("window.devicePixelRatio")) + return value.value(); RefPtr presContext = GetPresContextForRatio(mDoc); if (NS_WARN_IF(!presContext)) { @@ -3565,26 +3578,38 @@ already_AddRefed nsGlobalWindowInner::MatchMedia( } int32_t nsGlobalWindowInner::GetScrollMinX(ErrorResult& aError) { + if (auto value = MaskConfig::GetInt32("window.scrollMinX")) + return value.value(); FORWARD_TO_OUTER_OR_THROW(GetScrollBoundaryOuter, (eSideLeft), aError, 0); } int32_t nsGlobalWindowInner::GetScrollMinY(ErrorResult& aError) { + if (auto value = MaskConfig::GetInt32("window.scrollMinY")) + return value.value(); FORWARD_TO_OUTER_OR_THROW(GetScrollBoundaryOuter, (eSideTop), aError, 0); } int32_t nsGlobalWindowInner::GetScrollMaxX(ErrorResult& aError) { + if (auto value = MaskConfig::GetInt32("window.scrollMaxX")) + return value.value(); FORWARD_TO_OUTER_OR_THROW(GetScrollBoundaryOuter, (eSideRight), aError, 0); } int32_t nsGlobalWindowInner::GetScrollMaxY(ErrorResult& aError) { + if (auto value = MaskConfig::GetInt32("window.scrollMaxY")) + return value.value(); FORWARD_TO_OUTER_OR_THROW(GetScrollBoundaryOuter, (eSideBottom), aError, 0); } double nsGlobalWindowInner::GetScrollX(ErrorResult& aError) { + if (auto value = MaskConfig::GetDouble("screen.pageXOffset")) + return value.value(); FORWARD_TO_OUTER_OR_THROW(GetScrollXOuter, (), aError, 0); } double nsGlobalWindowInner::GetScrollY(ErrorResult& aError) { + if (auto value = MaskConfig::GetDouble("screen.pageYOffset")) + return value.value(); FORWARD_TO_OUTER_OR_THROW(GetScrollYOuter, (), aError, 0); } diff --git a/dom/base/nsHistory.cpp b/dom/base/nsHistory.cpp index 99994a73cc..837214d872 100644 --- a/dom/base/nsHistory.cpp +++ b/dom/base/nsHistory.cpp @@ -5,6 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "nsHistory.h" +#include "MaskConfig.hpp" #include "jsapi.h" #include "nsCOMPtr.h" @@ -55,6 +56,8 @@ JSObject* nsHistory::WrapObject(JSContext* aCx, } uint32_t nsHistory::GetLength(ErrorResult& aRv) const { + if (auto value = MaskConfig::GetUint32("window.history.length")) + return value.value(); nsCOMPtr win(do_QueryReferent(mInnerWindow)); if (!win || !win->HasActiveDocument()) { aRv.Throw(NS_ERROR_DOM_SECURITY_ERR); diff --git a/dom/base/nsScreen.cpp b/dom/base/nsScreen.cpp index 4bd1e0c964..a5a95d3fdf 100644 --- a/dom/base/nsScreen.cpp +++ b/dom/base/nsScreen.cpp @@ -4,6 +4,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include "MaskConfig.hpp" #include "nsContentUtils.h" #include "nsScreen.h" #include "mozilla/dom/Document.h" @@ -37,6 +38,10 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(nsScreen, DOMEventTargetHelper, mScreenOrientation) int32_t nsScreen::PixelDepth() { + if (auto value = MaskConfig::GetUint32("screen.colorDepth")) + return value.value(); + if (auto value = MaskConfig::GetUint32("screen.pixelDepth")) + return value.value(); // Return 24 to prevent fingerprinting. if (ShouldResistFingerprinting(RFPTarget::ScreenPixelDepth)) { return 24; @@ -89,6 +94,12 @@ CSSIntRect nsScreen::GetRect() { } CSSIntRect nsScreen::GetAvailRect() { + auto rect = MaskConfig::GetRect("screen.availLeft", "screen.availTop", + "screen.availWidth", "screen.availHeight"); + if (rect.has_value()) { + auto values = rect.value(); + return {values[0], values[1], values[2], values[3]}; + } // Return window inner rect to prevent fingerprinting. if (ShouldResistFingerprinting(RFPTarget::ScreenAvailRect)) { return GetWindowInnerRect(); diff --git a/dom/battery/BatteryManager.cpp b/dom/battery/BatteryManager.cpp index a42ac3017d..fadae4a714 100644 --- a/dom/battery/BatteryManager.cpp +++ b/dom/battery/BatteryManager.cpp @@ -7,6 +7,7 @@ #include #include #include "BatteryManager.h" +#include "MaskConfig.hpp" #include "Constants.h" #include "mozilla/DOMEventTargetHelper.h" #include "mozilla/Hal.h" @@ -51,6 +52,9 @@ JSObject* BatteryManager::WrapObject(JSContext* aCx, bool BatteryManager::Charging() const { MOZ_ASSERT(NS_IsMainThread()); + if (auto value = MaskConfig::GetBool("battery:charging"); value.has_value()) + return value.value(); + // For testing, unable to report the battery status information if (Preferences::GetBool("dom.battery.test.default", false)) { return true; @@ -67,6 +71,8 @@ bool BatteryManager::Charging() const { double BatteryManager::DischargingTime() const { MOZ_ASSERT(NS_IsMainThread()); + if (auto value = MaskConfig::GetDouble("battery:dischargingTime")) + return value.value(); // For testing, unable to report the battery status information if (Preferences::GetBool("dom.battery.test.default", false)) { return std::numeric_limits::infinity(); @@ -84,6 +90,8 @@ double BatteryManager::DischargingTime() const { double BatteryManager::ChargingTime() const { MOZ_ASSERT(NS_IsMainThread()); + if (auto value = MaskConfig::GetDouble("battery:chargingTime")) + return value.value(); // For testing, unable to report the battery status information if (Preferences::GetBool("dom.battery.test.default", false)) { return 0.0; @@ -101,6 +109,7 @@ double BatteryManager::ChargingTime() const { double BatteryManager::Level() const { MOZ_ASSERT(NS_IsMainThread()); + if (auto value = MaskConfig::GetDouble("battery:level")) return value.value(); // For testing, unable to report the battery status information if (Preferences::GetBool("dom.battery.test.default")) { return 1.0; diff --git a/dom/battery/moz.build b/dom/battery/moz.build index 3a90c93c01..91d673039b 100644 --- a/dom/battery/moz.build +++ b/dom/battery/moz.build @@ -21,3 +21,6 @@ FINAL_LIBRARY = "xul" MOCHITEST_CHROME_MANIFESTS += ["test/chrome.toml"] MOCHITEST_MANIFESTS += ["test/mochitest.toml"] + +# DOM Mask +LOCAL_INCLUDES += ["/omegacfg"] \ No newline at end of file diff --git a/dom/workers/WorkerNavigator.cpp b/dom/workers/WorkerNavigator.cpp index b05e409a84..8e0f7ea657 100644 --- a/dom/workers/WorkerNavigator.cpp +++ b/dom/workers/WorkerNavigator.cpp @@ -5,6 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "mozilla/dom/WorkerNavigator.h" +#include "MaskConfig.hpp" #include @@ -92,6 +93,9 @@ JSObject* WorkerNavigator::WrapObject(JSContext* aCx, } bool WorkerNavigator::GlobalPrivacyControl() const { + if (auto value = MaskConfig::GetBool("navigator.globalPrivacyControl"); + value.has_value()) + return value.value(); bool gpcStatus = StaticPrefs::privacy_globalprivacycontrol_enabled(); if (!gpcStatus) { JSObject* jso = GetWrapper(); @@ -114,6 +118,8 @@ void WorkerNavigator::SetLanguages(const nsTArray& aLanguages) { void WorkerNavigator::GetAppVersion(nsString& aAppVersion, CallerType aCallerType, ErrorResult& aRv) const { + if (auto value = MaskConfig::GetString("navigator.appVersion")) + return aAppVersion.Assign(NS_ConvertUTF8toUTF16(value.value())); WorkerPrivate* workerPrivate = GetCurrentThreadWorkerPrivate(); MOZ_ASSERT(workerPrivate); @@ -136,6 +142,8 @@ void WorkerNavigator::GetAppVersion(nsString& aAppVersion, void WorkerNavigator::GetPlatform(nsString& aPlatform, CallerType aCallerType, ErrorResult& aRv) const { + if (auto value = MaskConfig::GetString("navigator.platform")) + return aPlatform.Assign(NS_ConvertUTF8toUTF16(value.value())); WorkerPrivate* workerPrivate = GetCurrentThreadWorkerPrivate(); MOZ_ASSERT(workerPrivate); @@ -200,6 +208,8 @@ class GetUserAgentRunnable final : public WorkerMainThreadRunnable { void WorkerNavigator::GetUserAgent(nsString& aUserAgent, CallerType aCallerType, ErrorResult& aRv) const { + if (auto value = MaskConfig::GetString("navigator.userAgent")) + return aUserAgent.Assign(NS_ConvertUTF8toUTF16(value.value())); WorkerPrivate* workerPrivate = GetCurrentThreadWorkerPrivate(); MOZ_ASSERT(workerPrivate); @@ -211,6 +221,8 @@ void WorkerNavigator::GetUserAgent(nsString& aUserAgent, CallerType aCallerType, } uint64_t WorkerNavigator::HardwareConcurrency() const { + if (auto value = MaskConfig::GetUint64("navigator.hardwareConcurrency")) + return value.value(); RuntimeService* rts = RuntimeService::GetService(); MOZ_ASSERT(rts); diff --git a/dom/workers/moz.build b/dom/workers/moz.build index c7818826d1..2e2e6526e7 100644 --- a/dom/workers/moz.build +++ b/dom/workers/moz.build @@ -112,3 +112,6 @@ MARIONETTE_MANIFESTS += ["test/marionette/manifest.toml"] XPCSHELL_TESTS_MANIFESTS += ["test/xpcshell/xpcshell.toml"] BROWSER_CHROME_MANIFESTS += ["test/browser.toml"] + +# DOM Mask +LOCAL_INCLUDES += ["/omegacfg"] \ No newline at end of file