Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-01 02:23:21 +00:00
Code Issues Projects Releases Packages Wiki Activity
6018 commits 8 branches 109 tags 27 MiB
Commit graph

6018 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
pvogt09
4386cc4f22 Revert "add test case for installation of dependencies for installer, core and web" 
This reverts commit 60a4814ac1.

Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
 2020-10-27 12:44:57 +01:00
pvogt09
cb49ce38f5 fix stickler errors 
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
 2020-10-27 12:32:23 +01:00
pvogt09
3128d14d1f update images to versions supported by pi-hole 5 
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
 2020-10-27 12:02:57 +01:00
pvogt09
bef9cd3bc2 mock whiptail to add universe repo 
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
 2020-10-27 11:35:49 +01:00
pvogt09
60a4814ac1 add test case for installation of dependencies for installer, core and web 
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
 2020-10-27 11:35:48 +01:00
pvogt09
fec1595183 add docker containers for debian 9 and 10, ubuntu 16 and 18, fedora 28 and 29 
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
 2020-10-27 11:34:27 +01:00
Adam Warner
3e79e0b1ab
Merge pull request #3625 from pi-hole/new/tests 
Update Test suite
 2020-10-26 21:32:48 +00:00
Adam Warner
c80f0766c5
drop debian/fedora container versions to lowest supported 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-10-26 17:56:17 +00:00
Adam Warner
fb454ebe14
fix stickler complaints 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-10-23 23:09:07 +01:00
Adam Warner
ee556088b5
Fake OS details in /etc/os-release and confirm install fails 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-10-23 23:05:41 +01:00
bcambl
660c17814d
E128 continuation line under-indented for visual indent 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2020-10-23 22:20:37 +01:00
bcambl
a7c58e7112
E302 expected 2 blank lines, found 1 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2020-10-23 22:20:36 +01:00
bcambl
05b6717187
test PHP optin/optout separately for CentOS 7 & 8 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2020-10-23 22:20:36 +01:00
bcambl
2c461460db
test with both centos7 and centos8 images 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2020-10-23 22:20:36 +01:00
Adam Warner
5aab68ab41
Update test/test_automated_install.py 
Co-authored-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
 2020-10-23 22:20:36 +01:00
Adam Warner
5648ad6b61
[Experiment] up python to 3.7 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-10-23 22:20:36 +01:00
Adam Warner
c9edcfa335
add test to check "os_check" works 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-10-23 22:18:42 +01:00
Adam Warner
33e5735053
Change base images for test containers to latest supported version 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-10-23 22:18:42 +01: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
de02bcc8a0
Merge pull request #3787 from pi-hole/verdantfire 
fixed small grammatical error
 2020-10-19 10:53:41 +01:00
DL6ER
83f2e2d85a
Merge pull request #3801 from pi-hole/new/armv4_armv5_armv8 
Add native ARMv4T, ARMv5TE and ARMv8-A support
 2020-10-18 19:53:56 +02:00
DL6ER
01c9bbd3ca
Improve processor detection to use the new dedicated ARMv4T, ARMv5TE and ARMv8-A binaries we provide for FTL. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-10-14 20:31:22 +02:00
DL6ER
e93d7ad8ff
Merge pull request #3803 from pi-hole/privacylevel 
Remove references to privacy level 4 (no longer functional)
 2020-10-14 14:05:20 +09: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
Dan Schaper
326168509c
Merge pull request #3798 from bcambl/debug_firewalld 
add FirewallD configuration checks to debug script
 2020-10-12 12:37:20 -07: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
MichaIng
615b19c3d6
web server question enhancements (#3225) 
+ Do not ask to install the web server, if the web interface has been deselected before.
+ Add additional info, that PHP modules need to be installed manually, when web server is deselected and the web server user needs to be member of the "pihole" group.
+ Consequently use webroot variable instead of /var/www/html

Signed-off-by: MichaIng <micha@dietpi.com>
 2020-10-09 16:12:21 +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
Adam Warner
716e981a79
Merge pull request #3776 from yubiuser/tweak/Debug 
Print tail of logs in /var/log/lighttpd in debug run as well
 2020-10-09 13:50:46 +01:00
verdantfire
b88efd2527
fixed small grammatical error 
Co-authored-by: Himanshu Ruhela <himanshuruhela013@gmail.com>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-10-09 13:46:25 +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
Adam Warner
fa0815fb1d
Merge pull request #3763 from yubiuser/cleanup 
Remove traces of previous default adlists
 2020-09-28 08:53:08 +01:00
Christian König
e9796d5671 Remove traces of previous default adlists 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2020-09-28 06:15:46 +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
Adam Warner
d6c4f0696f
Merge pull request #3698 from yubiuser/remove/FreeSpaceCheck 
Remove check for free disk space and associated variables
 2020-09-21 08:47:41 +01: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
Blayne Campbell
4d98e156b6
Merge pull request #3607 from cgzones/selinux 
basic-install: document how to continue after SELinux check
 2020-09-16 23:54:05 -06:00
DL6ER
5db45aed8b
Merge pull request #3178 from jlagermann/wormhole 
added instructions for forking and rebase
 2020-09-08 22:58:43 +02:00
Dan Schaper
b865fa7c0a
Merge pull request #3739 from pi-hole/tweak/remove_gravity_optimization 
Remove extra gravity optimization flag
 2020-09-07 14:23:54 -07: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