BSK support for FB CTL update #760
Merged
Conversation
This file contains 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
6 tasks
ladamski
force-pushed
the
la/clicktoload-redux
branch
from
0402bab to
a4ec422
Compare
ladamski
changed the title
ladamski
commented
Apr 19, 2024
Sources/BrowserServicesKit/ContentBlocking/UserScripts/TrackerResolver.swift
Outdated
Show resolved
Hide resolved
ladamski
force-pushed
the
la/clicktoload-redux
branch
from
20e59fa to
717db16
Compare
|
This PR has been inactive for more than 7 days and will be automatically closed 7 days from now. |
|
This PR has been closed after 14 days of inactivity. Feel free to reopen it if you plan to continue working on it or have further discussions. |
|
This PR has been inactive for more than 7 days and will be automatically closed 7 days from now. |
jaceklyp
previously requested changes
May 20, 2024
Sources/BrowserServicesKit/ContentBlocking/UserScripts/TrackerResolver.swift
Outdated
Show resolved
Hide resolved
Sources/BrowserServicesKit/ContentBlocking/UserScripts/TrackerResolver.swift
Outdated
Show resolved
Hide resolved
Tests/BrowserServicesKitTests/ContentBlocker/WebViewTestHelper.swift
Outdated
Show resolved
Hide resolved
5 tasks
|
This PR has been inactive for more than 7 days and will be automatically closed 7 days from now. |
note: `testWhenThereIsCTLIsDisabledThenCTLSurrogateIsNotInjected` test is WIP
bwaresiak
reviewed
Jun 11, 2024
Tests/BrowserServicesKitTests/ContentBlocker/SurrogatesUserScriptTests.swift
Outdated
Show resolved
Hide resolved
bwaresiak
reviewed
Jun 12, 2024
Sources/BrowserServicesKit/ContentBlocking/ClickToLoadRulesSplitter.swift
Outdated
Show resolved
Hide resolved
bwaresiak
reviewed
Jun 13, 2024
Sources/BrowserServicesKit/ContentBlocking/ClickToLoadRulesSplitter.swift
Outdated
Show resolved
Hide resolved
bwaresiak
approved these changes
Jun 14, 2024
ladamski
added a commit
to duckduckgo/macos-browser
that referenced
this pull request
Jun 14, 2024
Task/Issue URL: https://app.asana.com/0/72649045549333/1205105078450227/f Tech Design URL: https://app.asana.com/0/1201720254973470/1206422390411022/f CC: **Description**: This requires the corresponding BSK PR to test: duckduckgo/BrowserServicesKit#760 Note that his PR also relies on a custom config URL for testing purposes, to enable this new codepath. Once we merge the [corresponding privacy config PR](https://royal-thankful-weight.glitch.me/macos-config.json), the URL will be reverted to the production version prior to final review & merge. **Steps to test this PR**: Verify blocking 1. Navigate to https://privacy-test-pages.site/privacy-protections/click-to-load/ 2. Ensure request are blocked ("Facebook Resources Loads: NONE") 3. No social buttons should be shown ("All the social buttons from the SDK" & "All the social buttons in iFrames") 4. Login button should be replaced with a DDG overlay and hover 5. All posts should be replaced with DDG overlays Verify clicking through overlays 1. Click on several of the CTL overlays. They should disappear and be replaced with the underlying FB content (note that this test page is rather old so some posts may take several seconds to load, or even time out) Verify protections toggling 1. Turn protections off 4. FB requests should be allowed ("Facebook Resources Loads: DETECTED") 5. Both sets of social buttons should show up 6. Login button should by the stock FB one (no DDG hover tip) 7. All FB content should be shown without any CTL overlays Test login with FB 1. Navigate to https://www.eventbrite.com/signin/?iss=https%3A%2F%2Fid.auth.eventbrite.com%2F and/or https://www.grubhub.com/login 2. For eventbrite, a small round FB icon should be present 3. For grubhub, "Continue with Facebook" should be present 4. Click on the login button 5. You should see a DDG dialog warning the user about continuing ("Logging in with Facebook lets them track you") 6. Click on "Log In" 7. A new window should open with an FB login At this point that means that CTL blocking rules have been removed and the real FB sdk injected in place of the surrogate (otherwise the FB window content would not appear) Optionally you can complete the login process, but its not strictly necessary. <!-- Tagging instructions If this PR isn't ready to be merged for whatever reason it should be marked with the `DO NOT MERGE` label (particularly if it's a draft) If it's pending Product Review/PFR, please add the `Pending Product Review` label. If at any point it isn't actively being worked on/ready for review/otherwise moving forward (besides the above PR/PFR exception) strongly consider closing it (or not opening it in the first place). If you decide not to close it, make sure it's labelled to make it clear the PRs state and comment with more information. --> --- ###### Internal references: [Pull Request Review Checklist](https://app.asana.com/0/1202500774821704/1203764234894239/f) [Software Engineering Expectations](https://app.asana.com/0/59792373528535/199064865822552) [Technical Design Template](https://app.asana.com/0/59792373528535/184709971311943) [Pull Request Documentation](https://app.asana.com/0/1202500774821704/1204012835277482/f) --------- Co-authored-by: Jacek Łyp <[email protected]> Co-authored-by: Bartek Waresiak <[email protected]>
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.
Please review the release process for BrowserServicesKit here.
Required:
Task/Issue URL: https://app.asana.com/0/72649045549333/1205105078450227/f
iOS PR: TBD (hopefully N/A)
macOS PR: duckduckgo/macos-browser#2162
What kind of version bump will this require?: Major/Minor/Patch
Optional:
Tech Design URL: https://app.asana.com/0/1201720254973470/1206422390411022/f
CC:
Description:
Updates BSK to support separate clickToLoad rule list, with associated surrogates changes. CTL is disabled for iOS
Steps to test this PR:
1.
1.
OS Testing:
Internal references:
Software Engineering Expectations
Technical Design Template