wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-08-23 21:03:08 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #2736 - Follow-up: Stop using worker thread-only functions for checking if CSP is enabled

Browse source 
Should stop the barrage of worker thread assertions on debug builds.
This commit is contained in:
Francis Dominic Fajardo 2025-07-02 14:03:52 +08:00 • committed by roytam1
commit c8608ad5cf
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dom/workers/ScriptLoader.cpp
View file

@ -1102,7 +1102,7 @@ private:
return NS_ERROR_NOT_AVAILABLE;
}
if (mWorkerPrivate->CSPEnabled()) {
if (CSPService::sCSPEnabled) {
httpChannel->GetResponseHeader(
NS_LITERAL_CSTRING("content-security-policy"),
tCspHeaderValue);
@ -1166,7 +1166,7 @@ private:
// by using the SRICheck module
MOZ_LOG(SRILogHelper::GetSriLog(), mozilla::LogLevel::Debug,
("Scriptloader::Load, SRI required but not supported in workers"));
if (mWorkerPrivate->CSPEnabled()) {
if (CSPService::sCSPEnabled) {
nsCOMPtr<nsIContentSecurityPolicy> wcsp;
chanLoadInfo->LoadingPrincipal()->GetCsp(getter_AddRefs(wcsp));
MOZ_ASSERT(wcsp, "We should have a CSP for the worker here");
@ -1325,7 +1325,7 @@ private:
MOZ_ALWAYS_SUCCEEDS(responsePrincipal->Equals(principal, &equal));
MOZ_DIAGNOSTIC_ASSERT(equal);
if (mWorkerPrivate->CSPEnabled()) {
if (CSPService::sCSPEnabled) {
nsCOMPtr<nsIContentSecurityPolicy> csp;
MOZ_ALWAYS_SUCCEEDS(responsePrincipal->GetCsp(getter_AddRefs(csp)));
MOZ_DIAGNOSTIC_ASSERT(!csp);
@ -1342,7 +1342,7 @@ private:
rv = mWorkerPrivate->SetPrincipalOnMainThread(responsePrincipal, loadGroup);
MOZ_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv));
if (mWorkerPrivate->CSPEnabled()) {
if (CSPService::sCSPEnabled) {
rv = mWorkerPrivate->SetCSPFromHeaderValues(aCSPHeaderValue,
aCSPReportOnlyHeaderValue);
MOZ_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv));