Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-15 10:43:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
4293 commits 8 branches 109 tags 27 MiB
Commit graph

406 commits

Author SHA1 Message Date
Chris Crocker-White
69dba022c4 Handle an empty local.list 
Handle the case of an empty local.list file which would otherwise prevent the system from starting

Change-type: patch
Signed-off-by: Chris Crocker-White <chriscw@balena.io>
 2019-05-27 10:27:28 -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
pvogt09
3f90261520 Moves chmod after every creation of ${destination} instead of end of function 
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
 2019-05-12 11:25:48 +02:00
pvogt09
225285cb97 Removes chmod for ${source} and superfluous chmod for ${destination} 
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
 2019-05-11 11:14:07 +02:00
pvogt09
a3d2a1062f Makes blocklists world readable 
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
 2019-05-10 11:13:19 +02:00
Mcat12
ec06fd0ad4
Fix incorrect adlist query when an adlist is blocked during gravity 
hosts-file.net was hard-coded as the domain to check instead of the
actual domain.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-05-04 11:35:21 -07:00
DL6ER
0cfecd31d3
Invert logic to reduce nesting 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-01 22:07:14 +02:00
DL6ER
008e88b84b
Only migrate legacy list files when we create gravity.db in the same gravity run 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-01 18:04:31 +02:00
DL6ER
540c57f755
Add comment for automigrated list entries 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-01 17:51:25 +02:00
DL6ER
983117d788
Add id (primary key, autoincrement) field to lists tables 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-01 17:47:15 +02:00
DL6ER
b372f808dd
Fix lint errors 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-01 17:06:14 +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
DL6ER
a932209143
Set default for date_modified to be the current time 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-29 17:21:59 +02:00
DL6ER
4946b5907b
Move migrated files to backup directory instead of deleting them. This has the benefit that gravity.db can be recreated at any time by: 1. deleting gravity.db, 2. copying all files from the migration_backup directory back to /etc/pihole, 3. running pihole -g again. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-28 22:15:47 +02:00
Mark Drobnak
4596d9a577
Merge branch 'development' into new/gravitydb 2019-04-26 23:40:28 -04:00
DL6ER
8524aecfed
Don't set gravity database permissions 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-26 17:56:11 +02:00
DL6ER
3dcb9722d3
Remove global haveSourceUrls variable and just skip downloading and processing adlists if there aren't any to be downloaded 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-26 17:39:35 +02:00
DL6ER
bd0215524b
Add vw_adlists view which returns only enabled adlists 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-26 17:36:00 +02:00
DL6ER
53e3ff2b24
Only add non-empty lines when moving file content into database tables 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-26 17:32:05 +02:00
DL6ER
0efc46260f
Use both old and new strings for detecting whether this is a Pi-hole dnsmasq config file 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-26 16:16:30 +02:00
DL6ER
d94bbfca7f
Finish migrating gravity.db to using our new gravity database. This removes the --skip-download, --blacklist-only, --whitelist-only, and --wildcard-only options as it is not necessary to run gravity when modifying them from now on (gravity really only builds the gravity database and the local.list file). 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-25 11:23:06 +02:00
DL6ER
465a39427b
Source adlists from gravity database 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-25 10:46:18 +02:00
DL6ER
2664ac0efc
Improve error reporting 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-25 10:18:37 +02:00
DL6ER
c1277705d8
Copy existing whitelist.txt, blacklist.txt, regex.list, and adlists.list to the database. We remove the files afterwards as the content lives in the database now 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-25 10:14:45 +02:00
DL6ER
e57d0fb93c
Remove the empty templates gravity.list, white.list, black.list. The old source files whitelist.txt, blacklist.txt, and regex.list still exist and need to be removed in a follow-up commit 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-24 19:05:08 +02:00
DL6ER
ee20164207
Remove detect_pihole_blocking_status() as we can modify the database at any time 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-24 19:01:31 +02:00
Dan Schaper
54ae9d83b0 Stickler-lints 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2019-02-23 13:42:15 -08:00
DL6ER
bbc392caeb
More review comments 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-02-22 22:49:02 +01:00
DL6ER
61840edb30
Fill comment field with NULL (default) instead of empty string and use a variable for the timestamp instead of periodically calling date 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-02-22 22:46:19 +01:00
DL6ER
f9250d91a5
Explictly escape the escape. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-02-06 19:17:13 +01:00
DL6ER
491c828661
Improved code, ensure that gravity.sh passes shellcheck as a whole 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-02-06 19:09:09 +01:00
DL6ER
644ec36e64
Review comments 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-02-06 18:57:48 +01:00
DL6ER
ec5b16ef85
Fix incomplete comment 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-02-05 19:08:08 +01:00
DL6ER
dbbf21071b
Invert logic to use ENABLED instead of DISABLED. We make sure to set "enabled = 1 WHERE enabled IS NULL" in gravity_store_in_database() 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-02-05 19:05:11 +01:00
DL6ER
b2f4385232
Avoid infinity loop if gravity optimization fails 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-02-03 17:05:00 +01:00
DL6ER
1f9a7d0b0c
Only run VACUUM on "pihole -g -o" 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-02-03 17:01:38 +01:00
DL6ER
d5feffa117
Do not backup the database 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-02-03 16:45:19 +01:00
DL6ER
fc62cf7e2f
Only run VACUUM on "full" gravity runs 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-02-03 16:45:06 +01:00
DL6ER
93f1859bab
Store regex in gravity.db as well 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-02-03 15:13:18 +01:00
DL6ER
dcf0a605cf
Use views for all tables and set disabled column to false for those tables that support it 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-02-03 14:14:14 +01:00
DL6ER
8a91fe6992
Store domains in gravit tables: gravity, whitelist, blacklist 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-02-03 13:21:26 +01:00
DL6ER
09c4c88a6d
Create and fill gravity.db during pihole -g 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-02-03 13:04:31 +01:00
xch12i5
cd8a423b32 Solves RegEx issue and updates documentation. 
Signed-off-by: xch12i5 <40517505+xCh12i5@users.noreply.github.com>
 2019-01-20 16:09:25 +01:00
xch12i5
e02da90faa Replaces double quotes by single quotes and updates documentation. 
Signed-off-by: xch12i5 <40517505+xCh12i5@users.noreply.github.com>
 2019-01-19 17:52:28 +01:00
xch12i5
0de5132e2b Solves RegEx issue. 
Signed-off-by: xch12i5 <40517505+xCh12i5@users.noreply.github.com>
 2019-01-19 17:07:27 +01:00
DL6ER
05bd88b4d8
Update agent string: the selected string is the most abundant one on 06 Dec 2018 with a percentage of almost 10% 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-12-06 18:04:17 +01:00
Adam Warner
83f7bd66e6
Don't mv preEventHorizon, copy it. 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-12-05 22:29:01 +00:00
Dan Schaper
5c621fa253
Lints 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-11-12 17:21:34 -08:00
Dan Schaper
f9e71bee0a
Account for port, or lack of, in PIHOLE_DNS_1 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-11-12 17:15:24 -08:00
Mark Drobnak
33939a30ea
Merge pull request #2347 from Gusher123/patch-1 
Don't let one blocklist block an other blocklist
 2018-09-30 21:24:45 -04:00
Adam Warner
0131055ec9
Submission stale, addressing @mcat12's comments 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-09-30 20:00:06 +01:00
DL6ER
337cc5ca18
BLOCKING -> BLOCKING_ENABLED 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-08-13 17:22:10 +02:00
DL6ER
b011adc453
Use new setupVars BLOCKING variable to determine which file to update via gravity 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-08-13 14:19:59 +02:00
DL6ER
6cde066edd
Have gravity detect the presence of files like gravity.list.bck and update this file if present (assuming blocking is disabled) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-08-13 13:43:14 +02:00
Gusher123
2feb5f22cc
Signed-off-by 
This is my commit message

Signed-off-by: Gusher123 <t.siebeling@gmail.com>
 2018-08-12 10:05:58 +02:00
Gusher123
03a9d3bc5b Not hardcoding dns and covering all blockingmodes 
Using double brackets

Mode double brackets
 2018-08-12 03:05:53 +02:00
Gusher123
e58142b4ac
Added comments 2018-08-11 15:14:45 +02:00
Gusher123
3e5c6afaee
Don't let one blocklist, block an other 
If a blocklist is blocked by an other and 'pihole -g' is run, update the blocked blocklist by useing an alternate dns server (in this case 1.1.1.1) to acquire the IP adres and download the blocklist using the 'curl --resolve' (https://curl.haxx.se/docs/manpage.html#--resolve)
 2018-08-11 14:33:33 +02:00
DL6ER
760dd01b50
Use grep invert-match 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-08-07 18:36:06 +02:00
DL6ER
5bf90cb77d
Use alternative logic for counting regex file entries, skipping commented out lines 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-08-07 18:02:01 +02:00
Mcat12
1a8d5fb4a9
Allow PHP to edit the regex file if installed 
Fixes permissions error on the web interface when modifying the regex.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-28 21:57:39 -04:00
Dan Schaper
dbc82cfb6a
Merge pull request #2236 from pi-hole/new/regex-lists 
Use regex lists instead of wildcards for blocking
 2018-07-14 06:10:44 -07:00
Mcat12
72be7ad5f0
Don't count commented out regex lines 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-12 21:21:06 -04:00
WaLLy3K
7ddae8f2eb
Treat URLs without a protocol as HTTP 
Signed off by WaLLy3K <wally3k@pi-hole.net>
 2018-07-02 19:59:22 +10:00
Mcat12
0f4968d75c
Merge remote-tracking branch 'origin/development' into new/regex-lists 2018-06-29 23:12:34 -04:00
Mcat12
55175087c4
Set regex file permissions for web access 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-06-28 22:52:44 -04:00
Dan Schaper
d5547f5c7c
Revert "Fix error: /opt/pihole/gravity.sh: 385: Warning: command substitution: ignored null byte in input" 2018-06-24 16:06:55 -07:00
Mark Drobnak
4fc3546887
Merge pull request #2069 from pi-hole/fix/nullbyte 
Fix error: /opt/pihole/gravity.sh: 385: Warning: command substitution: ignored null byte in input
 2018-06-20 20:42:24 -04:00
DL6ER
bc705aac03
Add automated wildcard list -> regex filter conversion 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-17 14:39:19 +02:00
Mark Drobnak
3149a95d6a
Fix gravity_ParseFileIntoDomains Awk comment 
Signed-off-by: Mark Drobnak <newtoncat12@yahoo.com>
 2018-06-03 13:33:33 -04:00
Adam Warner
5f2217a079
Fix for gravity.list not being emptied with an empty/missing adlist file. 
Variable output depending on content of /existence of adlist

Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-30 21:56:33 +01:00
Adam Warner
3216d65353
Merge branch 'development' into new/RemoveDefaultBlocklists 2018-04-29 13:39:17 +01:00
Adam Warner
9c29bd627e
fix user blacklisting 2018-04-21 23:55:33 +01:00
DL6ER
d24b141d8b
Get rid of numBlocked file, FTLDNS can now determine number of domains thanks to the new lists format 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-21 23:58:42 +02:00
DL6ER
bac9e005ae
Generate gravity.list and black.list in simple domain lists format for FTLDNS. Leave local.list in HOSTS format 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-21 23:27:36 +02:00
Dan Schaper
d4d1ec2568
Merge pull request #2124 from pi-hole/development 
Internal
 2018-04-17 11:54:50 -07:00
Adam Warner
88d4108f92
- Add new whipstail to choose from example blocklists on new install 
- remove adlists.default
- do not copy non-existent adlists.default on run of gravity

Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-17 10:33:06 +01:00
Jacob Salmela
187848660c
try another fix for #2028 
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
 2018-03-31 16:12:29 -05:00
Jacob Salmela
c3f391dc5a
maybe fixes #2028 by deleting null bytes 
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
 2018-03-31 14:08:48 -05:00
DL6ER
ff47ab12fb
Save number of effectively blocked domains in /etc/pihole/numBlocked 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-03-30 21:01:51 +02:00
Riley Avron
f390671018 Improve scheme matching to avoid inadvertent blocking 
Signed-off-by: Riley Avron <riley.avron@gmail.com>
 2018-03-06 22:03:56 -08:00
Riley Avron
512ec7fb87 Remove unneeded ifs in awk 
Signed-off-by: Riley Avron <riley.avron@gmail.com>
 2018-03-06 22:03:43 -08:00
Adam Warner
24219422df
Merge branch 'development' into FTLDNSremoveDnsmasq 2018-03-06 20:43:27 +00:00
Adam Warner
ad1f210528
As we no longer add source lists to the whitelist by default, gravity falls over on new installs. 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-03-06 18:29:28 +00:00
Adam Warner
cadab61a21
Merge branch 'development' into FTLDNS 2018-03-05 21:33:53 +00:00
DL6ER
7ed45d26c2
Remove " " at some places where they shouldn't be 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-02-26 17:26:51 +01:00
DL6ER
e8ec0dc701
Use pihole-FTL resolver in pihole and gravity 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-02-25 09:34:04 +01:00
Adam Warner
6b4685b333
much more elegant to export LC_ALL at the beginning of the script! 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-02-21 11:33:29 +00:00
Adam Warner
d4ac818a0b
Specifty LC_ALL=C when dealing with sorted lists. 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-02-21 11:23:07 +00:00
DL6ER
fc5034696d
Don't auto-whitelist blocking list domains 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-02-16 19:42:33 +01:00
Dan Schaper
9f2ce0e296
Merge pull request #1910 from pi-hole/fix/BinaryFileLineInGravity 
Potential fix for #1909
 2018-01-28 03:23:19 -08:00
Adam Warner
55e10d8287
replace another grep -F as pointed out by @StarPicard 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-01-28 00:50:15 +00:00
Adam Warner
f1956119fb
proposed gravity function renames 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-01-14 20:38:39 +00:00
Adam Warner
876170767c
Print actual domain instead of grep output of "Binary file /etc/pihole/list.preEventHorizon matches" when a domain with a unicode char is in a source list. 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-01-13 16:43:20 +00:00
Adam Warner
2d3906450a
add back in str local var, and change ticks to info on whitelist lines 
Signed-off-by: Adam Warner <adamw@rner.email>
 2017-12-18 20:14:53 +00:00
Adam Warner
5ecc46d85b
Accidentally too many spaces 
Signed-off-by: Adam Warner <adamw@rner.email>
 2017-12-16 14:03:12 +00:00
Adam Warner
ddd6f3dbe5
Grammar changes. Lets not work out programmatically whether we need to pluralise a word. It's not needed. 
Signed-off-by: Adam Warner <adamw@rner.email>
 2017-12-16 13:55:52 +00:00
Adam Warner
761fd13a70
Remove quotes from the uniqDomains array to actually whitelist the sources 
Signed-off-by: Adam Warner <adamw@rner.email>
 2017-12-16 13:15:26 +00:00