DL6ER
9ff43040ec
Add list type in pihole -q
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
4 months ago
DL6ER
75fadb9b55
Adlists need to be grouped by both address and type to differentiate between anti-/gravity lists
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
4 months ago
Adam Warner
f193edd428
Merge branch 'development' into development-v6-merge-development (resolved conflicts)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 months ago
DL6ER
3f7413d538
Add "-ni" to all sqlite3 invocations
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 months ago
yubiuser
2529fbeacd
Treat FTL return data as strings ( #5509 )
6 months ago
Christian König
2681835f94
Treat FTL return data as strings
...
Signed-off-by: Christian König <ckoenig@posteo.de>
6 months ago
DL6ER
96bf07863f
Use CHAOS TXT local.api.txt instead of trying to parse pihole-FTL --config webserver.ports
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 months ago
Christian König
480a8c8d7f
Remove idn2 as punycode conversion is handled by FTL
...
Signed-off-by: Christian König <ckoenig@posteo.de>
7 months ago
Christian König
2005d04625
Exact search is the new default
...
Signed-off-by: Christian König <ckoenig@posteo.de>
8 months ago
Christian König
f7ba059b94
Query directly and authenticate only if required
...
Signed-off-by: Christian König <ckoenig@posteo.de>
8 months ago
Christian König
ee4eb8db20
chmod +x
...
Signed-off-by: Christian König <ckoenig@posteo.de>
10 months ago
Christian König
8e0a40e717
Use api.sh within query.sh
...
Signed-off-by: Christian König <ckoenig@posteo.de>
10 months ago
Christian König
088b2c2920
Do not remove -all|excat when not sourrounded by space in query.sh
...
Signed-off-by: Christian König <ckoenig@posteo.de>
1 year ago
Christian König
fd4e8766e4
Remove unused code from query.sh
...
Signed-off-by: Christian König <ckoenig@posteo.de>
1 year ago
RD WebDesign
66ed7c9ea3
Declaring all local variables under the function declaration line
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
1 year ago
RD WebDesign
6b919f3a2e
Removing unnecessary commas
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
1 year ago
RD WebDesign
20f8c6af3c
Search for ABP entries only if they exist in gravity.db
...
and use `abp_domains` property.
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
1 year ago
RD WebDesign
c35ed68051
Allow `pihole -q` matching ABP subdomains
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
1 year ago
Dan Schaper
75a32d22a3
Allow limited parsing of ABP style adlists ( #5179 )
1 year ago
Christian König
309ee78903
Use distinct variabled
...
Signed-off-by: Christian König <ckoenig@posteo.de>
1 year ago
Christian König
d6f5552ccf
Convert domain to lowercase in pihole -q
...
Signed-off-by: Christian König <ckoenig@posteo.de>
1 year ago
Adam Warner
c5faf3d174
Use ',' as the separator char in query rather than the default '|' as we now expect some valid results to contain '|'
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
1 year ago
Christian König
d349a4640f
Remoce leftover from query.sh
...
Signed-off-by: Christian König <ckoenig@posteo.de>
1 year ago
Adam Warner
e35a9da921
Remove the blockpage-focussed customisations to query.sh
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2 years ago
Adam Warner
0b81dd387b
type -> list_type per @yubiuser suggestion
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2 years ago
Christian König
e4a1f3a175
Rename block lists to adlists within the query list functions
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
DL6ER
8cbffa179d
Replace remaining sqlite3 calls by calls to our embedded pihole-FTL sqlite3 engine and remove sqlite3 as dependency in the installer.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2 years ago
RD WebDesign
6ead24b315
Move space into variable ( #4562 )
...
Signed-off-by: rdwebdesign <github@rdwebdesign.com.br>
2 years ago
jbzdarkid
bc8150adfa
Clean up bash script formatting
...
Done with the help of beautysh (a python-based bash formatter)
Signed-off-by: jbzdarkid <jbzdarkid@gmail.com>
3 years ago
DL6ER
f536718aaa
Use possibly custom gravity.db location in the copying SQL script
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
DL6ER
f1740da9ff
Update gravity path in query.sh
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
XhmikosR
7579ab178a
Update links
...
* use https when possible
* replace coverage with a link to the docs page in README.md
* remove obsolete affiliate link in README.md
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
4 years ago
DL6ER
497bfd80a5
Update development from release/v5.0 ( #3200 )
...
* Use bash regex instead of awk.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
* Fix incorrect type description. (#3201 )
Signed-off-by: DL6ER <dl6er@dl6er.de>
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
4 years ago
DL6ER
2444296348
Again, Mr. Stickler
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
4be7ebe61f
Scan domainlist instead of view to also catch disabled domains.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
40e8657137
Please Mr. Stickler
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
52dd72dfa5
Ensure output is always correct and also display if domain has been found but is disabled
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
922ce7359c
pihole -q should also scan gravity table
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
Adam Warner
61a40c1b43
merge devel into 4.3.2 And Resolve merge conflicts
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
5 years ago
DL6ER
aed2e35bc0
Print messages only after removing possible matches in comments.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
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>
5 years ago
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>
5 years ago
DL6ER
1820c2c598
Merge branch 'development' into new/whitelist-regex-support
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
23b688287f
Fix indentation in query.sh. No functional change in this commit.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
42ccc1ef24
Add support for regex whitelist in "pihole -q".
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
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>
5 years ago
Mcat12
8d9ff550d4
Fix blockpage error if whitelisted, blacklisted, or regex filtered
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
5 years ago
DL6ER
7a1b6fd205
Merge branch 'development' into new/gravity.db_domain_groups
5 years ago
MMotti
04abcb71f6
Fix potential invalid result for pihole -q
...
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
5 years ago
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>
5 years ago