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

Add wildcard support for the server-side Query Log #1678

Merged
merged 2 commits into from
Oct 18, 2023

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Oct 18, 2023

What does this implement/fix?

Add wildcard support for server-side Query Log for the fields domain, client-ip, client-by-name, and upstream and fix a minor glitch resulting in showing the total number of queries in the last 24 hours even when the timerange was narrowed down.

Instead of the completely random wildcard matching, we decided to opt for "real" wildcards with the wildcard character *. You can get anything ending in google.com - for instance, analytics.google.com - by searching for *google.com (hint: It'd also match google.com itself). But the wildcard implementation presented here goes beyond that, you can use a wildcard in any place you want: *fla*.c* will match cloudflare.com, flamewar.com and others.

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.

DL6ER added 2 commits October 10, 2023 19:28
…ast 24 hours being used even when a limited timeframe has been requested

Signed-off-by: DL6ER <[email protected]>
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/query-log-advanced-filtering-domain-not-working/65694/5

@DL6ER DL6ER enabled auto-merge October 18, 2023 17:05
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.

Works nicely.

Screenshot at 2023-10-18 22-34-12


I don't know if you want to go that step, but sqlite also supports _ as wildcard operator (matches any single char)

@DL6ER DL6ER merged commit 04269f3 into development-v6 Oct 18, 2023
@DL6ER DL6ER deleted the new/query_log_wildcards branch October 18, 2023 20:46
@PromoFaux PromoFaux mentioned this pull request Feb 18, 2025
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.

3 participants