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.

Sign up for GitHub

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

Jump to bottom

Pi-hole FTL v4.1 #408

Merged
merged 135 commits into from
Dec 9, 2018
Merged

Pi-hole FTL v4.1 #408

merged 135 commits into from
Dec 9, 2018

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Oct 28, 2018

Release PR

DL6ER and others added 30 commits August 6, 2018 09:59
@DL6ER
Merge pull request #340 from pi-hole/release/v4.0
f9c3423 
Merge v4.0 into development
@DL6ER
Merge pull request #341 from pi-hole/hotfix/v4.0-version
177f756 
Hotfix/v4.0 version
@DL6ER
Implement detection for when a local configuration is a blocking inst…
c30356c 
…ruction (in the legacy wildcard sense)

Signed-off-by: DL6ER <[email protected]>
@DL6ER
Determine query type earlier on
5528505 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Allow all query types (not only A and AAAA) during database import
64a895d 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Be able to return any query type through API
a3ac3bc 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Remove limitation to only analyze A and AAAA queries
124f81e 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Correct comment
835ae44 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Also call FTL_cache(...) for the other query types (so far, we only c…
1edbd99 
…alled the routine for A and AAAA queries)

Signed-off-by: DL6ER <[email protected]>
@DL6ER
Remove more checks that skipped PTR replies
2f4dd87 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Add new reply type: REPLY_DOMAIN
111f160 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Don't forget to GC wildcard blocked entries
1f360dc 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Extend FTL_reply(...). Meanwhile, I removed some code duplication and…
baeceeb 
… fixed the behavior to avoid multiple counting of query types if there are multiple replies (for instance, a PTR query can return multiple host names for a given IP address)

Signed-off-by: DL6ER <[email protected]>
@DL6ER
Add RRNAME reply type (needed for TXT queries)
877c81b 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Merge pull request #348 from pi-hole/new/show_config_NXDOMAIN_as_blocked
2f82a58 
Add user-defined wildcard blocking support
@DL6ER
Merge branch 'development' into new/more_query_types
82f5324 
Signed-off-by: DL6ER <[email protected]>

Conflicts:
	dnsmasq_interface.c
@DL6ER
Add "ANALYZE_ONLY_A_AND_AAAA" config option to obtain pre-v4.1 behavi…
1a242be 
…or (show and record only A and AAAA queries, ignore all others)

Signed-off-by: DL6ER <[email protected]>
@DL6ER
Show "regex.list" as source of regex blocked queries
77f3eda 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Merge pull request #350 from pi-hole/tweak/log_show_regex.list_as_source
5979012 
Show "regex.list" as source of regex blocked queries
@DL6ER
Merge branch 'development' into new/more_query_types
0d7c7e7
@DL6ER
Review comments
25042de 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Merge pull request #349 from pi-hole/new/more_query_types
9ac8980 
Analyze/show more query types
@DL6ER
Determine blocking status enabled/disabled by reading the new variabl…
679f9d9 
…e BLOCKING in setupVars.conf

Signed-off-by: DL6ER <[email protected]>
@DL6ER
Fix tense
c97f490 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
BLOCKING -> BLOCKING_ENABLED
716c978 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Add query type forting for ">getallqueries" request
a5a491b 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Implement forward destination filtering
2b27f8a 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Add new query type QUERY_EXTERNAL_BLOCKED triggered by an NXDOMAIN re…
79b2865 
…sponse with set AD bit (this is how Quad9 signals a blocked domain)

Signed-off-by: DL6ER <[email protected]>
@AzureMarker
Fix missing branch on tag builds
8eb10ef 
Fixes #344

Signed-off-by: Mcat12 <[email protected]>
@AzureMarker
Put tag builds in a folder named after the tag
8c14a6f 
Signed-off-by: Mcat12 <[email protected]>
DL6ER and others added 22 commits November 7, 2018 17:04
@DL6ER
Use new customizable paths for Travis' tests. Fallback to searching f…
ce10699 
…or a local pihole-FTL.conf if none was found in the default locations

Signed-off-by: DL6ER <[email protected]>
@DL6ER
Make WHITELISTFILE customizable
2f8a67f 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Make BLACKLISTFILE customizable
0a51cfa 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Make GRAVITYFILE customizable
ee6cf89 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Make REGEXLISTFILE customizable
5e17439 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Make SETUPVARSFILE customizable
f7a5ef0 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Make AUDITLISTFILE customizable
109861f 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Fix incorrect standard log path
ac3a8ab 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Improve check in getLogFilePath()
46771ff 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Ensure regex validation is working as expected if privacylevel > 0. T…
eeae592 
…his required a certain rearrangement of how we handle domains and clients internally.

Signed-off-by: DL6ER <[email protected]>
@DL6ER
Ensure privacy level can only be increased from starting pihole-FTL o…
68181fb 
…n. Lowering the privacy level is possible, but you need to restart pihole-FTL to enable it.

Signed-off-by: DL6ER <[email protected]>
@DL6ER
Don't warn if privacy level is reduced. This generates too much outpu…
41e9a8a 
…t when using the web interface.

Signed-off-by: DL6ER <[email protected]>
@DL6ER
Review comments
8de3079 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Rename conf2 to snapConf
ece52c2 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Simplify two if expressions using De Morgan's Law
fa39906 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Add documentation for getpath(...)
efa86f9 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Reimplement skipping of "0.0.0.0" in Top Client output
ebbb3e4 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Merge pull request #417 from pi-hole/fix/privacy_levels_regex_filtering
2e25dda 
Fix/privacy levels regex filtering
@DL6ER
Check return value of sscanf() explicitly (if one element was sucessf…
f9ef0d7 
…ully matched and assigned.

Signed-off-by: DL6ER <[email protected]>
@DL6ER
Merge pull request #416 from pi-hole/new/adjustable_file_locations
39d47f0 
Adjustable file locations
@AzureMarker
Revert blacklist file path to the original
d3641e9 
This fixes the incorrect parsing of the blacklist and "bad address"
errors printed to the dnsmasq log.

Signed-off-by: Mcat12 <[email protected]>
@DL6ER
Merge pull request #421 from pi-hole/fix/blacklist-default-path
1b85d49 
Revert blacklist file path to the original
@PromoFaux PromoFaux self-requested a review December 8, 2018 23:56
@DL6ER
Copy link
Member Author

DL6ER commented Dec 9, 2018

Approved ✔️

I'd be okay with overwriting the CircleCI test as the build of the last commit on this branch succeeded:
screenshot from 2018-12-09 09-24-43

@jacobsalmela jacobsalmela merged commit d42bcb7 into master Dec 9, 2018
@DL6ER DL6ER deleted the release/4.1 branch March 21, 2019 10:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PromoFaux PromoFaux PromoFaux approved these changes

@dschaper dschaper dschaper approved these changes

@jacobsalmela jacobsalmela jacobsalmela approved these changes

@AzureMarker AzureMarker AzureMarker approved these changes

Assignees
No one assigned
Labels
Release
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@DL6ER @PromoFaux @dschaper @jacobsalmela @AzureMarker