Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-27 07:12:27 +00:00
Code Issues Projects Releases Packages Wiki Activity
4524 commits 10 branches 109 tags 28 MiB
Commit graph

1118 commits

Author SHA1 Message Date
DL6ER
b32b5ad6e9
Update gravity database to version 8. This enforces uniqueness on the group name. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-20 00:09:10 +00:00
DL6ER
e2de199f47
Merge pull request #3037 from pi-hole/new/group_zero 
Add special group zero to gravity database
 2019-12-18 22:36:43 +01:00
DL6ER
a1633123aa
Merge pull request #3035 from pi-hole/fix/query_gravity 
pihole -q should also scan gravity table
 2019-12-16 01:45:10 +01:00
DL6ER
2444296348
Again, Mr. Stickler 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-15 11:55:19 +00:00
DL6ER
4be7ebe61f
Scan domainlist instead of view to also catch disabled domains. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-15 11:47:53 +00:00
DL6ER
a720fe1789
Add client trigger. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-12 22:49:21 +00:00
DL6ER
f0439c8d12
Add special group zero to gravity database. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-12 16:39:02 +00:00
DL6ER
40e8657137
Please Mr. Stickler 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-12 11:18:46 +00:00
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>
 2019-12-12 11:08:19 +00:00
DL6ER
922ce7359c
pihole -q should also scan gravity table 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-12 10:58:41 +00:00
DL6ER
69a909fc4c
On modification of lists, we should send real-time signal 0 instead of SIGHUP. This also preserves the DNS cache of not-blocked domains. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-11 21:47:46 +00:00
DL6ER
f482156cca
Merge branch 'development' into new/internal-blocking 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-09 16:49:16 +00:00
DL6ER
807a5cfb23
Merge pull request #3015 from pi-hole/tweak/domainlist_table 
Unite four domain tables into a single domainlist table.
 2019-12-08 16:50:22 +01:00
Adam Warner
eaf1244932
:dominik: Detect binary name before calling FTLcheckUpdate in update.sh 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-12-04 20:10:46 +00:00
DL6ER
b6cd7b8e3d
Use more descriptive names instead of directly using the IDs in list.sh 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-02 17:27:32 +00:00
Adam Warner
869473172c
remove _ from regex descibers 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-12-01 12:50:24 +00:00
Adam Warner
63e407cfdc
Update advanced/Scripts/list.sh 
Co-Authored-By: DL6ER <DL6ER@users.noreply.github.com>
 2019-12-01 12:45:22 +00:00
Adam Warner
0251117c77
Update advanced/Scripts/list.sh 
Co-Authored-By: DL6ER <DL6ER@users.noreply.github.com>
 2019-12-01 12:45:06 +00:00
Adam Warner
44e1455b12
Update advanced/Scripts/list.sh 
Co-Authored-By: DL6ER <DL6ER@users.noreply.github.com>
 2019-12-01 12:44:48 +00:00
Adam Warner
76460f01e9
Change the regex used for domain validation 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-11-30 17:45:07 +00:00
Adam Warner
4b8a72fda7
functionise parameter discovery 
Rename HandleOther to ValidateDomain
Capital letters on the new functions

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-11-30 16:26:26 +00:00
Adam Warner
edaee4e962
remove redundant function and comments 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-11-30 16:02:50 +00:00
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
a1f120b2ff
Address stickler's complaint 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-11-30 12:43:07 +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
5c6dd3f6f4
Merge pull request #2978 from Mograine/patch-1 
Add commands to add/remove custom DNS records
 2019-11-29 13:25:09 +01:00
Adam Warner
edcdf9f619
Merge pull request #3003 from pi-hole/fix/tbd 
FTL always determined.
 2019-11-27 09:46:17 +00:00
Mograine
c809c34024 Add user feedback 
Signed-off-by: Mograine <ghiot.pierre@gmail.com>
 2019-11-27 00:28:44 +01:00
DL6ER
037d52104a
New command "pihole -g -r" recreates gravity.db based on files backed up in /etc/pihole/migration_update. This is useful to restore a working version of the database when the user destroyed the original database. Also, update gravity.db to version 5 because of a fix we needed to implement. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-11-26 10:58:39 +01:00
Adam Warner
eeb26e3975
Merge pull request #2990 from chrunchyjesus/unix-compliance 
make some shebangs comply to posix standard
 2019-11-16 12:26:49 +00:00
Adam Warner
12817c09bb
(Squashed commits) 
Always ensure we have the correct machine arch by storing to/reading from a file rather than depending on global variable that for some reason is not always populated...

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

no need for global variable

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Use a file in the temporary FTL download directory

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>

Local binary variable named to l_binary. Disambiguate from global binary.

Allow 'binary' to be shadowed for testing.

Use ./ftlbinary in all operations.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>

Revert shadow ability on binary variable.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>

Remove unused tests, binary variable can not be overridden.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>

This should work here, too

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

binary name is passed through from pihole checkout

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Add comments

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

OK, let's try it this way again

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

we might be getting somewhere.. squash after this I think!

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

This is a test to see if it fixes the aarch64 test (we are definitely squashing these commits

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

fix the rest of the tests

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Remove trailing whitespace in the files we've touched here

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-11-15 19:49:09 +00:00
Mograine
b93628acb3 Merge branch 'development' of https://github.com/Mograine/pi-hole into patch-1 2019-11-13 09:44:48 +01:00
DL6ER
7f7b9d089c
Merge pull request #2965 from pi-hole/tweak/BackendChangesForAdlistComments 
backend changes to allow comment when adding new adlist
 2019-11-12 21:50:19 +01:00
chrunchyjesus
476975540a
make some shebangs comply to posix standard 2019-11-05 22:33:00 +01:00
Mograine
193ff38ab3 Allow more precise deletion by passing ip as parameter 
Signed-off-by: Mograine <ghiot.pierre@gmail.com>
 2019-10-28 13:21:05 +01:00
Pierre Ghiot
f9d16c2b15 Update webpage.sh 
Signed-off-by: Mograine <ghiot.pierre@gmail.com>
 2019-10-27 16:55:54 +01:00
John Krull
c6f9fe3af2 Fix spelling of the word "permitting" 
Signed-off-by: John Krull <john.a.krull@gmail.com>
 2019-10-15 21:29:55 -05:00
Adam Warner
5bac1ad58b
backend changes to allow comment when adding new adlist 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-10-14 22:59:58 +01:00
DL6ER
d883854aad
Use constant for long path. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-10-03 12:12:32 +02:00
DL6ER
756c99653e
Merge branch 'development' into new/internal-blocking 2019-10-03 12:01:27 +02:00
DL6ER
2e0370367c
Print when we upgrade gravity database version. This will make possibly failed upgrades easier to debug. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-26 14:02:20 +02:00
Adam Warner
61a40c1b43
merge devel into 4.3.2 And Resolve merge conflicts 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-09-22 01:16:44 +01:00
DL6ER
a27c7b1398
regex white- and blacklist views need to be re-created as well as we need the ID for storing internally whether or not we try to match a given regex for a specific client. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-18 20:58:44 +02:00
DL6ER
7b48431917
Add client_by_group table like we have for the other lists. It stores associations between individual clients and list groups. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-09 00:03:57 +02:00
DL6ER
1f36ec48e3
Add use-application-dns.net = NXDOMAIN in ProcessDNSSettings rather than in the template so we can ensure that it will survive config-renewals. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-07 23:11:20 +02:00
DL6ER
ff08add7c0
Update vw_whitelist and vw_blacklist to return group_id alongside domain so we can filter if the current client wants to get this domain blocked or not. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-07 13:01:36 +02:00
DL6ER
ffc91a6c81
Update view vw_gravity to only return domains from enabled adlists. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-07 11:17:53 +02:00
DL6ER
a8af2e1837
Store domains without sorting and unifying them first. This allows us to preserve the relationship of the individual domains to the lists they came from. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-04 23:14:29 +02:00
DL6ER
aed2e35bc0
Print messages only after removing possible matches in comments. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-02 22:39:28 +02:00
DL6ER
a7b44426cd
Merge pull request #2838 from pi-hole/new/whitelist-regex-support 
Whitelist regex support
 2019-09-01 14:23:37 +02:00
Dan Schaper
b9fed8fca6
Merge pull request #2891 from niklasea/development 
Restore 'pihole -q' hosts format support and improve matching in edge cases
 2019-08-30 20:56:52 -07:00
DL6ER
d8eee47ca4
Add dhcp-ignore-names option when enabling DHCP service. We currently remove anything that starts with "dhcp-" to have a clean configuration and removed these lines without noticing when enabling the DHCP server. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-28 22:10:26 -07:00
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>
 2019-08-27 12:13:28 +02:00
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>
 2019-08-26 20:39:56 +02:00
Dan Schaper
03c65dd0e9
Convert hardcoded /usr/local/bin to variable 
Update pihole script with full path to 'pihole'

Variable for webpage.sh 'pihole' call.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2019-08-24 04:49:14 -07:00
DL6ER
6faddfcd3d
Print timestamps in local time zone of the Pi-hole. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-23 10:09:52 +02:00
DL6ER
1820c2c598
Merge branch 'development' into new/whitelist-regex-support 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-22 14:19:51 +02:00
DL6ER
23b688287f
Fix indentation in query.sh. No functional change in this commit. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-22 14:12:58 +02:00
DL6ER
42ccc1ef24
Add support for regex whitelist in "pihole -q". 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-22 14:06:42 +02:00
DL6ER
cc40c18f49
Wrap upgrade script commands in a transaction. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-22 13:54:46 +02:00
DL6ER
b1838512b2
Explicitly select columns (and their order) when listing the databaes tables. Print timestamps translated to strings instead of printing the integer timestamps. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-22 13:39:58 +02:00
DL6ER
3e78ed95d4
Fix displaying options for table "group" in the debugger. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-17 15:04:04 +02:00
snapsl
20a839fef5 fixed local declaration before assignment 
Signed-off-by: snapsl <chris.baller@gmx.de>
 2019-08-15 11:20:55 +02:00
snapsl
b2d8c4374b tweaked code style of webpage.sh 
Signed-off-by: snapsl <chris.baller@gmx.de>
 2019-08-14 23:28:13 +02:00
DL6ER
dc93462d42
Group table has only two columns 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-06 20:28:00 +02: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
af754e3fc4
Rearrange group tables directly next to the tables they refer to. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-05 21:08:36 +02:00
DL6ER
06860ed5b4
Group tables have only two columns. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-05 21:07:39 +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
0692be9bae
Fix small mistake in 2->3 upgrade script. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-22 20:59:52 +02:00
DL6ER
0d28dce326
Print group table contents in debug log. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-22 20:18:15 +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
Mark Drobnak
ab3f6dfcc6
Merge pull request #2831 from pi-hole/fix/block-page-adlists 
Fix block page errors due to gravity DB and changes to queryAds
 2019-07-20 14:55:37 -04:00
Mark Drobnak
445127accc
Merge pull request #2832 from pi-hole/new/audit_database 
Migrate audit list to gravity.db database table
 2019-07-10 22:55:48 -04:00
DL6ER
420f60b5c7
Add timeout to migration script (1->2). 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-10 12:02:07 +02:00
DL6ER
65fdbc85d5
Add timeout to migration script (2->3). 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-10 12:01:38 +02:00
DL6ER
87f75c737a
Review comments. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-10 12:00:38 +02:00
DL6ER
5ff9052200
Review comments 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-09 11:41:44 +02:00
Mcat12
b154dd5f07
Quote calls to read FTL config 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-07-08 19:48:50 -07:00
DL6ER
0683842ec3
Fix typo in 2->3 migration script. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-08 21:43:49 +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
3d3fc2947e
Review comments 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-08 19:22:35 +02:00
Mcat12
e8e5d4afda
Get file locations of FTL files from the config 
Instead of hardcoding the location of certain FTL files (`gravity.db`,
`pihole-FTL.log`), read the configured location from FTL's config. The
default location is used if no custom location has been configured.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-07-07 18:10:39 -07:00
DL6ER
8382f4d727
Rename table to domain_audit and simplify subroutine addAudit(). 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-07 21:21:56 +02:00
DL6ER
be3e198f9a
Address linting errors. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-07 10:46:20 +02:00
DL6ER
acc50b709e
Only migrate files once (domain and adlist lists druing initial creation of gravity.db auditlog.list on database upgrade from version 1 to 2. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-07 10:33:08 +02:00
DL6ER
efe8216445
Fix further stickler complaint. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-06 09:45:07 +02:00
DL6ER
0405aaa3da
Review comments and fixing stickler complaints. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-06 09:32:41 +02:00
DL6ER
2fb4256f84
Rename table to "auditlist" 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-05 16:28:36 +02:00
DL6ER
82476138c1
Instead of calling sqlite3 multiple times within a loop, we use the ability to add multiple rows within one INSERT clause. This is supported since sqlite3 3.7.11 (2012-03-20) and should be available on all systems. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-05 16:09:13 +02:00
DL6ER
5293beeb77
Update audit script to store domains in new database table. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-05 14:10:33 +02:00
DL6ER
0c8f5f1221
Remove comment field from audit table 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-05 14:06:05 +02:00
DL6ER
4f4a12bb40
Upgrade database if necessary and store audit domains therein. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-05 14:03:57 +02:00
DL6ER
1dbe6c83c3
Add database upgrading mechanism for adding the audit table. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-05 13:54:18 +02:00
Mcat12
8d9ff550d4
Fix blockpage error if whitelisted, blacklisted, or regex filtered 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-07-04 13:44:14 -07:00
Mark Drobnak
92c3c86be4
Merge pull request #2769 from pi-hole/new/arp-flush 
Add new "pihole arpflush" command
 2019-07-04 14:00:16 -04:00
DL6ER
7a1b6fd205
Merge branch 'development' into new/gravity.db_domain_groups 2019-07-03 19:21:55 +02:00
MMotti
04abcb71f6 Fix potential invalid result for pihole -q 
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
 2019-07-03 13:04:57 +01:00
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>
 2019-07-03 07:56:10 +02:00
DL6ER
6996ffa451
Also flush network_addresses table 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-06-15 09:15:12 +02:00
DL6ER
c1495b0fa8
Merge branch 'development' into new/arp-flush 2019-06-15 09:04:30 +02:00
MMotti
bcf03647ef Add comment and remove blankspace 
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
 2019-06-12 16:02:59 +01:00
MMotti
a9d0690f4d Change the case of some variables 
Just for consistency

Signed-off-by: MMotti <matthew.w.motti@gmail.com>
 2019-06-10 18:50:52 +01:00
MMotti
10fbed50f3 Shellcheck 
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-10 18:10:25 +01:00
MMotti
785f1fedd9 Tidy regexp queries 
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
 2019-06-10 17:52:58 +01:00
MMotti
cf21efa103 Minor grammar changes 
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
 2019-06-05 14:36:43 +01:00
MMotti
7613e94ef6 Minor tweaks 
Mainly for consistency

Signed-off-by: MMotti <matthew.w.motti@gmail.com>
 2019-06-04 06:06:17 +01:00
MMotti
b49c702f33 Consistency tweak 
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
 2019-06-04 00:03:37 +01:00
MMotti
09532638d5 Read from DB instead of regex.list 
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
 2019-06-04 00:00:25 +01:00
MMotti
97df6d7415 Stickler fix 
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
 2019-06-03 19:56:10 +01:00
MMotti
54bfaa28c1 Fix for regexp queries through pihole -q 
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-06-03 19:32:59 +01:00
Mark Drobnak
d92ced6fb6
Merge pull request #2734 from pi-hole/fix/query_black_and_whitelists_database 
Query black and whitelists database
 2019-06-01 00:55:05 -04:00
DL6ER
9ddce88092
Review comments 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-31 08:42:22 +02:00
DL6ER
44f8fcb600
We can print the table name without any extra check as we already returned early in case there are no results. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-31 08:39:18 +02:00
Mark Drobnak
814fdcf9b6
Merge pull request #2768 from pi-hole/fix/dhcp-ignore-names 
Add dhcp-ignore-names option when enabling DHCP service
 2019-05-30 22:35:52 -04:00
DL6ER
5060605626
Print table name before entering the loop for the sake of simplicity 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-30 21:44:59 +02:00
DL6ER
285e6fe090
Address lint complaints 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-30 21:32:35 +02:00
DL6ER
c3023fe681
Add new "pihole arpflush" command to flush both the ARP cache as well as the network table in pihole-FTL.db 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-30 21:25:10 +02:00
DL6ER
c5df104a66
Add dhcp-ignore-names option when enabling DHCP service. We currently remove anything that starts with "dhcp-" to have a clean configuration and removed these lines without noticing when enabling the DHCP server. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-30 16:41:37 +02:00
Mcat12
bfb99c361c
Note that the gravity size does not include the blacklist entries 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-05-21 17:12:47 -07:00
Mcat12
5796054305
Increase ID column width to 4 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-05-20 21:59:18 -07:00
Mcat12
a3e1473ac1
Set explicit column widths to prevent text from getting cut off 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-05-20 21:33:09 -07:00
Mcat12
7b5fc60e00
Improve table formatting 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-05-20 21:20:38 -07:00
Mcat12
807ce0af4e
Show whitelist, blacklist, and regexlist details 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-05-20 21:15:22 -07:00
Mcat12
3f05efd60f
Add extra newline 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-05-20 21:02:31 -07:00
Mcat12
03d93aa19a
Update debug script with gravity DB changes 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-05-20 20:58:57 -07:00
Dan Schaper
7de6bbca61
Merge branch 'development' into release/v4.3 2019-05-18 13:18:14 -07:00
Mcat12
8e1bf6e3d4
Merge branch 'development' into new/gravitydb 
# Conflicts:
#	advanced/Scripts/list.sh
#	gravity.sh
#	pihole
 2019-05-12 15:20:52 -07:00
mpiederiet
3220e2b978
Fix for preventing git error message in cron logs 
Fix to prevent "fatal: No names found, cannot describe anything" git message during scheduled update checks

Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-11 10:57:44 +02:00
DL6ER
a904c183df
Use printf to escape domain content. This prevents possible SQL injection issues 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-04 18:25:11 +02:00
DL6ER
5246b3e496
Explicitly escape backslash in ESCAPE clause. This has been suggested by Stickler bot. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-04 13:24:36 +02:00
DL6ER
f80fdd7e83
Improve comments 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-04 13:19:50 +02:00
DL6ER
6ba58896d2
Simplify code 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-04 13:15:30 +02:00
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) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-04 13:02:14 +02:00
Dan Schaper
5532df24e4
Pi-hole Debug - tricorder upload function calls 
Fix tricorder upload function calls to use new curl function.
 2019-05-03 02:46:27 -07: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
b372f808dd
Fix lint errors 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-01 17:06:14 +02:00
DL6ER
bc9b623638
Modify query.sh to use the gravity database 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-01 16:56:16 +02:00
pvogt09
8a92fb24c4 Incorporates changes requested by @Mcat12 
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
 2019-05-01 11:20:26 +02:00
pvogt09
5c575e73c7 Adds world readable attribute to files created by Pi-hole to circumvent #2724 
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
 2019-04-30 22:41:12 +02:00
Mark Drobnak
6812e8880e
Merge pull request #2705 from pi-hole/fix/chronometer-refresh-arg 
Fix chronometer refresh incorrectly reading the long argument sleep time
 2019-04-29 11:43:07 -04:00
DL6ER
efeba594ae
Add support for manipulating adlists from the CLI 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-28 21:39:06 +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
Mcat12
b320e74921
Improve argument handling 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-04-27 14:05:04 -07:00
Mcat12
add5e4ca5e
Explicitly allow only -r and --refresh in argument handler 
It is already checked, but this make the code explicit.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-04-27 13:39:44 -07:00