Skip to content

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Jul 1, 2025
Merged

Safari blocking extension redirect as "known tracker". #47402

merged 1 commit into from
Jul 1, 2025
+34 −23

Conversation

xeenon
Copy link
Contributor

@xeenon xeenon commented Jun 30, 2025 •
edited by webkit-early-warning-system
Loading

649580f

Safari blocking extension redirect as "known tracker".
https://webkit.org/b/293881
rdar://problem/152403968

Reviewed by Jeff Miller.

This was mostly fixed by 296000@main (19746da205f1), 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):

Canonical link: https://commits.webkit.org/296880@main

adcedac

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 win
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🧪 wpe-wk2 ⏳ 🧪 win-tests
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 api-wpe
✅ 🧪 ios-wk2-wpt ✅ 🧪 mac-wk1 ✅ 🛠 wpe-cairo
✅ 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🛠 gtk
✅ 🛠 vision ✅ 🧪 mac-AS-debug-wk2 ✅ 🧪 gtk-wk2
✅ 🛠 vision-sim ✅ 🧪 mac-wk2-stress ✅ 🧪 api-gtk
✅ 🧪 vision-wk2 ✅ 🧪 mac-intel-wk2 ✅ 🛠 playstation
✅ 🛠 🧪 unsafe-merge ✅ 🛠 tv ✅ 🛠 mac-safer-cpp
✅ 🛠 tv-sim
✅ 🛠 watch
✅ 🛠 watch-sim

@xeenon xeenon self-assigned this Jun 30, 2025
@xeenon xeenon added the WebKit Extensions Bugs related to extension support. label Jun 30, 2025
@webkit-early-warning-system
Copy link
Collaborator

webkit-early-warning-system commented Jun 30, 2025 •
edited
Loading

EWS run on current version of this PR (hash adcedac)

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 win
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🧪 wpe-wk2 ⏳ 🧪 win-tests
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 api-wpe
✅ 🧪 ios-wk2-wpt ✅ 🧪 mac-wk1 ✅ 🛠 wpe-cairo
✅ 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🛠 gtk
✅ 🛠 vision ✅ 🧪 mac-AS-debug-wk2 ✅ 🧪 gtk-wk2
✅ 🛠 vision-sim ✅ 🧪 mac-wk2-stress ✅ 🧪 api-gtk
✅ 🧪 vision-wk2 ✅ 🧪 mac-intel-wk2 ✅ 🛠 playstation
✅ 🛠 🧪 unsafe-merge ✅ 🛠 tv ✅ 🛠 mac-safer-cpp
✅ 🛠 tv-sim
✅ 🛠 watch
✅ 🛠 watch-sim

kiaraarose
kiaraarose reviewed Jun 30, 2025
View reviewed changes
@xeenon xeenon added the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Jul 1, 2025
@xeenon
Safari blocking extension redirect as "known tracker".
649580f 
https://webkit.org/b/293881
rdar://problem/152403968

Reviewed by Jeff Miller.

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):

Canonical link: https://commits.webkit.org/296880@main
@webkit-commit-queue
Copy link
Collaborator

Committed 296880@main (649580f): https://commits.webkit.org/296880@main

Reviewed commits have been landed. Closing PR #47402 and removing active labels.

@webkit-commit-queue webkit-commit-queue merged commit 649580f into WebKit:main Jul 1, 2025
@webkit-commit-queue webkit-commit-queue removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Jul 1, 2025
@xeenon xeenon deleted the bug/293881 branch July 1, 2025 19:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@elijahsawyers elijahsawyers elijahsawyers approved these changes

@jeffmapple jeffmapple jeffmapple approved these changes

@kiaraarose kiaraarose kiaraarose approved these changes

@cdumez cdumez Awaiting requested review from cdumez cdumez is a code owner

@b-weinstein b-weinstein Awaiting requested review from b-weinstein b-weinstein is a code owner

@rniwa rniwa Awaiting requested review from rniwa rniwa is a code owner

@whsieh whsieh Awaiting requested review from whsieh

@davidjohnson91 davidjohnson91 Awaiting requested review from davidjohnson91

Assignees

@xeenon xeenon

Labels
WebKit Extensions Bugs related to extension support.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@xeenon @webkit-early-warning-system @webkit-commit-queue @elijahsawyers @jeffmapple @kiaraarose