WaLLy3K
58353e2839
Update queryFunc() to search Whitelist
...
If there is a match in Whitelist/Blacklist/Wildcards, `[ ! -t 1 ]` will cause the search to end if the terminal is closed when the script is called. This has the intended effect of allowing a user to search for a W/B/W domain (as well as all the adlists it's found in) using `pihole -q` via Terminal, but the script will stop searching after a W/B/W match when called by the block page.
2017-05-11 19:58:35 +10:00
WaLLy3K
3081c151bd
Perform EXACT searches on HOSTS lists correctly
...
`\s` on the end may be overkill, but it is the existing scanList() behaviour.
2017-05-11 09:13:32 +10:00
WaLLy3K
a0603ad3b7
Update queryFunc()
...
* Allow scanList() to search files using a wildcard by removing quotes wrapped around `${list}`
* scanList() will not provide a domain ouput on each string if exact is specified (`grep -l`)
* Remove unused processWildcards() function
* Return a message if no domain is specified
* IDN domains are converted to punycode when running a `pihole -q` search if the `python` package is available, otherwise will revert to current behaviour
* Scan Blacklist & Wildcards first, exiting from search if a match is found (Fixes #1330 )
* Use one `grep` subshell to search for all "*.domains" lists at once (opposed to looping to get every matching file name, and then spawning a `grep` instance for every matching file)
* queryFunc() will not return "(0 results)" output from files where no match is found
* Sort results based off list number
* Return a message if no results are found
2017-05-02 17:13:55 +10:00
Anthony Giorgio
fd584dd03b
Formatting cleanup.
...
Convert backticks to quotes to fix error message.
Make Pi-hole capitalization consistent.
Make Pi-hole capitalization consistent.
2017-03-18 20:47:13 -04:00
Mcat12
c4b43f92ce
Fix help text bug
...
Fixes #1325
2017-03-14 13:19:43 -04:00
Dan Schaper
b8f1eadb7f
Shift off checkout from being passed to script from pihole
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-08 14:17:56 -08:00
DL6ER
8a14a63d5d
Pi-hole checkout feature
2017-03-08 13:16:40 +01:00
DL6ER
dce3e50a00
Check for existence of wildcard blocking list before trying to acces it
2017-03-06 16:44:56 +01:00
Dan Schaper
17b0db6515
Fix for calling -w without -a.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-27 11:40:20 -08:00
Dan Schaper
83b0600863
Carriage return or newline based webcalls.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-27 11:03:57 -08:00
Dan Schaper
38961fb31b
Help text clarification and addition of the automated debuggin flag.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-27 10:49:25 -08:00
Dan Schaper
ba5bbf3523
Modify pihole for -d -a arguments.
2017-02-26 15:36:53 -08:00
Jacob Salmela
7a1a2dec67
update license to EUPL on core files
2017-02-22 11:55:20 -06:00
Markus Napp
19e30b829a
Add wildcard description to help text, improve other help texts
2017-02-08 12:42:14 +01:00
Jacob Salmela
51acdfa633
remove pihole -s flag
2017-01-27 10:12:51 -06:00
DL6ER
2935275227
Merge branch 'development' into wildcardblacklisting
2017-01-09 14:53:01 +01:00
Adam Warner
12bec1df68
Merge pull request #1048 from pi-hole/tweak/simplify_webpage.sh
...
Major simplification of webpage.sh + extend DHCP to IPv6
2017-01-02 14:28:26 +00:00
DL6ER
2b778695b1
Implement querying ad lists support for wildcards (what hell of a bash experience)
2017-01-02 14:27:13 +01:00
DL6ER
40798da6b1
Add blacklisting wildcard support
2016-12-31 12:49:04 +00:00
DL6ER
d0cd39a25f
Added space behind :53 to only match port 53
2016-12-28 20:32:56 +01:00
DL6ER
1e627c7e8f
Make webpage.sh fully library style
2016-12-28 16:25:14 +00:00
DL6ER
9170488b0a
Test if DNS service is listening on local port 53
2016-12-28 15:58:48 +00:00
DL6ER
c674a175ee
Make grep case insensitive
2016-12-23 17:02:56 +01:00
Promofaux
906a1753be
specifically comment out gravity.list addn-host
2016-12-14 19:42:20 +00:00
Adam Warner
bebb569c43
Merge pull request #964 from pi-hole/queryadsonlyexactmatches
...
pihole -q: Add option to show all partial or only exact matches
2016-12-09 23:25:15 +00:00
Mcat12
74e33bb1a0
Merge pull request #973 from pi-hole/taillog
...
Add tail argument to automatically "tail -f" pihole.log
2016-12-08 16:40:17 -05:00
Mcat12
b591df55b0
Tell user how to exit tail command
2016-12-08 16:35:50 -05:00
Mcat12
b9e0e88fe9
Update pihole
2016-12-08 15:47:30 -05:00
DL6ER
5120d9ec33
Add tail option
2016-12-08 21:15:03 +01:00
DL6ER
c0886cb5c6
pihole -q <domain> is partial matching (as before), pihole -q <domain> -exact is exact matching (new behavior)
2016-12-06 13:18:01 +01:00
DL6ER
294df8690c
Do only one grep on each of the lists and count the number of non-empty lines in the result. Improves speed by factor of 2x
2016-12-06 09:55:17 +01:00
DL6ER
fb72ac9904
Show only exact matches for pihole -q
2016-12-06 08:18:49 +01:00
DL6ER
74cb79252c
Only looking for blocking entries (do not scan whitelist.txt)
2016-12-05 17:12:28 +01:00
DL6ER
6cd3c93472
Also query white- and blacklist
2016-12-05 17:09:49 +01:00
DL6ER
eb63e75379
No need for pipe here
2016-12-05 17:06:20 +01:00
Dan Schaper
2ec4acfe52
Begin fixing exit values.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-01 12:21:08 -08:00
Mcat12
3ba7d7640f
Merge pull request #933 from DL6ER/delayedreactivation
...
Add possiblity for delayed reactivation of blocking
2016-11-21 08:26:26 -05:00
DL6ER
7bf0985a57
Extended help text of main pihole command
2016-11-21 11:30:34 +01:00
DL6ER
f50cbe74cb
Changed -web (webpage) to -a (admin)
2016-11-20 15:15:27 +01:00
DL6ER
291ca0874a
Fixed two more typos
2016-11-18 12:16:26 +01:00
DL6ER
96f2aa1803
fixed typo
2016-11-17 23:36:53 +01:00
DL6ER
c6857501aa
Removed check for availability of nohup
2016-11-17 23:31:11 +01:00
DL6ER
3aba1607b2
Removed debug echos
2016-11-17 23:04:46 +01:00
DL6ER
f667298b64
Added possiblity for delayed reactivation of blocking
2016-11-17 22:58:00 +01:00
DL6ER
db278d81e4
Added webpage.sh
2016-11-16 21:34:43 +01:00
Dan Schaper
1d64ad1ccd
Stash all changed files, clean directory and pull updates.
2016-11-02 10:39:27 -07:00
Dan Schaper
dfb4ac0365
Keep .yml's from going to user local repos.
2016-11-02 09:52:15 -07:00
Dan Schaper
0ef8832b04
whitespace
2016-11-02 09:36:30 -07:00
Dan Schaper
e42a037b7d
Grep -i instead of cat.
2016-11-02 09:28:00 -07:00
Dan Schaper
fe18d69b65
Grep should start at the beginning of line to make sure it doesn't fire on # beginning lines.
2016-11-02 09:25:32 -07:00
