Skip to content

Commit e69512d

Browse files
crazy-maxcrazy-max
committed
Typo on IP for Windows 10 spy
Error parsing OpenWRT data (Issue #63) Move 66.119.144 to update for Windows 10 (Issue #62) Move 207.46 to extra for Windows 10 (Issue #15)
1 parent 7491842 commit e69512d

File tree

18 files changed

+165
-168
lines changed

18 files changed

+165
-168
lines changed

‎CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Changelog
22

3+
## 4.4.1 (2017/06/01)
4+
5+
* Typo on IP for Windows 10 spy
6+
* Error parsing OpenWRT data (Issue #63)
7+
* Move 66.119.144 to update for Windows 10 (Issue #62)
8+
* Move 207.46 to extra for Windows 10 (Issue #15)
9+
310
## 4.3.1 (2017/05/31)
411

512
* Again Windows Store cannot download apps (Issue #15)

‎app.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "4.3.1",
2+
"version": "4.4.1",
33
"debug": false,
44
"proxifier": {
55
"logPath": "C:/Users/[username]/Documents/Proxifier/Log.txt"

‎app/bindata/bindata.go

+57-57
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/utils/config/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
// App constants
1818
const (
1919
NAME = "WindowsSpyBlocker"
20-
VERSION = "4.3.1"
20+
VERSION = "4.4.1"
2121
PACKAGE = "github.com/crazy-max/WindowsSpyBlocker"
2222
URL = "https://" + PACKAGE
2323
)

‎app/utils/data/data.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -356,8 +356,8 @@ func getOpenwrtHosts(system string, rule string) (hosts, error) {
356356
if !strings.HasPrefix(line, "server=/") {
357357
continue
358358
}
359-
line = strings.TrimRight(strings.TrimLeft(line, "server=/"), "/")
360-
result = append(result, host{Domain: line})
359+
lineAr := strings.Split(line, "/")
360+
result = append(result, host{Domain: lineAr[1]})
361361
}
362362

363363
sort.Sort(result)

‎build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ app.name = WindowsSpyBlocker
44
app.desc = Block spying and tracking on Windows
55
app.package = github.com/crazy-max/WindowsSpyBlocker
66
app.url = https://${app.package}
7-
app.version = 4.3.1
7+
app.version = 4.4.1
88
app.default.release = 0
99

1010
# Libs

‎data/firewall/win10/extra.txt

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
### firewall win10 extra (27/05/2017 17:18)
1+
### firewall win10 extra (01/06/2017 11:35)
22
### More info: https://github.com/crazy-max/WindowsSpyBlocker
33

44
13.80.12.54
@@ -21,9 +21,12 @@
2121
168.63.18.79
2222
191.232.139.0-191.232.139.255
2323
204.79.197.0-204.79.197.255
24-
207.46.134.255
24+
207.46.7.252
25+
207.46.101.29
26+
207.46.153.155
2527
207.46.194.14
2628
207.46.194.25
2729
207.46.194.33
30+
207.46.194.40
2831
207.46.223.94
2932
207.68.166.254

‎data/firewall/win10/spy.txt

+1-10
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
### firewall win10 spy (27/05/2017 17:18)
1+
### firewall win10 spy (01/06/2017 11:35)
22
### More info: https://github.com/crazy-max/WindowsSpyBlocker
33

44
13.76.218.117
@@ -25,7 +25,6 @@
2525
40.77.229.5
2626
40.77.229.133
2727
40.83.189.49
28-
40.113.8.255
2928
40.113.10.78
3029
40.113.14.159
3130
40.113.22.47
@@ -68,10 +67,6 @@
6867
65.55.176.90
6968
65.55.223.0-65.55.223.255
7069
65.55.252.0-65.55.252.255
71-
66.119.144.157
72-
66.119.144.158
73-
66.119.144.189
74-
66.119.144.190
7570
66.119.147.131
7671
77.67.29.176
7772
104.41.207.73
@@ -150,9 +145,5 @@
150145
191.237.218.239
151146
191.239.54.52
152147
195.138.255.0-195.138.255.255
153-
207.46.7.252
154-
207.46.101.29
155-
207.46.153.155
156-
207.46.194.40
157148
207.68.166.254
158149
213.199.179.0-213.199.179.255

‎data/firewall/win10/update.txt

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
### firewall win10 update (21/05/2017 15:57)
1+
### firewall win10 update (01/06/2017 11:35)
22
### More info: https://github.com/crazy-max/WindowsSpyBlocker
33

44
13.107.4.50
@@ -8,6 +8,10 @@
88
23.103.189.158
99
65.55.138.0-65.55.138.255
1010
65.55.163.0-65.55.163.255
11+
66.119.144.157
12+
66.119.144.158
13+
66.119.144.189
14+
66.119.144.190
1115
131.253.33.50
1216
134.170.51.187
1317
134.170.51.188

‎data/openwrt/win10/extra/firewall.user

+4-1
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,12 @@ iptables -I FORWARD -j DROP -d 134.170.185.70
2626
iptables -I FORWARD -j DROP -d 168.63.18.79
2727
iptables -I FORWARD -j DROP -d 191.232.139.0/24
2828
iptables -I FORWARD -j DROP -d 204.79.197.0/24
29-
iptables -I FORWARD -j DROP -d 207.46.134.255
29+
iptables -I FORWARD -j DROP -d 207.46.7.252
30+
iptables -I FORWARD -j DROP -d 207.46.101.29
31+
iptables -I FORWARD -j DROP -d 207.46.153.155
3032
iptables -I FORWARD -j DROP -d 207.46.194.14
3133
iptables -I FORWARD -j DROP -d 207.46.194.25
3234
iptables -I FORWARD -j DROP -d 207.46.194.33
35+
iptables -I FORWARD -j DROP -d 207.46.194.40
3336
iptables -I FORWARD -j DROP -d 207.46.223.94
3437
iptables -I FORWARD -j DROP -d 207.68.166.254

‎data/openwrt/win10/spy/firewall.user

-9
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ iptables -I FORWARD -j DROP -d 40.77.229.1
3030
iptables -I FORWARD -j DROP -d 40.77.229.5
3131
iptables -I FORWARD -j DROP -d 40.77.229.133
3232
iptables -I FORWARD -j DROP -d 40.83.189.49
33-
iptables -I FORWARD -j DROP -d 40.113.8.255
3433
iptables -I FORWARD -j DROP -d 40.113.10.78
3534
iptables -I FORWARD -j DROP -d 40.113.14.159
3635
iptables -I FORWARD -j DROP -d 40.113.22.47
@@ -73,10 +72,6 @@ iptables -I FORWARD -j DROP -d 65.55.130.50
7372
iptables -I FORWARD -j DROP -d 65.55.176.90
7473
iptables -I FORWARD -j DROP -d 65.55.223.0/24
7574
iptables -I FORWARD -j DROP -d 65.55.252.0/24
76-
iptables -I FORWARD -j DROP -d 66.119.144.157
77-
iptables -I FORWARD -j DROP -d 66.119.144.158
78-
iptables -I FORWARD -j DROP -d 66.119.144.189
79-
iptables -I FORWARD -j DROP -d 66.119.144.190
8075
iptables -I FORWARD -j DROP -d 66.119.147.131
8176
iptables -I FORWARD -j DROP -d 77.67.29.176
8277
iptables -I FORWARD -j DROP -d 104.41.207.73
@@ -155,9 +150,5 @@ iptables -I FORWARD -j DROP -d 191.237.208.126
155150
iptables -I FORWARD -j DROP -d 191.237.218.239
156151
iptables -I FORWARD -j DROP -d 191.239.54.52
157152
iptables -I FORWARD -j DROP -d 195.138.255.0/24
158-
iptables -I FORWARD -j DROP -d 207.46.7.252
159-
iptables -I FORWARD -j DROP -d 207.46.101.29
160-
iptables -I FORWARD -j DROP -d 207.46.153.155
161-
iptables -I FORWARD -j DROP -d 207.46.194.40
162153
iptables -I FORWARD -j DROP -d 207.68.166.254
163154
iptables -I FORWARD -j DROP -d 213.199.179.0/24

‎data/openwrt/win10/update/firewall.user

+4
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ iptables -I FORWARD -j DROP -d 23.103.189.157
1313
iptables -I FORWARD -j DROP -d 23.103.189.158
1414
iptables -I FORWARD -j DROP -d 65.55.138.0/24
1515
iptables -I FORWARD -j DROP -d 65.55.163.0/24
16+
iptables -I FORWARD -j DROP -d 66.119.144.157
17+
iptables -I FORWARD -j DROP -d 66.119.144.158
18+
iptables -I FORWARD -j DROP -d 66.119.144.189
19+
iptables -I FORWARD -j DROP -d 66.119.144.190
1620
iptables -I FORWARD -j DROP -d 131.253.33.50
1721
iptables -I FORWARD -j DROP -d 134.170.51.187
1822
iptables -I FORWARD -j DROP -d 134.170.51.188

‎data/proxifier/win10/extra/ips.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,12 @@
1818
168.63.18.79;
1919
191.232.139.0-191.232.139.255;
2020
204.79.197.0-204.79.197.255;
21-
207.46.134.255;
21+
207.46.7.252;
22+
207.46.101.29;
23+
207.46.153.155;
2224
207.46.194.14;
2325
207.46.194.25;
2426
207.46.194.33;
27+
207.46.194.40;
2528
207.46.223.94;
2629
207.68.166.254;

‎data/proxifier/win10/spy/ips.txt

-9
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
40.77.229.5;
2323
40.77.229.133;
2424
40.83.189.49;
25-
40.113.8.255;
2625
40.113.10.78;
2726
40.113.14.159;
2827
40.113.22.47;
@@ -65,10 +64,6 @@
6564
65.55.176.90;
6665
65.55.223.0-65.55.223.255;
6766
65.55.252.0-65.55.252.255;
68-
66.119.144.157;
69-
66.119.144.158;
70-
66.119.144.189;
71-
66.119.144.190;
7267
66.119.147.131;
7368
77.67.29.176;
7469
104.41.207.73;
@@ -147,9 +142,5 @@
147142
191.237.218.239;
148143
191.239.54.52;
149144
195.138.255.0-195.138.255.255;
150-
207.46.7.252;
151-
207.46.101.29;
152-
207.46.153.155;
153-
207.46.194.40;
154145
207.68.166.254;
155146
213.199.179.0-213.199.179.255;

‎data/proxifier/win10/update/ips.txt

+4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
23.103.189.158;
66
65.55.138.0-65.55.138.255;
77
65.55.163.0-65.55.163.255;
8+
66.119.144.157;
9+
66.119.144.158;
10+
66.119.144.189;
11+
66.119.144.190;
812
131.253.33.50;
913
134.170.51.187;
1014
134.170.51.188;

‎logs/win10/firewall-test-extra.csv

+18-8
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ IP,ORGANIZATION,COUNTRY,RESOLVED DATE,RESOLVED DOMAIN
3434
,,,2017-05-07,star-r-bat-bing-com.a-0001.a-msedge.net
3535
,,,2017-05-07,bat-bing-com.a-0001.a-msedge.net
3636
,,,2017-05-07,2.bing.com
37-
,,,2017-05-06,ca.bing.com
38-
,,,2017-05-06,mr0c.bing.com
3937
,,,2017-05-06,aaajaj.bing.com
38+
,,,2017-05-06,mr0c.bing.com
39+
,,,2017-05-06,ca.bing.com
4040
,,,2017-05-05,ck.bing.com
4141
,,,2017-05-05,fail.bing.com
4242
,,,2017-05-04,sg.bing.com
@@ -97,21 +97,21 @@ IP,ORGANIZATION,COUNTRY,RESOLVED DATE,RESOLVED DOMAIN
9797
,,,2017-03-23,8mzjma.blu.livefilestore.com
9898
,,,2017-03-23,cid-05c2bd2c684734a7.users.storage.live.com
9999
,,,2017-03-23,5ofs6a.blu.livefilestore.com
100-
,,,2017-03-22,byirda.bay.livefilestore.com
101100
,,,2017-03-22,bsehdg.bay.livefilestore.com
101+
,,,2017-03-22,byirda.bay.livefilestore.com
102102
,,,2017-03-21,chplkg.bay.livefilestore.com
103103
,,,2017-03-19,bsxyca.blu.livefilestore.com
104104
,,,2017-03-18,bycfyw.bay.livefilestore.com
105+
,,,2017-03-11,1fjeoa.blu.livefilestore.com
105106
,,,2017-03-11,amdqug.bay.livefilestore.com
106107
,,,2017-03-11,bmcfqw.blu.livefilestore.com
107-
,,,2017-03-11,8wzqgq.blu.livefilestore.com
108-
,,,2017-03-11,1fjeoa.blu.livefilestore.com
109108
,,,2017-03-11,8gzc6q.bay.livefilestore.com
110109
,,,2017-03-11,861mag.blu.livefilestore.com
111110
,,,2017-03-11,9wz40g.bay.livefilestore.com
111+
,,,2017-03-11,8wzqgq.blu.livefilestore.com
112112
,,,2017-03-10,byfiles.storage.msn.com
113-
,,,2017-03-09,docs.live.net
114113
,,,2017-03-09,7ej8tg.bn1.livefilestore.com
114+
,,,2017-03-09,docs.live.net
115115
,,,2017-03-03,akvc7q.dm1.livefilestore.com
116116
,,,2017-03-03,bpmqcg.bay.livefilestore.com
117117
,,,2017-03-02,cid-162596e848be0b43.users.storage.live.com
@@ -202,8 +202,17 @@ IP,ORGANIZATION,COUNTRY,RESOLVED DATE,RESOLVED DOMAIN
202202
,,,2014-08-07,privacy.microsoft.com
203203
168.63.18.79,Microsoft Azure,Netherlands,2017-03-03,nexusrules.officeapps.live.com
204204
,,,2017-01-08,prod.nexusrules.live.com.akadns.net
205-
207.46.134.255,Microsoft Azure,Hong Kong,2017-02-11,nexusrules.officeapps.live.com
206-
,,,2016-12-05,prod.nexusrules.live.com.akadns.net
205+
207.46.7.252,Microsoft Azure,United States,2017-05-28,gateway.skyprod.akadns.net
206+
,,,2017-04-17,ssw.live.com
207+
,,,2016-06-09,ssw.live.com.nsatc.net
208+
,,,2014-05-18,ssw.msn.com
209+
,,,2013-10-15,ds.ssw.live.com
210+
207.46.101.29,Microsoft Azure,United States,2017-05-18,gateway.skyprod.akadns.net
211+
,,,2017-05-02,ssw.live.com
212+
,,,2016-06-04,ssw.live.com.nsatc.net
213+
,,,2015-03-03,ssw.msn.com
214+
,,,2013-10-17,ds.ssw.live.com
215+
207.46.153.155,Microsoft Azure,Hong Kong,2015-10-06,nexus.officeapps.live.com
207216
207.46.194.14,Microsoft bingbot,Ireland,2015-04-29,msnbot-207-46-194-14.search.msn.com
208217
,,,2014-11-09,msn.co.uk
209218
,,,2014-10-17,g.msn.co.kr
@@ -247,5 +256,6 @@ IP,ORGANIZATION,COUNTRY,RESOLVED DATE,RESOLVED DOMAIN
247256
,,,2015-02-02,arc.msn.com.nsatc.net
248257
,,,2014-10-15,mobileads.msn.com
249258
,,,2014-09-16,mobileads.msn.com.nsatc.net
259+
207.46.194.40,Microsoft bingbot,Ireland,2014-12-12,mobileads.msn.com.nsatc.net
250260
207.46.223.94,Microsoft Azure,United States,,
251261
207.68.166.254,Microsoft Corporation,United States,2015-12-09,survey.watson.microsoft.com

0 commit comments

Comments
 (0)