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 |
|
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 |
|