1863 commits

Author	SHA1	Message	Date
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
DL6ER	d5781fb110	Fix extra space in front on END statement in CREATE TRIGGER commands ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-05-01 16:38:41 +02:00
DL6ER	487718512d	Remove DISTINCT attribute from views. They are not needed as the corresponding data is obtained from fields with UNIQUE attribute so duplications are already prevented at domain insertion. The elimination of the duplication check on imort through the views slightly reduces the load during import (I observed about 8 percent time saved on my NanoPi NEO). ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-05-01 16:37:23 +02:00
pvogt09	8a92fb24c4	Incorporates changes requested by @Mcat12 ... Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>	2019-05-01 11:20:26 +02:00
pvogt09	5c575e73c7	Adds world readable attribute to files created by Pi-hole to circumvent #2724 ... Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>	2019-04-30 22:41:12 +02:00
DL6ER	2180531a84	Add trigger for automatic updates of the date_modified column and improve formating in the gravity.db template ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-04-29 19:43:35 +02:00
Mark Drobnak	6812e8880e	Merge pull request #2705 from pi-hole/fix/chronometer-refresh-arg ... Fix chronometer refresh incorrectly reading the long argument sleep time	2019-04-29 11:43:07 -04:00
DL6ER	a932209143	Set default for date_modified to be the current time ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-04-29 17:21:59 +02:00
DL6ER	efeba594ae	Add support for manipulating adlists from the CLI ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-04-28 21:39:06 +02:00
DL6ER	126f7101ff	Add (optional) date_modified field and use vw_whitelist view in vw_blacklist ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-04-28 14:44:03 +02:00
Mcat12	b320e74921	Improve argument handling ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-04-27 14:05:04 -07:00
Mcat12	add5e4ca5e	Explicitly allow only -r and --refresh in argument handler ... It is already checked, but this make the code explicit. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-04-27 13:39:44 -07:00
DL6ER	b4ae142149	Remove printf escaping (we will realize it differently) and ensure we're using single quotes for strings (although double quotes are possible, too) ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-04-26 20:54:01 +02:00
DL6ER	3fe43ce1d9	Rely on default value (database provided) for date_added when adding a new domain ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-04-26 18:16:04 +02:00
DL6ER	e04dc9d2bb	Remove sqlitekey variable as the first column of the regex table is now called domain as well ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-04-26 17:44:42 +02:00
DL6ER	bd0215524b	Add vw_adlists view which returns only enabled adlists ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-04-26 17:36:00 +02:00
DL6ER	5bb8163674	Change type of whitelist, blacklist, regex, and adlists time column to INTEGER and insert a DEFAULT clause that returns the current Unix time as such an integer ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-04-26 17:26:15 +02:00
DL6ER	a891d64395	We should always exit after displaying a list, even if it is empty ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-04-26 17:13:36 +02:00
DL6ER	6b1d2523e8	Also print datetime a domain was added when listing the domains on the CLI ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-04-26 17:07:16 +02:00
DL6ER	08ee9526ad	Review comments ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-04-26 17:06:01 +02:00
DL6ER	a2a7e80007	Add --web for sending a confirmation string when executed from the web interface. This is necessary as the "Reloading DNS service" message does not always propagate through to the web interface when reloading pihole-FTL takes a while. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-04-25 15:01:13 +02:00
DL6ER	cce66a13b6	Fix output in list.sh when adding a domain that is already present in the target list ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-04-25 14:54:41 +02:00
DL6ER	43bced7997	Add more comments ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-04-25 12:45:08 +02:00
DL6ER	788cd78321	Reduce code duplication and add special handling of | character as it might appear in regex filter string ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-04-25 12:30:38 +02:00
DL6ER	e5d1cb5a2e	Rewrite list.sh to operate on database-based lists ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-04-25 12:10:42 +02:00
DL6ER	61cfd2f9f9	Add adlists table ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-04-24 19:48:06 +02:00
DL6ER	ee4dabeca6	Merge branch 'development' into new/gravitydb ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-04-24 19:12:19 +02:00
DL6ER	de44563301	Remove addn-hosts from 01-pihole.conf ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-04-24 18:51:38 +02:00
Mark Drobnak	d2c7c426de	Fix teleporter backup file extension ... Fixes #2714 Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>	2019-04-22 19:43:26 -07:00
DL6ER	84244b7cd5	Fix indentation in display of branches available during pihole checkout ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-04-16 18:30:04 +02:00
Mcat12	422680ee9f	Fix chronometer refresh incorrectly reading the long argument sleep time ... `-r` worked, but `--refresh` did not. Fixes #2703 Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-04-14 13:03:25 -07:00
Adam Warner	a7f6c9b3a0	Ignore matches that start # using negative lookbehind ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2019-03-29 00:08:04 +00:00
Mark Drobnak	204a4e459b	Merge pull request #2637 from TheNoim/patch-1 ... Support pi hole behind a reverse proxy with ssl	2019-03-13 22:12:00 -04:00
DL6ER	2e17c23333	Don't warn if user is on development as this branch is constantly updated ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-03-02 16:40:59 +01:00
DL6ER	63f3381a2b	Warn user if FTL is not on branch master ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-03-02 16:36:49 +01:00
Dan Schaper	71cd6c137b	Use curl instead of openssl for transmission of unmodified ... log file. We want ansi color codes to be sent. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2019-02-23 04:13:44 -08:00
DL6ER	0e14d11a20	Merge branch 'development' into new/gravitydb	2019-02-22 23:06:17 +01:00
Adam Warner	a145f1d931	Be more verbose with debug script output ... If output of `git status -s` is non-null display changes if output of `git diff` is non-null, display diff Signed-off-by: Adam Warner <adamw@rner.email>	2019-02-18 22:32:53 +00:00
Nils Bergmann	cd9fadbc44	Remove protocol determination ... No protocol determination is neede, if you just use double slash. Signed-off-by: Nils Bergmann <nilsbergmann@noim.io>	2019-02-16 15:32:56 +01:00
DL6ER	5ca1bfc11c	Delete /dev/shm/FTL-* files on (re)start of pihole-FTL ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-02-08 15:00:35 +01:00
DL6ER	644ec36e64	Review comments ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-02-06 18:57:48 +01:00
DL6ER	9984647ebb	After renaming column in regex, it also needs to be renamed in vw_regex ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-02-05 19:41:11 +01:00
DL6ER	c3c60e10f1	Rename regex field from domain to filter because this described better what it is ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-02-05 19:07:12 +01:00
DL6ER	8a2363621d	Rename fields from DateAdded to dateadded ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-02-05 19:06:46 +01:00
DL6ER	dbbf21071b	Invert logic to use ENABLED instead of DISABLED. We make sure to set "enabled = 1 WHERE enabled IS NULL" in gravity_store_in_database() ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-02-05 19:05:11 +01:00
Mcat12	7a19d24058	Remove user/group from dnsmasq config ... In the case that FTL is started under root, dnsmasq changes the user to pihole due to this setting. The shared memory is created before this switch, and may cause issues such as failing to delete or reallocate the shared memory. These config lines were necessary before dnsmasq became part of FTL, but now since dnsmasq runs under FTL, we can configure the user/group through FTL. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-02-03 10:55:18 -08:00
DL6ER	93f1859bab	Store regex in gravity.db as well ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-02-03 15:13:18 +01:00
DL6ER	dcf0a605cf	Use views for all tables and set disabled column to false for those tables that support it ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-02-03 14:14:14 +01:00
DL6ER	710036adae	Add DISABLED field to white- and blacklist defaulting to false. The two views respect the DISABLED fields for both lists. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-02-03 13:34:08 +01:00
DL6ER	09c4c88a6d	Create and fill gravity.db during pihole -g ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-02-03 13:04:31 +01:00
Mcat12	26f2410fe6	Change /var/run/shm to /dev/shm ... The /var directory may not exist (does not exist on Fedora 29), and is simply a symlink to /dev/shm. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-02-02 10:37:12 -08:00
Mcat12	5c4ee23795	Fix missed start_service -> restart_service call ... start_service was changed to restart_service. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-02-02 10:19:44 -08:00
DL6ER	87800a3659	Merge pull request #2570 from pi-hole/tweak/wpad ... Add wpad vulnerability fix as suggested by dnsmasq.conf.example	2019-01-03 00:10:31 +01:00
Mark Drobnak	a3cee67a61	Merge pull request #2571 from pi-hole/tweak/debug/shm ... List content of /var/run/shm in debugger	2019-01-02 15:12:54 -05:00
DL6ER	5ffc8c7443	List content of /var/run/shm in debugger ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-01-01 17:56:02 +01:00
DL6ER	04fd296ffe	Add wpad vulnerability fix as suggested by dnsmasq.conf.example ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-01-01 17:13:43 +01:00
Mark Drobnak	ed5869646f	Use source instead of dot for setupVars ... Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>	2018-12-27 16:37:10 -05:00
Mcat12	be2d494fcf	Don't show web version in pihole -v output if not installed ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-12-12 14:55:09 -05:00
Mcat12	1cad069050	Add privacy level 4 to all privacy level code ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-12-10 10:18:25 -05:00
Dan Schaper	916b2920be	Merge pull request #2525 from pi-hole/release/v4.1 ... Release/v4.1 to Development	2018-11-29 08:46:05 -08:00
Dan Schaper	9f672593bc	Update advanced/Scripts/webpage.sh ... Co-Authored-By: DL6ER <DL6ER@users.noreply.github.com>	2018-11-26 20:01:41 +01:00
DL6ER	a285ae65fb	Backend changes for DHCPv4 rapid commit support ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-11-25 08:39:58 +01:00
DL6ER	d0125d5aad	Suppress warning if Pi-hole is not used as DHCP server (/etc/pihole/dhcp.leases is not present in this case) ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-11-19 17:38:19 +01:00
Mcat12	9d59da8974	Remove dnsmasq checks from debugger ... This also fixes an issue where the port checks weren't running (`compare_port_to_service_assigned`). Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-11-08 21:51:21 -05:00
Mark Drobnak	bbb759c684	Merge pull request #2477 from bcambl/debug_init_service_check ... fix debug service check via sysvinit	2018-11-07 17:50:32 -05:00
Mark Drobnak	f1a7bc9ecd	Merge pull request #2481 from pi-hole/revert-2468-lighttpd-conf-enhancements ... Revert "lighttpd conf enhancements"	2018-11-07 17:49:25 -05:00
Dan Schaper	a986f53134	Merge pull request #2436 from pi-hole/fix/password-read-error ... Fix error when reading in new password	2018-11-01 07:05:27 -07:00
Mcat12	28cbf45d1d	Add explanatory comment for include_shell ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-10-30 21:52:42 -04:00
Dan Schaper	72829be281	Remove shellcheck overrides ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-10-26 12:14:10 -07:00
Adam Warner	d57f9906bd	read -r -a, not read -a -r ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-10-26 19:24:43 +01:00
Adam Warner	3d4fea6510	Move -r to before the -p ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-10-26 19:17:49 +01:00
Adam Warner	f670644954	Revert "lighttpd conf enhancements"	2018-10-26 19:12:11 +01:00
bcambl	3ec84553ef	fix debug service check via sysvinit ... Signed-off-by: bcambl <blayne@blaynecampbell.com>	2018-10-24 10:06:11 -06:00
Mark Drobnak	a301d4381f	Merge pull request #2472 from pi-hole/fix-webpwexpansion ... Prevent BASH from expanding Web Password	2018-10-22 22:18:32 -04:00
Mark Drobnak	49b8ad7e94	Merge pull request #2470 from jeremysherriff/patch-1 ... Silence updateGravity cron job unless errors occur	2018-10-21 14:04:39 -04:00
WaLLy3K	180d29c7b3	Prevent BASH from expanding Web Password ... * Resolves issue #2471 Signed-off-by: WaLLy3K <wally3k@pi-hole.net>	2018-10-21 11:08:22 +11:00
Mark Drobnak	a23ba91681	Merge pull request #2468 from gstrauss/lighttpd-conf-enhancements ... lighttpd conf enhancements	2018-10-20 16:43:03 -04:00
jeremysherriff	d3ac8bb6f8	Silence updateGravity job unless errors occur ... No need for append/logrotate as we are only interested in the latest output Signed-off-by: jeremysherriff <jeremysherriff@gmail.com>	2018-10-19 19:10:13 +13:00
Mark Drobnak	f87f3b9199	Merge pull request #2467 from pi-hole/fix/dnsmasq-license ... Update dnsmasq config license	2018-10-17 11:56:41 -04:00
Glenn Strauss	67bdcbcf19	lighttpd: slightly more efficient sample config ... Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>	2018-10-17 06:54:54 -04:00
Glenn Strauss	69b2a5a876	lighttpd: use file glob for optional external.conf ... lighttpd 1.4.50 config parse will error if include_shell exits non-zero and pi-hole sample config: include_shell "cat external.conf 2>/dev/null" is an error if external.conf does not exist Replace with: include "external*.conf" file glob supported since lighttpd 1.4.40 and is not an error if there is no file which matches the file glob Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>	2018-10-17 06:54:43 -04:00
WaLLy3K	7f92671765	Update dnsmasq config license ... * Also updated "separate config" text Signed-off-by: WaLLy3K <wally3k@pi-hole.net>	2018-10-17 11:01:28 +11:00
Mark Drobnak	85dceb12a1	Use curl -s instead of -q ... See #2416 Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>	2018-10-12 23:53:21 -04:00
Mcat12	d55012f724	Append versions (after the first) instead of overwriting in updatecheck ... Fixes an issue brought up in #2435 Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-09-30 20:56:44 -04:00
Mcat12	7c6eecc9c8	Ignore shellcheck warning ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-09-30 18:16:08 -04:00
Mcat12	e4cbf5023a	Fix error when reading in new password ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-09-30 18:09:59 -04:00
Mark Drobnak	46356d3027	Merge pull request #2434 from pi-hole/fix/2200 ... Only check web versions if web interface is installed	2018-09-30 17:57:54 -04:00
Mark Drobnak	958a263437	Merge pull request #2431 from pi-hole/fix/use_PHP_comments_in_pihole-FTL.conf_template ... Improve pihole-FTL.conf template	2018-09-30 17:24:36 -04:00
Mark Drobnak	a89ae82270	Merge pull request #2430 from pi-hole/chrono-lc-all ... Fix invalid numbers in Chronometer	2018-09-30 17:23:06 -04:00
Mark Drobnak	cedc39bf09	Merge pull request #2426 from mrmajik45/master ... Read without -r will mangle backslashes. (Fix)	2018-09-30 17:19:56 -04:00
Adam Warner	0627e68078	Shellcheck is not a fan of sourcing scripts it does not know about. Add Directive to stop shellcheck from checking this. ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-09-30 19:45:04 +01:00
Adam Warner	7d78f6314a	Source Setupvars file and only check local/remote Web branch/version if the web interface is installed. ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-09-30 19:41:04 +01:00
mrmajik45	0f509f4a34	Update piholeDebug.sh	2018-09-28 17:22:31 -04:00
DL6ER	b043000044	Improve template by removing it. PHP cannot digest comments starting in "#" as of v7.0.0 ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-09-28 12:08:39 +02:00
DL6ER	c338eab3c6	According to the PHP documentation, PHP 7.0.0+ does not longer recognize hash marks (#) as comments. As FTL has been trained to understand PHP-style (comment lines start with ";") as well, we switch to using them. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-09-28 11:11:30 +02:00
WaLLy3K	24e1dc92ba	Resolve issue #2428 ... Signed-off-by: WaLLy3K <wally3k@pi-hole.net>	2018-09-28 10:34:49 +10:00
mrmajik45	00f98543ad	read without -r will mangle backslashes.	2018-09-26 10:32:22 -04:00
mrmajik45	8684356b44	read without -r will mangle backslashes.	2018-09-26 10:31:44 -04:00
Mark Drobnak	dac27f1f18	Only get the first gateway for chronometer ... Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>	2018-09-09 15:12:48 -04:00
Mark Drobnak	6f276ae4bb	Merge pull request #2299 from nullr0ute/net-tools ... Use ip route rather than old net-tools route in chronometer.sh	2018-09-09 15:11:19 -04:00
Mark Drobnak	ec29829550	Merge pull request #2388 from Sh4d1/ipv6_brackets ... Remove external Ipv6 brackets in servername if any	2018-09-01 19:44:29 -04:00
DL6ER	40656641b6	Merge branch 'development' into tweak/reload_on_enable_disable	2018-08-30 22:26:57 +02:00
DL6ER	45bf4b02e7	Ensure that when pihole-FTL is launched as user root, it will drop permissions as soon as this is possible. We tell pihole-FTL to change UID/GID to pihole:pihole instead of the default nobody:nogroup. This default causes conflicts with our SQLite3 database. See that corresponding pull request for further details. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-27 16:51:33 +02:00
Patrik Cyvoct	85cf98888d	Merge remote-tracking branch 'origin/development' into ipv6_brackets ... Signed-off-by: Patrik Cyvoct <patrik@ptrk.io>	2018-08-22 09:31:54 +02:00
Patrik Cyvoct	048e5bb9a2	Remove external ipv6 brackets if any in servername ... Signed-off-by: Patrik Cyvoct <patrik@ptrk.io>	2018-08-22 09:11:55 +02:00
DL6ER	b9d47d0dd2	Merge pull request #2378 from pi-hole/fix/pihole-FTL-no-caps ... Start pihole-FTL as root if capabilities are not supported by the system	2018-08-21 14:11:24 +02:00
DL6ER	940c9c3bae	Merge pull request #2383 from pi-hole/feature/privacy-level-4 ... Add support for privacy level 4	2018-08-21 13:03:41 +02:00
Mcat12	f141b9f778	Add support for privacy level 4 ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-08-20 17:36:16 -04:00
DL6ER	1dca1efbc6	Don't use extra query logging ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-20 23:11:23 +02:00
DL6ER	ec2426b24d	Add clarifying comments ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-19 19:55:47 +02:00
DL6ER	5cd3b11391	Start pihole-FTL as root if capabilities are not supported by the system ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-19 14:32:19 +02:00
DL6ER	d30b565d98	Touch dhcp.leases to ensure it exists. There are some systems out there where the installer didn't finish on the first run and some users don't have this file being created. Although /etc/pihole should be owned by pihole:pihole, pihole-FTL sometimes fails to open this file and - if this is the case and DHCP is enabled - refuses to start altogether. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-19 13:53:34 +02:00
DL6ER	ca309d3b28	Restart pihole-FTL after log flushing to force reloading history. Fixes #2339 ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-14 13:16:17 +02:00
DL6ER	165affc39b	list.sh writes into blacklist.txt not black.list so does not need to account for a possibly changed list location ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-13 18:53:31 +02:00
DL6ER	f794018e0c	Acknowledge temporary file if disabled for "pihole -b" command ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-13 18:17:14 +02:00
DL6ER	94e4ed6644	Add facility to add multiple audit list entries at once and to nuke audit list ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-10 18:22:55 +02:00
WaLLy3K	eef948d797	Fix header newlines ... * Added \\n to each $xxx_ver_str, resolving issue #2325 Signed-off-by: WaLLy3K <wally3k@pi-hole.net>	2018-08-07 10:45:30 +10:00
Mcat12	e4e22fb58e	Fix permissive regex ... The `\.?` is too permissive, letting in anything that ends in the domain Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-07-31 22:16:40 -04:00
Mcat12	7086a400e8	Use simpler regex format for wildcards ... Use `\.?domain\.com$` instead of `((^)|(\.))domain\.com$` Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-07-31 21:36:29 -04:00
Dan Schaper	af2ec61965	Convert [] to () ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-29 08:17:57 -07:00
Dan Schaper	94b7c8eb59	Added header for file. Not using standard Pi-hole copyright header. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-28 19:58:23 -07:00
Dan Schaper	f2c675cff6	Formatted pihole-FTL.conf for readability. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-28 16:16:16 -07:00
Dan Schaper	b79ff05e29	Move template files to own subdir. Include pihole-FTL.conf in templates. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-27 15:21:25 -07:00
Adam Warner	9b1356ad01	Revert #2282 ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-07-27 00:27:06 +01:00
Peter Robinson	45521b377a	Use ip route rather than old net-tools route in chronometer.sh ... The only use of net-tools is the use of route in chronometer.sh so instead use the same method as used in piholeDebug.sh to get the default gateway so there's no need to depend on net-tools anylonger. Signed-off-by: Peter Robinson <pbrobinson@gmail.com>	2018-07-26 17:46:51 +01:00
Mcat12	03e5a78d8f	Merge remote-tracking branch 'origin/FTLDNS' into development ... # Conflicts: # advanced/Scripts/piholeDebug.sh	2018-07-22 15:18:26 -04:00
Dan Schaper	ba7782f867	Space/Tab piholeDebug.sh ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-20 15:25:35 -07:00
Dan Schaper	c5091b0e49	Space/Tab wildcard_regex_converter.sh ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-20 14:00:34 -07:00
Dan Schaper	b54e32f0ca	Space/Tab webpage.sh ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-20 13:57:15 -07:00
Dan Schaper	328e7738d5	Space/Tab version.sh ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-20 13:27:30 -07:00
Dan Schaper	aca359c2e2	Space/Tab updatecheck.sh ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-20 13:24:05 -07:00
Dan Schaper	1cd40dc9e5	Space/Tab update.sh ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-20 13:22:37 -07:00
Dan Schaper	dc9407281f	Space/Tab setupLCD.sh ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-20 13:17:10 -07:00
Dan Schaper	8f727c1f35	Space/Tab query.sh ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-20 13:13:42 -07:00
Dan Schaper	a08ea28feb	Space/Tab piholeLogFlush.sh ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-20 13:07:54 -07:00
Dan Schaper	c5535dd9a0	Space/Tab piholeCheckout.sh ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-20 12:54:24 -07:00
Dan Schaper	3519cc5e44	Space/Tab list.sh ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-20 12:42:11 -07:00
Dan Schaper	d251bbbb05	Space/Tab chronometer.sh ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-20 12:29:09 -07:00
Dan Schaper	76c5b4a06b	Merge pull request #2118 from pi-hole/fix/debug-shellcheck ... fix some shellcheck/stickler compaints in debug script	2018-07-19 05:18:40 -07:00
RamSet	56b04017e7	Port 53 check updated with 4 spaces. ... Signed-off-by: RamSet <RamSet@gmail.com>	2018-07-16 11:29:12 -06:00
Dan Schaper	f42a57088f	Merge pull request #2280 from rrobgill/development ... Add regex option to autocomplete	2018-07-16 09:34:22 -07:00
Rob Gill	c5b9d99b48	Add regex option to autocomplete ... Signed-off-by: Rob Gill <rrobgill@protonmail.com>	2018-07-16 10:50:05 +10:00
Mcat12	f8d4c36f6d	Add back --wild list.sh help and use -- for long params like --regex ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-07-15 18:59:25 -04:00
Dan Schaper	dbc82cfb6a	Merge pull request #2236 from pi-hole/new/regex-lists ... Use regex lists instead of wildcards for blocking	2018-07-14 06:10:44 -07:00
Mcat12	941a766aa3	Replace -wild and -regex with --wild and --regex ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-07-12 21:38:43 -04:00
Mcat12	1b276a74fe	Display all lines of a list, even if there is no newline at the end ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-07-08 16:03:16 -04:00
Mcat12	8084c4b2a3	Fix regex period substitution due to switching to bashism ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-07-08 15:56:15 -04:00
Mcat12	1ca852191f	Fix stickler complaints ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-07-08 15:50:05 -04:00
Mcat12	af5fc6547a	Fix echoing wrong domain when converting wildcard ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-07-08 15:47:18 -04:00
Mcat12	70f2b26c86	Escape periods in wildcard converted regex filters. ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-07-08 15:45:06 -04:00
Mcat12	cfd95dbe87	Fix incorrect variable usage ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-07-08 15:38:44 -04:00
Mcat12	c5bb404d6a	Emulate wildcard blacklisting via -wild and move regex to -regex ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-07-08 14:37:33 -04:00
Mcat12	d21298c156	Add back conditional forwarding to webpage.sh ... This was accidentally removed in a previous PR. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-07-07 15:23:47 -04:00
Mcat12	4763969c8f	Move processWildcards to query.sh ... Closes #2255 Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-06-30 22:03:53 -04:00
Mcat12	f868052062	Fix incorrect variable string substitution ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-06-30 15:50:43 -04:00
Mcat12	0f4968d75c	Merge remote-tracking branch 'origin/development' into new/regex-lists	2018-06-29 23:12:34 -04:00
Mcat12	3077c22e4f	Change help strings from wildcard to regex blacklist ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-06-29 23:10:49 -04:00
Mcat12	0decc37b5a	Appease stickler ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-06-29 22:55:00 -04:00
Mcat12	4a953b66e0	Make removing regex domains work correctly ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-06-29 22:51:37 -04:00
Mcat12	8435eeed4d	Don't validate regex domains ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-06-28 23:31:50 -04:00
Mcat12	cffb4de83b	Use strict grep instead of regex for duplicates ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-06-28 23:01:27 -04:00
Mcat12	868948509a	Split declaration and assignment of random_url ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-06-20 20:30:42 -04:00
Mark Drobnak	e71492a2b3	Update debug script for simple list format ... Gravity is now just a list of domains, not IP addresses and domains separated by a space. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-06-20 20:29:32 -04:00
DL6ER	2809579dd7	Refine regex filter generation ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-06-17 14:59:21 +02:00
DL6ER	c7afe3e9a4	Please stickler by making clear that the variable regexFile is declared outside of this routine ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-06-17 14:46:26 +02:00
DL6ER	cd026cd865	Add comment where regexList is defined ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-06-17 14:43:33 +02:00
DL6ER	bc705aac03	Add automated wildcard list -> regex filter conversion ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-06-17 14:39:19 +02:00
Rob Gill	23adbf9540	remove quotes ... Signed-off-by: Rob Gill <rrobgill@protonmail.com>	2018-06-15 14:45:27 +10:00
Rob Gill	a7347238e6	$adListsList replace filename in text ... Signed-off-by: Rob Gill <rrobgill@protonmail.com>	2018-06-15 14:42:30 +10:00
Rob Gill	bf55666492	Appease stickler. ... Signed-off-by: Rob Gill <rrobgill@protonmail.com>	2018-06-13 16:29:07 +10:00
Rob Gill	8ab0b0e460	colfile ... Signed-off-by: Rob Gill <rrobgill@protonmail.com>	2018-06-13 16:25:43 +10:00
Rob Gill	b8e1849cec	wildcardlist ... Signed-off-by: Rob Gill <rrobgill@protonmail.com>	2018-06-13 16:19:07 +10:00
Rob Gill	45a8eda49b	Stop grep leak in query ... Fix grep error leak from #1805 Signed-off-by: Rob Gill <rrobgill@protonmail.com>	2018-06-13 16:08:21 +10:00
Rob Gill	d61fd01d61	Split queryFunc() into query.sh ... Signed-off-by: Rob Gill <rrobgill@protonmail.com>	2018-06-13 15:47:08 +10:00
Alex Villarreal	e422f4154f	Clean error message on successful response ... Signed-off-by: Alejandro Villarreal <alex@alexvy86.com>	2018-06-11 12:59:53 -05:00
Rob Gill	cabb06230c	--json not --jason ... Signed-off-by: Rob Gill <rrobgill@protonmail.com>	2018-06-09 10:30:04 +10:00
DL6ER	d254d6075a	First step from wildcards to regex lists for blocking ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-06-06 19:26:56 +02:00
Rob Gill	8004080643	Additional command-line completion ... Signed-off-by: Rob Gill <rrobgill@protonmail.com>	2018-06-06 22:37:43 +10:00
Mark Drobnak	d232f08933	Merge pull request #2208 from pi-hole/tweak/checkout ... Don't run the installer when doing ftl checkout, instead just run the…	2018-06-03 14:35:35 -04:00
Adam Warner	f5541860bc	Don't run the installer when doing ftl checkout, instead just run the ftl install functions ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-06-02 09:56:08 +01:00
Rob Gill	83ff0055b6	Test and indicate status ... This added function tests if pihole-FTL is running when the sysV. Signed-off-by: Rob Gill <rrobgill@protonmail.com>	2018-06-02 15:30:51 +10:00
Mark Drobnak	ab45360808	Merge pull request #1954 from ryanknapper/adlist.lists ... Prevent redundant entries from being added to Adlists.list	2018-05-31 14:58:16 -04:00
Mark Drobnak	9fd70cbdf9	Merge pull request #2057 from pi-hole/fix/debug-empty-ports ... debug script: fix empty ports on some systems	2018-05-30 21:48:53 -04:00
Mark Drobnak	3f3254a4df	Merge pull request #2176 from rrobgill/php5fix ... Fix block page crash on PHP 5.4	2018-05-22 23:21:20 -04:00
Mark Drobnak	f568012b9d	Merge pull request #2070 from pi-hole/new/debug-locale ... Get user locale when debugging	2018-05-14 16:43:05 -04:00
Rob Gill	382c19024f	oh stickler bot... ... accidentally a space Signed-off-by: Rob Gill <rrobgill@protonmail.com>	2018-05-12 10:53:44 +10:00
Rob Gill	9379487942	changes as requested ... changes as requested Signed-off-by: Rob Gill <rrobgill@protonmail.com>	2018-05-12 10:49:01 +10:00
Rob Gill	5e99baf7b9	Update index.php ... thanks stickler-ci ....... Signed-off-by: Rob Gill <rrobgill@protonmail.com>	2018-05-11 14:52:30 +10:00
Rob Gill	31951dae4c	Update index.php ... Avoiding calling empty() on a function allows this to work under PHP5. Making the check for blocklist generation in this way instead is compatible with both PHP5 and PHP7. Signed-off-by: Rob Gill <rrobgill@protonmail.com>	2018-05-11 14:31:42 +10:00
DL6ER	2ef76d5e31	Remove LOCAL_DNS_PORT support ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-05-04 22:19:39 +02:00
Adam Warner	a6e4b0fea5	- Test for existence of remote non-master branch of FTL before attemtping to check for update ... - Move some functions from checkout to basic-install - provide helpful error message on downlaod not existing Signed-off-by: Adam Warner <adamw@rner.email>	2018-05-01 23:15:26 +01:00
MichaIng	43f19034b9	"INSTALL_WEB" renamed to "INSTALL_WEB_INTERFACE" #2115 ... + Small fix, as due to PR https://github.com/pi-hole/pi-hole/pull/2115 variable "INSTALL_WEB" was renamed into "INSTALL_WEB_INTERFACE".	2018-04-28 15:17:29 +02:00
Adam Warner	ceaf4bc6bc	Some extra code made it's way into the dev branch. Not entirely sure how that happened... related to #2115 ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-04-23 20:46:57 +01:00
Dan	acfc49fd41	Merge branch 'development' into Install-Web-Server	2018-04-22 09:23:11 +01:00
DL6ER	ce35509a40	Change command to "pihole -a localdnsport X" ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-04-18 17:30:51 +02:00
DL6ER	24b8b4e904	Add backend changes for supporting a local recursive DNS server ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-04-18 17:12:20 +02:00
Adam Warner	6977f655e3	fix a typo ... comment out some unused variables, but not deleting them in case there is a plan for them in future... Signed-off-by: Adam Warner <adamw@rner.email>	2018-04-15 22:08:55 +01:00
Adam Warner	e6fc9dc75d	disable 2016 in two places and declare local variables ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-04-15 22:00:14 +01:00
Adam Warner	b57b3f4588	Disable SC2001 for generation of the_os ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-04-15 21:36:50 +01:00
Adam Warner	776ae92416	fix some shellcheck/stickler compaints in debug script ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-04-15 21:33:10 +01:00
Adam Warner	6ba53c1ac0	Merge branch 'development' into FTLDNS	2018-04-15 20:46:13 +01:00
Mark Drobnak	d4870b3854	Merge pull request #2053 from pi-hole/tweak/debug-logs ... Get head and tail of pihole-FTL.log during debug process	2018-04-15 14:23:25 -04:00
Adam Warner	bca23dd896	Allow passing of --check-only to update script. ... Don't run installer for updating web files, it's handled by getGitFiles. I think this works... Signed-off-by: Adam Warner <adamw@rner.email>	2018-04-15 18:25:35 +01:00
Daniel (Fourdee)	3a483a1b20	install_web_server ... + Splits web interface and server into two variables. + Option to disable forced install of Lighttpd.	2018-04-15 02:08:16 +01:00
Adam Warner	310d33b8ee	Merge dev > FTLDNS fix merge conflicts ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-04-13 17:01:54 +01:00
Adam Warner	8b5dcc3872	Match change made by 7edab27 to prevent merge conflict ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-04-13 16:53:57 +01:00
Ludovic Rousseau	7edab27e53	Stylistic change to use an explicit if/then/fi ... Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>	2018-04-13 12:19:55 +02:00
Ludovic Rousseau	9b3531f634	Fix stylistic issue ... Expand variable using ${FTLconf} Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>	2018-04-13 11:48:34 +02:00
Ludovic Rousseau	d8f85a8981	Avoid a "No such file or directory" error ... Check the file /etc/pihole/pihole-FTL.conf exists before trying to use it. without the patch I get, each day, in my logs: sed: can't read /etc/pihole/pihole-FTL.conf: No such file or directory I use a variable FTLconf to not repeat the file name twice. Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>	2018-04-13 11:16:58 +02:00
Ludovic Rousseau	3b229489c2	Fix regex to find DBFILE= from configuration file ... The regex ^\s^.DBFILE\s*=\s* does not work to match "DBFILE=" I don't know what the second '^' is used for. With the change I now have the results: DBFILE=/foo/bar -> /foo/bar DBFILE=/foo/bar -> /foo/bar # DBFILE=/foo/bar -> /etc/pihole/pihole-FTL.db xDBFILE=/foo/bar -> /etc/pihole/pihole-FTL.db Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>	2018-04-13 11:16:50 +02:00
Jacob Salmela	5ffc3561ed	implement dschapers suggestions--better command, less subshells, and finer formatting ... Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>	2018-04-11 20:35:51 -05:00
Dan Schaper	250b445eee	Split declaration and population for stickler. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-04-10 21:37:04 -07:00
DL6ER	82d5afe996	Silence error in log flush subroutine when no pihole-FTL.conf can be found ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-04-05 22:28:55 +02:00
DL6ER	6086614274	Add "-l, privacylevel" description to "pihole -a" ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-04-04 18:10:23 +02:00
Adam Warner	6bb4780d32	Merge pull request #2077 from pi-hole/tweak/FTLDNSExperiments ... FTLDNS tweaks	2018-04-04 17:00:03 +01:00
Adam Warner	631f5b4848	Change order of updatable components to match the end output ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-04-04 16:35:11 +01:00
DL6ER	4941e0f8ad	Backend changes needed to be able to set the privacy level ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-04-04 13:12:39 +02:00
Adam Warner	f37b2bc7c1	move call to get_binary_name into FTLcheckUpdate() to avoid having to run that first ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-04-02 23:22:06 +01:00
Adam Warner	56278c6394	Fix shellcheck complaints ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-04-02 22:06:36 +01:00
Adam Warner	b1d6c03190	Break out binary name funtion to it's own function ... Remove duplicate code. get_binary_name is now in the install script Add some "version" checking to ftl download when using an alt branch, uses checksum Greatly simplify update process. Source pihole-FTL version checker from basic-install.sh Always run install script to finalise changes. Install script now outputs versions after an update (This is a Squash of previous work into one commit) Signed-off-by: Adam Warner <adamw@rner.email>	2018-04-02 21:53:32 +01:00
Mark Drobnak	bb9a18ef08	Merge pull request #1987 from ryanknapper/patch-1 ... Proper output for debug CPU detection	2018-04-02 00:00:14 -04:00
Jacob Salmela	1a275ba184	debug user locale; improve function to parse variables and files ... Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>	2018-04-01 06:40:48 -05:00
Mark Drobnak	971e6f2664	Merge pull request #2064 from Perflyst/chronometer-1 ... Add RaspberryPi 3B+ to Chronometer	2018-03-30 17:42:50 -04:00
Dan Schaper	34d84522dd	Merge pull request #2054 from theLMGN/patch-1 ... Link to the admin panel on the splash page.	2018-03-28 20:08:39 -07:00
Perflyst	3390fbf238	Add RaspberryPi 3B+ ... Signed-off-by: Perflyst <mail@perflyst.de>	2018-03-27 12:23:01 +02:00
Jacob Salmela	68c27eb2a1	add label to x-header so you know which one is being evaluated ... Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>	2018-03-25 21:27:40 -05:00
Jacob Salmela	143e75d213	fix empty ports on some systems ... Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>	2018-03-25 09:39:29 -05:00
DL6ER	295ac49f83	Add capability CAP_NET_RAW to allow pihole-FTL to use RAW sockets for being able to create an ICMPv6 socket for IPv6 handling in the DHCP service ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-03-25 09:58:22 +02:00
Adam Warner	fbab930cb1	Allow install script to install FTL instead of the checkout script. Utilises the /etc/pihole/ftlbranch file. ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-03-23 22:46:41 +00:00
Leo MG Nesfield (LMGN)	bfcbd72e4b	Link to the admin panel on the splash page.	2018-03-23 16:17:31 +00:00
Jacob Salmela	d9d3caec22	new head tail function and get head tail of pihole-FTL.log instead of just head ... Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>	2018-03-23 06:56:40 -05:00
Jacob Salmela	7159ecb632	reduce ping times for faster script completion ... Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>	2018-03-23 00:11:21 -05:00
Adam Warner	5584a9ce5d	Merge branch 'development' into FTLDNS	2018-03-18 00:29:08 +00:00
Adam Warner	76cb129d3c	don't forget master and development branches! ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-03-07 21:48:09 +00:00
Adam Warner	246d5cd587	store checked out FTL branch in /etc/pihole/ftlbranch ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-03-07 21:41:00 +00:00
Ryan Knapper	5ecfc58e5f	Require exact match ... Updated to require an exact match to reduce false-positives, as suggested by DL6ER. Signed-off-by: Ryan Knapper <ryanknapper@gmail.com>	2018-02-28 13:06:07 -05:00
DL6ER	56a2924a33	Unprivileged processes are subject to full permission checking based on the process's credentials, we have to explicitly allow pihole-FTL to bind to ports < 1024 (port 53 for DNS) and for various advanced network-related operations (to allow for handling DHCP requests) ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-02-25 23:42:26 +01:00
DL6ER	09886a3f11	Add resolveconf config to pihole-FTL.service ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-02-25 10:11:11 +01:00
DL6ER	b87bcc8f5f	Modifications in pihole-FTL.service for FTLDNS ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-02-24 13:23:06 +01:00
Ryan Knapper	c17d95bfed	Proper output for debug CPU detection ... Inserted "log_write" to properly output CPU detection lines. Signed-off-by: Ryan Knapper (ryanknapper@gmail.com>	2018-02-19 10:22:28 -05:00
Mark Drobnak	f14184df30	Merge pull request #1982 from LudovicRousseau/master ... Create blacklist.txt if not existant	2018-02-18 15:32:01 -05:00
Ludovic Rousseau	47bbea9ba7	Use " " to protect parameter substitution ... Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>	2018-02-18 21:20:04 +01:00
Mark Drobnak	7265935cd4	Merge pull request #1915 from ryanknapper/development ... Add conditional forwarding options to webpage.sh	2018-02-18 12:51:46 -05:00
Ludovic Rousseau	b7891f92a5	Create blacklist.txt if not existant ... Closes: https://github.com/pi-hole/pi-hole/issues/1888 Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>	2018-02-18 14:19:49 +01:00
DL6ER	5465ac9ba0	Merge pull request #1929 from pi-hole/fix/flushDB ... pihole -f: Flush database	2018-02-17 17:45:15 +01:00
DL6ER	b8eaa9a527	Use double quotes to precent globbing and word splitting ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-02-17 13:01:00 +01:00
DL6ER	5d274008db	Use possibly user-defined database location when flushing ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-02-17 12:58:57 +01:00
Mcat12	8a42ef431b	Fix Javascript warning when no password is set ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-02-11 21:49:12 -05:00
Mcat12	2cf1f0e8fc	Hide the password input when there is no password ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-02-11 14:07:02 -05:00
Ryan Knapper	f2b3752f3d	lan to local ... Reduced differences. Signed-off-by: Ryan Knapper <ryanknapper@gmail.com>	2018-02-07 17:08:55 -05:00
Ryan Knapper	36945a67d0	Prevent redundant entries in to adlists.list ... Grep ${args[3]} and only add if grep -c -eq 0 Signed-off-by: Ryan Knapper <ryanknapper@gmail.com>	2018-02-07 17:04:10 -05:00
Mcat12	1a5c86d32e	Revert "Hide password textbox if there is no password" ... This reverts commit 009fa2f1b7.	2018-01-23 20:28:43 -05:00
Mcat12	c7219fbdff	Merge remote-tracking branch 'origin/development' into tweak/block-page-no-password	2018-01-21 09:09:36 -05:00
DL6ER	4c249a1186	Flush most recent 24 hours from FTL's database ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-01-21 13:48:13 +01:00
DL6ER	158ea1d43b	Add sqlite3 dependency ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-01-21 11:54:49 +01:00
DL6ER	52cc8e2fcf	Use "lan" as fallback TLD for DHCP generated domains ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-01-16 22:10:27 +01:00
ryanknapper	607664c860	Update webpage.sh ... Updated webpage.sh to include conditional forwarding options.	2018-01-14 21:01:08 -05:00
Adam Warner	80307a3bcd	Remove update line from cron ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-01-12 15:43:15 +00:00
Vasilis Gerakaris	939806f021	piholeDebug.sh: Correct typo mistake ... Signed-off-by: Vasilis Gerakaris <vgerak@gmail.com> **By submitting this pull request, I confirm the following:** `{please fill any appropriate checkboxes, e.g: [X]}` - [x] I have read and understood the [contributors guide](https://github.com/pi-hole/pi-hole/blob/master/CONTRIBUTING.md), as well as this entire template. - [x] I have made only one major change in my proposed changes. - [] I have commented my proposed changes within the code. - [] I have tested my proposed changes, and have included unit tests where possible. - [] I am willing to help maintain this change if there are issues with it later. - [x] I give this submission freely and claim no ownership. - [x] It is compatible with the [EUPL 1.2 license](https://opensource.org/licenses/EUPL-1.1) - [x] I have squashed any insignificant commits. ([`git rebase`](http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html))	2018-01-12 02:17:31 +02:00
DL6ER	793bdd9743	No need for cat | sed here as we source setupVars.conf, so we can use interface="${PIHOLE_INTERFACE}" ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-01-07 14:36:03 +01:00
DL6ER	9d50f52bb2	Add fallback interface for DNS listening behavior in case PIHOLE_INTERFACE is not set in setupVars.conf ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-01-07 14:34:02 +01:00
DL6ER	4efb533d2e	Create directories /etc/{var,log}/pihole on startup of pihole-FTL and set proper ownership ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-01-01 11:26:03 +01:00
DL6ER	afa2e9c2f7	Exchange hard-coded domain "localhost" by hard-coded address "127.0.0.1" ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-12-30 17:44:59 +01:00
DL6ER	a4c8f1a0a4	Merge pull request #1859 from pi-hole/new/extra-logging ... Enable dnsmasq's extra logging feature	2017-12-28 22:49:43 +01:00
Adam Warner	8e0d76b63b	initiated -> initialized ... Signed-off-by: Adam Warner <adamw@rner.email>	2017-12-24 13:26:32 +00:00
DL6ER	cca8412921	Use "echo -n" to avoid haveing newlines in the files ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-12-23 11:52:27 +01:00
DL6ER	d15a5ad5c1	Add required documentation in the source code ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-12-23 00:46:51 +01:00
DL6ER	8ed75dd176	Add extra entry to the end of the saved branches and versions such that PHP's explode() subroutine can correctly disentangle the first three entries and does not get confused by the newline character at the end of the FTL version/branch... ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-12-23 00:42:41 +01:00
Dan Schaper	8ca0582afc	Merge branch 'release/v3.2.1' into fix/DNSSEC_trustanchor	2017-12-21 10:56:37 -08:00
DL6ER	5c2dcb5e74	Enable dnsmasq's extra logging feature ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-12-21 16:42:55 +01:00
DL6ER	be0c457445	Sleep 30 seconds after reboot to be sure that the system is ready ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-12-21 12:42:28 +01:00
DL6ER	3c04dbb4ed	Update remote version at 17:59 as well as on reboot ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-12-21 12:33:08 +01:00
DL6ER	cfca367eef	Quickly verified in dnsmasq's source code: It has to be "trust-anchor" (with "-") ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-12-18 21:45:24 -05:00
DL6ER	8a243c5872	Insert also old trust anchor ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-12-18 21:45:15 -05:00
DL6ER	b30b3f3aeb	Update DNSSEC trust anchor ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-12-18 21:44:34 -05:00
Mark Drobnak	e3fa06d7ff	Merge pull request #1829 from keithbentrup/development ... Must send HTTP headers before html	2017-12-13 13:37:32 -05:00
Dan Schaper	423280cee1	Merge pull request #1817 from jjssoftware/development ... pihole.log permissions	2017-12-09 14:15:12 -08:00
Keith Bentrup	45ab2a3d7a	send HTTP headers before HTML ... Signed-off-by: Keith Bentrup <keith@keithbentrup.com>	2017-12-09 17:03:20 -05:00
DL6ER	05d015169c	Check for local version and branches every 10 minutes, check for remote versions only once a day ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-12-09 19:00:46 +01:00
Jacob Salmela	28bed0041e	remove comment ... Signed-off-by: Jacob Salmela <github@decoy.email>	2017-12-08 18:29:28 -06:00
Jacob Salmela	6f03e30151	fixes #1537 by checking if systemctl is found ... Signed-off-by: Jacob Salmela <github@decoy.email>	2017-12-08 18:23:55 -06:00
Joe	6ecd93d0c9	pihole.log permissions ... This change makes pihole more friendly to the non-existence of the pihole.log file. This can help with systems that are configured to mount /var/log as a tmpfs volume. It may also help with systems where the pihole.log file is accidentally/unintentionally removed. Further discussion around the details of this change are in https://github.com/pi-hole/pi-hole/issues/1798	2017-12-08 22:25:01 +00:00
Adam Warner	a9a40ca46c	Useless cat. Consider 'cmd < file | ..' or 'cmd file | ..' instead. ... Signed-off-by: Adam Warner <adamw@rner.email>	2017-12-06 23:27:40 +00:00
Adam Warner	162a7b56fe	force mode is no longer referenced. Regression. Same with domToRemoveList ... Signed-off-by: Adam Warner <adamw@rner.email>	2017-12-06 22:42:08 +00:00
WaLLy3K	2dc1851892	Allow passwords with spaces ... e.g: `pihole -a -p "foo bar"` Signed off by WaLLy3K <wally3k@pi-hole.net>	2017-11-23 13:17:34 +11:00
Jacob Salmela	9631519eb1	Merge pull request #1752 from pi-hole/new/bashupdatechecker ... Add bash / cron based update checker for Pi-hole	2017-11-08 20:38:40 -06:00
DL6ER	90efa3b610	Simplify git subroutines ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-11-08 19:11:41 +01:00
Mcat12	009fa2f1b7	Hide password textbox if there is no password	2017-11-01 21:30:14 -04:00
Adam Warner	5221767a70	Merge pull request #1735 from bcambl/debug_selinux ... add SELinux checks to debug script	2017-10-30 13:07:36 +00:00
DL6ER	9492ff26c6	Merge pull request #1747 from pi-hole/tweak/gravity_update_time ... Randomize gravity update time	2017-10-29 16:34:18 +01:00
DL6ER	0db76aada0	Silence errors when directory to be checked does not exist (system may have been installed without a web interface!) ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-10-28 15:44:17 +02:00
DL6ER	9be854031f	Don't store FTL branch until the next release of FTL which supports returning the branch in an easy way ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-10-28 13:41:24 +02:00
DL6ER	709851503f	Use "pihole-FTL branch" to get FTL's branch ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-10-28 13:27:12 +02:00
DL6ER	6ca47dc3b3	Add bash / cron based update checker for Pi-hole	2017-10-28 13:20:02 +02:00
WaLLy3K	2390b80359	Silence non-numeric domains_being_blocked output ... * Round $cpu_mhz to 1 decimal place * Remove ".0" from $cpu_freq * Silence non-numeric domains_being_blocked output * Use "Core" and "Web" as appropriate Signed off by WaLLy3K <wally3k@pi-hole.net>	2017-10-25 21:04:43 +11:00
DL6ER	85d159bdd1	Randomize gravity update time ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-10-21 15:52:53 +02:00
bcambl	0f868f7649	remove un-used DONE variable ... (still available via sourced COL_TABLE on line 29)	2017-10-19 22:57:07 -06:00
bcambl	31730e7197	add missing colors to COL_TABLE fallback	2017-10-13 09:14:19 -06:00
bcambl	7d76db00ac	update 'SELinux not detected' message	2017-10-13 08:58:35 -06:00
bcambl	8aceb8bf53	replace deprecated colors in debug script ... - COL_LIGHT_GREEN -> COL_GREEN - COL_LIGHT_RED -> COL_RED - COL_LIGHT_PURPLE -> COL_PURPLE	2017-10-12 23:33:28 -06:00
bcambl	a17d1be7a4	simplify selinux debug variables	2017-10-12 23:24:02 -06:00
bcambl	1e6cc63abe	add SELinux checking to debug script	2017-10-12 20:55:14 -06:00
WaLLy3K	3e727c5e5d	Merge pull request #1721 from pi-hole/fix/lightyconf ... Add comment for include_shell feature	2017-10-11 01:55:05 +00:00
DL6ER	e0edac32c7	Merge pull request #1728 from pi-hole/new/nuke_lists ... Add nuclear option to list.sh	2017-10-10 19:12:16 +02:00
WaLLy3K	e4b3bc4209	Minor spacing corrections ... Signed off by WaLLy3K <wally3k@pi-hole.net>	2017-10-10 13:17:33 +11:00
WaLLy3K	51b09efceb	Fix minor typo ... Signed off by WaLLy3K <wally3k@pi-hole.net>	2017-10-09 19:53:45 +11:00
WaLLy3K	2dabacd024	Fix minor typo ... Signed off by WaLLy3K <wally3k@pi-hole.net>	2017-10-09 19:53:22 +11:00
WaLLy3K	0613dcc87b	Merge pull request #1692 from andofrjando/cors_mixed_content_fix ... Fix for bug on block page (#1416) caused by CORS mixed content when behind reverse proxy using SSL	2017-10-09 07:53:33 +00:00
WaLLy3K	d59a2a4cfc	Merge pull request #1729 from pi-hole/fix/email-help-argument ... Allow emails which include `-h` in them (Fix for #1691)	2017-10-08 12:23:46 +11:00
WaLLy3K	2c091f3a3c	Merge branch 'development' into cors_mixed_content_fix	2017-10-08 12:22:14 +11:00
WaLLy3K	cfcdc53185	Merge pull request #1722 from pi-hole/fix/bpfqdn ... Improve FQDN Authorized Hosts functionality (Fix for #1416)	2017-10-08 12:19:11 +11:00
WaLLy3K	bd33018660	Shellcheck OR validation ... Signed off by WaLLy3K <wally3k@pi-hole.net>	2017-10-08 12:16:05 +11:00
Mcat12	e7589945a2	Disable password field if no password is set ... For someone to actually whitelist a domain without a password, more changes will be needed on the PHP side.	2017-10-07 16:41:30 -04:00
Mcat12	67a5594909	Allow emails which include -h in them ... For example, mcat12@pi-hole.net would previously spit out the help message	2017-10-07 16:06:16 -04:00
DL6ER	70ad656af0	Save backup as ".bck~" to prevent reading of the file by dnsmasq ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-10-07 22:04:14 +02:00
DL6ER	f22b83d379	Create a backup before emptying the list ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-10-07 17:46:40 +02:00
DL6ER	114f84c948	Add --nuke option to list.sh that can be used e.g. by Teleporter to empty out lists before importing new content ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-10-07 17:29:47 +02:00
WaLLy3K	43e1121618	Match current style of Web Interface ... * Remove border from about menu Signed off by WaLLy3K <wally3k@pi-hole.net>	2017-10-04 01:05:44 +11:00
WaLLy3K	97dd1b4cf3	Improve FQDN Authorized Hosts functionality ... * Use inverse if statement, instead of IF/ELSE when checking setupVars.conf * Remove $svFQDN * Add or elaborate on more comments * Add $serverName to $authorizedHosts if admin has specified `setenv.add-environment = ("fqdn" => "true")` within lighttpd's external.conf * e.g: `$HTTP["host"] == "pihole.domain.com" { setenv.add-environment = ("fqdn" => "true") }` * Move "No exact results" check to top of exception handling * Remove unnecessary IF/ELSE when handling $queryAds error Signed off by WaLLy3K <wally3k@pi-hole.net>	2017-10-04 00:46:51 +11:00
WaLLy3K	288635abc9	Add comment for include_shell feature ... * Capitalise first letter for Lighttpd * Fix spacing * Add comment for include_shell feature	2017-10-03 22:05:06 +11:00
Celly	3f20981aab	Update access rules to block all root '.' files	2017-09-22 09:29:00 -04:00
Celly	f54a812ad5	Update access rules to block all root '.' files	2017-09-22 09:27:43 -04:00
andofrjando	6323d5afed	Use PHP short echo tag to avoid Codacy expecting an escaping function	2017-09-22 07:15:03 +08:00
Celly	e3e3b4da58	Add in some exclusions form some leaky files in the admin	2017-09-21 17:47:37 -04:00
Adam Warner	ef1ce7d4d6	Merge pull request #1631 from pi-hole/tweak/gravity ... Clean up and optimise Gravity	2017-09-21 19:58:38 +01:00
DL6ER	ee2169dd13	Merge branch 'development' into tweak/gravity	2017-09-21 17:05:30 +02:00
WaLLy3K	11282aaca3	Decrease local-ttl to 2 ... * Decreasing value should benefit clients when whitelisting blocked sites, [as per this discussion](https://github.com/pi-hole/pi-hole/pull/1698#issuecomment-331134576).	2017-09-21 23:11:44 +10:00
WaLLy3K	f3cc8c71c4	Merge pull request #1691 from pi-hole/new/adminemail ... Add `pihole -a email` functionality for Block Page contact email	2017-09-19 18:39:37 +10:00
WaLLy3K	500a755250	Delete superseded file ... * Functionality is reproduced from within the Block Page	2017-09-19 01:03:24 +10:00
andofrjando	5e48b3f7f7	Fix one mistake where $proto would not be created if $_SERVER['HTTPS'] exists but is not set to on	2017-09-16 11:24:38 +08:00
andofrjando	00d62b3423	This fixes the following bug: ... If Pi-Hole is behind a reverse proxy that uses SSL, then the block page will not load resources such as `blockingpage.css` and `jquery.min.js` as the insecure `http://` is hard coded. Browsers will block attempts to load insecure resources if the page is loaded of SSL. The fix is acheived by checking `$_SERVER['HTTPS']` and setting the variable `$proto` to either `http` or `https`. The harcoded `http` is replaced by the contents of this variable.	2017-09-16 10:24:37 +08:00
WaLLy3K	28063aa7f7	Add administrative contact address functionality ... * Disable shellcheck for SC1090	2017-09-15 00:24:29 +10:00
WaLLy3K	c458e4a93b	Merge pull request #1420 from WaLLy3K/new/https ... Disable Let's Encrypt HTTPS & shift functions to block page	2017-09-14 20:40:20 +10:00
WaLLy3K	e7ae62ba76	Merge pull request #1416 from WaLLy3K/blockpage2 ... Block Page 2.0	2017-09-14 20:39:45 +10:00
WaLLy3K	34ae4844fa	Merge branch 'development' into tweak/gravity	2017-09-14 16:44:14 +10:00
DL6ER	b8fedf76cd	Merge pull request #1572 from pi-hole/gedetil-development ... Add web frontend shutdown command	2017-09-08 20:21:20 +02:00
DL6ER	c9d4995900	Update to comply with current development code ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-09-08 19:35:05 +02:00
DL6ER	279e809aaf	Use poweroff instead of halt ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-09-08 19:33:06 +02:00
DL6ER	0d037e96fb	Merge branch 'development' into gedetil-development ... Signed-off-by: DL6ER <dl6er@dl6er.de> Conflicts: advanced/Scripts/webpage.sh	2017-09-08 19:32:38 +02:00
WaLLy3K	bea99abd8d	Ensure colour consistency between terminal themes ... * Comment file for review-ability * Add BOLD and UNDERLINE options * Select most readable colours out of LIGHT/DARK options * Provide empty variables for `set -u` * Deprecate unnecessary variables * Correct colours for TICK/CROSS/DONE * Escape r twice and add ESC to OVER	2017-09-05 23:28:33 +10:00
WaLLy3K	bab44c52ae	Merge branch 'development' into blockpage2	2017-08-28 13:30:57 +10:00
WaLLy3K	7cac207c00	Merge branch 'development' into tweak/gravity	2017-08-28 03:11:38 +10:00
Adam Warner	199de9ebc0	Merge branch 'development' into new/https	2017-08-27 11:38:30 +01:00
Adam Warner	504ae0193f	Merge branch 'development' into blockpage2	2017-08-27 11:23:21 +01:00
WaLLy3K	1ae403b742	Merge pull request #1667 from pi-hole/install-space ... Remove erroneous space	2017-08-24 14:00:20 +10:00
Adam Warner	18b41adbf6	Merge branch 'development' into tweak/gravity	2017-07-29 17:14:39 +01:00
Mcat12	898fdf7a60	Merge pull request #1602 from molikuner/development ... Fix URL extension parsing	2017-07-29 11:49:24 -04:00
Adam Warner	78143c2ff4	Merge branch 'development' into blockpage2	2017-07-29 16:44:28 +01:00
Adam Warner	7b1524ad01	Merge branch 'development' into new/https	2017-07-29 16:44:20 +01:00
Adam Warner	5799485b0f	Merge branch 'development' into development	2017-07-29 16:29:57 +01:00
Adam Warner	0a9965292c	Additional check to fix any existing cases of "24h" in setupVars.conf automatically. ... Signed-off-by: Adam Warner <adamw@rner.email>	2017-07-28 19:40:13 +01:00
Adam Warner	4fb66e632f	The other h	2017-07-28 16:30:03 +01:00
Adam Warner	5787895794	stop an extra h being added to leasetime of DHCP server. We already storethe h in setupVars.conf ... Signed-off-by: Adam Warner <adamw@rner.email>	2017-07-28 16:10:13 +01:00
Adam Warner	d90489b31d	Include branch we're switching from ... Signed-off-by: Adam Warner <adamw@rner.email>	2017-07-27 22:21:25 +01:00
Adam Warner	f38912a0c9	- Correctly overwrite ${INFO} boxes with ${CROSS} etc ... - Notify user that branch has been changed Signed-off-by: Adam Warner <adamw@rner.email>	2017-07-27 21:33:41 +01:00
WaLLy3K	2d8fff099f	Pass correct options to gravity.sh ... * Optimise $validDomain function by using bashism and `grep` * Add black/white/wildcard variables to pass to Reload() * Revert reload variable behaviour * Ensure Reload() function passes correct options to gravity.sh Signed-off-by: WaLLy3K <wally3k@pi-hole.net>	2017-07-27 12:34:26 +10:00
WaLLy3K	fdf2649f2f	Clean up known remaining colour output issues (#1613) ... * Print newline on error message * Output last three lines of error if update fails * Consistent error messages & housekeeping * Add shellcheck directive to ignore COL_TABLE * Quoted and braced variables for codebase consistency * Escaped newlines correctly * Made error messages consistent (indenting and wording) * Removed consecutive echos * Conditional formatting consistency * Braced, quoted and used [[ on conditionals * Fix specific ShellCheck issues * Fixed issues that could be safely changed without extensive testing * Update SELinux whiptail behaviour & more * Colourised some strings * Fixed multiple line string indenting * Made output consistent with existing codebase * Removed sequential echos * Make SELinux whiptail use "--defaultno", and change text wording * Add help text for hostrecord, and colourise output * this should fix the tests... Signed-off-by: Adam Warner <adamw@rner.email> * revert changes to `update_package_cache()` to prove tests Signed-off-by: Adam Warner <adamw@rner.email>	2017-07-26 18:00:08 +01:00
Mcat12	b09c660833	Always process DNS and DHCP settings in installer (#1630) ... * Always process DNS and DHCP settings in installer * Make sure dnsmasq config exists before modifying it Signed-off-by: Mcat12 <newtoncat12@yahoo.com> * Make sure the dnsmasq config directory exists Signed-off-by: Mcat12 <newtoncat12@yahoo.com> * Only remove the DHCP config if it exists (fixes tests, hopefully) Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2017-07-26 17:15:23 +01:00
WaLLy3K	714fd93292	Provide correct FTL stats (#1619) ... * Provide correct FTL stats * Use the correct lines in the array when displaying FTL stats * Treat ads_blocked_today/dns_queries_today as currency, like domains_being_blocked is on large screens * Chronometer Shellcheck validation * Remove unnecessary \ from CPU usage readout	2017-07-25 23:03:23 +01:00
WaLLy3K	61ff0452e1	Remove duplicate code ... * Make RestartDNS() use `pihole restartdns` Signed-off-by: WaLLy3K <wally3k@pi-hole.net>	2017-07-24 21:27:12 +10:00
WaLLy3K	406098e55a	Speed up refresh time ... * Add "--blacklist-only" to only run essential gravity functions * Pass "--wildcard" option to `gravity.sh` to ensure dnsmasq is restarted Signed-off-by: WaLLy3K <wally3k@pi-hole.net>	2017-07-24 21:26:39 +10:00
WaLLy3K	49aee8b931	Fixed development branch check	2017-07-19 12:26:00 +10:00
WaLLy3K	f2a3b557c8	Updated Block Page to work with queryFunc output	2017-07-19 00:15:59 +10:00
Adam Warner	0a062d26e6	Merge pull request #1611 from pi-hole/developmentNew ... Sort out Merge conflicts with master	2017-07-17 14:49:55 +01:00
Adam Warner	eb8333c772	Merge branch 'development' into developmentNew	2017-07-16 16:45:33 +01:00
Adam Warner	247d3ed729	list availible branches for FTL ... Signed-off-by: Adam Warner <adamw@rner.email>	2017-07-16 13:54:23 +01:00
Adam Warner	031c6428d5	Merge branch 'tweak/checkout_FTL' of https://github.com/pi-hole/pi-hole into tweak/checkout_FTL ... Signed-off-by: Adam Warner <adamw@rner.email> # Conflicts: # advanced/Scripts/piholeCheckout.sh	2017-07-16 13:34:20 +01:00
Adam Warner	f2e9d585f7	* Add helptext for pihole checkout ftl ... * Only attempt to install FTL if branch was found * ~~corebranches~~ webbranches (web branches now actually listed) Signed-off-by: Adam Warner <adamw@rner.email>	2017-07-16 13:33:00 +01:00
WaLLy3K	8af9853b9a	Fixed minor formatting issues ... * Removed useless echo * Quoted and braced conditionals * Explicit escaping of newline * Fixed arrays implicitly concatenating (SC2199) * Fixed incorrect variable used in checkout web	2017-07-16 22:32:34 +10:00
Adam Warner	783f50657b	Merge branch 'development' into tweak/checkout_FTL ... Signed-off-by: Adam Warner <adamw@rner.email> # Conflicts: # advanced/Scripts/piholeCheckout.sh	2017-07-16 12:25:27 +01:00
WaLLy3K	3631d1349e	Prevent Web Admin from printing restartdns colour codes (#1575) ... * Prevent Web Admin from printing unnecessary msgs * Make DNS restart behaviour consistent	2017-07-15 11:11:06 +01:00
Adam Warner	7d56e2a937	FTL has an L in it, innit? ... Signed-off-by: Adam Warner <adamw@rner.email>	2017-07-14 20:54:41 +01:00
Jacob Salmela	e1f818ffb7	Tweak/debug improvements (#1585) ... * check for CIDR notation when comparing IPv6 address to that found in setupVars.conf * highlight bad address entries in pihole.log and reference a corresponding FAQ * show header output if Pi-holes x-header does not match * fix automated mode when running from the dashboard. It would previously not automatically upload and generate a token. * show disclaimer message * undocumented feature for now: obfuscate domains in pihole.log so they are not visible when sent to the Pi-hole developers. We need to make an additonal flag for this in the pihole command. if the variable OBFUSCATE has a value, it will replace the domain in the log with a placeholder value * fix small typo in the disclaimer	2017-07-14 16:53:45 +01:00
Molikuner	9934f505a5	Fix URL extension parsing ... when there is a querystring Pi-hole sometimes parsed a wrong extension	2017-07-13 23:18:40 +02:00
Jacob Salmela	fb66fb12c5	put "no password will be set" on a newline.	2017-07-06 20:54:09 -05:00
Jacob Salmela	042dcf795c	fixes #1430	2017-07-06 20:44:40 -05:00
Jacob Salmela	cb65907e60	Merge branch 'development' of https://github.com/pi-hole/pi-hole into revamp/debug ... merge in development to avoid shellcheck from travis	2017-07-05 16:55:34 -05:00
DL6ER	bb8a263d70	ShellCheck	2017-07-05 19:34:20 +02:00
DL6ER	70fd94edb3	Edit message when requested branch of FTL is not available	2017-07-05 19:30:05 +02:00
WaLLy3K	1bebcef265	Make Chronometer usable on smaller screens (#1518)	2017-07-04 13:52:51 +10:00
DL6ER	6ce79ae1d0	Fix git commands (#1577)	2017-07-01 23:52:10 +02:00
Adam Warner	b3eb5c4f0e	Colour Tweaks (#1549)	2017-07-01 22:08:17 +10:00
DL6ER	ec4e9780ed	Accept underscores when validating domain names (#1571)	2017-06-30 22:52:33 +10:00
Adam Warner	22abbffbb7	Merge branch 'development' of https://github.com/gedetil/pi-hole into gedetil-development ... Signed-off-by: Adam Warner <adamw@rner.email> # Conflicts: # advanced/Scripts/webpage.sh	2017-06-29 19:47:32 +01:00
Jacob Salmela	05a724afae	codacy appeasement: remove useless cats	2017-06-29 11:49:28 -05:00
Jacob Salmela	1957b002bc	add comments about X-Headers and further explain the file descriptor cod.	2017-06-29 11:37:58 -05:00
Jacob Salmela	04cef25add	remove color character codes before uploading so the log is more readable on our plaintext tricorder server	2017-06-29 11:17:19 -05:00
DL6ER	98afb0e998	pihole checkout ftl	2017-06-27 14:28:05 +02:00
DL6ER	e9d81fc883	Backend additions for aufit log feature (#1399)	2017-06-27 10:53:24 +02:00
Jacob Salmela	22fac5e1e0	additional shellcheck fixes	2017-06-26 22:03:45 -05:00
Jacob Salmela	b6a2a4ad5a	more shellcheck fixes	2017-06-26 21:51:41 -05:00
Jacob Salmela	5f00347019	appease shellcheck by removing two unneccesary functions and making some if/else blocks	2017-06-26 21:34:39 -05:00
Mcat12	009363a7bb	Merge pull request #1560 from pi-hole/fix/ad-domain-hostname ... Move local.list after the ad blocking lists	2017-06-25 18:11:48 -04:00
Mcat12	8dc94e014f	Merge branch 'development' into fix/invalid-ipv6-wildcard	2017-06-25 18:04:38 -04:00
Mcat12	78e7c8b8e9	Merge branch 'development' into fix/ad-domain-hostname	2017-06-25 18:03:16 -04:00
Dan Schaper	c29c4ceb0f	Integrate DL's update.sh fixes. ... `shellcheck -x` for following files. Do not test for included files SC1091 Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-06-25 14:39:09 -07:00
Mcat12	bc46694ea7	Move local.list after the ad blocking lists ... Fixes the bug found by [Reddit](https://www.reddit.com/r/pihole/comments/6j3az9/urls_in_my_blacklist_are_showing_up_as_my_default/)	2017-06-25 12:18:09 -04:00
Mcat12	cb09e0bc9a	Strip /* from the end of the IPv6 address ... Fixes #1536	2017-06-24 11:14:23 -04:00
Adam Warner	536585b846	Colourise Core Output Text (#1471) ... * Define colours within COL_TABLE * Do not output colours for non-terminal instances * Removed ":::" * Fixed indenting & spacing * Made output consistent throughout project * Reworded text to fit on standard 80 char wide Terminal screen * Made 'sudo raspi-config' warning (insufficient disk space) only show on RPi * Make "Installation/Update Complete" the final msg * Remove redundant messages * Simplify update available message * Confirm user would like to begin uninstall * If "git pull" string says "Already up-to-date.", place [i] before it * Colour Temp/Interface output * Made `pihole disable 5z` invalid * Added error fallback if invalid argument (not s/m) is detected * Quoted "$2" for consistency * Updated help text * L185/286: Replaced echo with redirect * User agents for adblock.mahakala.is/adaway.org unnecessary * Print newline on confirmation of repository reset * Add output to admin-related dnsmasq restarts * Return error message for "pihole -q" * Imply default checkout behaviour with y/N * Fix uninstall failing to remove pihole user * Print checkout 'git remote show origin' STDERR on new line * Replaced checkout "AdminLTE" wording with "Web Admin"	2017-06-21 21:49:05 +10:00
DL6ER	0283a1ab74	Introduce new file black.list for blacklist content	2017-06-17 13:50:10 +02:00
DL6ER	54a88ab5ab	Change ownership of /etc/pihole to user/group pihole. Fixes #1529 (#1530)	2017-06-17 08:43:05 +02:00
WaLLy3K	aff5ff08d5	Trim version output when update is successful (#1527)	2017-06-15 09:50:05 +02:00
Jacob Salmela	fc0440546f	add functions to parse head and tails of gravity.list and pihole.log	2017-06-10 23:20:27 -05:00
Jacob Salmela	172b8d2427	parse ftl log	2017-06-10 22:18:33 -05:00
Jacob Salmela	6d10a498a5	implement a limit on how many lines of a file we want to view	2017-06-10 21:57:17 -05:00
Jacob Salmela	881819ed5f	ignore big files we dont need to know about; also fix diagnosing pihole processes	2017-06-10 18:37:28 -05:00
Jacob Salmela	3275c5f710	more comments to help understand the script	2017-06-10 15:54:27 -05:00
Jacob Salmela	b0cc1a38c3	adjust minor formatting for better readability	2017-06-10 15:28:04 -05:00
Jacob Salmela	e10182c839	only parse files required by Pi-hole	2017-06-10 12:27:05 -05:00
Jacob Salmela	b4f1fe08f0	variablize all files and directories. also put required files and folders into an arry so we can compare them in later functions by parsing through them	2017-06-09 23:22:37 -05:00
Jacob Salmela	64171fa2a1	small color and formatting changes	2017-06-09 15:42:54 -05:00
Jacob Salmela	048eacd305	parse array in correct location	2017-06-07 12:31:08 -05:00
Jacob Salmela	24aa72c19d	condense repetative code into functions; parse the content of each file	2017-06-07 12:25:00 -05:00
Jacob Salmela	92b5fe4be4	check arch compatibility and add gateway faq url	2017-06-05 14:55:58 -05:00
DL6ER	f1146a3443	Don't update FTL when there is a core update (as this will update FTL a second time). Fixes #1516	2017-06-04 12:41:44 +02:00
DL6ER	2516a1e298	Make clear that NO is the default if the user just hits return (#1514)	2017-06-03 17:23:47 +02:00
DL6ER	8ef64dbe74	Add weekly logrotation of FTL's log (#1509)	2017-06-03 14:51:35 +02:00
Jacob Salmela	8b4c0b456b	exclude webpassword from being uploaded. also check that the IP addresses detected match those defined in setupVars.conf	2017-06-01 01:15:11 -05:00
Jacob Salmela	02a601deff	comment out dir checks for lighttpd, cronm and http as they have a lot of other files that need parsing through. May need to increase the logic there if this is information we really need to know.	2017-06-01 00:19:15 -05:00
Jacob Salmela	b207fadc04	check if os is supported based on pretty name	2017-06-01 00:18:06 -05:00
Jacob Salmela	d51c067e1b	change some verbiage; new function to compare the ports in use to the services assigned to them.	2017-05-27 21:21:18 -05:00
Jacob Salmela	2fea5d428d	condense repetitive code into functions	2017-05-27 15:47:15 -05:00
Jacob Salmela	d51e0c49b1	remove comments and blank lines when parsing files	2017-05-27 13:44:33 -05:00
Jacob Salmela	36907edd50	parse contents of each file in each dir, several log_writes	2017-05-27 00:04:42 -05:00
Jacob Salmela	7ec169ab10	more comments, fixed automated tricorder, variablizing echos, verify FTL version	2017-05-26 22:05:50 -05:00
Jacob Salmela	7873da1ae5	more colors. shortened dig timeouts	2017-05-26 15:17:26 -05:00
Jacob Salmela	ef5a6e7880	add faq urls to some functions, added more colors, also use a static url for remote digs	2017-05-26 14:26:02 -05:00
Jacob Salmela	96f01e670f	add functions to write to console and log at the same time	2017-05-26 12:16:22 -05:00
WaLLy3K	10139241f5	Fix output IPv4 addr when removing CIDR notation (#1498)	2017-05-26 09:57:27 +02:00
Jacob Salmela	5902be2a49	comments for every line	2017-05-24 22:07:15 -05:00
Jacob Salmela	cc946ce068	upload to tricorder functions	2017-05-24 21:11:15 -05:00
Jacob Salmela	1102fdc44b	append everything the user sees to the pihole_debug.log file	2017-05-24 20:24:23 -05:00
Jacob Salmela	c995c81fff	adjust some spacing	2017-05-24 19:36:06 -05:00
Jacob Salmela	6684af9938	add lighttpd list function and gravity analysis	2017-05-24 18:31:55 -05:00
Jacob Salmela	8bafd12f95	fix resolver functions and add x-header function	2017-05-24 16:10:14 -05:00
Jacob Salmela	76266cf31b	add resolver functions and check directory content functions	2017-05-24 15:29:31 -05:00
WaLLy3K	4ad0cdf5d4	Rewrite Chronometer to output more stats	2017-05-25 01:03:13 +10:00
Jacob Salmela	1a87d3a659	add process check function	2017-05-23 22:57:22 -05:00
Jacob Salmela	085f2c6ca0	add port check function	2017-05-23 22:32:30 -05:00
Jacob Salmela	b74300f67c	add ping internet function and fix some spacing issues	2017-05-22 12:57:55 -05:00
Jacob Salmela	107babe8f4	add ping gateway function	2017-05-22 12:35:57 -05:00
Jacob Salmela	8fd9a22d18	add detect IP function	2017-05-22 12:05:42 -05:00
Jacob Salmela	8c5c1316dd	add php version and processor check functions	2017-05-22 08:48:56 -05:00
Jacob Salmela	daff5d8b5a	add critical dependencies version check functions	2017-05-22 03:05:51 -05:00
Jacob Salmela	6c4a7b626e	add pihole version check functions	2017-05-22 02:39:00 -05:00
Jacob Salmela	1aa5943e67	add if directory exists function	2017-05-22 01:06:15 -05:00
Jacob Salmela	69fe889f92	comments for all lines and small formatting changes	2017-05-21 23:25:53 -05:00
Jacob Salmela	5d7ef9281f	get just the OS pretty name for Dan	2017-05-20 02:01:56 -05:00
Jacob Salmela	6fa00e7cc8	first functions with pretty colors. check OS, setupVars, and contents of .d dirs	2017-05-20 01:34:13 -05:00
WaLLy3K	69fa9874dd	Use HTTP_HOST instead of SERVER_NAME ... * Fixes https://github.com/pi-hole/pi-hole/issues/1479	2017-05-18 18:54:26 +10:00
WaLLy3K	f6732a484e	Merge pull request #1317 from r0ckarong/development ... Fixed handling of `pihole -wild` help text	2017-05-18 11:16:25 +10:00
DL6ER	42eb811910	Add "quiet" mode + update comments in the cron file	2017-05-17 12:54:43 +02:00
DL6ER	c9042ffedd	Print echos only when manual flushing is requested	2017-05-17 12:51:04 +02:00
DL6ER	4e2c6a7b8e	Fix logrotation: manual flushing should be done twice, but automated rotation at midnight should only be done *once*!	2017-05-17 12:44:35 +02:00
WaLLy3K	7453bf2ee6	Fix wildcard help text ... * -wild is not a valid option since we're already using -wild	2017-05-16 10:23:53 +10:00
WaLLy3K	7d17c652f3	Merge branch 'development' into development	2017-05-16 10:18:32 +10:00
Adam Warner	90119c75d5	more merge conflicts!	2017-05-14 16:43:20 +01:00
WaLLy3K	30035ce1c2	Merge branch 'development' into tweak/help-output	2017-05-14 13:03:33 +10:00
WaLLy3K	3bd677c102	Show help for "pihole -v -h" ... * Indent output text * Minor help text change	2017-05-14 11:57:46 +10:00
WaLLy3K	0e4473685b	Show help for "pihole -a -i --help"	2017-05-14 11:47:56 +10:00
WaLLy3K	b721ed49ab	Update Help Output (#1467) ... * File consistency * Tabs to 2 spaces * Corrected indenting * Double braced conditionals * Quoted variables within conditionals * Standardise core help text * Added help text for disable command * Added help text for logging command * Clean up * Fixed certain new lines and spaces * Sync with development branch * Formatting consistency * Tabs to 2 spaces * Corrected indenting * Double braced conditionals * Quoted variables within conditionals * Fixed certain newlines and spaces * Admin help text * Added help text for interface command * Sync with development branch * Formatting consistency * Tabs to 2 spaces * Fixed some wording * Fixed certain spaces * Formatting consistency * Minor wording changes * Tabs to 2 spaces * Corrected indenting * Double braced conditionals * Quoted variables within conditionals * Fixed certain newlines and spaces * Blacklist help text * Formatting consistency * Tabs to 2 spaces * Corrected indenting * Cronometer help text * Formatting consistency * Fixed certain newlines and spaces * Corrected indenting * Checkout warning alteration * Add checkout help text * Corrected help output	2017-05-14 11:11:44 +10:00
Dan Schaper	25601b9fcc	Document sed substitution for user readability ... Comment the oneliner with explanations of what each step does.	2017-05-13 17:49:58 -07:00
Adam Hill	55f78e3b64	Update list.sh ... I believe this has feature parity with `sed /foo/ Id` but also supports busybox, and my alpine docker ;)	2017-05-13 18:44:41 -05:00
WaLLy3K	f9d41caeb6	Merge branch 'development' into blockpage2	2017-05-13 23:29:44 +10:00
Hans Geiblinger	b166410cbf	Solve piholeLogFlush.sh having to be issued 2 x to clear logs (#1460) ... Simplified the command -v syntax, and added a sleep 3 timer to the first execution of the log rotation. The second execution was being issued while the first was still running, thus it would fail and you would have to issue the "Flush Logs" command a second time.	2017-05-12 22:39:55 +02:00
0412465564	31d5a7ae9e	whitelist on website blocked doesnt work (#1452) ... Since Pi-hole redirects ad domains to itself, accessing the script via de.ign.com is the same as pi.hole in this case. The fix should be as simple as adding a / before admin on this line.	2017-05-12 22:29:07 +02:00
Dan Schaper	5bb91759b4	Merge pull request #1459 from WaLLy3K/patch-2 ... Provide remote hashes for version.sh	2017-05-12 12:38:13 -07:00
Dan Schaper	80c4b7c9bb	Merge pull request #1455 from pi-hole/tweak/logecho_gateway ... Debug: Log and echo gateway responses	2017-05-12 12:02:21 -07:00
WaLLy3K	ea0a9ceb37	Provide remote hashes for version.sh ... * Provide remote hashes for comparison * Use double braces for all conditions (for consistency) * Suppress potential "cd" error output * Provide "not applicable" output upon any hash request for FTL	2017-05-12 15:25:01 +10:00
WaLLy3K	f875976268	Replacing superseded file with dummy content	2017-05-11 21:02:04 +10:00
WaLLy3K	1c2aa44d46	Provide notice message for whitelisted sites	2017-05-11 20:10:40 +10:00
WaLLy3K	3b44a0da32	Provide error message if not found in any list	2017-05-11 20:09:00 +10:00
Dan Schaper	501b26decd	Log and echo gateway responses	2017-05-10 22:08:06 -07:00
WaLLy3K	c6596f2c54	Modified syntax to be valid for Shellcheck	2017-05-11 14:19:13 +10:00
WaLLy3K	2863308090	Minimise string duplication & other minor changes ... Instead of duplicating output strings, rewrite core/web/ftlOutput() into one neat versionOutput().	2017-05-11 13:34:58 +10:00