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

Fix incorrect unification of regex warnings #1989

Merged
merged 2 commits into from
Jun 3, 2024

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Jun 3, 2024

What does this implement/fix?

Current development-v6 singles out regex warnings by the warning itself rather than the regex itself. This leads to the defect that multiple warnings get incorrectly summarized together when they are affected by the same warning.

How to reproduce:

Add domains via the sqlite3 CLI to the gravity.db database, e.g.

INSERT INTO domainlist (type,domain) VALUES (3,'[[[');
INSERT INTO domainlist (type,domain) VALUES (3,'[[[[');
INSERT INTO domainlist (type,domain) VALUES (3,'[[[[[');
INSERT INTO domainlist (type,domain) VALUES (3,'[[[[[[');

On development-v6: Only one entry is created in the diagnosis system
On this branch: All warnings are shown, e.g.,
image

We don't need to update anything in any other repo as FTL is now the only responsible player in generating messages.


Related issue or feature (if applicable): N/A

Pull request in docs with documentation (if applicable): N/A


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

Checklist:

  • The code change is tested and works locally.
  • I based my code and PRs against the repositories developmental branch.
  • I signed off all commits. Pi-hole enforces the DCO for all contributions
  • I signed all my commits. Pi-hole requires signatures to verify authorship
  • I have read the above and my PR is ready for review.

Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER requested review from a team and removed request for a team June 3, 2024 07:52
@DL6ER DL6ER marked this pull request as draft June 3, 2024 07:54
Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER
Copy link
Member Author

DL6ER commented Jun 3, 2024

The last commit fixes another issue which could have happened when multiple warnings are triggered for database table adjacent entries were issued - cfm. the last three warnings in the screenshot above had the same ID shown.

@DL6ER DL6ER marked this pull request as ready for review June 3, 2024 09:47
@DL6ER DL6ER requested a review from a team June 3, 2024 09:48
Copy link
Member

@yubiuser yubiuser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Screenshot at 2024-06-03 12-55-20

@DL6ER DL6ER merged commit b20d80f into development-v6 Jun 3, 2024
18 checks passed
@DL6ER DL6ER deleted the fix/regex_diagnosis branch June 3, 2024 11:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants