Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/pi-hole/pi-hole.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/advanced/Scripts/query.sh
AgeCommit message (Collapse)Author
2020-03-02Don't quote inside backticks, use unquoted variable.Dan Schaper
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2020-03-02Loop through array of lists.Dan Schaper
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2020-03-02Use bash regex instead of awk.Dan Schaper
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2019-12-15Again, Mr. SticklerDL6ER
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-15Scan domainlist instead of view to also catch disabled domains.DL6ER
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-12Please Mr. SticklerDL6ER
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-12Ensure output is always correct and also display if domain has been found ↵DL6ER
but is disabled Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-12pihole -q should also scan gravity tableDL6ER
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-09-22merge devel into 4.3.2 And Resolve merge conflictsAdam Warner
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-09-02Print messages only after removing possible matches in comments.DL6ER
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-08-27Properly escape domain regexNiklas Elmose Andersen
Dots in domain names should not match any character. Signed-off-by: Niklas Elmose Andersen <mail@niklasea.dk>
2019-08-26Restore and improve 'pihole -q' matchingNiklas Elmose Andersen
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-22Merge branch 'development' into new/whitelist-regex-supportDL6ER
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-08-22Fix indentation in query.sh. No functional change in this commit.DL6ER
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-08-22Add support for regex whitelist in "pihole -q".DL6ER
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-08Create new table + view regex_whitelist + rename old regex table to ↵DL6ER
regex_blacklist. This updates the gravity.db version to 3. Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-04Fix blockpage error if whitelisted, blacklisted, or regex filteredMcat12
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-07-03Merge branch 'development' into new/gravity.db_domain_groupsDL6ER
2019-07-03Fix potential invalid result for pihole -qMMotti
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
2019-07-03Adlists table was renamed to Adlist. Adapt further places in the code to ↵DL6ER
match the new name. Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-12Add comment and remove blankspaceMMotti
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
2019-06-10Change the case of some variablesMMotti
Just for consistency Signed-off-by: MMotti <matthew.w.motti@gmail.com>
2019-06-10ShellcheckMMotti
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-10Tidy regexp queriesMMotti
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
2019-06-05Minor grammar changesMMotti
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
2019-06-04Minor tweaksMMotti
Mainly for consistency Signed-off-by: MMotti <matthew.w.motti@gmail.com>
2019-06-04Consistency tweakMMotti
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
2019-06-04Read from DB instead of regex.listMMotti
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
2019-06-03Stickler fixMMotti
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
2019-06-03Fix for regexp queries through pihole -qMMotti
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-05-31We can print the table name without any extra check as we already returned ↵DL6ER
early in case there are no results. Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-30Print table name before entering the loop for the sake of simplicityDL6ER
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-04Use printf to escape domain content. This prevents possible SQL injection issuesDL6ER
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-04Explicitly escape backslash in ESCAPE clause. This has been suggested by ↵DL6ER
Stickler bot. Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-04Improve commentsDL6ER
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-04Simplify codeDL6ER
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-04Implement black- and whitelist searching with SQL statements. We use the ↵DL6ER
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-01Fix lint errorsDL6ER
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-01Modify query.sh to use the gravity databaseDL6ER
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-03-29Ignore matches that start `# ` using negative lookbehindAdam Warner
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2018-07-20Space/Tab query.shDan Schaper
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-07-01Move processWildcards to query.shMcat12
Closes #2255 Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-06-30Fix incorrect variable string substitutionMcat12
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-06-15remove quotesRob Gill
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-06-15$adListsList replace filename in textRob Gill
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-06-13Appease stickler.Rob Gill
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-06-13colfileRob Gill
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-06-13wildcardlistRob Gill
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-06-13Stop grep leak in queryRob Gill
Fix grep error leak from #1805 Signed-off-by: Rob Gill <rrobgill@protonmail.com>
    generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 21:49:12 +0300