Pi-hole/pi-hole

mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-22 14:13:42 +00:00

Author	SHA1	Message	Date
DL6ER	19ae9d3ee6	Merge pull request #4375 from pi-hole/companion/adminlte-1231 Companion to pi-hole/adminlte #1231	2021-10-10 19:03:59 +02:00
DL6ER	d03aa0c0c7	Merge pull request #4379 from pi-hole/tweak/vw_adlist Simplify vw_adlist	2021-10-10 07:11:05 +02:00
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>	2021-10-08 22:54:23 +01:00
Christian König	fdc4cf9869	Fix stickler Signed-off-by: Christian König <ckoenig@posteo.de>	2021-10-08 21:54:50 +02:00
Christian König	a0ecfcc1dc	Include df -h in debug log Signed-off-by: Christian König <ckoenig@posteo.de>	2021-10-08 21:50:46 +02:00
Christian König	b30d729aa4	Simplify vw_adlist Signed-off-by: Christian König <ckoenig@posteo.de>	2021-10-08 21:08:10 +02:00
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
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
Adam Warner	b2ba55c27b	Show details of any remotes on the git repositories Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-05-21 21:23:26 +01:00
Frank Riley	9d04c517e6	Reload the lists, which will cause the cached privacy level to be updated. Signed-off-by: Frank Riley <fhriley@gmail.com>	2020-05-20 15:47:53 -07:00
DL6ER	b421e422c2	Merge pull request #3351 from marank/development Added support for CNAME record add/remove	2020-05-20 09:13:54 +02:00
MichaIng	5c17e41cf1	Start pihole-FTL after network "$network" on a systemd-driven OS leads to "After=network-online.target" in the generated systemd unit. This target is no guarantee that all network interfaces have been fully configured, as it depends on the related network services types, but at least it reduces the risk that those have not fully finished their job when pihole-FTL starts. If this is the case, certain issues can occur: - https://github.com/pi-hole/pi-hole/issues/2924 - https://discourse.pi-hole.net/t/have-to-pihole-restartdns-after-reboot/28772 Runtime files are now consistently created in "/run" instead of "/var/run". The second is a symlink to the first for backwards compatibility but on none-ancient distro versions one should use "/run", systemd even prints a warnings if service files use "/var/run". The service file used "/run" and "/var/run" both, in cases for the same files/directories before, which does not directly cause issues currently, due to the symlink, but is inconsistent at best. Signed-off-by: MichaIng <micha@dietpi.com>	2020-05-16 13:38:18 +02:00
Dan Schaper	10addc5923	Merge pull request #3218 from JulienOrain/patch-1 fix typo	2020-05-14 09:48:59 -07:00
Dan Schaper	c76435883b	Merge pull request #3360 from dnicolson/fix-github-capitalisation Fix GitHub capitalisation	2020-05-13 16:56:36 -07:00
Dave Nicolson	ab753e88a2	Fix GitHub capitalisation Signed-off-by: Dave Nicolson <david.nicolson@gmail.com>	2020-05-13 12:55:00 +02:00
Adam Warner	be25b4d9c4	Merge pull request #3352 from pi-hole/merge-master-dev Merge master dev	2020-05-12 22:27:24 +01:00
Adam Warner	9e96ff37de	Fix merge conflicts Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-05-12 22:16:43 +01:00
DL6ER	a9c66c7b45	Implement pihole -a theme option Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-05-12 23:03:49 +02:00
Matthias Rank	2b9898e9ca	Fixed indentation Signed-off-by: Matthias Rank <development@m-rank.de>	2020-05-12 21:04:30 +02:00
Matthias Rank	0add5eb291	Added support for CNAME record add/remvoe Signed-off-by: Matthias Rank <development@m-rank.de>	2020-05-12 21:02:29 +02:00
Jeroen Baert	4cf241b42b	Fix for pihole -w --nuke displaying help info even if command is executed correctly Signed-off-by: Jeroen Baert <3607063+Forceflow@users.noreply.github.com>	2020-05-12 19:59:19 +02:00
DL6ER	7cc35d3b04	Add update to gravity database version 12, renaming the Unassociated group to Default group. Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-05-07 18:01:37 +02:00
DL6ER	78469ee58d	Merge pull request #3255 from pi-hole/tweak/emailregex Enhanced email validation regex	2020-05-06 09:48:26 +02:00
Adam Warner	369288cc48	Update advanced/Scripts/webpage.sh Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>	2020-05-06 08:40:54 +01:00
Dan Schaper	742d802940	Merge pull request #3027 from XhmikosR/patch-1 Serve JS files with utf-8 charset too	2020-05-05 12:29:27 -07:00
Dan Schaper	017d405b28	Merge pull request #3307 from pi-hole/tweak/debugger_type_display Improve debugger database table printing	2020-04-29 11:48:47 -07:00
DL6ER	ddb354f78b	Add enable indentation for the domainlist Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-04-29 06:23:29 +02:00
DL6ER	20ef5e0264	Show associated group IDs in domains/clients/adlists listing. We get the data through a LEFT JOIN followed by a GROUPing by the left list ID and finialized through a GROUP_CONCATenation. Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-04-24 10:33:46 +02:00
DL6ER	ad5802715e	enabled field: Center 0, right-align 1 Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-04-23 15:16:48 +02:00
DL6ER	989bbad37e	Remove pihole -a hostrecord Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-04-23 13:20:15 +02:00
DL6ER	63f6c6a894	Add indentation for enabled and type fields Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-04-23 10:01:22 +02:00
Adam Warner	d42785a3bf	Merge pull request #3271 from pi-hole/tweak/version Add branch name to pihole -v	2020-04-21 16:07:27 +01:00
DL6ER	401c029dc4	Improve else condition of branch determination Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-04-21 16:08:32 +02:00
DL6ER	0343171703	Add correct displaying for detached HEAD state. Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-04-21 08:54:28 +02:00
DL6ER	176fbaf83b	Ask pihole-FTL for the branch it was compiled from instead of trusting the checkout file to be present. Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-04-21 08:51:17 +02:00
Adam Warner	471006676c	Merge pull request #3227 from pi-hole/new/CLI_domain_comments Add option --comment "whatever" for adding comments for new domains through the CLI interface.	2020-04-19 14:39:05 +01:00
Adam Warner	3cc9ba4ee8	stickler Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-04-18 12:57:06 +01:00
Adam Warner	6dc85c3527	Don't display branch name if it is on master. Prefer cached remote version over github API Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-04-18 12:51:04 +01:00
Adam Warner	851947bbf2	Add branch name to version output Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-04-13 20:58:46 +01:00
Matthias Schoettle	308eb5eda5	Fixes broken blocking page and landing page when changing server port and/or hostname. See issues #2195 and #2720. Signed-off-by: Matthias Schoettle <git@mattsch.com>	2020-04-10 12:29:01 -04:00
DL6ER	093054a1eb	Automatically convert legacy IP range to Class C network Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-04-09 09:49:07 +02:00
DL6ER	4130af0aab	Retain rev-server settings when the feature gets disabled. Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-04-09 09:05:50 +02:00
DL6ER	90a5a13197	Convert CONDITIONAL_FORWARDING to REV_SERVER settings. Try to detect intended CIDR range automatically. Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-04-08 15:35:35 +02:00
DL6ER	982c1b0059	Merge branch 'release/v5.0' into development Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-04-08 12:02:53 +02:00
Adam Warner	26f71e4dbe	accidentally a space Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-04-05 12:34:14 +01:00
Adam Warner	b6ac1585ec	add regex attribution Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-04-05 12:29:45 +01:00
Adam Warner	a9b19df4ec	expand email validation regex to catch more valid emails see comments on PR #3254 Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-04-05 12:28:33 +01:00
M4x	2de5362adc	Sanitize email address in case of security issues (#3254 ) * Sanitize email address in case of security issues Signed-off-by: bash-c <aboultraman@gmail.com>	2020-04-05 10:20:35 +01:00
DL6ER	d1caad76d8	Do not flush neigh cache as this is known to create a number of issues. The better aproach to this is to manually flush the ARP cache by either restarting or calling "ip neigh flush all". Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-04-01 17:19:32 +00:00
Adam Warner	7d19ee1b25	validate blocklist URL before adding to the database (#3237 ) Signed-off-by: Adam Warner <me@adamwarner.co.uk> Co-authored-by: DL6ER <dl6er@dl6er.de>	2020-03-31 21:48:10 +01:00
DL6ER	277179f150	Remove 19036 trust anchor, now expired: https://www.icann.org/resources/pages/ksk-rollover Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-03-27 19:34:41 +01:00
DL6ER	15a9d662ac	Add option --comment "whatever" for adding comments for new domains through the CLI interface. Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-03-27 08:45:04 +01:00
Julien Orain	6d4844a0b3	docs(typo): fix typo Signed-off-by: Julien Orain <julien.orain@gmail.com>	2020-03-18 21:41:54 +01:00
XhmikosR	7b8611ced0	Assorted typo fixes. (#3126 ) * Assorted typo fixes. Signed-off-by: XhmikosR <xhmikosr@gmail.com> Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>	2020-03-08 16:53:14 -07:00
DL6ER	497bfd80a5	Update development from release/v5.0 (#3200 ) * Use bash regex instead of awk. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net> * Fix incorrect type description. (#3201) Signed-off-by: DL6ER <dl6er@dl6er.de> Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>	2020-03-08 16:38:53 -07:00
DL6ER	22ce5c0d70	Fix incorrect type description. (#3201 ) Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-03-08 16:32:37 -07:00
Dan Schaper	bf4fada3b7	Don't quote inside backticks, use unquoted variable. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2020-03-02 09:52:06 -08:00
Dan Schaper	360d0e4e6b	Loop through array of lists. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2020-03-02 08:07:10 -08:00
Dan Schaper	4f390ce801	Use bash regex instead of awk. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2020-03-02 05:39:21 -08:00
Adam Warner	8ecaaba247	Compare daemons to expected results. (#3158 ) (#3159 ) Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net> Co-authored-by: Dan Schaper <dan@glacialmagma.com>	2020-02-24 18:00:19 +00:00
Adam Warner	4a5f344b09	then Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-02-19 17:46:45 +00:00
Adam Warner	af95e8c250	force `updatchecker.sh` run if any of the three components are updated Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-02-19 17:41:53 +00:00
Dan Schaper	c5c414a7a2	Stickler Lint - quote to prevent splitting Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2020-02-16 19:24:05 -08:00
DL6ER	d0e29ab7b0	Add human-readable output of time of the last gravity run. Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-02-16 17:43:54 -08:00
DL6ER	714a79ffce	Migrate debugger to domainlist and add printing of client table. Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-02-16 17:43:54 -08:00
DL6ER	cd3ad0bdc7	Show info table instead of counting domains to speed up the debugging process on low-end hardware drastically. Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-02-16 17:43:54 -08:00
DL6ER	e528903488	Merge pull request #3107 from pi-hole/new/client_comments Add timestamps and comment fields to clients table	2020-02-12 19:35:01 +01:00
DL6ER	92aa510bda	Add timestamps and comment fields to clients. This updates the gravity database to version 11. Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-01-27 10:36:16 +00:00
DL6ER	6b04997fc3	DROP and reCREATE TRIGGERs during gravity swapping. Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-01-27 10:12:05 +00:00
DL6ER	10c2dad48a	Improve gravity performance (#3100 ) * Gravity performance improvements. Signed-off-by: DL6ER <dl6er@dl6er.de> * Do not move downloaded lists into migration_backup directory. Signed-off-by: DL6ER <dl6er@dl6er.de> * Do not (strictly) sort domains. Random-leaf access is faster than always-last-leaf access (on average). Signed-off-by: DL6ER <dl6er@dl6er.de> * Append instead of overwrite gravity_new collection list. Signed-off-by: DL6ER <dl6er@dl6er.de> * Rename table gravity_new to gravity_temp to clarify that this is only an intermediate table. Signed-off-by: DL6ER <dl6er@dl6er.de> * Add timers for each of the calls to compute intense parts. They are to be removed before this finally hits the release/v5.0 branch. Signed-off-by: DL6ER <dl6er@dl6er.de> * Fix legacy list files import. It currently doesn't work when the gravity database has already been updated to using the single domainlist table. Signed-off-by: DL6ER <dl6er@dl6er.de> * Simplify database_table_from_file(), remove all to this function for gravity lost downloads. Signed-off-by: DL6ER <dl6er@dl6er.de> * Update gravity.db.sql to version 10 to have newle created databases already reflect the most recent state. Signed-off-by: DL6ER <dl6er@dl6er.de> * Create second gravity database and swap them on success. This has a number of advantages such as instantaneous gravity updates (as seen from FTL) and always available gravity blocking. Furthermore, this saves disk space as the old database is removed on completion. * Add timing output for the database swapping SQLite3 call. Signed-off-by: DL6ER <dl6er@dl6er.de> * Explicitly generate index as a separate process. Signed-off-by: DL6ER <dl6er@dl6er.de> * Remove time measurements. Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-01-24 09:39:13 -08:00
Dan Schaper	52e2a2610e	Merge pull request #3089 from pi-hole/tweak/gravity_db_10 Add gravity database 9->10 update script	2020-01-24 09:23:34 -08:00
DL6ER	3f9e79f152	Print human-readable timestamps in the debugger's gravity output Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-01-20 20:13:44 +01:00
DL6ER	633e56e8a9	Add gravity database 9->10 update script. Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-01-20 17:59:24 +01:00
DL6ER	276b191845	Remove dead code causing failure from the blocking page. Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-01-19 21:39:49 +01:00
DL6ER	bb30c818ab	Update database version during migration. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-12-30 09:21:30 +00:00
Adam Warner	c944f6a320	Add a new migration script to fix the previous one Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2019-12-29 23:32:31 +00:00
Adam Warner	aa4c0ff329	Don't create trigger with duplicate name until after old table is deleted Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2019-12-29 20:35:11 +00:00
DL6ER	37217ece73	Merge pull request #3049 from pi-hole/tweak/unique_group_name Group table enhancements	2019-12-28 14:19:04 +01:00
DL6ER	cda0133dd1	Revert "Change the regex used for domain validation" This reverts commit `76460f01e9`. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-12-21 11:15:18 +00:00
DL6ER	eda7f40fef	Reinstall trigger that prevents group zero from being deleted. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-12-20 00:42:59 +00:00
DL6ER	e589e665a7	Also add date_added and date_modified fields to group table. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-12-20 00:21:25 +00:00
DL6ER	b32b5ad6e9	Update gravity database to version 8. This enforces uniqueness on the group name. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-12-20 00:09:10 +00:00
DL6ER	e2de199f47	Merge pull request #3037 from pi-hole/new/group_zero Add special group zero to gravity database	2019-12-18 22:36:43 +01:00
DL6ER	a1633123aa	Merge pull request #3035 from pi-hole/fix/query_gravity pihole -q should also scan gravity table	2019-12-16 01:45:10 +01:00
DL6ER	2444296348	Again, Mr. Stickler Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-12-15 11:55:19 +00:00
DL6ER	4be7ebe61f	Scan domainlist instead of view to also catch disabled domains. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-12-15 11:47:53 +00:00
DL6ER	a720fe1789	Add client trigger. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-12-12 22:49:21 +00:00
DL6ER	0b0ec43bf5	Merge pull request #3036 from pi-hole/fix/reload-lists Improve list reloading	2019-12-12 21:37:09 +01:00
DL6ER	f0439c8d12	Add special group zero to gravity database. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-12-12 16:39:02 +00:00
DL6ER	40e8657137	Please Mr. Stickler Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-12-12 11:18:46 +00:00
DL6ER	52dd72dfa5	Ensure output is always correct and also display if domain has been found but is disabled Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-12-12 11:08:19 +00:00
DL6ER	922ce7359c	pihole -q should also scan gravity table Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-12-12 10:58:41 +00:00
DL6ER	5457b2c6ea	Merge pull request #2935 from pi-hole/new/internal-blocking Per-client blocking changes	2019-12-12 09:49:02 +01:00
DL6ER	69a909fc4c	On modification of lists, we should send real-time signal 0 instead of SIGHUP. This also preserves the DNS cache of not-blocked domains. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-12-11 21:47:46 +00:00
Adam Warner	ec09b5843c	Merge branch 'development' into fix/do_not_force_local_resolver	2019-12-11 19:09:02 +00:00
DL6ER	f482156cca	Merge branch 'development' into new/internal-blocking Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-12-09 16:49:16 +00:00
DL6ER	620e1e9c73	Do not force nameserver 127.0.0.1 through resolvconf in pihole-FTL.service Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-12-09 12:23:42 +00:00
DL6ER	8a119d72e2	Ensure database permissions are set up correctly by the service script. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-12-09 12:17:55 +00:00
DL6ER	807a5cfb23	Merge pull request #3015 from pi-hole/tweak/domainlist_table Unite four domain tables into a single domainlist table.	2019-12-08 16:50:22 +01:00
XhmikosR	54d0b9a1b8	Serve JS files with utf-8 charset too Signed-off-by: XhmikosR <xhmikosr@gmail.com>	2019-12-07 13:48:25 +02:00
Adam Warner	eaf1244932	:dominik: Detect binary name before calling FTLcheckUpdate in update.sh Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2019-12-04 20:10:46 +00:00
DL6ER	b6cd7b8e3d	Use more descriptive names instead of directly using the IDs in list.sh Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-12-02 17:27:32 +00:00
Adam Warner	869473172c	remove _ from regex descibers Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2019-12-01 12:50:24 +00:00
Adam Warner	63e407cfdc	Update advanced/Scripts/list.sh Co-Authored-By: DL6ER <DL6ER@users.noreply.github.com>	2019-12-01 12:45:22 +00:00
Adam Warner	0251117c77	Update advanced/Scripts/list.sh Co-Authored-By: DL6ER <DL6ER@users.noreply.github.com>	2019-12-01 12:45:06 +00:00
Adam Warner	44e1455b12	Update advanced/Scripts/list.sh Co-Authored-By: DL6ER <DL6ER@users.noreply.github.com>	2019-12-01 12:44:48 +00:00
Adam Warner	76460f01e9	Change the regex used for domain validation Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2019-11-30 17:45:07 +00:00
Adam Warner	4b8a72fda7	functionise parameter discovery Rename HandleOther to ValidateDomain Capital letters on the new functions Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2019-11-30 16:26:26 +00:00
Adam Warner	edaee4e962	remove redundant function and comments Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2019-11-30 16:02:50 +00:00
Adam Warner	77bfb3fb67	tidy up variable usage in list.sh Remove some that are redundant Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2019-11-30 14:18:12 +00:00
Adam Warner	6a881545b0	tweak wording Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2019-11-30 13:25:32 +00:00
Adam Warner	d0de5fda30	Simplify removal of domain from one list when it is requested for another Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2019-11-30 13:13:26 +00:00
DL6ER	a1f120b2ff	Address stickler's complaint Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-11-30 12:43:07 +00:00
DL6ER	185319d560	Unite four domain tables into a single domainlist table. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-11-30 12:33:51 +00:00
DL6ER	5c6dd3f6f4	Merge pull request #2978 from Mograine/patch-1 Add commands to add/remove custom DNS records	2019-11-29 13:25:09 +01:00
Adam Warner	edcdf9f619	Merge pull request #3003 from pi-hole/fix/tbd FTL always determined.	2019-11-27 09:46:17 +00:00
Mograine	c809c34024	Add user feedback Signed-off-by: Mograine <ghiot.pierre@gmail.com>	2019-11-27 00:28:44 +01:00
DL6ER	037d52104a	New command "pihole -g -r" recreates gravity.db based on files backed up in /etc/pihole/migration_update. This is useful to restore a working version of the database when the user destroyed the original database. Also, update gravity.db to version 5 because of a fix we needed to implement. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-11-26 10:58:39 +01:00
Adam Warner	eeb26e3975	Merge pull request #2990 from chrunchyjesus/unix-compliance make some shebangs comply to posix standard	2019-11-16 12:26:49 +00:00
Adam Warner	12817c09bb	(Squashed commits) Always ensure we have the correct machine arch by storing to/reading from a file rather than depending on global variable that for some reason is not always populated... Signed-off-by: Adam Warner <me@adamwarner.co.uk> no need for global variable Signed-off-by: Adam Warner <me@adamwarner.co.uk> Use a file in the temporary FTL download directory Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net> Local binary variable named to l_binary. Disambiguate from global binary. Allow 'binary' to be shadowed for testing. Use ./ftlbinary in all operations. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net> Revert shadow ability on binary variable. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net> Remove unused tests, binary variable can not be overridden. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net> This should work here, too Signed-off-by: Adam Warner <me@adamwarner.co.uk> binary name is passed through from pihole checkout Signed-off-by: Adam Warner <me@adamwarner.co.uk> Add comments Signed-off-by: Adam Warner <me@adamwarner.co.uk> OK, let's try it this way again Signed-off-by: Adam Warner <me@adamwarner.co.uk> we might be getting somewhere.. squash after this I think! Signed-off-by: Adam Warner <me@adamwarner.co.uk> This is a test to see if it fixes the aarch64 test (we are definitely squashing these commits Signed-off-by: Adam Warner <me@adamwarner.co.uk> fix the rest of the tests Signed-off-by: Adam Warner <me@adamwarner.co.uk> Remove trailing whitespace in the files we've touched here Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2019-11-15 19:49:09 +00:00
Mograine	b93628acb3	Merge branch 'development' of https://github.com/Mograine/pi-hole into patch-1	2019-11-13 09:44:48 +01:00
DL6ER	7f7b9d089c	Merge pull request #2965 from pi-hole/tweak/BackendChangesForAdlistComments backend changes to allow comment when adding new adlist	2019-11-12 21:50:19 +01:00
chrunchyjesus	476975540a	make some shebangs comply to posix standard	2019-11-05 22:33:00 +01:00
Mograine	193ff38ab3	Allow more precise deletion by passing ip as parameter Signed-off-by: Mograine <ghiot.pierre@gmail.com>	2019-10-28 13:21:05 +01:00
Pierre Ghiot	bb8dbe9da5	Update 01-pihole.conf Signed-off-by: Mograine <ghiot.pierre@gmail.com>	2019-10-27 16:55:54 +01:00
Pierre Ghiot	f9d16c2b15	Update webpage.sh Signed-off-by: Mograine <ghiot.pierre@gmail.com>	2019-10-27 16:55:54 +01:00
John Krull	c6f9fe3af2	Fix spelling of the word "permitting" Signed-off-by: John Krull <john.a.krull@gmail.com>	2019-10-15 21:29:55 -05:00
Adam Warner	5bac1ad58b	backend changes to allow comment when adding new adlist Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2019-10-14 22:59:58 +01:00
DL6ER	d883854aad	Use constant for long path. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-10-03 12:12:32 +02:00
DL6ER	756c99653e	Merge branch 'development' into new/internal-blocking	2019-10-03 12:01:27 +02:00
DL6ER	2e0370367c	Print when we upgrade gravity database version. This will make possibly failed upgrades easier to debug. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-09-26 14:02:20 +02:00
DL6ER	3cb4f6d9d4	We cannot create vw_gravity before having created vw_whitelist as the former depends onthe later. This commit changes the order in which the tables are created. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-09-26 13:50:54 +02:00
Adam Warner	61a40c1b43	merge devel into 4.3.2 And Resolve merge conflicts Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2019-09-22 01:16:44 +01:00
DL6ER	a27c7b1398	regex white- and blacklist views need to be re-created as well as we need the ID for storing internally whether or not we try to match a given regex for a specific client. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-09-18 20:58:44 +02:00
DL6ER	7b48431917	Add client_by_group table like we have for the other lists. It stores associations between individual clients and list groups. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-09-09 00:03:57 +02:00
DL6ER	1f36ec48e3	Add use-application-dns.net = NXDOMAIN in ProcessDNSSettings rather than in the template so we can ensure that it will survive config-renewals. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-09-07 23:11:20 +02:00
DL6ER	ff08add7c0	Update vw_whitelist and vw_blacklist to return group_id alongside domain so we can filter if the current client wants to get this domain blocked or not. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-09-07 13:01:36 +02:00
DL6ER	ffc91a6c81	Update view vw_gravity to only return domains from enabled adlists. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-09-07 11:17:53 +02:00
DL6ER	525ec8cd01	Signal to Firefox that the local network is unsuitable for DNS-over-HTTPS Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-09-07 08:44:03 +02:00
DL6ER	a8af2e1837	Store domains without sorting and unifying them first. This allows us to preserve the relationship of the individual domains to the lists they came from. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-09-04 23:14:29 +02:00
DL6ER	aed2e35bc0	Print messages only after removing possible matches in comments. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-09-02 22:39:28 +02:00
DL6ER	a7b44426cd	Merge pull request #2838 from pi-hole/new/whitelist-regex-support Whitelist regex support	2019-09-01 14:23:37 +02:00
Dan Schaper	b9fed8fca6	Merge pull request #2891 from niklasea/development Restore 'pihole -q' hosts format support and improve matching in edge cases	2019-08-30 20:56:52 -07:00
DL6ER	d8eee47ca4	Add dhcp-ignore-names option when enabling DHCP service. We currently remove anything that starts with "dhcp-" to have a clean configuration and removed these lines without noticing when enabling the DHCP server. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-08-28 22:10:26 -07:00
Niklas Elmose Andersen	a3e32d9a15	Properly escape domain regex Dots in domain names should not match any character. Signed-off-by: Niklas Elmose Andersen <mail@niklasea.dk>	2019-08-27 12:13:28 +02:00
Niklas Elmose Andersen	989d1aff60	Restore and improve 'pihole -q' matching Removes regex lookaround which 'grep -E' does not support. Restores support for blocklists in hosts format. Simplifies domain match cleanup logic by eliminating an if-condition. Improves domain matching by eliminating commented domain names, eliminating false positives in a few edge cases. Signed-off-by: Niklas Elmose Andersen <mail@niklasea.dk>	2019-08-26 20:39:56 +02:00
Dan Schaper	03c65dd0e9	Convert hardcoded /usr/local/bin to variable Update pihole script with full path to 'pihole' Variable for webpage.sh 'pihole' call. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2019-08-24 04:49:14 -07:00
DL6ER	6faddfcd3d	Print timestamps in local time zone of the Pi-hole. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-08-23 10:09:52 +02:00
DL6ER	1820c2c598	Merge branch 'development' into new/whitelist-regex-support Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-08-22 14:19:51 +02:00
DL6ER	23b688287f	Fix indentation in query.sh. No functional change in this commit. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-08-22 14:12:58 +02:00
DL6ER	42ccc1ef24	Add support for regex whitelist in "pihole -q". Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-08-22 14:06:42 +02:00
DL6ER	cc40c18f49	Wrap upgrade script commands in a transaction. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-08-22 13:54:46 +02:00
DL6ER	b1838512b2	Explicitly select columns (and their order) when listing the databaes tables. Print timestamps translated to strings instead of printing the integer timestamps. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-08-22 13:39:58 +02:00
DL6ER	e27f50b8e5	Try to obtain PID from PIDFILE. If this fails (file does not exist or is empty), fall back to using pidof + awk Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-08-21 04:38:58 -07:00
DL6ER	484f618685	Use last PID in case pidof returns multiple PIDs for pihole-FTL Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-08-21 04:38:55 -07:00
Jeroen Baert	d3d45a8776	Fix 404 error when browsing to pi.hole (without /admin) (for fedora) Signed-off-by: Jeroen Baert <3607063+Forceflow@users.noreply.github.com>	2019-08-20 11:29:20 -07:00
Jeroen Baert	9f86fd0cb4	Fix for 404 error when browsing to pi.hole (without /admin) Signed-off-by: Jeroen Baert <3607063+Forceflow@users.noreply.github.com>	2019-08-20 11:29:17 -07:00
DL6ER	3e78ed95d4	Fix displaying options for table "group" in the debugger. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-08-17 15:04:04 +02:00
snapsl	20a839fef5	fixed local declaration before assignment Signed-off-by: snapsl <chris.baller@gmx.de>	2019-08-15 11:20:55 +02:00
snapsl	b2d8c4374b	tweaked code style of webpage.sh Signed-off-by: snapsl <chris.baller@gmx.de>	2019-08-14 23:28:13 +02:00
DL6ER	dc93462d42	Group table has only two columns Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-08-06 20:28:00 +02:00
DL6ER	6e2e825a5f	Rename options "pihole --whiteregex" to "pihole --white-regex" for the sake of readability. The same applied for "whitewild" -> "white-wild" Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-08-05 21:10:52 +02:00
DL6ER	af754e3fc4	Rearrange group tables directly next to the tables they refer to. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-08-05 21:08:36 +02:00
DL6ER	06860ed5b4	Group tables have only two columns. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-08-05 21:07:39 +02:00
DL6ER	09190c1735	Only check once for if this is a regex list or not. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-08-05 21:03:47 +02:00
DL6ER	a95b473417	Rearranage if statements to ensure the proper output is shown for wildcard-style filters. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-08-05 20:56:01 +02:00
DL6ER	6f58d58cae	Add --whitewild to help texts and man pages. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-07-22 22:26:27 +02:00
DL6ER	40d0caa70b	Add undocumented --whitewild option that does the same --wild does for the whitelist. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-07-22 21:15:28 +02:00
DL6ER	0692be9bae	Fix small mistake in 2->3 upgrade script. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-07-22 20:59:52 +02:00
DL6ER	0d28dce326	Print group table contents in debug log. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-07-22 20:18:15 +02:00
DL6ER	96031214c6	Add support for whitelist regex filter management via CLI. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-07-22 19:36:11 +02:00
Mark Drobnak	ab3f6dfcc6	Merge pull request #2831 from pi-hole/fix/block-page-adlists Fix block page errors due to gravity DB and changes to queryAds	2019-07-20 14:55:37 -04:00
Mcat12	3ebd43ebf0	Remove outdated adlists.list check and fix empty adlists error message Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-07-19 17:39:00 -07:00
Mark Drobnak	445127accc	Merge pull request #2832 from pi-hole/new/audit_database Migrate audit list to gravity.db database table	2019-07-10 22:55:48 -04:00
DL6ER	420f60b5c7	Add timeout to migration script (1->2). Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-07-10 12:02:07 +02:00
DL6ER	65fdbc85d5	Add timeout to migration script (2->3). Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-07-10 12:01:38 +02:00
DL6ER	87f75c737a	Review comments. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-07-10 12:00:38 +02:00
DL6ER	5ff9052200	Review comments Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-07-09 11:41:44 +02:00
Mcat12	b154dd5f07	Quote calls to read FTL config Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-07-08 19:48:50 -07:00
DL6ER	0683842ec3	Fix typo in 2->3 migration script. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-07-08 21:43:49 +02:00
DL6ER	054c7a2c05	Create new table + view regex_whitelist + rename old regex table to regex_blacklist. This updates the gravity.db version to 3. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-07-08 21:35:31 +02:00
DL6ER	3d3fc2947e	Review comments Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-07-08 19:22:35 +02:00
Mcat12	e8e5d4afda	Get file locations of FTL files from the config Instead of hardcoding the location of certain FTL files (`gravity.db`, `pihole-FTL.log`), read the configured location from FTL's config. The default location is used if no custom location has been configured. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-07-07 18:10:39 -07:00
DL6ER	8382f4d727	Rename table to domain_audit and simplify subroutine addAudit(). Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-07-07 21:21:56 +02:00
DL6ER	be3e198f9a	Address linting errors. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-07-07 10:46:20 +02:00
DL6ER	acc50b709e	Only migrate files once (domain and adlist lists druing initial creation of gravity.db auditlog.list on database upgrade from version 1 to 2. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-07-07 10:33:08 +02:00
DL6ER	efe8216445	Fix further stickler complaint. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-07-06 09:45:07 +02:00
DL6ER	0405aaa3da	Review comments and fixing stickler complaints. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-07-06 09:32:41 +02:00
Mark Drobnak	6bb213e56f	Merge pull request #2826 from Forceflow/development Fix for 404 error when browsing to pi.hole (without /admin)	2019-07-05 17:18:50 -04:00
DL6ER	2fb4256f84	Rename table to "auditlist" Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-07-05 16:28:36 +02:00
DL6ER	82476138c1	Instead of calling sqlite3 multiple times within a loop, we use the ability to add multiple rows within one INSERT clause. This is supported since sqlite3 3.7.11 (2012-03-20) and should be available on all systems. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-07-05 16:09:13 +02:00
DL6ER	5293beeb77	Update audit script to store domains in new database table. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-07-05 14:10:33 +02:00
DL6ER	0c8f5f1221	Remove comment field from audit table Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-07-05 14:06:05 +02:00
DL6ER	4f4a12bb40	Upgrade database if necessary and store audit domains therein. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-07-05 14:03:57 +02:00
DL6ER	1dbe6c83c3	Add database upgrading mechanism for adding the audit table. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-07-05 13:54:18 +02:00
Mcat12	2b5033e732	Add missing spaces found by linter Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-07-04 13:49:39 -07:00
Mcat12	8d9ff550d4	Fix blockpage error if whitelisted, blacklisted, or regex filtered Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-07-04 13:44:14 -07:00
Mcat12	f1733f9c5d	Fetch adlists for the block page from gravity.db Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-07-04 13:11:46 -07:00
Mark Drobnak	92c3c86be4	Merge pull request #2769 from pi-hole/new/arp-flush Add new "pihole arpflush" command	2019-07-04 14:00:16 -04:00
DL6ER	7a1b6fd205	Merge branch 'development' into new/gravity.db_domain_groups	2019-07-03 19:21:55 +02:00
MMotti	04abcb71f6	Fix potential invalid result for pihole -q Signed-off-by: MMotti <matthew.w.motti@gmail.com>	2019-07-03 13:04:57 +01:00
DL6ER	1fe3507bc5	Adlists table was renamed to Adlist. Adapt further places in the code to match the new name. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-07-03 07:56:10 +02:00
Jeroen Baert	9fedafed15	Fix 404 error when browsing to pi.hole (without /admin) (for fedora) Signed-off-by: Jeroen Baert <3607063+Forceflow@users.noreply.github.com>	2019-07-03 04:28:44 +02:00
DL6ER	23b3a9a650	Add DISTINCT to the view\'s SELECT queries to avoid domain duplication in case they are enabled in multiple groups at the same time. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-07-01 09:44:20 +02:00
Jeroen Baert	7b2ac25a52	Fix for 404 error when browsing to pi.hole (without /admin) Signed-off-by: Jeroen Baert <3607063+Forceflow@users.noreply.github.com>	2019-07-01 03:42:02 +02:00
DL6ER	f91421418a	Rename adlists -> adlist table. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-06-30 23:21:10 +02:00
DL6ER	3a14e8b013	Check whitelist_by_group.group_id instead of group.enabled against NULL. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-06-30 23:20:13 +02:00
DL6ER	ad97e95f2f	Add required name column in group table. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-06-30 23:06:15 +02:00
DL6ER	5b01facd73	Fix logix on the views: AND ( OR ) Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-06-30 20:03:22 +02:00
DL6ER	6fe637b9ee	Rename groups -> group Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-06-30 19:43:18 +02:00
DL6ER	94d83dbb2d	Unify the two group tables into a single "groups" table. This allows managing adlists and domains together. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-06-30 19:33:02 +02:00
Mark Drobnak	c9a843b417	Merge pull request #2823 from pi-hole/fix/lighttpd-mime Update with v4.3.1 changes	2019-06-30 13:27:55 -04:00
DL6ER	87c115fc86	Change implementation to use linking tables (domain_groups, adlists_groups). This allows adding domains to multiple lists conveniently. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-06-30 19:04:38 +02:00
RamSet	b5af125be6	Removed line Signed-off-by: RamSet <RamSet@gmail.com>	2019-06-25 15:45:01 -06:00
RamSet	ecc49318f0	Fixed MIME related issue present in lighttpd/1.4.53 Signed-off-by: RamSet <RamSet@gmail.com>	2019-06-25 15:45:01 -06:00
DL6ER	0774c4e5ca	vw_gravity should actually filter using vw_whitelist. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-06-16 18:52:23 +02:00
DL6ER	01850c2128	Automatically recreate standard group after deletion to avoid violating foreign key constraints even if foreign key enforcing is disabled (SQLite's default behavior) Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-06-16 17:15:36 +02:00
DL6ER	cbc210b014	Add adlist_groups and mark group_id columns as NOT NULL. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-06-16 17:05:33 +02:00
DL6ER	c53ee4202b	Add filtering by domain groups to gravity database. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-06-16 16:50:51 +02:00
DL6ER	6996ffa451	Also flush network_addresses table Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-06-15 09:15:12 +02:00
DL6ER	4947350ca5	Add arpflush to help and bash autocompletion Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-06-15 09:08:33 +02:00
DL6ER	c1495b0fa8	Merge branch 'development' into new/arp-flush	2019-06-15 09:04:30 +02:00
MMotti	bcf03647ef	Add comment and remove blankspace Signed-off-by: MMotti <matthew.w.motti@gmail.com>	2019-06-12 16:02:59 +01:00
MMotti	a9d0690f4d	Change the case of some variables Just for consistency Signed-off-by: MMotti <matthew.w.motti@gmail.com>	2019-06-10 18:50:52 +01:00
MMotti	10fbed50f3	Shellcheck Suggesting to use parameter expansion but we need to be able to identify the start of each line Signed-off-by: MMotti <matthew.w.motti@gmail.com>	2019-06-10 18:10:25 +01:00
MMotti	785f1fedd9	Tidy regexp queries Signed-off-by: MMotti <matthew.w.motti@gmail.com>	2019-06-10 17:52:58 +01:00
MMotti	cf21efa103	Minor grammar changes Signed-off-by: MMotti <matthew.w.motti@gmail.com>	2019-06-05 14:36:43 +01:00
MMotti	7613e94ef6	Minor tweaks Mainly for consistency Signed-off-by: MMotti <matthew.w.motti@gmail.com>	2019-06-04 06:06:17 +01:00
MMotti	b49c702f33	Consistency tweak Signed-off-by: MMotti <matthew.w.motti@gmail.com>	2019-06-04 00:03:37 +01:00
MMotti	09532638d5	Read from DB instead of regex.list Signed-off-by: MMotti <matthew.w.motti@gmail.com>	2019-06-04 00:00:25 +01:00
MMotti	97df6d7415	Stickler fix Signed-off-by: MMotti <matthew.w.motti@gmail.com>	2019-06-03 19:56:10 +01:00
MMotti	54bfaa28c1	Fix for regexp queries through pihole -q Taking inspiration from: https://github.com/pi-hole/pi-hole/pull/2346 We will use awk to iterate through each regexp and print any that match the domain query. Signed-off-by: MMotti <matthew.w.motti@gmail.com>	2019-06-03 19:32:59 +01:00
Mark Drobnak	afd28fab03	Merge pull request #2767 from pi-hole/fix/multiple_pihole-FTL_PIDs Improve PID detection in pihole-FTL.service	2019-06-01 01:03:55 -04:00
Mark Drobnak	d92ced6fb6	Merge pull request #2734 from pi-hole/fix/query_black_and_whitelists_database Query black and whitelists database	2019-06-01 00:55:05 -04:00
DL6ER	ae98fde321	Try to obtain PID from PIDFILE. If this fails (file does not exist or is empty), fall back to using pidof + awk Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-05-31 09:18:12 +02:00
DL6ER	9ddce88092	Review comments Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-05-31 08:42:22 +02:00
DL6ER	44f8fcb600	We can print the table name without any extra check as we already returned early in case there are no results. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-05-31 08:39:18 +02:00
Mark Drobnak	814fdcf9b6	Merge pull request #2768 from pi-hole/fix/dhcp-ignore-names Add dhcp-ignore-names option when enabling DHCP service	2019-05-30 22:35:52 -04:00
DL6ER	5060605626	Print table name before entering the loop for the sake of simplicity Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-05-30 21:44:59 +02:00
DL6ER	285e6fe090	Address lint complaints Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-05-30 21:32:35 +02:00
DL6ER	c3023fe681	Add new "pihole arpflush" command to flush both the ARP cache as well as the network table in pihole-FTL.db Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-05-30 21:25:10 +02:00
DL6ER	c5df104a66	Add dhcp-ignore-names option when enabling DHCP service. We currently remove anything that starts with "dhcp-" to have a clean configuration and removed these lines without noticing when enabling the DHCP server. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-05-30 16:41:37 +02:00
DL6ER	f6213d4f4d	Use last PID in case pidof returns multiple PIDs for pihole-FTL Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-05-30 15:26:27 +02:00
Mcat12	bfb99c361c	Note that the gravity size does not include the blacklist entries Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-05-21 17:12:47 -07:00
Mcat12	5796054305	Increase ID column width to 4 Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-05-20 21:59:18 -07:00
Mcat12	a3e1473ac1	Set explicit column widths to prevent text from getting cut off Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-05-20 21:33:09 -07:00
Mcat12	7b5fc60e00	Improve table formatting Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-05-20 21:20:38 -07:00
Mcat12	807ce0af4e	Show whitelist, blacklist, and regexlist details Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-05-20 21:15:22 -07:00
Mcat12	3f05efd60f	Add extra newline Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-05-20 21:02:31 -07:00
Mcat12	03d93aa19a	Update debug script with gravity DB changes Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-05-20 20:58:57 -07:00
Dan Schaper	7de6bbca61	Merge branch 'development' into release/v4.3	2019-05-18 13:18:14 -07:00
Mcat12	8e1bf6e3d4	Merge branch 'development' into new/gravitydb # Conflicts: # advanced/Scripts/list.sh # gravity.sh # pihole	2019-05-12 15:20:52 -07:00
mpiederiet	3220e2b978	Fix for preventing git error message in cron logs Fix to prevent "fatal: No names found, cannot describe anything" git message during scheduled update checks Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-05-11 10:57:44 +02:00
DL6ER	a904c183df	Use printf to escape domain content. This prevents possible SQL injection issues Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-05-04 18:25:11 +02:00
DL6ER	5246b3e496	Explicitly escape backslash in ESCAPE clause. This has been suggested by Stickler bot. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-05-04 13:24:36 +02:00
DL6ER	f80fdd7e83	Improve comments Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-05-04 13:19:50 +02:00
DL6ER	6ba58896d2	Simplify code Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-05-04 13:15:30 +02:00
DL6ER	3aa838bbe4	Implement black- and whitelist searching with SQL statements. We use the ESCAPE clause in the LIKE query as the underscore "_" wildcard matches any single character but we want to suppress this behavior (underscores can be legitimate part of domains) Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-05-04 13:02:14 +02:00
Dan Schaper	5532df24e4	Pi-hole Debug - tricorder upload function calls Fix tricorder upload function calls to use new curl function.	2019-05-03 02:46:27 -07:00
DL6ER	0bc112ce52	Query only those columns we actually use when showing domains on the CLI. Show date of last modification instead of addition date for domains. Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-05-02 17:11:39 +02:00
DL6ER	d46ff1d2d7	Remove UNIQUE on gravity table as the only column is already PRIMARY KEY. Primary keys must contain UNIQUE values, and cannot contain NULL values Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-05-01 22:08:30 +02:00
DL6ER	2f698904e4	Use PRIMARY KEY instead of NOT NULL also in gravity and info tables Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-05-01 18:03:35 +02:00
DL6ER	106f079afc	Improve indentation (single tab) in SQLite template Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-05-01 17:57:23 +02:00
DL6ER	6c1e3a17f7	Remove NOT NULL constraint on list ids as this is implied by PRIMARY KEY (even though most, if not all, examples on the web still use both attributes at the same time) Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-05-01 17:54:29 +02:00
DL6ER	5e26e8245b	Order results of queries to list views by id key Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-05-01 17:51:10 +02:00
DL6ER	983117d788	Add id (primary key, autoincrement) field to lists tables Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-05-01 17:47:15 +02:00
DL6ER	b372f808dd	Fix lint errors Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-05-01 17:06:14 +02:00
DL6ER	bc9b623638	Modify query.sh to use the gravity database Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-05-01 16:56:16 +02:00

... 7 8 9 10 11 ...

2037 commits