Commit Graph

57 Commits (9048429bbbc002c851365d3ccef1c5923ef8845c)

Author SHA1 Message Date
Christian König d349a4640f
Remoce leftover from query.sh
1 year ago
Adam Warner e35a9da921
Remove the blockpage-focussed customisations to query.sh
2 years ago
Adam Warner 0b81dd387b
type -> list_type per @yubiuser suggestion
2 years ago
Christian König e4a1f3a175
Rename block lists to adlists within the query list functions
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.
2 years ago
RD WebDesign 6ead24b315
Move space into variable (#4562)
2 years ago
jbzdarkid bc8150adfa Clean up bash script formatting
3 years ago
DL6ER f536718aaa
Use possibly custom gravity.db location in the copying SQL script
3 years ago
DL6ER f1740da9ff
Update gravity path in query.sh
3 years ago
XhmikosR 7579ab178a Update links
4 years ago
DL6ER 497bfd80a5
Update development from release/v5.0 (#3200)
4 years ago
DL6ER 2444296348
Again, Mr. Stickler
4 years ago
DL6ER 4be7ebe61f
Scan domainlist instead of view to also catch disabled domains.
4 years ago
DL6ER 40e8657137
Please Mr. Stickler
5 years ago
DL6ER 52dd72dfa5
Ensure output is always correct and also display if domain has been found but is disabled
5 years ago
DL6ER 922ce7359c
pihole -q should also scan gravity table
5 years ago
Adam Warner 61a40c1b43
merge devel into 4.3.2 And Resolve merge conflicts
5 years ago
DL6ER aed2e35bc0
Print messages only after removing possible matches in comments.
5 years ago
Niklas Elmose Andersen a3e32d9a15 Properly escape domain regex
5 years ago
Niklas Elmose Andersen 989d1aff60 Restore and improve 'pihole -q' matching
5 years ago
DL6ER 1820c2c598
Merge branch 'development' into new/whitelist-regex-support
5 years ago
DL6ER 23b688287f
Fix indentation in query.sh. No functional change in this commit.
5 years ago
DL6ER 42ccc1ef24
Add support for regex whitelist in "pihole -q".
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.
5 years ago
Mcat12 8d9ff550d4
Fix blockpage error if whitelisted, blacklisted, or regex filtered
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
5 years ago
DL6ER 1fe3507bc5
Adlists table was renamed to Adlist. Adapt further places in the code to match the new name.
5 years ago
MMotti bcf03647ef Add comment and remove blankspace
5 years ago
MMotti a9d0690f4d Change the case of some variables
5 years ago
MMotti 10fbed50f3 Shellcheck
5 years ago
MMotti 785f1fedd9 Tidy regexp queries
5 years ago
MMotti cf21efa103 Minor grammar changes
5 years ago
MMotti 7613e94ef6 Minor tweaks
5 years ago
MMotti b49c702f33 Consistency tweak
5 years ago
MMotti 09532638d5 Read from DB instead of regex.list
5 years ago
MMotti 97df6d7415 Stickler fix
5 years ago
MMotti 54bfaa28c1 Fix for regexp queries through pihole -q
5 years ago
DL6ER 44f8fcb600
We can print the table name without any extra check as we already returned early in case there are no results.
5 years ago
DL6ER 5060605626
Print table name before entering the loop for the sake of simplicity
5 years ago
DL6ER a904c183df
Use printf to escape domain content. This prevents possible SQL injection issues
5 years ago
DL6ER 5246b3e496
Explicitly escape backslash in ESCAPE clause. This has been suggested by Stickler bot.
5 years ago
DL6ER f80fdd7e83
Improve comments
5 years ago
DL6ER 6ba58896d2
Simplify code
5 years ago
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)
5 years ago
DL6ER b372f808dd
Fix lint errors
5 years ago
DL6ER bc9b623638
Modify query.sh to use the gravity database
5 years ago
Adam Warner a7f6c9b3a0
Ignore matches that start `# ` using negative lookbehind
5 years ago
Dan Schaper 8f727c1f35
Space/Tab query.sh
6 years ago
Mcat12 4763969c8f
Move processWildcards to query.sh
6 years ago