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-27 16:43:16 +00:00
Code Issues Projects Releases Packages Wiki Activity
6461 commits 8 branches 109 tags 27 MiB
Commit graph

565 commits

Author SHA1 Message Date
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
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
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
7a1b6fd205
Merge branch 'development' into new/gravity.db_domain_groups 2019-07-03 19:21:55 +02:00
DL6ER
f91421418a
Rename adlists -> adlist table. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-06-30 23:21:10 +02:00
DL6ER
87c115fc86
Change implementation to use linking tables (domain_groups, adlists_groups). This allows adding domains to multiple lists conveniently. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-06-30 19:04:38 +02:00
DL6ER
d5e8f1a781
Add 10 seconds timeout to the sqlite3 command that writes tables to the gravity database. This prevents gravity from failing when the database file is locked for a short time. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-06-26 18:20:36 +02:00
DL6ER
cbc210b014
Add adlist_groups and mark group_id columns as NOT NULL. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-06-16 17:05:33 +02:00
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
Adam Warner
c24e5cd3f6
:codacy: :codacy2: :codacy3: 
Signed-off-by: Adam Warner <adamw@rner.email>
 2017-12-12 12:45:25 +00:00
Adam Warner
cc3035267f
Revert parsing method to that of 3.1.4. New Method is allowing illegal lists through, and that is causing issues such as blocking www.google.com. This method will just throw away invalid list entries. 
Signed-off-by: Adam Warner <adamw@rner.email>
 2017-12-12 12:36:09 +00:00
Jacob Salmela
80e17ab721
potentially fixes #1806 by falling back to dig if getent fails 
Signed-off-by: Jacob Salmela <github@decoy.email>
 2017-12-07 22:38:47 -06:00
Mcat12
8d721d086c
Modify indentation 2017-11-21 18:37:38 -05:00
DL6ER
6f0bb30def
Improve indentation 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-11-21 20:58:27 +01:00
DL6ER
c54f04ef4c
Repair username:password filtering 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-11-21 20:55:47 +01:00
DL6ER
eb83081a5c
Clarify error message: File could also have been of zero size 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-11-21 18:36:34 +01:00
DL6ER
8976930e20
Properly detect if local file was successfully downloaded 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-11-21 18:35:58 +01:00
DL6ER
164a81776e
Allow to add local lists to gravity using e.g. file:///path/to/my.list in adlists.list 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-11-21 18:30:40 +01:00
DL6ER
39ab1e1ea7
When using the Pi-hole DHCP server, local host names are called "something.local". Thir PR ensures that clients that are connected via VPN are augmented by a similar suffix like "someother.vpn". 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-09-30 13:03:49 +02:00
spacedingo
60365ad36a Update gravity.sh 2017-09-26 09:25:47 +04:00
spacedingo
466e6d9b30 Redo pull #1687 
Fix for case sensitive duplicate domains
The change (https://github.com/pi-hole/pi-hole/pull/1687) was recently undone.
 2017-09-26 05:53:07 +04:00
WaLLy3K
b9bcfe36ff Place errors on newline 2017-09-24 11:57:15 +10:00
WaLLy3K
cd7c00ef8e Fix Ctrl-C inadvertently deleting domains files 2017-09-23 10:32:56 +10:00
WaLLy3K
3aa525b0c0 Ensure domains files are not deleted upon w/blist 2017-09-22 14:17:56 +10:00
WaLLy3K
47099e2855 Ensure resolver test occurs each second 
* Ensure that gravity will run the second the resolver is available
* Increase timeout to 120s
 2017-09-22 03:56:53 +10:00
WaLLy3K
2deb2bf03f Fix broken whitelist functionality 2017-09-22 02:23:43 +10:00
WaLLy3K
a6f9272d4b Fix gravity from only parsing one adlist URL 
* Redirect `grep` correctly to $sources (instead of using `awk`)
* Redirect $sourceDomains correctly
* Replace use of ${COL_LIGHT_BLUE}
* Add numeric count informing user of unique source domains being whitelisted
 2017-09-20 22:25:33 +10:00
Adam Warner
8d8482d60b
<<<$() back to < <() 
Signed-off-by: Adam Warner <adamw@rner.email>
 2017-09-19 19:02:50 +01:00
WaLLy3K
d02bf258af Improve non-standard list parsing 
* Add 504 status (Gateway connection timed out)
* Add text for non-standard list parsing
* Improve adblock parsing
* Ensure adblock exception rules are removed from file
* Ensure "www." is not treated as a URL-format list
* Corrected typo
* Ensure script does not fail if "-f" is used when there are no blocklists generated

Signed off by WaLLy3K <wally3k@pi-hole.net>
 2017-09-18 17:36:03 +10:00
WaLLy3K
c957124fad Optimised parsing of domains on IPv6 servers 
* Remove WHITELIST_COMMAND
* Place IPv4/IPv6 availability test underneath setupVars.conf source
* Improved clarity on comments
* Define default lookupDomain on local line
* Use `getent hosts` instead of nslookup (faster)
* Make gravity_DNSLookup() function more readable
* Use bold on "Neutrino emissions detected"
* Swap conditionals around on adlists file handling
* Add comments to both gravity_Collapse() `awk`s
* Removed unnecessary "${str}" from gravity_Pull()
* Merge function variables into local line
* Place .phgbp suffice on mktemp, so patternbuffers can be cleaned up all at once in gravity_Cleanup()
* Removed success="false" from $httpCode case, placed empty success var in local
* Reordered $httpCode case numerically because I can
* Provide error if Dnsmasq format list is being parsed
* Remove IPv4 check when determining URL list (too slow on large lists)
* Check ${#sources[@]} to ensure we're checking the number of entries and not the character count
* Define empty plural in local line, removing unnecessary plural=;
* Optimised readability of gravity_Whitelist()
* Removed uninformative "Nothing to blacklist"/"No wildcards used" text
* Optimised parsing of domains into hosts format on IPv6 enabled servers
* Ensure /etc/hostname is non-zero
* Use `: >` instead of `rm` as consistent with the rest of the script
* Ensured that gravity_Cleanup() removes ${localList}.tmp
* Optimised readability of gravity_ParseUserDomains()
* Moved dnsRestart to ${var} case statement, renaming it to dnsRestartType for readability
* Set default $listType to ensure script passes "bash strict mode"
 2017-09-15 22:39:17 +10:00
WaLLy3K
ff5411a93a Add 'Connection Refused' for 000 status 
* Shift default dnsRestart value into unset default parameter expansion value
* Change nslookup timeout to 5 seconds 
* Use &> instead of >
* Standardise plural code
* Update some comments
* Add "000" when connection is refused
* Condense adblock detection logic
* Add Dnsmasq format detection and parsing logic
* Removed unnecessary echo
* Add dnsWasOffline variable to ensure that if DNS service has been stopped, that it doesn't start and also get reloaded
 2017-09-14 20:23:49 +10:00
WaLLy3K
d3073e5e23 Fix array of unique $sourceDomains 2017-09-14 17:09:52 +10:00
WaLLy3K
8191ec01e5 Gravity Bugfixes 
* Merge development OpenVPN code
* Determine which domain to resolve depending on existence of $localList
* Re-add code to remove $localList, preventing duplicate local entries
* Minor shellcheck validation fix
 2017-09-14 16:39:30 +10:00
WaLLy3K
0a00936e99 Update resolver test & added more comments 
* Add/update code comments
* Change resolver check to test for pi.hole
* Make resolver check timeout after 10 seconds
* Use > instead of &> where appropriate
* Make resolver check sleep for 30 seconds (effectively waiting up to 50s for dnsmasq to be resolvable)
* Provide confirmation upon success of resolver check availability
* Quotes and Braced remaining variables as appropriate
* Removed duplicate local
 2017-08-28 11:36:02 +10:00
WaLLy3K
f24ab8508e WIP cleanup 
* Changed supernova/eventHorizon variables to match their purpose
* Add gravity_DNSLookup() function
* Ensure all comments are clear and relevant
* Use && instead of || in gravity_Collapse()
* Renamed existing functions, and placed them in order of script execution
* Use \t instead of literal tab in gravity_ParseFileIntoDomains()
* Replace instances of "truncate" with : > (e.g: gravity_Schwarzschild())
* Ensure correct variables are local'd
* Use phrase "Cleaning up stray matter" when gravity_Cleanup() is called
* Add black/white/wildcard switches for list.sh
* Ensure necessary functions are called when modifying black/white/wildcards

Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
 2017-07-27 12:34:35 +10:00
WaLLy3K
6830b08723 Clean up and optimise Gravity 
* Shellcheck validation
* Made variable names, function names, comments and output clearer to understand
* Quoted and braced variables and conditionals
* Fix adlists.list handling logic, and remove any CR line endings
* Make CP/MV/RM provide user-friendly output upon failure
* Change adlists.list retrieval logic
* Moved and fixed adlists.list domain parsing logic
* Create gravity_ParseFileAsDomains() function to handle parsing of source files
* If no changes to a list is detected, print no output
* Ensure each source blocklist has a final newline
* Format number output as currency
* Make array of adlists domain sources unique to prevent redundant whitelisting
* Merged bash IPv4/IPv6 hosts formatting IF statement into an awk one-liner
* Trap Ctrl-C cancellations and run gravity_Cleanup()
* Use new gravity_Cleanup() function on errors and script completion
* Ensure that dnsmasq uses force-reload when gravity is invoked
* Add --wildcard option to ensure dnsmasq is restarted upon b/wlisting of a wildcard

Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
 2017-07-24 21:24:34 +10:00
Mcat12
1e31fa89aa Remove /* from IPv6 as well as IPv4 
Fixes Discourse issue: https://discourse.pi-hole.net/t/ipv6-aaaa-dns-issue/3830
 2017-06-26 09:51:21 -04:00
Adam Warner
536585b846 Colourise Core Output Text (#1471) 
* Define colours within COL_TABLE
* Do not output colours for non-terminal instances
* Removed ":::"
* Fixed indenting & spacing
* Made output consistent throughout project
* Reworded text to fit on standard 80 char wide Terminal screen
* Made 'sudo raspi-config' warning (insufficient disk space) only show on RPi
* Make "Installation/Update Complete" the final msg
* Remove redundant messages
* Simplify update available message
* Confirm user would like to begin uninstall
* If "git pull" string says "Already up-to-date.", place [i] before it
* Colour Temp/Interface output
* Made `pihole disable 5z` invalid
* Added error fallback if invalid argument (not s/m) is detected
* Quoted "$2" for consistency
* Updated help text
* L185/286: Replaced echo with redirect
* User agents for adblock.mahakala.is/adaway.org unnecessary 
* Print newline on confirmation of repository reset
* Add output to admin-related dnsmasq restarts
* Return error message for "pihole -q"
* Imply default checkout behaviour with y/N
* Fix uninstall failing to remove pihole user
* Print checkout 'git remote show origin' STDERR on new line
* Replaced checkout "AdminLTE" wording with "Web Admin"
 2017-06-21 21:49:05 +10:00
DL6ER
05798fe07a
cp + rm === mv (well, almost) 2017-06-19 20:22:03 +02:00
DL6ER
8bad56e897
Improve displayed messages and overall logic 2017-06-17 14:24:30 +02:00
DL6ER
92e691408f
Remove useless cat 2017-06-17 14:14:07 +02:00
DL6ER
0a9c234127
Add "pihole -g -b" to *only* update black.list (saves a bunch of time when adding/changing only blacklisted files - won'tdownload lal lists, but only processes the blacklist and restars dnsmasq) 2017-06-17 13:57:27 +02:00
DL6ER
0283a1ab74
Introduce new file black.list for blacklist content 2017-06-17 13:50:10 +02:00
Dan Schaper
6a2b885988
Update default User Agent to modern browser. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-04-27 11:41:08 -07:00
Mcat12
5e308dbd51 Delete the temp files created by gravity 2017-04-18 20:35:06 -04:00
Mcat12
a96b4d28e1 Merge pull request #1365 from pi-hole/adlistImprovements 
Adlist improvements
 2017-04-06 16:15:50 -04:00
Mcat12
ce86205df0 Use correct agent when downloading adaway.org list 
See https://discourse.pi-hole.net/t/2278
 2017-04-02 12:44:00 -04:00
Adam Warner
02040cd25d
We no longer need to do this, either 2017-03-31 19:23:26 +01:00
Adam Warner
bdc6bd4135
Don't need this comment anymore 2017-03-31 19:18:28 +01:00
Adam Warner
e720de401d
One file to rule them all, same functionality (made changes and want to go back to default? Delete your adlists.list) 2017-03-31 19:16:09 +01:00
Adam Warner
ce97896ffd
account for new adlists.custom file 2017-03-31 19:00:04 +01:00
DL6ER
d7b5870ba6
Use absolute path for pihole command in gravity.sh. Fixes #1318 2017-03-12 23:15:23 +01:00
Jacob Salmela
7a1a2dec67
update license to EUPL on core files 2017-02-22 11:55:20 -06:00
Markus Napp
66616eb0f0 Rename missing plurals check 2017-02-01 19:55:33 +01:00
Markus Napp
72a1fc3f64 Fix output for wildcards in gravity.sh 2017-02-01 00:07:47 +01:00
DL6ER
a8ac212ee6
Show number of wildcard blocked domains in gravity's summary 2017-01-29 13:46:27 +01:00
Promofaux
c2e1819098 This should not have been commented out. It's stopping any changes we make to the default lists getting out. 2017-01-17 19:48:20 +00:00
DL6ER
322cb2387b
Also accept the last line of the adlist file if there is no newline at the end 2017-01-13 11:02:51 +01:00
DL6ER
cd0c3f9418 Better output if file has not been downloaded because it has not been changed 2016-12-17 23:46:28 +01:00
DL6ER
efaee2b68b Improvements for gravity (errors shouldn't be able to escape the black hole if even light cannot do this!) 2016-12-17 23:33:09 +01:00
Promofaux
a3d519b671 no need to remove list, because of echo > 2016-12-14 19:33:15 +00:00
Promofaux
8591f9d576 check for list before removing it 2016-12-14 19:31:57 +00:00
Promofaux
db89fa9881 initial support for additional hosts file 2016-12-14 19:26:55 +00:00
Mcat12
d8912fd0a7 Merge pull request #952 from pi-hole/fix/exit_codes 
Fix/exit codes
 2016-12-01 18:24:30 -05:00
Dan Schaper
d92646324c
Double worded 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-01 13:59:58 -08:00
Dan Schaper
c9fe62a691
Clarify what the command is doing. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-01 13:58:40 -08:00
Dan Schaper
2ec4acfe52
Begin fixing exit values. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-01 12:21:08 -08:00
Adam Warner
c97cfde9f9 Update gravity.sh 
Only include domain part of lines that contain `/` e.g `www.fakenewswatch.com/megynkelly`
 2016-11-21 22:51:59 +00:00
DL6ER
cdee6d55d3 Minor change 2016-11-20 17:40:22 +01:00
DL6ER
e5a1afaa26 Added another missing "done" 2016-11-20 17:31:27 +01:00
Mcat12
08e7b7e0ad Fix typo 2016-11-19 14:00:56 -05:00
DL6ER
4945f33254 Added "-n" to first echo call 2016-11-18 17:39:34 +01:00
DL6ER
3fa05293fc Fixed file permissions 2016-11-18 17:37:13 +01:00
DL6ER
27e5f2798d Added missing "done." output 2016-11-18 17:33:46 +01:00
Adam Warner
99057ed859 Update var names from setupVars.conf in gravity.sh 2016-11-02 04:21:54 -07:00
Adam Warner
21fc6344bf Merge pull request #849 from pi-hole/aManHasNoNameResolution 
[BugFix] A man has no name resolution
 2016-10-27 19:41:07 +01:00
Promofaux
9e4e1d1cb2 improve comments 2016-10-27 11:09:24 +01:00
Promofaux
60142cd960 remove reference to whitelist.sh (no longer exists) replace with pihole -w 2016-10-27 11:06:11 +01:00
Promofaux
4c853defb2 add if traps to check for existence of whitelist.txt / blacklist.txt 2016-10-25 22:27:35 +01:00
Adam Warner
e0ac109dd1 remove hostname insertion into gravity.list from gravity.sh 2016-10-25 15:07:29 +01:00
Adam Warner
7653b3d088 Remove pi.hole references in gravity.sh 2016-10-25 15:01:16 +01:00
Promofaux
d0826b2c33 Merge branch 'development' of https://github.com/airencracken/pi-hole into airencracken-dev 2016-10-23 19:33:28 +01:00
Marcus Hildum
ebbe1fc236 More consistency 
Odd mix of variables quoted with and without no-op parameter expansion

(i.e. ${thing})

More ${thing} than not, make that the standard
 2016-10-21 23:11:17 -07:00
Marcus Hildum
aac8e45397 Imbue gravity.sh with some consistency 
Mish-mash of tabs and spaces used for indentation. Mostly tabs though,
so going with those. Also indenting blocks and enforcing the

loop statement; do
done

style over the newline for do since it seemed to be more common.
 2016-10-21 23:02:45 -07:00
Adam Warner
8f9ff930b3 Merge pull request #823 from tuplink/EnableOrDisable 
Enable or disable
 2016-10-21 11:02:10 +01:00
Promofaux
9ab6df0e54 Merge branch 'development' into promoTweaksTheSecond 
# Conflicts:
#	advanced/Scripts/blacklist.sh
#	advanced/Scripts/whitelist.sh
 2016-10-20 21:06:28 +01:00
Tommy Huff
15d68467a1 attempt to fix 2016-10-20 10:12:02 -04:00
Tommy Huff
3b6ecc573e fix conflict 
Merge remote-tracking branch 'upstream/promoTweaksTheSecond' into EnableOrDisable
 2016-10-20 10:09:23 -04:00
Tommy Huff
3ca3eaa62c change restartdnsmasq to restartdns 2016-10-20 09:40:45 -04:00
Tommy Huff
dda448e050 use finction in pihole to restart dnsmasq 2016-10-20 09:15:03 -04:00
Tommy Huff
60873144ea make last line of script return a new line been bugging me for awhile 2016-10-20 09:09:35 -04:00
Tommy Huff
a9d17c96be include status at end of gravity so if it is disabled you will see it when running 2016-10-20 09:03:20 -04:00
Tommy Huff
7d7e17b351 add toggle to enable or disable pi-hole 2016-10-20 08:45:20 -04:00
Adam Warner
c71a976e76 kill off an old ugly hack 2016-10-20 13:37:07 +01:00
Marcus Hildum
0efda04920 Use heredocs instead of multiple calls to echo 
There were a lot of places (like in help functions) that used multiple
echo calls instead of heredocs. Personal opinion but this seems cleaner.
 2016-10-19 20:46:37 -07:00
Marcus Hildum
28eeaf201b Standardize function declaration 
There were no fewer than three styles of function declaration going
on in these files, so I attempted to standardize them to the typical

myfucn() {
}

style.
 2016-10-19 19:47:45 -07:00
Promofaux
9aa38cf0ae mv patternbuffer instead of cp, then no need to clean up 2016-10-19 23:57:43 +01:00
Promofaux
a7fa7466fb remove no longer needed code 2016-10-19 23:54:43 +01:00
Promofaux
3f73c61cee cache event horizon before white/blacklists are applied for quicker processing on white/blacklist calls of gravity 2016-10-19 23:52:54 +01:00
Promofaux
b88fe572fe Whitelist/Blacklist domains directly in the Event Horizon. 2016-10-19 23:15:05 +01:00
Promofaux
59ba6f8aec add flag to skip download of lists 2016-10-19 22:06:19 +01:00
Promofaux
25343da6b7 wrong variable name 2016-10-19 20:03:29 +01:00
Promofaux
60d17b97f5 spacing 2016-10-19 19:51:32 +01:00
Promofaux
8cb72d87e4 make IPv4/IPv6 checking more robust in gravity 2016-10-19 19:50:21 +01:00
Promofaux
49f48e2aaa wrong word. #admincrimes 2016-10-17 22:24:59 +01:00
Promofaux
8c0f860601 Use systemctl/service calls instead of killall to restart/reload dnsmasq 2016-10-16 17:16:59 +01:00
Promofaux
7ee1110351 ugh. pihole.conf. 2016-10-15 20:09:38 +01:00
Promofaux
51c4c51d9e Add trap to check existence of setupVars 2016-10-15 20:03:33 +01:00
Promofaux
fc4fe54099 standardise function naming 2016-10-15 20:02:57 +01:00
Promofaux
4c42f00a86 remove uses of ${SUDO} and root check from gravity. As this is handled by pihole command. 2016-10-15 18:42:53 +01:00
Promofaux
4f35aac6dd transpose $ and " 2016-10-10 22:32:30 +01:00
Dan Schaper
4418ca9e9f Missing quote replacement. 2016-10-10 11:41:29 -07:00
Dan Schaper
07b7e8a1a6 Track down a couple more variable name changes. 2016-10-10 06:33:56 -07:00
Dan Schaper
7ae2fc37c0 Match up descriptive variable names with setupVars.conf. Rectifies Ubuntu 16.04 gravity.list bug. 2016-10-10 06:23:17 -07:00
Adam Warner
ac49e639bd Fix #718 2016-09-26 11:58:07 +01:00
bcambl
21d4199a38 Merge branch 'development' into dns-hostname-fixes 2016-09-19 17:33:32 -06:00
Promofaux
3ed62d45f5 Source IP addresses from /etc/pihole/setupVars.conf 2016-09-16 23:05:08 +01:00
bcambl
640af300cb additional hostname checks in gravity.sh 
- Test if /etc/hostname exists before attempting to cat the file.
 - Add alternative hostname discovery via hostname command
 - Add an error message to stdout if unable to determine host fqdn
 2016-09-07 21:16:52 -06:00
Promofaux
6796b8bdad pass argument from pihole command to gravity for -f check 2016-08-19 23:06:56 +01:00
Promofaux
475d016029 hmmm 2016-08-19 22:52:55 +01:00
Promofaux
201304e678 fix variables in gravity to stop it using -f wether it's set or not 2016-08-19 22:51:09 +01:00
Promofaux
f6ac0d73b4 Add force delete option 2016-08-17 19:08:55 +01:00
Promofaux
ae47be0ce9 Add HelpFunc 2016-08-17 18:59:00 +01:00
Dan Schaper
024b741552 Merge pull request #490 from bcambl/fedora-armhf7 
Fedora Support
 2016-06-29 14:25:23 -07:00
Mcat12
4e95f4678f Merge pull request #540 from pi-hole/bugfix/curl-redirect 
Have `curl` auto-redirect
 2016-06-26 13:42:40 -04:00
Dan Schaper
7670b4e380 Mahakala User Agen modernization 
Update Curl User Agent for Maha list.
 2016-06-25 06:00:49 -07:00
Dan Schaper
636a9123b8 Have curl auto-redirect 
This should solve the redirection issue if a list is moved.
 2016-06-23 18:37:45 -07:00
bcambl
27a9642090 check for sudo via 'command -v' instead of dkpg-query 2016-06-11 15:58:49 -06:00
Jim Liu
08e95ed606 Update gravity.sh 
Change piholeIPfile to a permanent location.
 2016-04-22 01:40:42 +08:00
Jim Liu
a5ad48aa18 Update gravity.sh 2016-04-21 23:40:44 +08:00
Promofaux
ad574f5e90 Replace kill with killall 2016-04-16 15:52:38 +01:00
Promofaux
4941a657bf remove -s switch, as it turns out it worked afterall. 2016-04-16 12:59:40 +01:00
Promofaux
3d4bff9414 Add -s switch to kill command to increase compatability 2016-04-16 10:56:49 +01:00
Adam Warner
99a5b3a98a remove all mentions of spinner 2016-04-11 11:29:14 +01:00
Promofaux
8514f42d0d Correct variable name (Missing capital letter! whoops!) 2016-04-05 08:53:52 +01:00
Promofaux
0c0dd914f7 Fix source lists not being skipped if they are already up to date 2016-04-04 23:48:34 +01:00
Promofaux
c6405bc93b Ensure addn-hosts value is updated in /etc/dnsmasq.d/01-pihole.conf if user has a custom value set in pihole.conf 2016-04-04 23:38:46 +01:00
nate
5347ee4896 Write verbose status of processes to debug log & Minor UI Fixes 2016-04-04 00:59:24 -05:00
Promofaux
d710b97276 Fix issue raised in #421 (Use variable instead of hardcoded path, do not delete user created pihole.conf!) 2016-04-03 22:10:04 +01:00
Promofaux
0e6e8040ba Change spinstr to match install and uninstall scripts 2016-04-03 21:54:16 +01:00
nate
767b72fbfa Merged branch development into PiHoleController 2016-04-02 17:34:41 -05:00
Mcat12
0fbf72bb09 Change dummy domain and show device's hostname in ping 
* Change dummy domain
Allows users to access Pi-hole console with my.pi-hole.net instead of the IP address

* Cleaned up formatting

* Put device hostname at the top of the list
Changed my.pi-hole.net to pi.hole and placed it under the device hostname. This way, ping will return the device hostname but you still can access the web interface with pi.hole/admin
 2016-04-01 20:19:47 -04:00
nate
bb66d559e7 Merge branch 'development' 
Conflicts:
	gravity.sh
 2016-04-01 11:08:46 -05:00
nate
7b8fa3b922 Permissions changed for /etc/pihole and cleaned up some output 2016-04-01 01:11:59 -05:00
nate
28f2a1309e Merge branch 'development' 
Conflicts:
	automated install/uninstall.sh
 2016-03-31 20:25:54 -05:00
nate
45f24c8a85 Readded cats that were originally considered UUOC 2016-03-30 19:56:11 -05:00
nate
f8427ab789 Merge remote-tracking branch 'refs/remotes/pi-hole/development' 
Conflicts:
	README.md
	advanced/Scripts/blacklist.sh
	advanced/Scripts/whitelist.sh
	automated install/basic-install.sh
	gravity.sh
 2016-03-29 12:57:22 -05:00
Nate
31fc2bfeb7 Modified gravity.sh to point to new file locations and fixed permission issue 2016-03-29 00:25:40 -05:00
nate
37c1999965 Merged branch ScriptCleanup-Dev into development 2016-03-28 18:46:08 -05:00
nate
86dd4dd784 New spinner for gravity.sh 
Spinner in gravity.sh now matches basic-install.sh and uninstall.sh
 2016-03-28 18:45:55 -05:00