96c6effa45
Only add "conf-dir=/etc/dnsmasq.d" to the config if this directory exists
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2023-01-15 12:33:32 +01:00
aae3905334
Add /config dnsmasq.logging (bool)
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2023-01-15 09:27:47 +01:00
393eaa766f
Update microtar (using the version from https://github.com/DL6ER/microtar ): We now have support for large files and in-memory processing
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2023-01-13 18:28:43 +01:00
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
8033c6c6bf
Add new config items to the test TOML file
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2023-01-09 20:34:54 +01:00
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
f199ac2f08
Automatically migrate the API password hash and the lists of clients and domains to be excluded from setupVars.conf
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2023-01-08 21:21:38 +01:00
1414e0d397
Ensure checkAPI.py also accepts situations with localAPIauth = false
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2023-01-08 20:59:18 +01:00
4ac52263e9
Implement login for python API checking script
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2023-01-08 16:04:26 +01:00
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
b8354c515c
Fix debug flag parsing after changing from bit-wise flags to individual bools
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2023-01-07 20:08:38 +01:00
8efd253529
Merge remote-tracking branch 'origin/development' into new/http
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2023-01-07 18:37:13 +01:00
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
8c4b4d7ed5
Add checkAPI.py to test suite
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2023-01-04 20:22:40 +01:00
6d7239dbc8
Add example verification when (possibly multiple) global examples are provided below the schema level
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2023-01-03 22:08:55 +01:00
f2d68f20d7
Also verify endpoint structure: Query endpoints from FTL and check if all properties mentioned in the docs are present (and of correct type) and that there are no extra properties we forgot to document. Furthermore, also verify that the provided examples are of correct type, too.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2023-01-03 21:51:13 +01:00
c7803df604
Add /api/stats/upstreams and /api/stats/database/upstreams documentation
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2023-01-02 21:19:11 +01:00
8df3500c83
Move /api/ftl/gateway -> /api/network/gateway, /api/ftl/interfaces -> /api/network/interfaces, /api/ftl/network -> /api/network/devices, and /api/ftl/config -> /api/config and add documentation for /api/network/devices
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2023-01-02 20:52:13 +01:00
69aaa71c97
Improve checkAPI.py script (add handling of {kind} URI variables)
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2023-01-02 20:41:21 +01:00
ab5722e2a4
Accelerate checkAPI script by ensuring we parse each YAML at most once
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2023-01-02 20:16:01 +01:00
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
bd5519c6bf
Add API checking script
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2023-01-01 20:34:40 +01:00
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
840e73ec4c
Resolve missed merge conflict on Github workflow
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2022-12-30 16:17:08 +01:00
a9ea62a3fc
Merge branch 'development' into new/http
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2022-12-30 15:12:14 +01:00
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
6b6c069b22
Remove downloading step of inspect.lua from the testing suite - the script is now embedded into FTL
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2022-11-20 12:57:46 +01:00
80b1d3edba
Run tests for all x86_* architectures
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2022-11-13 18:20:27 +01:00
57352c9e7c
Add building the full binary in the x86_64 container
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2022-11-13 10:44:56 +01:00
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
66ba5cfc43
Tests: Use dnssec.works instead of verteiltesysteme.net
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2022-11-09 19:38:45 +01:00
94be8de5b6
Merge pull request #1467 from pi-hole/update/ftl-build
...
Update included crypto library (nettle)
2022-11-06 15:04:01 +01:00
1429f9a25b
Do not check disk usage during tests
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2022-11-06 08:45:37 +01:00
a0909894c4
Adjust tests
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2022-11-03 20:51:54 +01:00
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
597e98e773
Don't create FTL.port
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2022-09-21 12:06:14 +02:00
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
0f520269d8
Merge pull request #1415 from pi-hole/adlist_message_table
...
Add warning about inaccessible adlists to message table (Pi-hole diagnosis)
2022-09-08 13:42:30 +02:00
84085bebcd
Tests: CNAME inspection: NODATA CNAME targets are blocked
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2022-09-05 20:07:19 +02:00
94a28040fa
Update gravity.db.sql
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2022-08-31 23:51:29 +02:00
15942b17ce
Store domainlist IDs for blocked/permitted queries
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2022-08-19 19:44:11 +02:00
ea537ddac3
Update expected binary information for cross-compiled armv6hf binary
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2022-07-30 18:08:03 +01:00
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
dbd2cb722c
Tests: Explicityl disable DNSSEC for zone ftl.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2022-07-30 18:08:02 +01:00
d79abd3000
Adjustments for upgrade to PowerDNS v4.6
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2022-07-30 18:08:02 +01:00
bfd9c02e89
Buster correctly builds ARMv5T binaries (Stretch still built for ARMv4 instead)
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2022-07-30 18:08:02 +01:00
5d8f44d094
The official Raspberry Pi toolchain does not support Buster
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2022-07-30 18:08:02 +01:00
9545dda5b2
The armv4t builder has to stay on stretch as Buster discontinued armv4t support
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2022-07-30 18:08:02 +01:00
56b0124d64
Update binary classification after ftl-build container upgrade to Debian Buster
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2022-07-30 18:08:01 +01:00
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
DL6ER
Christian König