d419eaf463
Merge branch 'development' into release/v5.4
3 years ago
2ec4e84db4
Merge branch 'development' into fix-logrotate-conflict
3 years ago
075b3f6468
Remove ports, nc option and fix wording.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
3 years ago
d2c75a33d5
Increase width of ID column in adlist and domain table in debug script
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
aa2da80768
Remove traces of unused files
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
b05fc5bb2b
Remove specific dnsmasq config files from requiered files
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
c99c86af7f
Make all dir list output human readable
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
f552173be3
Resolve merge conflict
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
d02aa3ced1
Fix error on checking interfaces that are not dual-stack
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
fbfec961d5
Remove comparison of IP addresses with setupVars.conf
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
0c125eba2c
Make output of SHM dir human readable
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
57c40cbd09
Update pihole-FTL.service
...
Make this script a bourne shell script, which requires the removal of only a single bashism, the "{n..m}" expansion. Furthermore, since POSIX echo has no reliable command line options, switch to printf when line breaks shall be omitted. On most distros/setups "sh" calls a much lighter bourne shell like dash, which inits and runs much faster than bash.
Remove unused PIDFILE variable, remove the single case of FTLUSER call and remove it as well. Using variables here might give the wrong impression that there is a change these can be varied. But both are hardcoded in many places throughout Pi-hole, so in this service script.
Consolidate and merge the commands to pre-create and set permissions for required files and directories. The /var/log/pihole directory is and was never used, the touch, chmod and chown call can be merged into one each to reduce overhead. Use "-f" option to to fail on missing database files instead of redirecting STDERR, which is otherwise helpful to debug other possible errors, like missing or corrupted commands, filesystem errors and such.
Do not use "which pihole-FTL" when setting capabilities when the hardcoded path /usr/bin/pihole-FTL is used for the actual daemon call. It makes sense to use the full path here, as the Pi-hole installer and updater installs it explicitly there, and so we prevent users from e.g. overriding it via /usr/local/bin/pihole-FTL too easily.
On pgrep and pkill calls, add the "-x" flag to assure that only "pihole-FTL" is matched and not "foo-pihole-FTL" or "pihole-FTL-bar".
Do not remove possible leftovers from previous pihole-FTL processes on start, but on stop instead. Since "start" includes a proceeding "stop" as well, on service start nothing changes, but on service stop, some resources are now freed.
Remove leading "$" from usage message. In bash this was omitted, as $'...' is a special syntax for escape sequence expansion, which is not applicable here. In dash it would be printed literally. To keep previous behaviour, it is hence removed.
Signed-off-by: MichaIng <micha@dietpi.com>
3 years ago
092e533a30
Add `-t` option to Admin Console help dialog
...
Signed-off-by: Kenneth Chew <kenneth.c0@protonmail.com>
3 years ago
3b6e6317b8
Merge pull request #4126 from lightswitch05/feature/support-and-test-debian-bullseye
...
Support and test Debian Bullsye (11) and Ubuntu 21.04
3 years ago
aa5c15a728
give pihole its own logrotate state file
...
Signed-off-by: Faye Duxovni <duxovni@duxovni.org>
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
3 years ago
fdca19e66d
Support and test Debian Bullsye (11)
...
Signed-off-by: Daniel <daniel@developerdan.com>
3 years ago
c9e341b5d4
Same change as with #4221 , but on fedora config too
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
3 years ago
31a096dec2
Remove mod_compress (mod_deflate) from lighttpd to provide backwards compatible support for Debian Bullseye (11)
...
Signed-off-by: Daniel <daniel@developerdan.com>
3 years ago
a0d74d1e9d
Canary domain handling is now happening in FTL where we have much finer control over it.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
0cbf77eb9f
Merge pull request #4131 from pi-hole/fix/gravity_no_locallist
...
Handle pi.hole and hostname in FTL instead of local.list
3 years ago
e80e54a61a
head_line -> line
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
3 years ago
9b9e907013
Merge branch 'development' into debug_tail_log
3 years ago
4ac4bc5c18
Merge branch 'development' into fix/gravity_no_locallist
3 years ago
a1d85155fd
Merge pull request #4178 from pi-hole/fix/custom_dns_removal
...
Add missing sed anchors when deleting lines.
3 years ago
01764cc581
Explicity declare values for the RA packet.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
3 years ago
08cf9aa5a7
Declare and assign 'logging_enabled' separately
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
1ae67e1de8
Only inform user about disabled logging, don't skipp printing pihole.log
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
f2cba6cad1
Skip analyze_pihole_log if query logging has been disabled
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
df3c46349a
Add tail of pihole.log to debug output
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
a9e761ec13
Add missing sed anchors when deleting lines.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
5895690b58
this has been annoying me for months
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
3 years ago
3b574096b8
Remove duplicated lo test
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
58905a1188
Modify debugger to test name resolution on all available interfaces
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
9b57f7fa33
Merge pull request #4120 from pi-hole/fix/splashPage
...
Add missing closing single quote
3 years ago
866045968d
Add missing closing single quote
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
3 years ago
b388ac5bb5
Merge pull request from GHSA-3597-244c-wrpj
...
Add some validation to passed arguments before running the values through `sed`
3 years ago
ea451e3c22
Merge pull request #4095 from jbaez/ft-3896
...
Fix error trying to access undefined variables on splash page.
3 years ago
6198165df8
Fix error trying to access undefined variables on splash page.
...
Signed-off-by: Jaime Baez <j.baezcastillo@gmail.com>
3 years ago
45d4ab4c22
Add some validation to passed arguments before running the values through `sed`
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
3 years ago
f536718aaa
Use possibly custom gravity.db location in the copying SQL script
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
f1740da9ff
Update gravity path in query.sh
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
9bdbe88a66
Update gravity path in list.sh
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
f27fd9f899
Merge pull request #3982 from andras-tim/list-fix-same-wildcard-regex
...
Fix list: User same wildcard regex that the UI use
3 years ago
13cf0c1288
Aligned pihole logo to center, Fixed responsive issue ( #4036 )
...
* Aligned pihole logo to center, Fixed responsive issue
* removed duplicate instance of #splashpage
Signed-off-by: Dany Gauthier <danygauthier57@yahoo.ca>
3 years ago
57fe3b6621
Merge pull request #3951 from pi-hole/new/gravity_adlist_infos
...
Store gravity details in gravity.db adlist table
3 years ago
56fa9714b5
Merge pull request #4010 from mtzfederico/master
...
Updates lighttpd config to allow a persistent port change on IPv6
3 years ago
78027bd2bf
Add default noname if hostname is empty
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
7dc7cbb80e
Add hostname to teleporter backup file if called from cli
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
1ab193fa9d
Update piholeDebug.sh
...
Signed-off-by: Alexander Schmitz <Flashbang007@gmail.com>
3 years ago
e5bfafefb9
Moved where external.conf is included
...
Signed-off-by: mtzfederico <fm@mtzfederico.com>
3 years ago
7c0c30fb0b
fixed typos
3 years ago
bfee230c79
scripts/list: User same wildcard regex that the UI use
...
The CLI and the UI should do the same to be able to add/remove the same
records via any supported interface.
Signed-off-by: Andras Tim <andras.tim@gmail.com>
3 years ago
1791fe22f6
Merge pull request #3912 from mdujava/basic_auth
...
Fix validation of adlist url
3 years ago
e033ee6664
Fix connection mechanism between Chronometer and FTL
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
6b33b8b4c0
Store status of downloaded list (downloaded, using cache, some error, ...) and number of (in-)valid domains on this list in the gravity database. This updates the gravity databaes to version 14.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
ef0bdf6470
Fix validation of adlist url
...
Already existing regex validation will be used on url after removing @ (in case
its in separating userinfo and host).
Signed-off-by: Matej Dujava <mdujava@kocurkovo.cz>
Fixes: https://github.com/pi-hole/pi-hole/issues/3911
Fixes: 7d19ee1b: validate blocklist URL before adding to the database (#3237 )
3 years ago
87cf9add8c
Merge pull request #3934 from mwoolweaver/patch-1
...
Fix typo found by #3933
3 years ago
3a05ac27a2
Fix typo found by #3933
...
Signed-off-by: Michael Woolweaver <m.woolweaver@icloud.com>
3 years ago
41479524f8
Merge pull request #3900 from ganto/fix/chrono-non-lte
...
Fix chronometer output if web interface is not installed
3 years ago
357b6702ec
Update advanced/Scripts/chronometer.sh
...
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
3 years ago
78cdd34992
Merge pull request #3904 from ganto/fix/debug-non-web-2
...
piholeDebug: Diagnose output if (Web) git directory is not found
3 years ago
9dc539c98b
piholeDebug: More detailed diagnostics if Web interface is not found
...
Signed-off-by: Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
4 years ago
18e4eb460c
piholeDebug: Fix version check if lighttpd/php are not installed
...
Signed-off-by: Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
4 years ago
e841347057
Fix chronometer output if web interface is not installed
...
Signed-off-by: Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
4 years ago
8443262214
Merge pull request #3890 from ganto/fix/x86-64-arch
...
Ensure x86_64 processor architecture is listed as supported
4 years ago
36937b1913
Strip such lines starting with a #. Do not silently truncate lines if they have a # somewhere in between (like server=127.0.0.1#5353)
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
4 years ago
d0af1a950b
Ensure x86_64 processor architecture is listed as supported
...
Signed-off-by: Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
4 years ago
a217c75134
Merge pull request #3882 from pi-hole/tweak/conditional_transforms
...
Fix processing of CONDITIONAL_FORWARDING_REVERSE
4 years ago
454c9a411c
Update advanced/Scripts/webpage.sh
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
4 years ago
f44b2f6aa3
Update advanced/Scripts/webpage.sh
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
4 years ago
49810262db
When there is a Pi-hole domain set and "Never forward non-FQDNs" is ticked, we add to tell FTL that this domain is purely local and FTL may answer queries from /etc/hosts or DHCP but should never forward queries on that domain to any upstream servers
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
4 years ago
58bc98ca44
Update advanced/Scripts/webpage.sh
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
4093959d3e
Appease stickler
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
06c5fe2a89
Set REV_SERVER_CIDR in the else condition if it is not in-addr.arpa
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
6cb8f3f403
Add some comments
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
e004d27b28
Fix processing of CONDITIONAL_FORWARDING_REVERSE
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
0711f4d63a
Revert "Enable DNS forwarding loop detection"
4 years ago
d2e9a20d96
Merge pull request #3859 from yubiuser/tweak/debug_pihole-FTL_status
...
Add systemctl status --full --no-pager pihole-FTL.service to the debug log
4 years ago
d4c33e5188
Include the raw messages from the Pi-hole diagnosis systems in debug logs
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
4 years ago
70c48afc04
Add else statement
...
Signed-off-by: Christian König <ckoenig@posteo.de>
4 years ago
ec5183b553
Rename function
...
Signed-off-by: Christian König <ckoenig@posteo.de>
4 years ago
50316ee617
Add systemctl status --full --no-pager pihole-FTL.service to the debug log
...
Signed-off-by: Christian König <ckoenig@posteo.de>
4 years ago
1c2c10c4a5
Merge pull request #3761 from BastiG/development
...
read REV_SERVER_CIDR from environment
4 years ago
e03585e0bb
Merge pull request #3810 from deHakkelaar/patch-5
...
Enable DNS forwarding loop detection
4 years ago
cd8120d33f
Add some output to the --nuke command
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
4abd8196ae
Merge pull request #3349 from Forceflow/development
...
Fix for pihole -w --nuke displaying help info even if command is exec…
4 years ago
95a28ae125
unset() now also occurs for $splashPage
...
After some email discussion with Adam, there is a preference to also prevent $splashPage from using variables
Signed-off-by: craigmayhew <craig@mayhew.io>
4 years ago
e5c7549f8f
Fixed potential security issue with $landPage receiving variables
...
Signed-off-by: craigmayhew <craig@mayhew.io>
4 years ago
ad39ba30bd
Enable DNS forwarding loop detection
...
Found below by accident:
```
pi@ph5:~ $ man dnsmasq
[..]
--dns-loop-detect
Enable code to detect DNS forwarding loops; ie the situa‐
tion where a query sent to one of the upstream server
eventually returns as a new query to the dnsmasq instance.
The process works by generating TXT queries of the form
<hex>.test and sending them to each upstream server. The
hex is a UID which encodes the instance of dnsmasq sending
the query and the upstream server to which it was sent. If
the query returns to the server which sent it, then the
upstream server through which it was sent is disabled and
this event is logged. Each time the set of upstream
servers changes, the test is re-run on all of them, in‐
cluding ones which were previously disabled.
```
Seems to work just fine if I point my router 10.0.0.1 back to Pi-hole in the WAN DNS settings:
```
pi@ph5:~ $ grep server= -R /etc/dnsmasq.*
/etc/dnsmasq.d/01-pihole.conf:server=9.9.9.10
/etc/dnsmasq.d/01-pihole.conf:server=149.112.112.10
/etc/dnsmasq.d/01-pihole.conf:server=10.0.0.1
/etc/dnsmasq.d/01-pihole.conf:rev-server=10.0.0.0/24,10.0.0.2
/etc/dnsmasq.d/01-pihole.conf:server=/dehakkelaar.nl/10.0.0.2
/etc/dnsmasq.d/01-pihole.conf:server=/use-application-dns.net/
```
```
pi@ph5:~ $ sudo tee /etc/dnsmasq.d/99-my-settings.conf <<< $'dns-loop-detect'
dns-loop-detect
```
```
pi@ph5:~ $ pihole restartdns
[✓] Restarting DNS server
```
```
pi@ph5:~ $ tail -F /var/log/pihole.log
[..]
Oct 22 18:17:41 dnsmasq[17301]: using nameserver 10.0.0.2#53 for domain dehakkelaar.nl
Oct 22 18:17:41 dnsmasq[17301]: using nameserver 10.0.0.2#53 for domain 0.0.10.in-addr.arpa
Oct 22 18:17:41 dnsmasq[17301]: NOT using nameserver 10.0.0.1#53 - query loop detected
Oct 22 18:17:41 dnsmasq[17301]: using nameserver 149.112.112.10#53
Oct 22 18:17:41 dnsmasq[17301]: using nameserver 9.9.9.10#53
```
4 years ago
50100017a5
Merge pull request #3794 from pi-hole/security/non_FQDNs_locality
...
Security enhancement for the "never forward non-FQDNs" feature
4 years ago
59b0a6af6f
Remove references to privacy level 4 (no longer functional)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
47aa1644a8
add debug checking for firewalld
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
4 years ago
08a84e51d6
Only add local=/<domain>/ when the "only forward FQDN queries" function is enabled to prevent unintended side-effects of this change
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
4 years ago
d631cd8b04
Security enhancement for the "never forward non-FQDNs" feature. This should prevent all local queries from being forwarded (will show up as blocked by regex) as well as any hostname without a domain (for example one word searches from the address bar in browsers). This fixes #3303
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
4 years ago
0445559610
Accidentally a number ( #3788 )
...
Co-authored-by: MichaIng <micha@dietpi.com>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
Co-authored-by: MichaIng <micha@dietpi.com>
4 years ago
948337dd8e
Merge pull request #3740 from pi-hole/new/adlist_date_updated
...
Add date_updated field to adlist table
4 years ago
fe463f15b3
Merge pull request #3741 from pi-hole/new/debug_scan_dhcp
...
Discover active DHCP servers during debugger run
4 years ago
568ebd67ca
Update comment
...
Signed-off-by: Christian König <ckoenig@posteo.de>
4 years ago
c628c970ae
Print tail of logs in /var/log/lighttpd in debug run as well
...
Signed-off-by: Christian König <ckoenig@posteo.de>
4 years ago
8041bbf443
read REV_SERVER_CIDR from environment
...
Signed-off-by: Sebastian Gmeiner <sebastian@gmeiners.net>
4 years ago
Adam Warner