David Irvine
c6da1a3918
Fix documentation; add some missing zones
...
Signed-off-by: David Irvine <aviddiviner@gmail.com>
3 years ago
Christian König
c1eb35a35e
Add custom.list (Local DNS Records) to debug log
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
596689b4c9
Validate host/domain of Local DNS records as well
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
a872fabe7d
Validate on removal as well
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
bc21a7155d
Add option to not reload
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
b7bba6a689
Validate when adding not when removing
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
DL6ER
16fb6665ec
Merge pull request #4380 from pi-hole/df
...
Include df -h in debug log
3 years ago
Christian König
d84da71310
Only show lines not containing sensitive keywords
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
77a30ac0c2
Use mapfile
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
DL6ER
19ae9d3ee6
Merge pull request #4375 from pi-hole/companion/adminlte-1231
...
Companion to pi-hole/adminlte #1231
3 years ago
DL6ER
d03aa0c0c7
Merge pull request #4379 from pi-hole/tweak/vw_adlist
...
Simplify vw_adlist
3 years ago
yubiuser
3c41ec08a3
Set file permission for querie database in pihole-FTL.service ( #4328 )
...
* Set file permission for querie database in pihole-FTL.service
Signed-off-by: Christian König <ckoenig@posteo.de>
* Use -f flag for chmod of the macvendor.db
Signed-off-by: Christian König <ckoenig@posteo.de>
* Fix missing space
Signed-off-by: Christian König <ckoenig@posteo.de>
* Fix spelling
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
fdc4cf9869
Fix stickler
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
a0ecfcc1dc
Include df -h in debug log
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
b30d729aa4
Simplify vw_adlist
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
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>
3 years ago
yubiuser
f3acc7c839
Make debug log file size human readable ( #4350 )
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
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>
3 years ago
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>
3 years ago
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>
3 years ago
DL6ER
b755330f4c
Remove local-ttl from set of default dnsmasq options.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
yubiuser
6d670991c3
Perform a check of required packages befor updating pihole ( #4326 )
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Adam Warner
62f29ba3fa
Merge branch 'release/v5.4' into development
3 years ago
DL6ER
89b1cfcd85
Merge pull request #4243 from yubiuser/debug_dnsmasq
...
Include all files in the dnsmasq config dir in the debug output
3 years ago
Adam Warner
89e187947e
Merge pull request #4282 from pi-hole/new/RFC6761
...
Install RFC6761 config file
3 years ago
Adam Warner
d2faa93241
Merge pull request #4314 from pi-hole/fix/capabilities
...
Add possibly missing capabilities
3 years ago
DL6ER
0df099a6a5
Merge pull request #4312 from yubiuser/debug_dnsmasq.conf
...
Add content of /etc/dnsmasq.conf to debug output
3 years ago
DL6ER
482ac12c9b
Merge pull request #4275 from MichaIng/patch-4
...
Remove ineffective Access-Control-Allow-Origin header
3 years ago
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>
3 years ago
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
3 years ago
DL6ER
cbc99d45c6
Small style change to finished debug upload display
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
DL6ER
be68a5339c
Apply same improvement to pihole tricorder feature
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
DL6ER
606b05eec1
Ensure curl is either storing a valid token or a meaningful error message
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
DL6ER
a1ee7d92a9
Add possibly missing capabilities
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
Christian König
6941155572
Add content of /etc/dnsmasq.conf to debug output
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
6fec4acd82
Add content of /etc/resolv.conf to debug output
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
DL6ER
b241a19e87
Use --no-progress-meter instead of --silent so error reasons are printed
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
DL6ER
21897d7fbd
Add warning if curl failed
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
DL6ER
06fd8123c3
Also remove "rev-server" lines when rewriting 01-pihole.conf
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
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>
3 years ago
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>
3 years ago
DL6ER
ea5a3bf0b2
Install RFC6761 config file
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
Adam Warner
c88c943cda
Merge branch 'release/v5.4' into dev-release5.4
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
3 years ago
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>
3 years ago
Christian König
676b7e60f3
Fix Splashpage not appearing properly on non-root directories
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
DL6ER
43b88cd628
Merge pull request #4236 from MichaIng/patch-4
...
Update pihole-FTL.service
3 years ago
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>
3 years ago
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>
3 years ago
Adam Warner
913dcead7f
move chmod/chown of macvendor.db to pihole-FTL.service
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
3 years ago
Dan Schaper
b729a44209
Merge pull request #4246 from pi-hole/tweak/debug_noipcheck
...
Remove comparison of IP addresses with setupVars.conf
3 years ago
Adam Warner
5a55fa5e48
Merge pull request #4263 from pi-hole/tweak/debugports
...
Update debug for new back end.
3 years ago
Adam Warner
d419eaf463
Merge branch 'development' into release/v5.4
3 years ago
Dan Schaper
2ec4e84db4
Merge branch 'development' into fix-logrotate-conflict
3 years ago
Dan Schaper
075b3f6468
Remove ports, nc option and fix wording.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
3 years ago
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>
3 years ago
Christian König
aa2da80768
Remove traces of unused files
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
b05fc5bb2b
Remove specific dnsmasq config files from requiered files
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
c99c86af7f
Make all dir list output human readable
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
f552173be3
Resolve merge conflict
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
DL6ER
d02aa3ced1
Fix error on checking interfaces that are not dual-stack
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
DL6ER
fbfec961d5
Remove comparison of IP addresses with setupVars.conf
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
Christian König
0c125eba2c
Make output of SHM dir human readable
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
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>
3 years ago
Kenneth Chew
092e533a30
Add `-t` option to Admin Console help dialog
...
Signed-off-by: Kenneth Chew <kenneth.c0@protonmail.com>
3 years ago
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
3 years ago
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>
3 years ago
Daniel
fdca19e66d
Support and test Debian Bullsye (11)
...
Signed-off-by: Daniel <daniel@developerdan.com>
3 years ago
Adam Warner
c9e341b5d4
Same change as with #4221 , but on fedora config too
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
3 years ago
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>
3 years ago
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>
3 years ago
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
3 years ago
Adam Warner
e80e54a61a
head_line -> line
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
3 years ago
Adam Warner
9b9e907013
Merge branch 'development' into debug_tail_log
3 years ago
Adam Warner
4ac4bc5c18
Merge branch 'development' into fix/gravity_no_locallist
3 years ago
Adam Warner
a1d85155fd
Merge pull request #4178 from pi-hole/fix/custom_dns_removal
...
Add missing sed anchors when deleting lines.
3 years ago
Dan Schaper
01764cc581
Explicity declare values for the RA packet.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
3 years ago
Christian König
08cf9aa5a7
Declare and assign 'logging_enabled' separately
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
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>
3 years ago
Christian König
f2cba6cad1
Skip analyze_pihole_log if query logging has been disabled
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
df3c46349a
Add tail of pihole.log to debug output
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
DL6ER
a9e761ec13
Add missing sed anchors when deleting lines.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
Adam Warner
5895690b58
this has been annoying me for months
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
3 years ago
DL6ER
3b574096b8
Remove duplicated lo test
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
4 years ago
DL6ER
58905a1188
Modify debugger to test name resolution on all available interfaces
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
4 years ago
Dan Schaper
9b57f7fa33
Merge pull request #4120 from pi-hole/fix/splashPage
...
Add missing closing single quote
4 years ago
Dan Schaper
866045968d
Add missing closing single quote
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
4 years ago
Adam Warner
b388ac5bb5
Merge pull request from GHSA-3597-244c-wrpj
...
Add some validation to passed arguments before running the values through `sed`
4 years ago
Adam Warner
ea451e3c22
Merge pull request #4095 from jbaez/ft-3896
...
Fix error trying to access undefined variables on splash page.
4 years ago
Jaime Baez
6198165df8
Fix error trying to access undefined variables on splash page.
...
Signed-off-by: Jaime Baez <j.baezcastillo@gmail.com>
4 years ago
Adam Warner
45d4ab4c22
Add some validation to passed arguments before running the values through `sed`
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
DL6ER
f536718aaa
Use possibly custom gravity.db location in the copying SQL script
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
4 years ago
DL6ER
f1740da9ff
Update gravity path in query.sh
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
4 years ago
DL6ER
9bdbe88a66
Update gravity path in list.sh
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
4 years ago
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
4 years ago
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>
4 years ago
DL6ER
57fe3b6621
Merge pull request #3951 from pi-hole/new/gravity_adlist_infos
...
Store gravity details in gravity.db adlist table
4 years ago
Adam Warner
56fa9714b5
Merge pull request #4010 from mtzfederico/master
...
Updates lighttpd config to allow a persistent port change on IPv6
4 years ago
Christian König
78027bd2bf
Add default noname if hostname is empty
...
Signed-off-by: Christian König <ckoenig@posteo.de>
4 years ago
Christian König
7dc7cbb80e
Add hostname to teleporter backup file if called from cli
...
Signed-off-by: Christian König <ckoenig@posteo.de>
4 years ago
Alexander Schmitz
1ab193fa9d
Update piholeDebug.sh
...
Signed-off-by: Alexander Schmitz <Flashbang007@gmail.com>
4 years ago
mtzfederico
e5bfafefb9
Moved where external.conf is included
...
Signed-off-by: mtzfederico <fm@mtzfederico.com>
4 years ago
freddii
7c0c30fb0b
fixed typos
4 years ago
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>
4 years ago
DL6ER
1791fe22f6
Merge pull request #3912 from mdujava/basic_auth
...
Fix validation of adlist url
4 years ago
DL6ER
e033ee6664
Fix connection mechanism between Chronometer and FTL
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
4 years ago
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>
4 years ago
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 )
4 years ago
Adam Warner
87cf9add8c
Merge pull request #3934 from mwoolweaver/patch-1
...
Fix typo found by #3933
4 years ago
Michael Woolweaver
3a05ac27a2
Fix typo found by #3933
...
Signed-off-by: Michael Woolweaver <m.woolweaver@icloud.com>
4 years ago
DL6ER
41479524f8
Merge pull request #3900 from ganto/fix/chrono-non-lte
...
Fix chronometer output if web interface is not installed
4 years ago
Adam Warner
357b6702ec
Update advanced/Scripts/chronometer.sh
...
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
4 years ago
DL6ER
78cdd34992
Merge pull request #3904 from ganto/fix/debug-non-web-2
...
piholeDebug: Diagnose output if (Web) git directory is not found
4 years ago
Reto Gantenbein
9dc539c98b
piholeDebug: More detailed diagnostics if Web interface is not found
...
Signed-off-by: Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
4 years ago
Reto Gantenbein
18e4eb460c
piholeDebug: Fix version check if lighttpd/php are not installed
...
Signed-off-by: Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
4 years ago
Reto Gantenbein
e841347057
Fix chronometer output if web interface is not installed
...
Signed-off-by: Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
4 years ago
Adam Warner
8443262214
Merge pull request #3890 from ganto/fix/x86-64-arch
...
Ensure x86_64 processor architecture is listed as supported
4 years ago
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>
4 years ago
Reto Gantenbein
d0af1a950b
Ensure x86_64 processor architecture is listed as supported
...
Signed-off-by: Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
4 years ago
DL6ER
a217c75134
Merge pull request #3882 from pi-hole/tweak/conditional_transforms
...
Fix processing of CONDITIONAL_FORWARDING_REVERSE
4 years ago
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>
4 years ago
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>
4 years ago
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>
4 years ago
Adam Warner
58bc98ca44
Update advanced/Scripts/webpage.sh
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
Adam Warner
4093959d3e
Appease stickler
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
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>
4 years ago
Adam Warner
6cb8f3f403
Add some comments
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
Adam Warner
e004d27b28
Fix processing of CONDITIONAL_FORWARDING_REVERSE
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
DL6ER
0711f4d63a
Revert "Enable DNS forwarding loop detection"
4 years ago
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
4 years ago
DL6ER
d4c33e5188
Include the raw messages from the Pi-hole diagnosis systems in debug logs
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
4 years ago
Christian König
70c48afc04
Add else statement
...
Signed-off-by: Christian König <ckoenig@posteo.de>
4 years ago
Christian König
ec5183b553
Rename function
...
Signed-off-by: Christian König <ckoenig@posteo.de>
4 years ago
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>
4 years ago
Adam Warner
1c2c10c4a5
Merge pull request #3761 from BastiG/development
...
read REV_SERVER_CIDR from environment
4 years ago
Adam Warner
e03585e0bb
Merge pull request #3810 from deHakkelaar/patch-5
...
Enable DNS forwarding loop detection
4 years ago
Adam Warner
cd8120d33f
Add some output to the --nuke command
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
Adam Warner
4abd8196ae
Merge pull request #3349 from Forceflow/development
...
Fix for pihole -w --nuke displaying help info even if command is exec…
4 years ago
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>
4 years ago
Craig Mayhew
e5c7549f8f
Fixed potential security issue with $landPage receiving variables
...
Signed-off-by: craigmayhew <craig@mayhew.io>
4 years ago
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
```
4 years ago
DL6ER
50100017a5
Merge pull request #3794 from pi-hole/security/non_FQDNs_locality
...
Security enhancement for the "never forward non-FQDNs" feature
4 years ago
Adam Warner
59b0a6af6f
Remove references to privacy level 4 (no longer functional)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
bcambl
47aa1644a8
add debug checking for firewalld
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
4 years ago
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>
4 years ago
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>
4 years ago
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>
4 years ago
Adam Warner
948337dd8e
Merge pull request #3740 from pi-hole/new/adlist_date_updated
...
Add date_updated field to adlist table
4 years ago
Adam Warner
fe463f15b3
Merge pull request #3741 from pi-hole/new/debug_scan_dhcp
...
Discover active DHCP servers during debugger run
4 years ago
Christian König
568ebd67ca
Update comment
...
Signed-off-by: Christian König <ckoenig@posteo.de>
4 years ago
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>
4 years ago
Sebastian Gmeiner
8041bbf443
read REV_SERVER_CIDR from environment
...
Signed-off-by: Sebastian Gmeiner <sebastian@gmeiners.net>
4 years ago
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>
4 years ago
DL6ER
41e899260f
Discover active DHCP servers during debugger run
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
4 years ago
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>
4 years ago
DL6ER
4fd412d7c3
Add date_updated field in adlist table set when a list changes.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
4 years ago
Michael Paul Killian
5eabf4255b
Sign-off for DCO
...
Signed-off-by: Michael Paul Killian <spammyreset-github@gmail.com>
4 years ago
Michael Paul Killian
538827397c
Update index.php
...
See #3736
4 years ago
Adam Warner
b8cd238fa1
Update advanced/Scripts/piholeDebug.sh
...
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
4 years ago
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>
4 years ago
Dan Schaper
ebdb68a47a
display_warning fixes
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
4 years ago
Dan Schaper
623ce1fe18
Tabs and debug.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
4 years ago
Adam Warner
bb1a6243d6
Merge pull request #3669 from pi-hole/release/v5.1.2
...
Release/v5.1.2 to development
4 years ago
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>
4 years ago
Samuel Boucher
8b4921405a
Upercase the temp_unit
...
Signed-off-by: Samuel Boucher <scboucher@users.noreply.github.com>
4 years ago
Nathan Friend
5a48478196
Update "About Pi-hole" link
...
Signed-off-by: Nathan Friend <nathan@gitlab.com>
4 years ago
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>
4 years ago
DL6ER
8f7f0881c6
Add /usr/sbin to cronjob PATH
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
4 years ago
DL6ER
17aabf26f7
Also use pkill/pgrep in the FTL service script
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
4 years ago
Adam Warner
f50cff54de
*innocent whistling*
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
Adam Warner
849139176e
fallback to NC if curl fails on uploadgit checkout
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
Adam Warner
b8bba7951f
Just one more newline, give it to me.
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
Adam Warner
76ce5ec66b
Add additional information about local debug log location
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
Adam Warner
7b41b99549
Merge pull request #2887 from tlk/fix/reenable
...
Prevent "pihole disable $timeout" from messing up future state changes
4 years ago
XhmikosR
d8822b70cf
Fix minor typo
...
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
4 years ago
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>
4 years ago
Adam Warner
f5a5f68a1a
Merge pull request #3403 from XhmikosR/XhmikosR-patch-1
...
Fix/tweak blocking page
4 years ago
Adam Warner
3205606fc3
Also validate IPV6 in the `setdns` function
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
Dan Schaper
3aaf9d89b3
Merge pull request #3260 from pi-hole/new/rev-server
...
Improve conditional forwarding
4 years ago
DL6ER
2c3aa9ab00
Merge pull request #3491 from pi-hole/fix_ip_address_section
...
Fix fresh install on dev branch not working
4 years ago
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>
4 years ago
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>
4 years ago
Adam Warner
011fa8c6ea
fix sticklr complaint
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
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>
4 years ago
Dan Schaper
5f9dac8d2b
Merge pull request #3434 from pi-hole/new/os_detect
...
Change OS Detection in debug script
4 years ago
Adam Warner
03a8cff55e
read > mapfile as suggested by @dschaper
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
DL6ER
2b1bc6a46e
Replace possible "\#" by "#". This fixes AdminLTE#1427
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
4 years ago
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>
4 years ago
DL6ER
318ca75269
Merge branch 'development' into new/rev-server
4 years ago
Adam Warner
58724a38a9
Improve detection and display of supported/unsupported OS in debug script
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
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>
4 years ago
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>
4 years ago
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>
4 years ago
Thomas L. Kjeldsen
903808a477
Improved explanation of why this script is needed
...
Signed-off-by: Thomas L. Kjeldsen <tlk@closureconsulting.com>
4 years ago
Thomas L. Kjeldsen
005da06b3d
Use PI_HOLE_BIN_DIR as introduced in PR #2886
...
Signed-off-by: Thomas L. Kjeldsen <tlk@closureconsulting.com>
4 years ago
Thomas L. Kjeldsen
852f6b95f5
Prevent "pihole disable $timeout" from messing up future state changes
...
Signed-off-by: Thomas L. Kjeldsen <tlk@closureconsulting.com>
4 years ago
DL6ER
de8976da7a
Add CAP_SYS_NICE to FTL's capabilities so it can control its own niceness.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
4 years ago
DL6ER
b60ec8a48f
Merge pull request #3248 from MichaIng/patch-8
...
Start pihole-FTL after network
4 years ago
DL6ER
27f0fd2372
Merge pull request #3415 from fhriley/reload_privacy
...
Reload the lists, which will cause the cached privacy level to be upd…
4 years ago
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>
4 years ago
Adam Warner
b2ba55c27b
Show details of any remotes on the git repositories
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago