master #1

Merged

loweel merged 16 commits from bloved/zabov:master into master

bloved commented

Major changes:

added multiple configuraitons
each configuration has his own BL sources and KillDB
configuration selection based on client ip (ip groups) or time rules (timetables)
local responder for local domains
domain aliases: /etc/hosts file replacement (can be used in ip groups too)
kill domain stats: domains are counted only once
Dockerfile: updated golang to 1.15.6
debug logs/query logger

bloved added 16 commits

b6dfee64a6 - WIP:

- new json configuration: added multiple configs, ip groups/ip aliases and timetables
  - added multiple configurations:
    - each configuration has his own upstream, singlefilters, doublefilters, blackholeip hostsfile
    - cache DB is global to all configs
    - BL downloader and parser is optimized: each BL source is downloaded/parsed only once
- TODO:
  - implement configuration selection based on source IPs and timetables
  - unused code cleanup

5e94032cd0 - killfile stats: incremented only when adding a new domain in BL

- Malformed lines stats: stats are reset at refresh; ignoring blank/comment lines

e86ead83b7 - config

- sanity checks
  - parsing of timetables
- removed unused global variables (moved at config level)
- added new stat: DNS request for each "CONFIG"
- implemented configuration from ip groups / timetables

945709f24e - config:

- more sanity checks
  - added localresponder: if set use specified DNS server for local domains
  - ipaliases is now used in DNS responses (works same as /etc/hosts file)
- ForwardQuery(): accept param to avoid cache

15ec9f49ac - stats: if "SET" to zero, stat is removed

cfabc60645 - config:

- unused configurations are disabled to avoid wasting resources

c96c9f23e2 - disabled verbose logs

- updated documentation in README.md

31e05cb177 - config:

- added "debug" mode
- updated documentation in README.md
- BL downloader threads: added 2 seconds delay to allow local DNS service go up & running

946a2245cc - if upstream DNS is missing fallbacks on localresponder if defined, else on "127.0.0.53:53" as last chance

aef07c50d6 - single/double and local lists: ignore blank/comment lines

0f046cf18e - config:

- added new global setting "debugdbpath": if set to a directory name enables DNS queries logging in CLIENTIP-DATE.log file format

85ff0dac52 - FIX: timetable eval time as "local time" (no UTC)

- FIX: Dockerfile: added timezone configuration (defaults to CET), use TZ env var to change it

d2f8601185 - added new setting: default/global timetable ( config->zabov->timetable )

This table will be used for any client that is not already included in an IP group

740e0a387b - removed unused/commented code

- ZabovCreateKDB is called only on active configurations

749029ba5b - FIX: optional settings were not optional

- Dockerfile: updated golang image to 1.15.6
- config.json: restored minimal settings
- added config.sample.json with all advanced settings
- urls-domains-updated.txt: removed/updated obsolete urls (CHEF-KOCH, malwaredomains.com)

0752a7e443 - FIX: Query logger: moved to different thread to serialize access to log file

loweel merged commit 13dd24b7b5 into master 2 years ago

loweel referenced this issue from a commit

Merge pull request 'master' (#1) from bloved/zabov:master into master

The pull request has been merged as 13dd24b7b5.

No reviewers

No Label

No Milestone

No project

No Assignees

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: loweel/zabov#1