Adam Warner
|
77bfb3fb67
|
tidy up variable usage in list.sh Remove some that are redundant
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
|
2019-11-30 14:18:12 +00:00 |
|
Adam Warner
|
6a881545b0
|
tweak wording Signed-off-by: Adam Warner <me@adamwarner.co.uk>
|
2019-11-30 13:25:32 +00:00 |
|
Adam Warner
|
d0de5fda30
|
Simplify removal of domain from one list when it is requested for another
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
|
2019-11-30 13:13:26 +00:00 |
|
DL6ER
|
185319d560
|
Unite four domain tables into a single domainlist table.
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2019-11-30 12:33:51 +00:00 |
|
DL6ER
|
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
|
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
|
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 |
|
DL6ER
|
87f75c737a
|
Review comments.
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2019-07-10 12:00:38 +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
|
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
|
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 |
|
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
|
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
|
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 |
|
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
|
3519cc5e44
|
Space/Tab list.sh
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2018-07-20 12:42:11 -07: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 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|