Skip to content
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

Filter ABP CSS selectors #5247

Merged
merged 5 commits into from May 4, 2023
Merged

Filter ABP CSS selectors #5247

merged 5 commits into from May 4, 2023

Conversation

yubiuser
Copy link
Member

@yubiuser yubiuser commented Apr 7, 2023

What does this PR aim to accomplish?:

Some ABP style lists contain lines with (extended) CSS selectors: ##, #$#, #?# and #@#

Currently our code strips all comments from the input file, converting e.g. good.com##bad-element to good.com leading to overblocking.
This PR deletes lines with CSS selectors before stripping comments.

Fixes #5246


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code and I have tested my changes.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)
  6. I have checked that another pull request for this purpose does not exist.
  7. I have considered, and confirmed that this submission will be valuable to others.
  8. I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
  9. I give this submission freely, and claim no ownership to its content.

  • I have read the above and my PR is ready for review. Check this box to confirm

yubiuser and others added 3 commits April 7, 2023 09:44
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: Christian König <ckoenig@posteo.de>
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
Signed-off-by: Christian König <ckoenig@posteo.de>
Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser
Copy link
Member Author

yubiuser commented Apr 7, 2023

I also removed the sed that would remove lines containing / prior to paring. Such lines (e.g. whole URLs) should be marked as invalid which the are not when they were removed before parsing.

@yubiuser yubiuser requested a review from a team April 7, 2023 08:37
gravity.sh Outdated Show resolved Hide resolved
Signed-off-by: Christian König <ckoenig@posteo.de>
…educe false positiv (deleting valid comments)

Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser yubiuser requested a review from rdwebdesign May 3, 2023 21:40
@yubiuser yubiuser merged commit cd638b1 into development May 4, 2023
16 checks passed
@yubiuser yubiuser deleted the filter_abp_extended branch May 4, 2023 10:01
@DL6ER DL6ER mentioned this pull request May 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants