Commit Graph

249 Commits

Author SHA1 Message Date
DL6ER 41ebe5ec51 !!! BREAKING CHANGE !!! Create new dnsmasq config file and test it.
This needs a manual removal of /etc/dnsmasq.d/01-pihole.conf and /etc/dnsmasq.d/02-pihole-dhcp.conf (if existing).
Furthermore, we need a new symlink /etc/pihole/01-pihole.conf -> /etc/dnsmasq.d/01-pihole.conf

Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-01-12 18:12:41 +01:00
DL6ER 140a365806 Tests: Set api.pwhash and dns.blocking.mode using PATCH /api/config
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-01-08 21:29:55 +01:00
DL6ER 4ac52263e9 Implement login for python API checking script
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-01-08 16:04:26 +01:00
DL6ER 3c5c1d52b7 Transform log_debug() into a function-like macro to save some time when we are not in debugging mode (the function is not called in this case)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-01-08 09:55:51 +01:00
DL6ER e145d20d28 Rewrite the entire config-related code to allow for changing data without having to restart. Hereby, we greatly reduce code duplication in the TOML routines so we won't have to touch tme in the future when adding additional options.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-01-07 18:06:41 +01:00
DL6ER 8c4b4d7ed5 Add checkAPI.py to test suite
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-01-04 20:22:40 +01:00
DL6ER 32279e0765 Also rename config options in test pihole-FTL.toml
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-01-02 20:08:45 +01:00
DL6ER 3389b1f0c2 Add /api/ftl/config which can be used to retrieve the entire configuration of FTL. This endpoint only supports GET so far, however, we will add POST in the future so that configuration values can be changed through the API
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-01-01 18:19:36 +01:00
DL6ER 840e73ec4c Resolve missed merge conflict on Github workflow
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-12-30 16:17:08 +01:00
DL6ER a9ea62a3fc Merge branch 'development' into new/http
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-12-30 15:12:14 +01:00
DL6ER 8cacd8f5ec Adds colors (if available) to verbose version output and completely revamp the help function
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-12-09 10:42:20 +01:00
DL6ER eec622c687 Add shortcut to compile an all-options build of dnsmasq inside FTL. Note that this does not include ubus as it is an OpenWRT-native thing that cannot be setup easily on any other distro.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-11-10 20:36:25 +01:00
DL6ER 66ba5cfc43 Tests: Use dnssec.works instead of verteiltesysteme.net
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-11-09 19:38:45 +01:00
DL6ER a0909894c4 Adjust tests
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-11-03 20:51:54 +01:00
DL6ER df0eeec53e Tests: Domain auditing, there are some non-approved domains after the tests
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-10-01 13:47:27 +02:00
Christian König 597e98e773 Don't create FTL.port
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-09-21 12:06:14 +02:00
DL6ER 4cd68092fe Merge pull request #1409 from pi-hole/tweak/white_regex_id
Store domainlist IDs for blocked/permitted queries
2022-09-11 22:12:33 +02:00
DL6ER 84085bebcd Tests: CNAME inspection: NODATA CNAME targets are blocked
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-09-05 20:07:19 +02:00
DL6ER 15942b17ce Store domainlist IDs for blocked/permitted queries
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-08-19 19:44:11 +02:00
DL6ER cf97933ca2 Tests: dig should now support SVCB and HTTPS directly
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-07-30 18:08:03 +01:00
DL6ER d79abd3000 Adjustments for upgrade to PowerDNS v4.6
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-07-30 18:08:02 +01:00
DL6ER 5d0559a5cb Warn if invalid IPv4/IPv6 addresses are specified in the config file
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-07-17 13:02:10 +02:00
DL6ER b422d1b931 Add dns.reply.own_host.IPv4/6 and dns.reply.ip_blocking.IPv4/6 to pihole-FTL.toml
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-07-17 12:32:40 +02:00
DL6ER 20ba471ccd pihole-FTL.log was renamed to FTL.log
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-07-17 12:20:28 +02:00
DL6ER dcc2e5d5a3 Change default log file path to /var/log/pihole/FTL.log
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-07-03 18:36:39 +02:00
DL6ER fa9f9a9b8e Remove some incompatible tests
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-07-03 14:17:25 +02:00
DL6ER f6755c3c2f Merge branch 'development' into new/http
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-06-28 22:11:17 +02:00
DL6ER 26ccee3f4c Merge branch 'development' into new/http
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-06-29 11:12:59 +02:00
DL6ER 17b0a59fc6 Also include IPv4+v6 addresses in >interfaces
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-06-17 11:14:36 +02:00
DL6ER 5aa601fdb9 Add test for new API endpoint
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-06-16 23:04:21 +02:00
Dan Schaper 8b1938b004 Remove nc verbosity.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2022-06-07 14:41:36 -07:00
DL6ER b0d9244eba Only consider routes which are UP and whose destinations are a gateway. If multiple match, ensure we're reporting the one with minimum metric value.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-06-07 07:52:34 +02:00
DL6ER 4b6bafe53a Add test
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-06-06 23:13:27 +02:00
Christian König 9b452f54fe logs from /var/log/ -> /var/log/pihole/
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-05-12 22:06:05 +02:00
DL6ER 613014e81a Merge branch 'development' into new/query_special_domain
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-04-24 09:26:46 +02:00
DL6ER 7acd0f31e4 Add QUERY_SPECIAL_DOMAIN as new query status
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-04-24 09:10:38 +02:00
DL6ER 1b15885c0f Check struct sizes on the CI (in code) instead of during compile time (using the preprocessor)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-04-18 10:39:43 +02:00
DL6ER a24e187486 Add individual reply counters as well as their sum to the API + ensure we subtract from the previous reply counter when setting a new status
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-03-26 13:22:51 +01:00
Christian König 1e880d3c80 penny-pitchy
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-02-12 13:21:05 +01:00
Christian König 7417a83a10 Rename upstream blocklist to blocked
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-02-12 10:08:23 +01:00
Adam Warner 86f7f2a2dd Merge pull request #1293 from pi-hole/new/force_ip46
Deprecate REPLY_ADDR4/6 in favor of more fine-grained setting
2022-02-03 18:16:22 +00:00
DL6ER ed73b76241 Merge pull request #1285 from pi-hole/new/database_reply_replytime_dnssec
Keep Query Log details across FTL restart
2022-02-02 06:10:34 +01:00
yubiuser 7afefbf7b1 Update test/test_suite.bats 2022-02-01 21:46:32 +01:00
DL6ER 23776e6c08 Add tests for LOCAL_IPV4/6 and BLOCK_IPV4/6
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-02-01 14:17:35 +01:00
DL6ER a20d833bab Tests: Add maxloagage test
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-02-01 09:47:46 +01:00
DL6ER 279a300f2d Merge pull request #1289 from pi-hole/tweak/build-scripts
Tidy Up CI scripts - untangle from variables named after CircleCI
2022-01-23 17:11:09 +01:00
Adam Warner c0cf8de918 Rename CI variables to remove CIRCLE references, as we no longer use Circle CI. Also remove circle config.
Tweak build script to accept a `test` argument, and also to accept the existing arguments at any position

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-01-23 15:04:20 +00:00
DL6ER b7904f1147 Test: Add CLI regex-test extension tests
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-01-22 13:48:12 +01:00
DL6ER ae5247a453 Merge pull request #1284 from pi-hole/tweak/upstream_pie_others
Add others section to upstream servers pie chart
2022-01-21 04:47:43 +01:00
DL6ER 14db6b47a4 Add others section to upstream servers pie chart
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-01-21 04:39:49 +01:00