Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-15 10:43:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
4814 commits 8 branches 109 tags 27 MiB
Commit graph

1597 commits

Author SHA1 Message Date
Alexander Schmitz
1ab193fa9d
Update piholeDebug.sh 
Signed-off-by: Alexander Schmitz <Flashbang007@gmail.com>
 2021-01-27 11:00:43 +01:00
mtzfederico
e5bfafefb9 Moved where external.conf is included 
Signed-off-by: mtzfederico <fm@mtzfederico.com>
 2021-01-22 15:53:40 -06:00
freddii
7c0c30fb0b fixed typos 2021-01-19 19:33:38 +01:00
Andras Tim
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>
 2021-01-11 17:05:17 +01:00
DL6ER
1791fe22f6
Merge pull request #3912 from mdujava/basic_auth 
Fix validation of adlist url
 2020-12-31 12:19:32 +01:00
DL6ER
e033ee6664
Fix connection mechanism between Chronometer and FTL 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-12-29 10:29:02 +01:00
DL6ER
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>
 2020-12-28 08:08:49 +01:00
Matej Dujava
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)
 2020-12-21 12:50:02 +01:00
Adam Warner
87cf9add8c
Merge pull request #3934 from mwoolweaver/patch-1 
Fix typo found by #3933
 2020-12-20 15:31:02 +00:00
Michael Woolweaver
3a05ac27a2
Fix typo found by #3933 
Signed-off-by: Michael Woolweaver <m.woolweaver@icloud.com>
 2020-12-19 17:37:17 -06:00
DL6ER
41479524f8
Merge pull request #3900 from ganto/fix/chrono-non-lte 
Fix chronometer output if web interface is not installed
 2020-12-12 10:08:05 +01:00
Adam Warner
357b6702ec
Update advanced/Scripts/chronometer.sh 
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
 2020-12-11 12:30:52 +00:00
DL6ER
78cdd34992
Merge pull request #3904 from ganto/fix/debug-non-web-2 
piholeDebug: Diagnose output if (Web) git directory is not found
 2020-12-10 23:00:45 +01:00
Reto Gantenbein
9dc539c98b piholeDebug: More detailed diagnostics if Web interface is not found 
Signed-off-by: Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
 2020-12-05 18:46:11 +01:00
Reto Gantenbein
18e4eb460c piholeDebug: Fix version check if lighttpd/php are not installed 
Signed-off-by: Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
 2020-12-05 14:11:53 +01:00
Reto Gantenbein
e841347057 Fix chronometer output if web interface is not installed 
Signed-off-by: Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
 2020-12-05 02:55:55 +01:00
Adam Warner
8443262214
Merge pull request #3890 from ganto/fix/x86-64-arch 
Ensure x86_64 processor architecture is listed as supported
 2020-12-02 21:12:18 +00:00
DL6ER
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>
 2020-12-02 20:52:39 +01:00
Reto Gantenbein
d0af1a950b Ensure x86_64 processor architecture is listed as supported 
Signed-off-by: Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
 2020-12-02 20:44:11 +01:00
DL6ER
a217c75134
Merge pull request #3882 from pi-hole/tweak/conditional_transforms 
Fix processing of CONDITIONAL_FORWARDING_REVERSE
 2020-12-01 18:46:54 +01:00
Adam Warner
454c9a411c
Update advanced/Scripts/webpage.sh 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
 2020-12-01 17:27:36 +00:00
Adam Warner
f44b2f6aa3
Update advanced/Scripts/webpage.sh 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
 2020-12-01 17:27:21 +00:00
DL6ER
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>
 2020-12-01 09:16:50 +01:00
Adam Warner
58bc98ca44
Update advanced/Scripts/webpage.sh 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-11-30 22:30:59 +00:00
Adam Warner
4093959d3e
Appease stickler 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-11-30 21:55:07 +00:00
Adam Warner
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>
 2020-11-30 21:29:54 +00:00
Adam Warner
6cb8f3f403
Add some comments 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-11-30 21:18:25 +00:00
Adam Warner
e004d27b28
Fix processing of CONDITIONAL_FORWARDING_REVERSE 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-11-30 18:58:23 +00:00
DL6ER
0711f4d63a
Revert "Enable DNS forwarding loop detection" 2020-11-28 18:29:32 +01:00
Adam Warner
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
 2020-11-28 16:58:23 +00:00
DL6ER
d4c33e5188
Include the raw messages from the Pi-hole diagnosis systems in debug logs 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-11-24 16:06:45 +01:00
Christian König
70c48afc04 Add else statement 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2020-11-24 06:02:18 +01:00
Christian König
ec5183b553 Rename function 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2020-11-24 05:57:13 +01:00
Christian König
50316ee617 Add systemctl status --full --no-pager pihole-FTL.service to the debug log 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2020-11-23 21:09:35 +01:00
Adam Warner
1c2c10c4a5
Merge pull request #3761 from BastiG/development 
read REV_SERVER_CIDR from environment
 2020-11-18 21:56:08 +00:00
Adam Warner
e03585e0bb
Merge pull request #3810 from deHakkelaar/patch-5 
Enable DNS forwarding loop detection
 2020-11-18 21:54:30 +00:00
Adam Warner
cd8120d33f
Add some output to the --nuke command 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-11-16 23:31:35 +00:00
Adam Warner
4abd8196ae
Merge pull request #3349 from Forceflow/development 
Fix for pihole -w --nuke displaying help info even if command is exec…
 2020-11-08 16:10:47 +00:00
Craig Mayhew
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
Craig Mayhew
e5c7549f8f Fixed potential security issue with $landPage receiving variables 
Signed-off-by: craigmayhew <craig@mayhew.io>
 2020-10-27 14:49:46 +00:00
deHakkelaar
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
DL6ER
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
Adam Warner
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
bcambl
47aa1644a8 add debug checking for firewalld 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2020-10-11 22:20:31 -06:00
DL6ER
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
DL6ER
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
Adam Warner
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
Adam Warner
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
Adam Warner
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
Christian König
568ebd67ca Update comment 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2020-10-03 16:17:37 +02:00
Christian König
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
Sebastian Gmeiner
8041bbf443 read REV_SERVER_CIDR from environment 
Signed-off-by: Sebastian Gmeiner <sebastian@gmeiners.net>
 2020-09-25 15:26:43 +02:00
DirkJanIT
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
DL6ER
41e899260f
Discover active DHCP servers during debugger run 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-09-07 23:17:50 +02:00
DL6ER
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
DL6ER
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
Michael Paul Killian
5eabf4255b
Sign-off for DCO 
Signed-off-by: Michael Paul Killian <spammyreset-github@gmail.com>
 2020-09-06 13:53:03 +02:00
Michael Paul Killian
538827397c
Update index.php 
See #3736
 2020-09-06 11:51:33 +02:00
Adam Warner
b8cd238fa1
Update advanced/Scripts/piholeDebug.sh 
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
 2020-08-23 14:35:02 +01:00
Adam Warner
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
Dan Schaper
ebdb68a47a
display_warning fixes 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2020-08-15 10:54:31 -07:00
Dan Schaper
623ce1fe18
Tabs and debug.sh 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2020-08-14 14:37:58 -07:00
Adam Warner
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
Samuel Boucher
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
Samuel Boucher
8b4921405a Upercase the temp_unit 
Signed-off-by: Samuel Boucher <scboucher@users.noreply.github.com>
 2020-08-09 15:09:49 -04:00
Nathan Friend
5a48478196
Update "About Pi-hole" link 
Signed-off-by: Nathan Friend <nathan@gitlab.com>
 2020-08-01 20:00:49 -05:00
Aiden Mitchell
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
DL6ER
8f7f0881c6
Add /usr/sbin to cronjob PATH 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-07-21 21:21:24 +02:00
DL6ER
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
Adam Warner
f50cff54de
*innocent whistling* 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-07-15 23:49:17 +01:00
Adam Warner
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
Adam Warner
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
Adam Warner
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
Adam Warner
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
XhmikosR
d8822b70cf Fix minor typo 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-07-05 15:12:02 +03:00
XhmikosR
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
Adam Warner
f5a5f68a1a
Merge pull request #3403 from XhmikosR/XhmikosR-patch-1 
Fix/tweak blocking page
 2020-07-02 10:27:16 +01:00
Adam Warner
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
Dan Schaper
3aaf9d89b3
Merge pull request #3260 from pi-hole/new/rev-server 
Improve conditional forwarding
 2020-06-21 13:26:07 -07:00
DL6ER
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
DL6ER
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
Adam Warner
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
Adam Warner
011fa8c6ea
fix sticklr complaint 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-13 21:47:00 +01:00
Adam Warner
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
Dan Schaper
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
Adam Warner
03a8cff55e
read > mapfile as suggested by @dschaper 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-05 21:01:53 +01:00
DL6ER
2b1bc6a46e
Replace possible "\#" by "#". This fixes AdminLTE#1427 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-04 09:32:40 +02:00
DL6ER
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
DL6ER
318ca75269
Merge branch 'development' into new/rev-server 2020-06-04 08:56:08 +02:00
Adam Warner
58724a38a9
Improve detection and display of supported/unsupported OS in debug script 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-03 17:57:22 +01:00
DL6ER
202ba055ea
Change UNIQUEness constraint from (domain) to (domain, type) in the domainlist table. This will allow duplicates which can be associated to different groups. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 10:49:35 +02:00
XhmikosR
d90313fe4d Fix/tweak blocking page 
* fix favicon
* add meta charset
* add html lang
* add a page title
* remove unneeded html end tags
* fix viewport tag to allow zooming
* compress the "blocked by Pi-hole" SVG
* remove trailing spaces
* switch to double colon pseudo elements (works from IE9 and newer)
* add missing vendor prefixes
* other minor tweaks
* add `Access-Control-Allow-Origin` header to all font types

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-31 15:54:11 +03:00
XhmikosR
7579ab178a Update links 
* use https when possible
* replace coverage with a link to the docs page in README.md
* remove obsolete affiliate link in README.md

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-30 21:50:16 +03:00
Thomas L. Kjeldsen
903808a477 Improved explanation of why this script is needed 
Signed-off-by: Thomas L. Kjeldsen <tlk@closureconsulting.com>
 2020-05-30 03:14:03 +02:00
Thomas L. Kjeldsen
005da06b3d Use PI_HOLE_BIN_DIR as introduced in PR #2886 
Signed-off-by: Thomas L. Kjeldsen <tlk@closureconsulting.com>
 2020-05-30 03:13:51 +02:00
Thomas L. Kjeldsen
852f6b95f5 Prevent "pihole disable $timeout" from messing up future state changes 
Signed-off-by: Thomas L. Kjeldsen <tlk@closureconsulting.com>
 2020-05-30 02:58:27 +02:00
DL6ER
de8976da7a
Add CAP_SYS_NICE to FTL's capabilities so it can control its own niceness. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-28 21:18:31 +02:00
DL6ER
b60ec8a48f
Merge pull request #3248 from MichaIng/patch-8 
Start pihole-FTL after network
 2020-05-25 21:27:27 +02:00
DL6ER
27f0fd2372
Merge pull request #3415 from fhriley/reload_privacy 
Reload the lists, which will cause the cached privacy level to be upd…
 2020-05-25 18:47:44 +02:00
Adam Warner
d0e250a616
Ensure pihole-FTL.conf is parsed, as well as external.conf for lighttpd, to rule out any custom modifications. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-21 22:25:00 +01:00