pi-hole

mirror of https://github.com/pi-hole/pi-hole synced 2024-12-23 07:18:07 +00:00

Author	SHA1	Message	Date
Christian König	e4a1f3a175	Rename block lists to adlists within the query list functions Signed-off-by: Christian König <ckoenig@posteo.de>	2022-04-04 13:52:26 +02:00
Adam Warner	0d74b27101	Merge pull request #4646 from pi-hole/tweak/debug_message Pool identical messages in debug output	2022-04-02 13:14:44 +01:00
Adam Warner	7fa8cdd03e	Address: - Review Comments - Stickler Complaints	2022-04-02 12:46:07 +01:00
RD WebDesign	5cebceadda	Remove `@` and following character from interface name Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>	2022-03-30 21:32:18 -03:00
Adam Warner	59fc3804be	Make utils.sh posix compatible per request Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-03-16 20:40:25 +00:00
Adam Warner	48138d32b6	Adjust addOrEditKeyValPair to optionally take two or three arguments (adjust test to suit) Add a removeKey function with test update webpage.sh to reference functions in utils.sh (this can likely be abstracted/refactored further) Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-03-16 17:42:01 +00:00
Christian König	48136c5bbc	Add last timestamp Signed-off-by: Christian König <ckoenig@posteo.de>	2022-03-14 19:54:46 +01:00
Christian König	0219e5dfe0	Pool identical messages in debug output Signed-off-by: Christian König <ckoenig@posteo.de>	2022-03-12 21:00:48 +01:00
Adam Warner	0631cb4984	Merge pull request #4645 from rdwebdesign/color_debug_web Generate colorful debug logs to web interface	2022-03-12 18:02:49 +00:00
RD WebDesign	40b96e673b	Allows colorful debug logs via web interface Note: needs the AdminLTE code changes to work. Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>	2022-03-12 02:58:46 -03:00
Christian König	42424b515b	Add getFTLAPIPort function Add ftl_api_port function Signed-off-by: Christian König <ckoenig@posteo.de> Use getFTLAPIPort in pihole Signed-off-by: Christian König <ckoenig@posteo.de> Use default portfile as fallback Signed-off-by: Christian König <ckoenig@posteo.de> Fix stickler Signed-off-by: Christian König <ckoenig@posteo.de> Correct variables Signed-off-by: Christian König <ckoenig@posteo.de> Apply suggestions from code review Co-authored-by: DL6ER <DL6ER@users.noreply.github.com> Add test getFTLAPIPort returing default port Signed-off-by: Christian König <ckoenig@posteo.de> Remove unused code from test_key_val_replacement_works Signed-off-by: Christian König <ckoenig@posteo.de> Add getFTLAPIPort_custom test Signed-off-by: Christian König <ckoenig@posteo.de> Fix output format Signed-off-by: Christian König <ckoenig@posteo.de> Add debugging Signed-off-by: Christian König <ckoenig@posteo.de> Remove debugging and fix function Signed-off-by: Christian König <ckoenig@posteo.de>	2022-02-27 18:16:53 +01:00
DL6ER	91b4233d3a	Add backend option to set rate-limit from the dashboard Signed-off-by: DL6ER <dl6er@dl6er.de>	2022-02-19 14:46:32 +01:00
Christian König	f4286a4d12	Fix log flush with new query database schema Signed-off-by: Christian König <ckoenig@posteo.de>	2022-02-12 23:33:19 +01:00
Adam Warner	08999bf315	Use case insensitive deletion when removing custom CNAME/DNS records in case of manual entries with mixed case having been added Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-02-04 21:16:02 +00:00
Adam Warner	2bd670a3dd	Merge pull request #4582 from lschloetterer/patch-1 add parameter to set filename for teleporter	2022-02-04 20:44:49 +00:00
Lukas Schlötterer	2a0bb5b9ee	Create second entry for teleporter and adjust spacing Signed-off-by: Lukas Schlötterer <80917404+lschloetterer@users.noreply.github.com>	2022-02-04 21:29:23 +01:00
DL6ER	844c4dcdc8	Merge pull request #4584 from pi-hole/fix/gravity_internal_sqlite3 Replace calls to sqlite3 by calls to pihole-FTL sqlite3	2022-02-03 05:45:04 +01:00
Lukas Schlötterer	881d92632c	add hint for custom teleporter filename to help function Signed-off-by: Lukas Schlötterer <80917404+lschloetterer@users.noreply.github.com>	2022-02-01 09:41:57 +01:00
DL6ER	76d4e1209f	Merge pull request #4585 from pi-hole/tweak/sed-add-if-not-exists Replace value for BLOCKING_ENABLED, add if it does not already exist	2022-02-01 07:45:34 +01:00
Adam Warner	77e5121d43	Split new function out into a separte utility script and add a test for it. Can be used in future to organise re/commonly-used code Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-01-30 23:05:28 +00:00
DL6ER	8cbffa179d	Replace remaining sqlite3 calls by calls to our embedded pihole-FTL sqlite3 engine and remove sqlite3 as dependency in the installer. Signed-off-by: DL6ER <dl6er@dl6er.de>	2022-01-30 11:18:17 +01:00
Lukas Schlötterer	bad6d8a59e	add parameter to set filename for teleporter Make it possible to write pihole -a -t myname.tar.gz to configure the filename however you want Signed-off-by: Lukas Schlötterer <80917404+lschloetterer@users.noreply.github.com>	2022-01-28 16:26:57 +01:00
Christian König	7aa28e4a3a	Do a full fetch Signed-off-by: Christian König <ckoenig@posteo.de>	2022-01-22 22:09:15 +01:00
RD WebDesign	6ead24b315	Move space into variable (#4562 ) Signed-off-by: rdwebdesign <github@rdwebdesign.com.br>	2022-01-14 17:00:34 +01:00
DL6ER	ec3a5c2989	Merge pull request #4543 from pi-hole/tweak/debug_ipaddr Include ip addr show and ip route show in debug log	2022-01-09 12:53:37 +01:00
DL6ER	b20b38d44f	Include ip addr show and ip route show for us to help with local-service issues (where hops-away is measured) Signed-off-by: DL6ER <dl6er@dl6er.de>	2022-01-09 12:38:22 +01:00
Christian König	a65a841c56	Remove oneline from ss call Signed-off-by: Christian König <ckoenig@posteo.de>	2022-01-09 07:13:51 +01:00
Adam Warner	3097c8fbdc	Skip the required ports check if installed in docker container. Unpriv'ed containers do not have access to the information required to resolve the service name listening - and the container should not start if there was a port conflict anyway (#4536 ) Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-01-08 13:57:49 +01:00
Christian König	81698ef1ed	Fix Pi-hole status in chronometer Signed-off-by: Christian König <ckoenig@posteo.de>	2022-01-05 21:09:57 +01:00
DL6ER	5823f5e254	Use ss instead of lsof (#4518 ) * Use ss instead of lsof for pihole status checks Signed-off-by: DL6ER <dl6er@dl6er.de> * Use ss FILTER instead of piping into bash Signed-off-by: DL6ER <dl6er@dl6er.de> * Use ss in debug log generation Signed-off-by: DL6ER <dl6er@dl6er.de> * Remove lsof from dependencies Signed-off-by: DL6ER <dl6er@dl6er.de>	2022-01-05 16:41:46 +00:00
Adam Warner	7807a93e10	If PIHOLE_DOCKER_TAG is set, then include that info in the debug run (#4515 ) Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-01-04 21:46:06 +00:00
yubiuser	241e53ed45	Skip debug upload question if called from web interface (#4494 ) * Skip debug upload question if called from web interface Signed-off-by: Christian König <ckoenig@posteo.de> * Suppress upload error if users opt-out from uploading from web interface Signed-off-by: Christian König <ckoenig@posteo.de> * Fix and reverse logic Signed-off-by: Christian König <ckoenig@posteo.de> * Remove addtional space Signed-off-by: Christian König <ckoenig@posteo.de> * Include reviewer's comment :D Co-authored-by: Adam Warner <me@adamwarner.co.uk> Co-authored-by: Adam Warner <me@adamwarner.co.uk>	2022-01-04 19:06:41 +00:00
Omoeba	5b84cd0a61	Fix IPv6 support when Pi-hole is a router Signed-off-by: Omoeba <38597972+Omoeba@users.noreply.github.com>	2022-01-03 04:02:01 -08:00
yubiuser	920cf6de14	Check for updates on master based on tags not commits (#4475 ) * Check for updates on master based on tags not commits Signed-off-by: Christian König <ckoenig@posteo.de> * Fix stickler Signed-off-by: Christian König <ckoenig@posteo.de> * Address reviewer's comments Signed-off-by: Christian König <ckoenig@posteo.de> * Fix stickler again Signed-off-by: Christian König <ckoenig@posteo.de> * Use local git instead of relying on github Signed-off-by: Christian König <ckoenig@posteo.de> * Add --tags Co-authored-by: DL6ER <DL6ER@users.noreply.github.com> Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>	2021-12-22 18:21:44 +00:00
DL6ER	1eb31174a5	Merge pull request #4455 from pi-hole/comment Add comment help text to list function	2021-12-21 22:26:05 +01:00
yubiuser	ff4487ff74	Escape quotes Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>	2021-12-21 22:10:56 +01:00
yubiuser	669f1b0f4a	Address reviewer's comment Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>	2021-12-21 12:58:39 +01:00
DL6ER	31de661bbb	Merge pull request #4414 from pi-hole/debug/custom.list Add custom.list (Local DNS Records) to debug log	2021-12-21 12:37:11 +01:00
DL6ER	c0f454ddfa	Add new interface listening option "bind" (#4476 ) Signed-off-by: DL6ER <dl6er@dl6er.de>	2021-12-20 21:36:19 +01:00
Christian König	b52a3a021d	Add comment help text to list function Signed-off-by: Christian König <ckoenig@posteo.de>	2021-12-06 20:30:37 +01:00
Subhaditya Nath	ba6d700e7e	Fix `pihole -v` output if WebAdmin not installed (#4370 ) * Fix https://github.com/pi-hole/pi-hole/issues/4279 Signed-off-by: Subhaditya Nath <sn03.general@gmail.com> * Don't ignore exit code of version.sh If it exits with a non-zero return code, that means some error occurred, and so it shouldn't be ignored. Signed-off-by: Subhaditya Nath <sn03.general@gmail.com> * Implement changes suggested by @Michalng Signed-off-by: Subhaditya Nath <sn03.general@gmail.com> * Implement changes suggested by @PromoFaux Signed-off-by: Subhaditya Nath <sn03.general@gmail.com> * Always source /etc/pihole/setupVars.conf https://github.com/pi-hole/pi-hole/pull/4370#issuecomment-978149567 Co-authored-by: Adam Warner <me@adamwarner.co.uk>	2021-12-02 20:46:11 +00:00
jbzdarkid	bc8150adfa	Clean up bash script formatting Done with the help of beautysh (a python-based bash formatter) Signed-off-by: jbzdarkid <jbzdarkid@gmail.com>	2021-11-25 14:12:09 -08:00
Christian König	e733553295	Remove unused code from webpage.sh Signed-off-by: Christian König <ckoenig@posteo.de>	2021-11-02 21:22:14 +01:00
Christian König	c1eb35a35e	Add custom.list (Local DNS Records) to debug log Signed-off-by: Christian König <ckoenig@posteo.de>	2021-10-26 22:46:52 +02:00
Christian König	596689b4c9	Validate host/domain of Local DNS records as well Signed-off-by: Christian König <ckoenig@posteo.de>	2021-10-19 21:34:16 +02:00
Christian König	a872fabe7d	Validate on removal as well Signed-off-by: Christian König <ckoenig@posteo.de>	2021-10-17 20:56:08 +02:00
Christian König	bc21a7155d	Add option to not reload Signed-off-by: Christian König <ckoenig@posteo.de>	2021-10-12 19:53:59 +02:00
Christian König	b7bba6a689	Validate when adding not when removing Signed-off-by: Christian König <ckoenig@posteo.de>	2021-10-12 19:32:55 +02:00
DL6ER	16fb6665ec	Merge pull request #4380 from pi-hole/df Include df -h in debug log	2021-10-11 19:09:22 +02:00
Christian König	d84da71310	Only show lines not containing sensitive keywords Signed-off-by: Christian König <ckoenig@posteo.de>	2021-10-11 18:02:47 +02:00
Christian König	77a30ac0c2	Use mapfile Signed-off-by: Christian König <ckoenig@posteo.de>	2021-10-11 17:31:03 +02: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
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
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
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
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	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
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
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
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
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
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
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
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	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
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
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
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
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
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	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
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
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
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
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
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
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
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	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	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	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
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
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	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
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	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	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	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
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	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
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	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

... 4 5 6 7 8 ...

1528 Commits