519 Commits

Author	SHA1	Message	Date
DL6ER	7523c49f62	Swapping the databases must be the last step before the cleanup. Otherwise, FTL may be reloading from an only partially completed database causing spurious errors and/or warnings. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2023-10-22 08:14:11 +02:00
RD WebDesign	27522fbc18	Add a final message to gravity ... The terminal version doesn't really need a final message, but this will be read by the web interface to show a success message Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>	2023-10-16 17:19:44 -03:00
Adam Warner	aba41b45b0	Some verbiage change to outputs ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2023-10-04 16:20:38 +01:00
DL6ER	f19a56cf87	Merge branch 'development-v6' into new/antigravity ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2023-09-11 11:43:56 +02:00
Christian König	eca84e0986	Remove user agent when downloading adlists ... Signed-off-by: Christian König <ckoenig@posteo.de>	2023-08-27 14:59:47 +02:00
DL6ER	2a03671fb9	Reinstall gravity cleanup on error ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2023-07-18 08:13:36 +01:00
DL6ER	35512c4dc9	Fix adlist.list migration step failing during tests ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2023-07-18 08:13:36 +01:00
DL6ER	00cbb8bc8a	Add antigravity support to gravity ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2023-07-18 08:13:36 +01:00
Adam Warner	a3bb3872bf	adlist table now contains 11 columns, not 10. ... Co-authored-by: Christian König <ckoenig@posteo.de> Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2023-06-18 21:10:12 +01:00
Christian König	7351a4d3b1	Merge branch 'development' into development-v6 ... Signed-off-by: Christian König <ckoenig@posteo.de>	2023-06-01 15:45:05 +02:00
DL6ER	6c302c9bc8	Adlist properties need to be stored in the new ("temp") database rather than the old. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2023-05-30 17:01:58 +02:00
Adam Warner	ea748822ef	REVISIT: I don't _think_ this line is nessacery. Why should gravity restart FTL if it is offline? It might be offline on purpose. ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2023-05-27 11:53:00 +01:00
Adam Warner	a91eb48d48	Remove some code from gravity that gets values from setupVars.conf / pihole-FTL.conf - use getFTLConfigValue from utils.sh instead ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2023-05-27 11:51:16 +01:00
Adam Warner	cd17040f95	setupVars.conf not existing is no longer a critical error ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2023-05-27 11:51:16 +01:00
Adam Warner	dbc6b814b2	Should not need to reloadDNS manually any more as FTL will detect that it needs to reload by itself ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2023-05-27 11:51:16 +01:00
DL6ER	3695610300	Allow running pihole -g without root (run as user pihole) ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2023-05-27 11:51:16 +01:00
DL6ER	73733308ba	Use parseList function offered by pihole-FTL	2023-05-15 19:25:56 +02:00
Christian König	eaded9fdb1	Remove forgotten variables ... Signed-off-by: Christian König <ckoenig@posteo.de>	2023-05-11 22:16:21 +02:00
Christian König	a3e610dbf2	Don't use '--suffix' in mktemp ... Signed-off-by: Christian König <ckoenig@posteo.de>	2023-05-10 06:52:51 +02:00
yubiuser	cd638b102f	Filter ABP CSS selectors (#5247)	2023-05-04 12:01:20 +02:00
Christian König	dd3a7a4edb	Only delete lines containing separator when preceded by a letter to reduce false positiv (deleting valid comments) ... Signed-off-by: Christian König <ckoenig@posteo.de>	2023-04-08 14:59:26 +02:00
Christian König	d10d59303e	There is no ! but an $ rule ... Signed-off-by: Christian König <ckoenig@posteo.de>	2023-04-07 21:44:49 +02:00
Christian König	aaf828117d	Remove unecessary $cmd_ext ... Signed-off-by: Christian König <ckoenig@posteo.de>	2023-04-07 12:36:50 +02:00
Christian König	9c4e74ffa7	Remove special handling of pgl.yoyo.org ... Signed-off-by: Christian König <ckoenig@posteo.de>	2023-04-07 12:23:11 +02:00
Christian König	2a0f720153	Don't delete lines containing / as they should count as invalid ... Signed-off-by: Christian König <ckoenig@posteo.de>	2023-04-07 10:25:25 +02:00
Christian König	cc17fe18a9	Remove lines with ABP extended CSS selector ... Co-authored-by: Adam Warner <me@adamwarner.co.uk> Signed-off-by: Christian König <ckoenig@posteo.de>	2023-04-07 10:14:59 +02:00
Christian König	61ff5b2c76	Unifiy sed commands ... Co-authored-by: RD WebDesign <github@rdwebdesign.com.br> Signed-off-by: Christian König <ckoenig@posteo.de>	2023-04-07 09:44:31 +02:00
RD WebDesign	66bfa606a7	Using a better text for the comment ... Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>	2023-03-29 14:17:41 -03:00
RD WebDesign	32fb2e69ff	Spliting the regex into TLD_pattern and subdomain_pattern ... Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>	2023-03-29 00:05:01 -03:00
RD WebDesign	c71460e4b6	Allow TLD blocking using ABP style ... This validates patterns without dots (only for abp style), allowing TLDs to be blocked Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>	2023-03-28 17:21:50 -03:00
Adam Warner	0656ceb149	Speed things up a bit with some humble greps. Consolodate regexes and remove the need for so many mapfile/arrays ... Signed-off-by: Adam Warner <me@adamwarner.co.uk> Use temp files for parsing and remove when done. Always rm the non-domains temp file. exit 1 if gravity database creation fails. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net> Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net> Co-authored-by: DL6ER <dl6er@dl6er.de> Co-authored-by: Adam Warner <me@adamwarner.co.uk>	2023-03-25 11:19:23 -07:00
kot0dama	76b7453f90	Add configurable GRAVITY_TMPDIR variable into setupVars ... Signed-off-by: Loïc Gomez <89980752+kot0dama@users.noreply.github.com>	2023-03-22 19:40:24 +09:00
Christian König	71e262c37f	Revert "Allow final dot (root zone)" ... This reverts commit 0b5da9f0da. Signed-off-by: Christian König <ckoenig@posteo.de>	2023-03-14 19:50:53 +01:00
Christian König	0b5da9f0da	Allow final dot (root zone) ... Signed-off-by: Christian König <ckoenig@posteo.de>	2023-03-04 10:36:07 +01:00
Christian König	16385af3ef	Use dedicated pattern variable to make RegEx reusable ... Signed-off-by: Christian König <ckoenig@posteo.de>	2023-02-26 21:16:45 +01:00
Christian König	6cb0be82ca	Add flag abp_domains into info table to signal if abp domains have been found ... Signed-off-by: Christian König <ckoenig@posteo.de>	2023-02-26 10:34:17 +01:00
Christian König	821c7dc190	Add info when list cotains ABP style domains ... Signed-off-by: Christian König <ckoenig@posteo.de>	2023-02-24 22:18:41 +01:00
Christian König	eedd93d782	Remove temporary files ... Signed-off-by: Christian König <ckoenig@posteo.de>	2023-02-24 21:55:22 +01:00
Adam Warner	1f3f849106	Remove lines starting with ! or [ to account for ABP style comments and header ... Also splits the piped "one-liner" in ParseFileIntoDomains into individually commented commands (makes for easier reading and debugging) Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2023-02-22 21:21:38 +01:00
Christian König	ca74152d1d	Allow adding ABP style blocklists ... Co-authored-by: Adam Warner <me@adamwarner.co.uk> Signed-off-by: Christian König <ckoenig@posteo.de>	2023-02-22 21:21:13 +01:00
Christian König	a4bdf2454b	Don't use intermediate strings to filter false positives in gravity ... Signed-off-by: Christian König <ckoenig@posteo.de>	2023-02-16 10:39:21 +01:00
Adam Warner	9939cf1d77	Rename some of the variables to hopefully make the process a little clearer ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2023-01-21 23:57:49 +00:00
Adam Warner	79f4a7cef0	Maintain a list of valid hostnames (taken from the top of StevenBlack's host file), and discount them when calculating the number of "invalid" domains in a given list ... Soften the output message when reporting on unsuable domains Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2023-01-20 18:52:14 +00:00
Christian König	14ab586603	Start counting with 1 ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-12-11 15:12:28 +01:00
Christian König	372070ab39	Improve detection of incorrecr lines during gravity ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-12-11 15:12:28 +01:00
Christian König	4004a93d1a	Don't double check for lines containing no domains in gravity ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-12-11 15:12:28 +01:00
RD WebDesign	090727b1d3	Remove unnecessary return ... Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>	2022-10-17 15:24:49 -03:00
RD WebDesign	8b98fd06ed	Remove unused old code ... Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>	2022-10-16 15:54:24 -03:00
Christian König	230d6a435f	Semi hardcode the connection_timeout value ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-08-31 21:41:57 +02:00
Christian König	53c0982c8b	Set connection timeout for curl ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-08-31 14:43:20 +02:00