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 logging for CNAME inspection #832

Merged
merged 7 commits into from
Jul 23, 2020
Merged

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Jul 13, 2020

By submitting this pull request, I confirm the following:

  • I have read and understood the contributors guide.
  • I have checked that another pull request for this purpose does not exist.
  • I have considered, and confirmed that this submission will be valuable to others.
  • I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
  • I give this submission freely, and claim no ownership to its content.

How familiar are you with the codebase?:

10


  • Add additional_info column to queries table. We fill it with the domain that caused blocking the entire CNAME chain.
  • Log CNAME blocking to pihole.log
  • Store + import ID of regex used for blocking in additional_info field
  • Fix an edge-case where CNAME blocking can be foiled when parts of the CNAME chain are already in the cache
  • Fix incorrect attribution of the blocked status to the wrong domain. This also simplifies the terminology in the CNAME inspection routine

…in that caused blocking the entire CNAME chain.

Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
…ase during import. This ensures restarting FTL does not mean we lost this information.

Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER force-pushed the new/cname_inspection_logging branch from d29f0d2 to e661bd5 Compare July 14, 2020 16:22
… CNAME chain are already in the cache

Signed-off-by: DL6ER <dl6er@dl6er.de>
…This also simplifies the terminology in the CNAME inspection routine.

Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER added the Bugfix label Jul 14, 2020
@DL6ER DL6ER marked this pull request as ready for review July 21, 2020 03:49
@DL6ER DL6ER changed the base branch from development to release/v5.1.1 July 21, 2020 03:49
@DL6ER DL6ER added this to the v5.1.1 milestone Jul 21, 2020
@DL6ER DL6ER merged commit 5f4582e into release/v5.1.1 Jul 23, 2020
@DL6ER DL6ER deleted the new/cname_inspection_logging branch July 23, 2020 04:19
@DL6ER DL6ER mentioned this pull request Jul 24, 2020
5 tasks
@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/regex-engine-improvements/34751/61

@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/pi-hole-ftl-v5-2-released/36964/1

@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/top-blocked-domain-not-showing-who-was-blocked/39217/21

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.

Recent query log does not show data of some top blocked domains. Hit number not limited to 24 hours.
3 participants