corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1564527 - Enable AssertEvalNotUsingSystemPrincipal on Nightly builds r=ckerschb

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D37460
This commit is contained in:
Tom Ritter
2019-07-18 18:22:06 +00:00
parent ee745352ec
commit b3804d474c
4 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
caps/nsScriptSecurityManager.cpp
View File

@@ -400,7 +400,7 @@ bool nsScriptSecurityManager::ContentSecurityPolicyPermitsJSAction(
JSContext* cx, JS::HandleValue aValue) { JSContext* cx, JS::HandleValue aValue) {
MOZ_ASSERT(cx == nsContentUtils::GetCurrentJSContext()); MOZ_ASSERT(cx == nsContentUtils::GetCurrentJSContext());
#if defined(DEBUG) && !defined(ANDROID) #if !defined(ANDROID) && (defined(NIGHTLY_BUILD) || defined(DEBUG))
nsCOMPtr<nsIPrincipal> subjectPrincipal = nsContentUtils::SubjectPrincipal(); nsCOMPtr<nsIPrincipal> subjectPrincipal = nsContentUtils::SubjectPrincipal();
nsContentSecurityManager::AssertEvalNotUsingSystemPrincipal(subjectPrincipal, nsContentSecurityManager::AssertEvalNotUsingSystemPrincipal(subjectPrincipal,
cx); cx);

2
dom/security/CSPEvalChecker.cpp
View File

@@ -31,7 +31,7 @@ nsresult CheckInternal(nsIContentSecurityPolicy* aCSP,
MOZ_ASSERT(NS_IsMainThread()); MOZ_ASSERT(NS_IsMainThread());
MOZ_ASSERT(aAllowed); MOZ_ASSERT(aAllowed);
#if defined(DEBUG) && !defined(ANDROID) #if !defined(ANDROID) && (defined(NIGHTLY_BUILD) || defined(DEBUG))
JSContext* cx = nsContentUtils::GetCurrentJSContext(); JSContext* cx = nsContentUtils::GetCurrentJSContext();
nsContentSecurityManager::AssertEvalNotUsingSystemPrincipal(aSubjectPrincipal, nsContentSecurityManager::AssertEvalNotUsingSystemPrincipal(aSubjectPrincipal,
cx); cx);

17
dom/security/nsContentSecurityManager.cpp
View File

@@ -201,27 +201,30 @@ void nsContentSecurityManager::AssertEvalNotUsingSystemPrincipal(
return; return;
} }
nsAutoCString fileName;
JS::AutoFilename scriptFilename; JS::AutoFilename scriptFilename;
if (JS::DescribeScriptedCaller(cx, &scriptFilename)) { if (JS::DescribeScriptedCaller(cx, &scriptFilename)) {
nsDependentCSubstring fileName(scriptFilename.get(), nsDependentCSubstring fileName_(scriptFilename.get(),
strlen(scriptFilename.get())); strlen(scriptFilename.get()));
ToLowerCase(fileName_);
ToLowerCase(fileName);
// Extract file name alone if scriptFilename contains line number // Extract file name alone if scriptFilename contains line number
// separated by multiple space delimiters in few cases. // separated by multiple space delimiters in few cases.
int32_t fileNameIndex = fileName.FindChar(' '); int32_t fileNameIndex = fileName_.FindChar(' ');
if (fileNameIndex != -1) { if (fileNameIndex != -1) {
fileName.SetLength(fileNameIndex); fileName_.SetLength(fileNameIndex);
} }
for (const nsLiteralCString& whitelistEntry : evalWhitelist) { for (const nsLiteralCString& whitelistEntry : evalWhitelist) {
if (fileName.Equals(whitelistEntry)) { if (fileName_.Equals(whitelistEntry)) {
return; return;
} }
} }
fileName = fileName_;
} }
MOZ_ASSERT(false, "do not use eval with system privileges"); MOZ_CRASH_UNSAFE_PRINTF("do not use eval with system privileges: %s",
fileName.get());
} }
/* static */ /* static */

8
modules/libpref/init/all.js
View File

@@ -2453,6 +2453,14 @@ pref("csp.overrule_about_uris_without_csp_whitelist", false);
pref("csp.skip_about_page_has_csp_assert", false); pref("csp.skip_about_page_has_csp_assert", false);
#endif #endif
#if !defined(ANDROID)
#if defined(NIGHTLY_BUILD) || defined(DEBUG)
// assertion flag will be set to false after fixing Bug 1473549
pref("security.allow_eval_with_system_principal", false);
pref("security.uris_using_eval_with_system_principal", "autocomplete.xml,redux.js,react-redux.js,content-task.js,lodash.js,jszip.js,sinon-7.2.7.js,ajv-4.1.1.js,jsol.js");
#endif
#endif
#ifdef EARLY_BETA_OR_EARLIER #ifdef EARLY_BETA_OR_EARLIER
// Disallow web documents loaded with the SystemPrincipal // Disallow web documents loaded with the SystemPrincipal
pref("security.disallow_non_local_systemprincipal_in_tests", false); pref("security.disallow_non_local_systemprincipal_in_tests", false);