Adam Warner
f8af1a1baa
Allow iFrame for teleporter.php, see https://github.com/pi-hole/AdminLTE/pull/1231
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-10-07 00:16:07 +01:00
yubiuser
f3acc7c839
Make debug log file size human readable ( #4350 )
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2021-10-06 15:19:25 -07:00
Adam Warner
55dce14655
Add execution bit accidentally dropped in #4106 ( #4368 )
...
Add some smoke tests for the repository.
- Add x bit to piholeCheckout.sh. Possibly not needed, but consistency is no bad thing
- Ensure all files in script directorys have executable bit set
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-10-05 19:34:51 +01:00
Andras Tim
541257849d
List fix: no reload ( #3981 )
...
* scripts/list: Fixed --noreload options
We should differentiate the ability and the needings.
Signed-off-by: Andras Tim <andras.tim@gmail.com>
* scripts/list: Removed unnecessary tailing whitespaces
Signed-off-by: Andras Tim <andras.tim@gmail.com>
* Update advanced/Scripts/list.sh
Signed-off-by: Andras Tim <andras.tim@gmail.com>
* Merge bash conditions according to MichaIng suggestion
Co-authored-by: micha@dietpi.com
Signed-off-by: Andras Tim <andras.tim@gmail.com>
2021-10-05 15:52:51 +01:00
yubiuser
38bb4a4908
Remove unused wildcard_regex_converter.sh ( #4369 )
...
* Remove unused wildcard_regex_converter.sh
Signed-off-by: Christian König <ckoenig@posteo.de>
* Remove regexconverter
Signed-off-by: Christian König <ckoenig@posteo.de>
2021-10-05 13:09:16 +01:00
DL6ER
b755330f4c
Remove local-ttl from set of default dnsmasq options.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-09-24 11:34:05 +02:00
yubiuser
6d670991c3
Perform a check of required packages befor updating pihole ( #4326 )
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2021-09-12 13:38:55 -07:00
Adam Warner
62f29ba3fa
Merge branch 'release/v5.4' into development
2021-09-11 21:35:11 +01:00
DL6ER
89b1cfcd85
Merge pull request #4243 from yubiuser/debug_dnsmasq
...
Include all files in the dnsmasq config dir in the debug output
2021-09-11 22:20:00 +02:00
Adam Warner
89e187947e
Merge pull request #4282 from pi-hole/new/RFC6761
...
Install RFC6761 config file
2021-09-11 20:44:46 +01:00
Adam Warner
d2faa93241
Merge pull request #4314 from pi-hole/fix/capabilities
...
Add possibly missing capabilities
2021-09-11 20:44:24 +01:00
DL6ER
0df099a6a5
Merge pull request #4312 from yubiuser/debug_dnsmasq.conf
...
Add content of /etc/dnsmasq.conf to debug output
2021-09-11 21:42:36 +02:00
DL6ER
482ac12c9b
Merge pull request #4275 from MichaIng/patch-4
...
Remove ineffective Access-Control-Allow-Origin header
2021-09-11 21:41:49 +02:00
DL6ER
d0e8b0c962
Forward unqualified names to the CF target only when the "Never forward non-FQDN" option is NOT ticked
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-09-09 20:28:33 +02:00
Dan Schaper
d48d3aba69
Merge pull request #4305 from pi-hole/tweak/debug_curl
...
Use --no-progress-meter instead of --silent so error reasons are printed
2021-09-07 09:33:25 -07:00
DL6ER
cbc99d45c6
Small style change to finished debug upload display
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-09-07 11:21:34 +02:00
DL6ER
be68a5339c
Apply same improvement to pihole tricorder feature
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-09-07 11:16:40 +02:00
DL6ER
606b05eec1
Ensure curl is either storing a valid token or a meaningful error message
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-09-07 11:13:09 +02:00
DL6ER
a1ee7d92a9
Add possibly missing capabilities
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-09-06 22:38:16 +02:00
Christian König
6941155572
Add content of /etc/dnsmasq.conf to debug output
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2021-09-06 17:16:36 +02:00
Christian König
6fec4acd82
Add content of /etc/resolv.conf to debug output
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2021-09-05 20:44:39 +02:00
DL6ER
b241a19e87
Use --no-progress-meter instead of --silent so error reasons are printed
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-08-30 21:19:47 +02:00
DL6ER
21897d7fbd
Add warning if curl failed
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-08-30 15:55:42 +02:00
DL6ER
06fd8123c3
Also remove "rev-server" lines when rewriting 01-pihole.conf
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-08-20 16:26:17 +02:00
DL6ER
c2f3477a82
Ensure conditional forwarding will forward unqualified host names if we have no local answer for them.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-08-20 15:54:25 +02:00
DL6ER
e8e8104b36
Remove server=/local/ because of https://github.com/pi-hole/pi-hole/pull/4282#discussion_r689112972
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-08-15 18:37:12 +02:00
DL6ER
ea5a3bf0b2
Install RFC6761 config file
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-08-15 11:21:24 +02:00
Adam Warner
c88c943cda
Merge branch 'release/v5.4' into dev-release5.4
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-08-13 20:24:35 +01:00
MichaIng
3ef90a9e47
Remove ineffective Access-Control-Allow-Origin header
...
The Access-Control-Allow-Origin header has only relevance, when a resource is loaded from an external host, so one that does not match the host of the primary loaded website. As the fonts are reasonably loaded via local URLs without hostname or scheme from the blocking page style sheet, they are never seen as external resources, regardless whether the blocking page is shown to the browser from a blocked domain or from the Pi-hole domain/IP.
For reference: https://github.com/pi-hole/pi-hole/issues/3462
Signed-off-by: MichaIng <micha@dietpi.com>
2021-08-13 20:42:51 +02:00
Christian König
676b7e60f3
Fix Splashpage not appearing properly on non-root directories
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2021-08-12 13:55:40 +02:00
DL6ER
43b88cd628
Merge pull request #4236 from MichaIng/patch-4
...
Update pihole-FTL.service
2021-08-10 16:09:41 +02:00
yubiuser
ee749f700f
Add switching 'to...from' message to ftl checkout output ( #4266 )
...
* Add switching 'to...from' message to ftl checkout output
Signed-off-by: Christian König <ckoenig@posteo.de>
* Add quotes
Signed-off-by: Christian König <ckoenig@posteo.de>
2021-08-07 20:07:45 +02:00
yubiuser
bb7c7cdf33
Add uptime to debug log ( #4265 )
...
* Add uptime to debug log
Signed-off-by: Christian König <ckoenig@posteo.de>
* Address github comments
Signed-off-by: Christian König <ckoenig@posteo.de>
2021-08-07 20:07:14 +02:00
Adam Warner
913dcead7f
move chmod/chown of macvendor.db to pihole-FTL.service
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-08-05 19:02:36 +01:00
Dan Schaper
b729a44209
Merge pull request #4246 from pi-hole/tweak/debug_noipcheck
...
Remove comparison of IP addresses with setupVars.conf
2021-08-05 09:34:08 -07:00
Adam Warner
5a55fa5e48
Merge pull request #4263 from pi-hole/tweak/debugports
...
Update debug for new back end.
2021-08-05 17:12:37 +01:00
Adam Warner
d419eaf463
Merge branch 'development' into release/v5.4
2021-08-05 17:05:12 +01:00
Dan Schaper
2ec4e84db4
Merge branch 'development' into fix-logrotate-conflict
2021-08-05 07:45:31 -07:00
Dan Schaper
075b3f6468
Remove ports, nc option and fix wording.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2021-08-04 20:57:09 -07:00
Christian König
d2c75a33d5
Increase width of ID column in adlist and domain table in debug script
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2021-08-04 20:13:41 +02:00
Christian König
aa2da80768
Remove traces of unused files
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2021-07-28 23:06:01 +02:00
Christian König
b05fc5bb2b
Remove specific dnsmasq config files from requiered files
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2021-07-28 23:01:18 +02:00
Christian König
c99c86af7f
Make all dir list output human readable
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2021-07-28 22:53:30 +02:00
Christian König
f552173be3
Resolve merge conflict
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2021-07-28 22:51:04 +02:00
DL6ER
d02aa3ced1
Fix error on checking interfaces that are not dual-stack
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-07-28 22:34:55 +02:00
DL6ER
fbfec961d5
Remove comparison of IP addresses with setupVars.conf
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-07-28 21:16:19 +02:00
Christian König
0c125eba2c
Make output of SHM dir human readable
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2021-07-27 22:04:30 +02:00
MichaIng
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>
2021-07-24 14:55:54 +02:00
Kenneth Chew
092e533a30
Add -t
option to Admin Console help dialog
...
Signed-off-by: Kenneth Chew <kenneth.c0@protonmail.com>
2021-07-18 14:31:37 -04:00
Adam Warner
3b6e6317b8
Merge pull request #4126 from lightswitch05/feature/support-and-test-debian-bullseye
...
Support and test Debian Bullsye (11) and Ubuntu 21.04
2021-07-15 19:11:26 +01:00
Faye Duxovni
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>
2021-07-09 20:00:10 -04:00
Daniel
fdca19e66d
Support and test Debian Bullsye (11)
...
Signed-off-by: Daniel <daniel@developerdan.com>
2021-07-07 19:09:54 +00:00
Adam Warner
c9e341b5d4
Same change as with #4221 , but on fedora config too
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-07-07 19:20:14 +01:00
Daniel
31a096dec2
Remove mod_compress (mod_deflate) from lighttpd to provide backwards compatible support for Debian Bullseye (11)
...
Signed-off-by: Daniel <daniel@developerdan.com>
2021-07-07 13:31:59 +00:00
DL6ER
a0d74d1e9d
Canary domain handling is now happening in FTL where we have much finer control over it.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-07-04 13:55:47 +02:00
Adam Warner
0cbf77eb9f
Merge pull request #4131 from pi-hole/fix/gravity_no_locallist
...
Handle pi.hole and hostname in FTL instead of local.list
2021-07-04 11:52:30 +01:00
Adam Warner
e80e54a61a
head_line -> line
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-07-04 01:18:46 +01:00
Adam Warner
9b9e907013
Merge branch 'development' into debug_tail_log
2021-07-04 00:53:14 +01:00
Adam Warner
4ac4bc5c18
Merge branch 'development' into fix/gravity_no_locallist
2021-07-04 00:48:09 +01:00
Adam Warner
a1d85155fd
Merge pull request #4178 from pi-hole/fix/custom_dns_removal
...
Add missing sed anchors when deleting lines.
2021-07-04 00:35:00 +01:00
Dan Schaper
01764cc581
Explicity declare values for the RA packet.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2021-06-20 10:28:25 -07:00
Christian König
08cf9aa5a7
Declare and assign 'logging_enabled' separately
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2021-06-19 12:25:38 +02:00
Christian König
1ae67e1de8
Only inform user about disabled logging, don't skipp printing pihole.log
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2021-06-19 12:25:38 +02:00
Christian König
f2cba6cad1
Skip analyze_pihole_log if query logging has been disabled
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2021-06-19 12:25:38 +02:00
Christian König
df3c46349a
Add tail of pihole.log to debug output
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2021-06-19 12:25:38 +02:00
DL6ER
a9e761ec13
Add missing sed anchors when deleting lines.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-05-23 12:11:04 +02:00
Adam Warner
5895690b58
this has been annoying me for months
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-04-24 15:38:27 +01:00
DL6ER
3b574096b8
Remove duplicated lo test
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-04-16 12:28:00 +02:00
DL6ER
58905a1188
Modify debugger to test name resolution on all available interfaces
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-04-16 12:14:05 +02:00
Dan Schaper
9b57f7fa33
Merge pull request #4120 from pi-hole/fix/splashPage
...
Add missing closing single quote
2021-04-14 13:50:45 -07:00
Dan Schaper
866045968d
Add missing closing single quote
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2021-04-14 12:27:36 -07:00
Adam Warner
b388ac5bb5
Merge pull request from GHSA-3597-244c-wrpj
...
Add some validation to passed arguments before running the values through `sed`
2021-04-14 18:16:46 +01:00
Adam Warner
ea451e3c22
Merge pull request #4095 from jbaez/ft-3896
...
Fix error trying to access undefined variables on splash page.
2021-04-12 20:41:25 +01:00
Jaime Baez
6198165df8
Fix error trying to access undefined variables on splash page.
...
Signed-off-by: Jaime Baez <j.baezcastillo@gmail.com>
2021-03-26 23:42:11 +01:00
Adam Warner
45d4ab4c22
Add some validation to passed arguments before running the values through sed
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-03-19 18:39:43 +00:00
DL6ER
f536718aaa
Use possibly custom gravity.db location in the copying SQL script
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-03-18 16:46:59 +01:00
DL6ER
f1740da9ff
Update gravity path in query.sh
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-03-18 09:58:19 +01:00
DL6ER
9bdbe88a66
Update gravity path in list.sh
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-03-18 09:58:19 +01:00
Dan Schaper
f27fd9f899
Merge pull request #3982 from andras-tim/list-fix-same-wildcard-regex
...
Fix list: User same wildcard regex that the UI use
2021-03-17 11:20:12 -07:00
Dany
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>
2021-03-17 11:18:50 -07:00
DL6ER
57fe3b6621
Merge pull request #3951 from pi-hole/new/gravity_adlist_infos
...
Store gravity details in gravity.db adlist table
2021-02-28 17:01:19 +01:00
Adam Warner
56fa9714b5
Merge pull request #4010 from mtzfederico/master
...
Updates lighttpd config to allow a persistent port change on IPv6
2021-02-28 14:42:21 +00:00
Christian König
78027bd2bf
Add default noname if hostname is empty
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2021-02-12 20:25:01 +01:00
Christian König
7dc7cbb80e
Add hostname to teleporter backup file if called from cli
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2021-02-11 19:45:32 +01:00
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