Marown/hosts
1
0
Fork 0
mirror of https://github.com/StevenBlack/hosts.git synced 2024-07-02 18:45:52 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,214 Commits 2 Branches 656 Tags 1.6 GiB
f83a5311ab
Commit Graph

223 Commits

Author SHA1 Message Date
Steven Black
2526b76bea Accept IP followed by host IP address. 2018-03-14 00:09:38 -04:00
Ankit Pati
4b5dc8d920
Remove Superfluous Check for Zero-Length List 
Checking for zero-length is not necessary here as iterating over a
zero-length list is perfectly valid, and produces exactly zero
iterations, matching the intended behaviour without an extra check.
 2018-03-10 00:38:31 +05:30
funilrys
0166642e00 Merge remote-tracking branch 'upstream/master' into encoding-review 2018-03-04 11:19:36 +01:00
funilrys
8405f87edb
Review of domain_to_idna() to support more tests cases 
Please note this patch comes after an issue reported by @FadeMind
which I could reproduce in 1/3 computer.
 2018-03-04 11:17:38 +01:00
Mitch Weaver
1ff8f4b13d add OpenBSD support 2018-03-03 22:55:18 +01:00
Steven Black
2bd48fb7ba
Merge pull request #519 from FadeMind/cross-sudo 
cross-compatible sudo FIXED CI
 2018-03-03 15:13:16 -05:00
FadeMind
ee411d82c9
updateHostsFile.py: DEL whitespace after '[' 
https://travis-ci.org/StevenBlack/hosts/jobs/346915934#L606-L609
 2018-03-03 15:30:49 +01:00
funilrys
50fde09ed7
Fix grammar. 
This patch fix: d98b31fb92 (r171971716)

Thanks to @gfyoung
 2018-03-02 22:56:32 +01:00
funilrys
6e62383b28
Review of Notes indentation 
This patch fix : https://github.com/StevenBlack/hosts/pull/520#discussion_r171971481
+ It also fix (forgoten coma) : https://github.com/StevenBlack/hosts/pull/520#discussion_r171971574
 2018-03-02 22:53:15 +01:00
funilrys
bebf7744ca
Review of the domain_to_idna() notes. 
This patch fix : https://github.com/StevenBlack/hosts/pull/520#discussion_r171971574
 2018-03-02 22:51:10 +01:00
funilrys
d98b31fb92
Removing of condescending line. 
This patch fix : 4798710029 (r171969863)
 2018-03-02 22:43:24 +01:00
funilrys
780e47ffe5
Review of domain_to_idna() 
This patch review the way we get the comment at the end of a line.
I also did an application of DRY (Do not Repeat Yourself)
and/or KISS (Keep It Simple, Stupid) by refactoring the 2 `else`
statements into one line.
 2018-03-02 22:07:11 +01:00
funilrys
8f00cb4d76
Deletion of a trailing '#'. 
Please note that I have added that '#' by mistake.
 2018-03-02 21:43:52 +01:00
funilrys
1141823bc8
Fix tests issues. 
This patch introduce the installation of dependencies needed my the main commit.

This patch fixes:
 * https://travis-ci.org/funilrys/hosts/jobs/347504195#L592
 * https://travis-ci.org/funilrys/hosts/jobs/347504195#L598
 2018-02-28 23:29:18 +01:00
funilrys
3403b10e50
Fix tests issues. 
This patch fixes:
 * https://travis-ci.org/funilrys/hosts/jobs/347500695#L400
 * https://travis-ci.org/funilrys/hosts/jobs/347500695#L401
 2018-02-28 23:24:58 +01:00
funilrys
f5c8ac58b2
Fix tests issue. 
This patch fix https://travis-ci.org/funilrys/hosts/jobs/347500695#L399
 2018-02-28 23:23:30 +01:00
funilrys
079d5ddd7f
Fix tests issue 
This patch fix https://travis-ci.org/funilrys/hosts/jobs/347500695#L397

Please also note that I introduced that patch because
we do not directly use lxml but it is required by
BeautifulSup() to parse the HTML.
 2018-02-28 23:22:32 +01:00
funilrys
1fea720034
Fix tests issue 
This patch fix https://travis-ci.org/funilrys/hosts/jobs/347500695#L398
 2018-02-28 23:20:01 +01:00
funilrys
d3ef85df17
Review typo + fix test issue. 
This patch fix https://travis-ci.org/funilrys/hosts/jobs/347497718#L749
 2018-02-28 23:15:01 +01:00
funilrys
079ad6b674
Fix test issue. 
This patch fix https://travis-ci.org/funilrys/hosts/jobs/347497718#L748
 2018-02-28 23:13:13 +01:00
funilrys
c82f691952
Review of get_file_by_url() 
Please note that this patch also introduce
which is in charge of converting a domain in a line into
IDNA and/or UTF-8 format.

Also note the introduction of BeautifulSoup() which helps
us to decode data from the downloaded URL.

Fixes (issue(s)/protocol(s) I was able to reproduce):
 * https://github.com/StevenBlack/hosts/issues/514#issuecomment-368932152

Possible fix of (issue(s)/protocol(s) I wasn't able to reproduce):
 * https://github.com/StevenBlack/hosts/issues/514#issue-300048106
 * https://github.com/StevenBlack/hosts/issues/494#issue-296166492
 * https://github.com/StevenBlack/hosts/issues/420#issue-267453114
 * https://github.com/StevenBlack/hosts/issues/372#issue-246927047
 * https://github.com/StevenBlack/hosts/issues/382#issuecomment-322010562
 2018-02-28 23:06:58 +01:00
FadeMind
33ba41bbea
updateHostsFile.py: cross-compatible sudo 2018-02-27 19:26:40 +01:00
Steven Black
007254e10f
Merge pull request #503 from ankitpati/minimise-hosts-file 
Add Option to Minimise hosts File
 2018-02-16 22:07:47 -05:00
Ankit Pati
01db326459
Add Option to Minimise hosts File 
This option (--minimise, -m) differs from compress (--compress, -c) in
that it keeps each host on a different line, while still removing
unnecessary newlines and comments.

This is necessary because many implementations of URL blockers that rely
on hosts files do not conform to the standard which allows multiple
hosts on a single line.
 2018-02-17 00:22:25 +05:30
Ankit Pati
db29acda65
FIX: Remove Hardcoded Offset in Compression 
An offset of 7 was hardcoded in the function compress_file, presumably
to skip over the default target IP address of 0.0.0.0 in a hosts file.
However, this causes problems when the default is overridden using the
--ip or -i flag, causing visibly garbled output in the generated hosts
file.

Fix is to calculate the length of target IP at runtime.
 2018-02-16 23:45:10 +05:30
FadeMind
5b5e854c7f
updateHostsFile.py: add ipv6 additionals 
@StevenBlack.
DEFAULT hosts file in Linux

127.0.0.1       localhost
127.0.1.1       mydevicename
::1     localhost ip6-localhost ip6-loopback
ff02::1 ip6-allnodes
ff02::2 ip6-allrouters
 2018-02-09 19:18:54 +01:00
Stefano
d4dadf6ca3 Fixed the number of domains in each line. 
Fixed the number of domains in each line and added the support to
inline comments (they will be ignored as the comment lines).
Code refactoring.
 2018-01-02 22:35:27 +01:00
Stefano
510109d6d4 Updated the documentation with the new compress option. 
Removed a redundant skipstatichosts option.
 2018-01-02 10:51:26 +01:00
Stefano
ff9e05ffec Added an option to compress the created hosts file. 
In particular, the compression option removes non-necessary lines (empty lines and comments) and puts multiple domains in each line.
This option should solve the issue #411 regarding the DNS client service of Windows.
 2017-12-30 20:55:12 +01:00
Stefano
ce8d3abf7e Added an option to compress the created host file. 
In particular, the compression option removes non-necessary lines (empty lines and comments) and puts multiple domains in each line.
This option should solve the issue #411 regarding the DNS client service of Windows.
 2017-12-30 17:12:04 +01:00
Steven Black
bb5d174866 Fix linter complaint. 2017-12-18 23:57:02 -05:00
Steven Black
04a9a712b3 Issue #180: fix - support JSON array transformation for hosts sources. 2017-12-17 22:06:05 -05:00
gfyoung
24ab22e139
Refactor out source data updating 2017-08-20 11:52:28 -07:00
Steven Black
68dcf5c125 Remove references to .zip files in the generator programs. 2017-08-20 12:00:19 -04:00
gfyoung
f83a56d317 Refactor out global settings usage in update logic 2017-08-09 08:13:22 -07:00
gfyoung
942069db81 Refactor out global settings usage in exclusions 2017-08-07 08:43:47 -07:00
gfyoung
4b96f3f34a Refactor out global settings usage in user prompt 2017-07-13 08:20:03 -07:00
Steven Black
d945d7bcc0 Merge pull request #341 from indrajitr/hostmatch-fix 
Honor whitelist exclusion only for domain or subdomain match
 2017-07-09 13:13:57 -04:00
Dylan Armstrong
02a28cd05b Fix the number of unique entries. 2017-07-08 20:20:03 -05:00
gfyoung
415b89a022 Reduce dependency on global settings variable 
Global variables make code less modular
and therefore more difficult to test.
 2017-07-03 18:42:15 -07:00
gfyoung
dce24af399 Add unittests for updateHostsFile.py 2017-06-28 20:13:01 -07:00
Indrajit Raychaudhuri
fd046bc460 Honor whitelist exclusion only for domain or subdomain match 
* Whitelisting `s.youtube.com` should not whitelist `ads.youtube.com`; but
  can whitelist `a.s.youtube.com`
* Whitelisting `twitter.com` should not whitelist `ttwitter.com` or
  `twitter.com.au`; but can whitelist `a.twitter.com`
 2017-06-22 01:43:56 -05:00
Indrajit Raychaudhuri
7e1b06ecf9 Tighten regex rule to discard IP address as hostname 2017-06-20 02:06:31 -05:00
Steven Black
96ac61c119 Merge pull request #325 from gfyoung/terminal-color-support 
Check if terminal supports color
 2017-05-29 23:00:35 -04:00
gfyoung
2d6a8676a4 Check if terminal supports color 
Closes gh-151.
 2017-05-28 12:40:32 -04:00
gfyoung
3b581ce782 Refactor DNS cache flushing for Linux 2017-05-28 12:40:25 -04:00
gfyoung
51a0ec21bd Document all functions in Python scripts 2017-05-23 21:58:22 -04:00
Steven Black
526a457a38 Merge pull request #322 from gfyoung/kde-neon-dns-cache 
Check /usr/lib and /lib for systemd
 2017-05-23 10:03:22 -04:00
gfyoung
2aecbf9707 Concatenate str only in os.path.join 
Closes gh-316.
 2017-05-22 23:31:35 -04:00
gfyoung
8806131c74 Check /usr/lib and /lib for systemd 
Closes gh-321.
 2017-05-22 21:19:31 -04:00