Macintosh-SW
/
tenfourfox
mirror of https://github.com/classilla/tenfourfox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #607: new, separate blocklist in caps/ for scripts that can crash the browser, but have no obvious workaround (#609)

This commit is contained in:
NapalmSauce 2020-06-11 20:30:45 -04:00 committed by GitHub
parent 3f33f8a6e5
commit 5748c75132
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
caps/nsScriptSecurityManager.cpp
View File

@ -688,6 +688,34 @@ nsScriptSecurityManager::CheckLoadURIWithPrincipal(nsIPrincipal* aPrincipal,
return NS_ERROR_DOM_BAD_URI;
}
// See TenFourFox issue 607
// determine if this is a script we want to block
// Scripts that somehow hit hard limits should go in here
if (!mIsTenFourFoxTroublesomeJsAllowed &&
(targetScheme.EqualsLiteral("http") || targetScheme.EqualsLiteral("https"))) {
nsAutoCString hostname;
if (MOZ_LIKELY(NS_SUCCEEDED(targetBaseURI->GetHost(hostname)))) {
ToLowerCase(hostname);
#define BLOC(q) hostname.EqualsLiteral(q)
if (0 ||
#ifdef __ppc__
BLOC("static.twitchcdn.net") ||
#endif // __ppc__
0) {
#undef BLOC
#ifndef DEBUG
if (mIsTenFourFoxTroublesomeJsLoggingEnabled)
#endif
fprintf(stderr, "Warning: TenFourFox blocking problematic script from %s.\n",
hostname.get());
return NS_ERROR_DOM_BAD_URI;
}
}
}
// TenFourFox issue 469
// determine if this is a script we want to block
if (mIsTenFourFoxAdBlockEnabled &&
@ -1790,6 +1818,7 @@ static const char* kObservedPrefs[] = {
sFileOriginPolicyPrefName,
"capability.policy.",
"tenfourfox.adblock.",
"tenfourfox.troublesome-js.",
nullptr
};
@ -1810,6 +1839,8 @@ nsScriptSecurityManager::nsScriptSecurityManager(void)
, mIsJavaScriptEnabled(false)
, mIsTenFourFoxAdBlockEnabled(false)
, mIsTenFourFoxAdBlockLoggingEnabled(false)
, mIsTenFourFoxTroublesomeJsAllowed(false)
, mIsTenFourFoxTroublesomeJsLoggingEnabled(false)
{
static_assert(sizeof(intptr_t) == sizeof(void*),
"intptr_t and void* have different lengths on this platform. "
@ -1950,6 +1981,12 @@ nsScriptSecurityManager::ScriptSecurityPrefChanged()
Preferences::GetBool("tenfourfox.adblock.enabled", mIsTenFourFoxAdBlockEnabled);
mIsTenFourFoxAdBlockLoggingEnabled =
Preferences::GetBool("tenfourfox.adblock.logging.enabled", mIsTenFourFoxAdBlockLoggingEnabled);
mIsTenFourFoxTroublesomeJsAllowed =
Preferences::GetBool("tenfourfox.troublesome-js.allow",
mIsTenFourFoxTroublesomeJsAllowed);
mIsTenFourFoxTroublesomeJsLoggingEnabled =
Preferences::GetBool("tenfourfox.troublesome-js.logging.enabled",
mIsTenFourFoxTroublesomeJsLoggingEnabled);
//
// Rebuild the set of principals for which we allow file:// URI loads. This

2
caps/nsScriptSecurityManager.h
View File

@ -125,6 +125,8 @@ private:
bool mIsJavaScriptEnabled;
bool mIsTenFourFoxAdBlockEnabled;
bool mIsTenFourFoxAdBlockLoggingEnabled;
bool mIsTenFourFoxTroublesomeJsAllowed;
bool mIsTenFourFoxTroublesomeJsLoggingEnabled;
nsTArray<nsCOMPtr<nsIURI>> mFileURIWhitelist;
// This machinery controls new-style domain policies. The old-style