-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Safari blocking extension redirect as "known tracker". #47402
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
xeenon
wants to merge
1
commit into
WebKit:main
Choose a base branch
from
xeenon:bug/293881
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+34
−23
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
https://webkit.org/b/293881 rdar://problem/152403968 Reviewed by NOBODY (OOPS!). This was mostly fixed by 296000@main (19746da), however there were a couple of places that didn't check `redirectedPriorToBlock`. Mainly the console log message saying a known tracker resource was blocked was being logged to the console erroneously. Fix this by adding a `shouldBlock()` helper function and using it everywhere `blockedLoad` was being checked. This ensures consistency in the blocking and console reporting. Unable to write automated tests due to the nature of known tracker blocking in Safari. * Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.cpp: (WebCore::ThreadableWebSocketChannel::validateURL): * Source/WebCore/contentextensions/ContentExtensionsBackend.cpp: (WebCore::ContentExtensions::ContentExtensionsBackend::processContentRuleListsForLoad): * Source/WebCore/contentextensions/ContentRuleListResults.h: (WebCore::ContentRuleListResults::shouldBlock const): (WebCore::ContentRuleListResults::shouldNotifyApplication const): * Source/WebCore/css/StyleSheetContents.cpp: (WebCore::StyleSheetContents::subresourcesAllowReuse const): * Source/WebCore/html/HTMLMediaElement.cpp: (WebCore::HTMLMediaElement::loadResource): * Source/WebCore/loader/FrameLoader.cpp: (WebCore::FrameLoader::loadResourceSynchronously): (WebCore::FrameLoader::prefetchDNSIfNeeded): * Source/WebCore/loader/LinkLoader.cpp: (WebCore::LinkLoader::preconnectIfNeeded): * Source/WebCore/loader/PingLoader.cpp: (WebCore::processContentRuleListsForLoad): * Source/WebCore/loader/ResourceLoader.cpp: (WebCore::ResourceLoader::willSendRequestInternal): * Source/WebCore/loader/cache/CachedResourceLoader.cpp: (WebCore::CachedResourceLoader::requestResource): * Source/WebCore/page/LocalDOMWindow.cpp: (WebCore::LocalDOMWindow::open): * Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp: (WebKit::NetworkLoadChecker::checkRequest):
EWS run on current version of this PR (hash adcedac) |
kiaraarose
reviewed
Jun 30, 2025
kiaraarose
approved these changes
Jun 30, 2025
elijahsawyers
approved these changes
Jun 30, 2025
jeffmapple
approved these changes
Jul 1, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
adcedac
adcedac