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 >
2020-10-28 18:32:46 +00:00
e5c7549f8f
Fixed potential security issue with $landPage receiving variables
...
Signed-off-by: craigmayhew <craig@mayhew.io >
2020-10-27 14:49:46 +00:00
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
```
2020-10-22 18:54:04 +02:00
50100017a5
Merge pull request #3794 from pi-hole/security/non_FQDNs_locality
...
Security enhancement for the "never forward non-FQDNs" feature
2020-10-21 21:09:05 +02:00
59b0a6af6f
Remove references to privacy level 4 (no longer functional)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-10-13 23:53:23 +01:00
47aa1644a8
add debug checking for firewalld
...
Signed-off-by: bcambl <blayne@blaynecampbell.com >
2020-10-11 22:20:31 -06:00
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 >
2020-10-10 11:23:55 +02:00
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 >
2020-10-10 11:01:01 +02:00
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 >
2020-10-09 17:24:42 +02:00
948337dd8e
Merge pull request #3740 from pi-hole/new/adlist_date_updated
...
Add date_updated field to adlist table
2020-10-09 14:04:13 +01:00
fe463f15b3
Merge pull request #3741 from pi-hole/new/debug_scan_dhcp
...
Discover active DHCP servers during debugger run
2020-10-09 14:00:57 +01:00
568ebd67ca
Update comment
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2020-10-03 16:17:37 +02:00
c628c970ae
Print tail of logs in /var/log/lighttpd in debug run as well
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2020-10-02 21:04:27 +02:00
8041bbf443
read REV_SERVER_CIDR from environment
...
Signed-off-by: Sebastian Gmeiner <sebastian@gmeiners.net >
2020-09-25 15:26:43 +02:00
b88510d89a
Add CACHE_SIZE to setupVars ( #3170 )
...
* Update 01-pihole.conf
Signed-off-by: DoubleOhmSeven <57564379+DoubleOhmSeven@users.noreply.github.com >
* Update basic-install.sh
Signed-off-by: DoubleOhmSeven <57564379+DoubleOhmSeven@users.noreply.github.com >
Co-authored-by: DoubleOhmSeven <57564379+DoubleOhmSeven@users.noreply.github.com >
2020-09-17 23:13:40 +02:00
41e899260f
Discover active DHCP servers during debugger run
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2020-09-07 23:17:50 +02:00
12b9748c43
Fine-tune adlist:adte_modified trigger and don't default new date_updated column to now but use NULL instead
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2020-09-07 21:11:57 +02:00
4fd412d7c3
Add date_updated field in adlist table set when a list changes.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2020-09-07 20:59:23 +02:00
5eabf4255b
Sign-off for DCO
...
Signed-off-by: Michael Paul Killian <spammyreset-github@gmail.com >
2020-09-06 13:53:03 +02:00
538827397c
Update index.php
...
See #3736
2020-09-06 11:51:33 +02:00
b8cd238fa1
Update advanced/Scripts/piholeDebug.sh
...
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com >
2020-08-23 14:35:02 +01:00
8e219cb799
Make output more meaningful in case of dig failure.
...
Include dig return code and response in debug run
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-08-23 10:48:15 +01:00
ebdb68a47a
display_warning fixes
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2020-08-15 10:54:31 -07:00
623ce1fe18
Tabs and debug.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2020-08-14 14:37:58 -07:00
bb1a6243d6
Merge pull request #3669 from pi-hole/release/v5.1.2
...
Release/v5.1.2 to development
2020-08-14 16:28:53 +01:00
d4dd446ba3
Update advanced/Scripts/chronometer.sh
...
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net >
Signed-off-by: Samuel Boucher <scboucher@users.noreply.github.com >
2020-08-09 17:12:20 -04:00
8b4921405a
Upercase the temp_unit
...
Signed-off-by: Samuel Boucher <scboucher@users.noreply.github.com >
2020-08-09 15:09:49 -04:00
5a48478196
Update "About Pi-hole" link
...
Signed-off-by: Nathan Friend <nathan@gitlab.com >
2020-08-01 20:00:49 -05:00
7c53b97004
Updating FAQ_HARDWARE_REQUIREMENTS and FAQ_HARDWARE_REQUIREMENTS_PORTS ( #3632 )
...
Signed-off-by: Aiden Mitchell <aiden@bcyouthcouncil.ca >
Co-authored-by: Adam Warner <me@adamwarner.co.uk >
2020-07-30 12:57:19 -07:00
8f7f0881c6
Add /usr/sbin to cronjob PATH
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2020-07-21 21:21:24 +02:00
17aabf26f7
Also use pkill/pgrep in the FTL service script
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2020-07-21 21:21:17 +02:00
f50cff54de
*innocent whistling*
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-07-15 23:49:17 +01:00
849139176e
fallback to NC if curl fails on uploadgit checkout
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-07-15 21:54:45 +01:00
b8bba7951f
Just one more newline, give it to me.
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-07-15 20:49:18 +01:00
76ce5ec66b
Add additional information about local debug log location
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-07-15 20:45:02 +01:00
7b41b99549
Merge pull request #2887 from tlk/fix/reenable
...
Prevent "pihole disable $timeout" from messing up future state changes
2020-07-15 20:23:33 +01:00
d8822b70cf
Fix minor typo
...
Signed-off-by: XhmikosR <xhmikosr@gmail.com >
2020-07-05 15:12:02 +03:00
cf1c1e2e7e
Tweak lighttpd configs
...
* Compress more types
* Add charset=utf-8 in more text types
* Use proper media types
* Add default expire header
* Use consistent indentation
Signed-off-by: XhmikosR <xhmikosr@gmail.com >
2020-07-02 12:28:26 +03:00
f5a5f68a1a
Merge pull request #3403 from XhmikosR/XhmikosR-patch-1
...
Fix/tweak blocking page
2020-07-02 10:27:16 +01:00
3205606fc3
Also validate IPV6 in the setdns function
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-06-23 20:38:18 +01:00
3aaf9d89b3
Merge pull request #3260 from pi-hole/new/rev-server
...
Improve conditional forwarding
2020-06-21 13:26:07 -07:00
2c3aa9ab00
Merge pull request #3491 from pi-hole/fix_ip_address_section
...
Fix fresh install on dev branch not working
2020-06-21 21:58:36 +02:00
9bf0f2a161
Reduce handholding when trying to foresee the intentions of the user. The code does now preserve legacy behavior and users can open up the subnet manually if they like.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2020-06-21 21:47:30 +02:00
7ea6d7b92b
remove ; so IFS changes don't stick
...
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net >
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-06-14 00:17:51 +01:00
011fa8c6ea
fix sticklr complaint
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-06-13 21:47:00 +01:00
0320d85028
Additionally source the install script in webpage.sh to validate IP entered on pihole -a setdns
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-06-13 20:57:57 +01:00
5f9dac8d2b
Merge pull request #3434 from pi-hole/new/os_detect
...
Change OS Detection in debug script
2020-06-05 13:38:50 -07:00
03a8cff55e
read > mapfile as suggested by @dschaper
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-06-05 21:01:53 +01:00
2b1bc6a46e
Replace possible "\#" by "#". This fixes AdminLTE#1427
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2020-06-04 09:32:40 +02:00
6160eb6894
This regex is too complex for bash's own replacement. Add ignore for the shellcheck rule.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2020-06-04 09:22:40 +02:00
