bugfix: user-rule不生效问题
This commit is contained in:
@@ -1,17 +1,8 @@
|
|||||||
aliyun.com
|
|
||||||
aliyuncdn.com
|
|
||||||
aliyuncs.com
|
|
||||||
baidu.com
|
baidu.com
|
||||||
baidupcs.com
|
baidupcs.com
|
||||||
baidustatic.com
|
baidustatic.com
|
||||||
bdimg.com
|
bdimg.com
|
||||||
bdstatic.com
|
bdstatic.com
|
||||||
dbank.com
|
|
||||||
gtimg.com
|
gtimg.com
|
||||||
qq.com
|
qq.com
|
||||||
qstatic.com
|
qstatic.com
|
||||||
taobao.com
|
|
||||||
taobaocdn.com
|
|
||||||
tmall.com
|
|
||||||
tmcdn.net
|
|
||||||
tb.cn
|
|
||||||
@@ -262,6 +262,7 @@ def main():
|
|||||||
# Yeah, it's an URL, try to download it
|
# Yeah, it's an URL, try to download it
|
||||||
print('Downloading user rules file from %s' % args.user_rule)
|
print('Downloading user rules file from %s' % args.user_rule)
|
||||||
user_rule = urllib.request.urlopen(args.user_rule, timeout=10).read().decode('utf-8')
|
user_rule = urllib.request.urlopen(args.user_rule, timeout=10).read().decode('utf-8')
|
||||||
|
user_rule = user_rule.splitlines(False)
|
||||||
|
|
||||||
if args.direct_rule:
|
if args.direct_rule:
|
||||||
directrule_parts = urllib.parse.urlsplit(args.direct_rule)
|
directrule_parts = urllib.parse.urlsplit(args.direct_rule)
|
||||||
@@ -293,9 +294,8 @@ def main():
|
|||||||
|
|
||||||
cnips = fetch_ip_data()
|
cnips = fetch_ip_data()
|
||||||
|
|
||||||
domains = []
|
|
||||||
# domains = reduce_domains(domains)
|
# domains = reduce_domains(domains)
|
||||||
pac_content = generate_pac_fast(domains, args.proxy, direct_rule, cnips, localtld_rule)
|
pac_content = generate_pac_fast(user_rule, args.proxy, direct_rule, cnips, localtld_rule)
|
||||||
|
|
||||||
with open(args.output, 'w') as f:
|
with open(args.output, 'w') as f:
|
||||||
f.write(pac_content)
|
f.write(pac_content)
|
||||||
|
|||||||
30
gfw.pac
30
gfw.pac
@@ -10761,26 +10761,34 @@ var cnips = [
|
|||||||
];
|
];
|
||||||
|
|
||||||
var directDomains = {
|
var directDomains = {
|
||||||
"aliyun.com": 1,
|
|
||||||
"aliyuncdn.com": 1,
|
|
||||||
"aliyuncs.com": 1,
|
|
||||||
"baidu.com": 1,
|
"baidu.com": 1,
|
||||||
"baidupcs.com": 1,
|
"baidupcs.com": 1,
|
||||||
"baidustatic.com": 1,
|
"baidustatic.com": 1,
|
||||||
"bdimg.com": 1,
|
"bdimg.com": 1,
|
||||||
"bdstatic.com": 1,
|
"bdstatic.com": 1,
|
||||||
"dbank.com": 1,
|
|
||||||
"gtimg.com": 1,
|
"gtimg.com": 1,
|
||||||
"qq.com": 1,
|
"qq.com": 1,
|
||||||
"qstatic.com": 1,
|
"qstatic.com": 1
|
||||||
"taobao.com": 1,
|
|
||||||
"taobaocdn.com": 1,
|
|
||||||
"tb.cn": 1,
|
|
||||||
"tmall.com": 1,
|
|
||||||
"tmcdn.net": 1
|
|
||||||
};
|
};
|
||||||
|
|
||||||
var domainsUsingProxy = {};
|
var domainsUsingProxy = {
|
||||||
|
"bing.cn": 1,
|
||||||
|
"bing.com": 1,
|
||||||
|
"bing.net": 1,
|
||||||
|
"ggpht.com": 1,
|
||||||
|
"github.com": 1,
|
||||||
|
"githubusercontent.com": 1,
|
||||||
|
"google-analytics.com": 1,
|
||||||
|
"google.com": 1,
|
||||||
|
"google.com.hk": 1,
|
||||||
|
"googleadservices.com": 1,
|
||||||
|
"googleadsserving.cn": 1,
|
||||||
|
"googleapis.com": 1,
|
||||||
|
"googlesyndication.com": 1,
|
||||||
|
"live.com": 1,
|
||||||
|
"stackoverflow.com": 1,
|
||||||
|
"wikipedia.org": 1
|
||||||
|
};
|
||||||
|
|
||||||
var localTlds = {
|
var localTlds = {
|
||||||
".localhost": 1,
|
".localhost": 1,
|
||||||
|
|||||||
Reference in New Issue
Block a user