Commit graph

5986 commits

Author SHA1 Message Date
DL6ER
cc333f79cc
Check if this domain is blocked by Pi-hole but only if the domain is not a local file or empty
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-11-22 21:10:22 +01:00
DL6ER
df7633bd1b
Add missing value for ${gravityDBfile_default}
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-11-22 21:08:06 +01:00
DL6ER
4efcdf1189
Add missing double quotes to prevent globbing and word splitting
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-11-22 21:06:09 +01:00
DL6ER
f16cf71781
${PIHOLE_DNS_1} is gone, use the first server from pihole-FTL --config dns.upstreams instead
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-11-22 21:04:46 +01:00
DL6ER
19d3489bcb
gravity_DownloadBlocklistFromUrl needs ${domain} but it was declared local before and was not passed as argument, making gravity currently depend on undefined behavior. It seems to be working well in the vast majority of cases, however, it seems we have at least one report where it is not working.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-11-22 20:56:23 +01:00
yubiuser
2338c9e916
Bump pytest-xdist from 3.3.1 to 3.4.0 in /test (#5490) 2023-11-18 12:31:11 +01:00
dependabot[bot]
f4b67065cc
Bump pytest-xdist from 3.3.1 to 3.4.0 in /test
Bumps [pytest-xdist](https://github.com/pytest-dev/pytest-xdist) from 3.3.1 to 3.4.0.
- [Changelog](https://github.com/pytest-dev/pytest-xdist/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest-xdist/compare/v3.3.1...v3.4.0)

---
updated-dependencies:
- dependency-name: pytest-xdist
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-11-18 10:55:51 +00:00
yubiuser
2b79abb948
Bump pytest-testinfra from 9.0.0 to 10.0.0 in /test (#5491) 2023-11-18 11:55:06 +01:00
dependabot[bot]
ab09233753
Bump pytest-testinfra from 9.0.0 to 10.0.0 in /test
Bumps [pytest-testinfra](https://github.com/pytest-dev/pytest-testinfra) from 9.0.0 to 10.0.0.
- [Release notes](https://github.com/pytest-dev/pytest-testinfra/releases)
- [Changelog](https://github.com/pytest-dev/pytest-testinfra/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest-testinfra/compare/9.0.0...10.0.0)

---
updated-dependencies:
- dependency-name: pytest-testinfra
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-11-18 10:17:34 +00:00
yubiuser
af9b8df118
Improve v6 debug log and remove leftovers (#5481) 2023-11-14 00:04:16 +01:00
Christian König
b61e8be3b4
Address reviewer's comment
Co-authored-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-11-13 23:04:44 +01:00
Christian König
54ab71d817
Don't use hardcoded ports to check for
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-11-13 23:04:44 +01:00
Christian König
e7c89ce25f
No need to pass a default value to get_ftl_conf_value()
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-11-13 23:04:44 +01:00
Christian König
d3813c4be5
Update check for required ports
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-11-13 23:04:44 +01:00
Christian König
d854eb1a97
Add lshw to Pi-hole deps
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-11-13 23:04:44 +01:00
Christian König
86aa6b1df6
Improve v6 debug log and remove leftovers
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-11-13 23:04:44 +01:00
yubiuser
1da36bd4e7
Move custom.list to /hosts/custom.list (#5488) 2023-11-13 22:58:16 +01:00
Christian König
f65b126433
Move custom.list to /hosts/custom.list
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-11-13 21:37:41 +01:00
DL6ER
834e52f15d
pihole -d: Include pihole.toml only once (#5478) 2023-11-06 19:46:33 +01:00
DL6ER
72c972175d
Remove left-over parts of setupVars processing and only include pihole.toml once
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-11-06 13:53:08 +01:00
yubiuser
2746ee3ae9
Tweak help text of pihole setpassword (#5476) 2023-11-05 23:24:31 +01:00
Christian König
bc96d3b0a9
Tweak help text of pihole setpassword
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-11-05 21:18:46 +01:00
DL6ER
395110f92f
When setting a blank password, use webserver.api.password instead of webserver.api.pwhash (#5465) 2023-11-04 17:43:09 +01:00
yubiuser
758ace57c0
Check for valid OS via IPv4 and IPv6 (#5305) 2023-11-04 08:02:38 +01:00
yubiuser
4c129afb10
Start counting at postion 1 (#5470) 2023-11-02 07:00:23 +01:00
Christian König
ced1c5d50b Start counting at postion 1
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-11-01 21:57:36 +01:00
yubiuser
ce21b4c731
Remove idn2 as punycode conversion is handled by FTL (#5468) 2023-11-01 21:06:02 +01:00
Christian König
480a8c8d7f
Remove idn2 as punycode conversion is handled by FTL
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-10-31 21:02:26 +01:00
DL6ER
0a193f98a4
Tweak Pi-hole's debug facility for v6 (#5461) 2023-10-29 06:13:22 +01:00
Adam Warner
4c4a2ad5bd
Use suffixed temp file (#5457) 2023-10-28 22:20:33 +01:00
Adam Warner
ab3b6dfa67
No need to >/dev/null because setFTLConfigValue already does this
adjust output of setFTLConfigValue to test for the exit code of `pihole-FTL --config`
2023-10-28 19:46:45 +01:00
Adam Warner
6292e65b37
When setting a blank password, use webserver.api.password instead of webserver.api.pwhash (fixed in https://github.com/pi-hole/FTL/pull/1702)
This prevents the password from being blanked out on the command line when it has been set by an environment variable
2023-10-28 17:56:37 +01:00
yubiuser
ed5d794008
Bump pytest from 7.4.2 to 7.4.3 in /test (#5462) 2023-10-28 14:02:35 +02:00
dependabot[bot]
2e9e579bba
Bump pytest from 7.4.2 to 7.4.3 in /test
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.4.2 to 7.4.3.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/7.4.2...7.4.3)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-28 10:31:54 +00:00
DL6ER
d377cfbc3e
Extract the first entry in the answer section from dig's output, replacing any multiple spaces and tabs with a single space
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-10-28 08:34:30 +02:00
DL6ER
15be8eeffa
Remove lighttpd config test
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-10-28 08:21:08 +02:00
DL6ER
635b4e952f
Add NOERROR/NXDOMAIN support in the DNS resolution test
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-10-28 08:20:31 +02:00
DL6ER
c86e7b3f96
Generalize CPU check to a short hardware information output
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-10-28 08:13:31 +02:00
DL6ER
dcc7e96d2f
Remove detection of addresses of PIHOLE_INTERFACE as it is gone, too
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-10-28 08:07:11 +02:00
DL6ER
ccd8c470a5
check_x_headers is no more
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-10-28 08:03:37 +02:00
DL6ER
00d7e998b4
setupVars.conf and pihole-FTL.conf are no more - use pihole.toml instead
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-10-28 08:03:09 +02:00
Christian König
fd8fdd3513
Use suffixed temp file
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-10-23 21:36:18 +02:00
DL6ER
a44e51bf76
Fix and simplify binary download (#5451) 2023-10-22 23:03:42 +02:00
DL6ER
91c5967b27
Fix gravity swapping (#5455) 2023-10-22 23:03:30 +02:00
DL6ER
842a9d7778
Address review comments
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-10-22 08:33:56 +02:00
DL6ER
7523c49f62
Swapping the databases must be the last step before the cleanup. Otherwise, FTL may be reloading from an only partially completed database causing spurious errors and/or warnings.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-10-22 08:14:11 +02:00
DL6ER
369ccf13a8
Move FTL binary availability check after the supported OS check
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-10-21 21:40:21 +02:00
DL6ER
38ecc1693f
Further simplify the ARMv6 test
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-10-21 20:39:32 +02:00
DL6ER
30bfc7cc9f
Add binutils tot he OS check dependencies as we need it to check if the local system is abel to run any of our precompiled FTL binaries
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-10-21 19:15:10 +02:00
DL6ER
45687d675b
Fix the binary detection for ARMv6 and simplify the router overall
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-10-21 19:13:45 +02:00