From 3592b3acca609d733f5784725677068709640623 Mon Sep 17 00:00:00 2001 From: URenko <18209292+URenko@users.noreply.github.com> Date: Fri, 7 Dec 2018 23:32:47 +0800 Subject: [PATCH 1/5] change proxy method from hosts to pac --- .gitignore | 1 + README.md | 5 +- accesser.py | 124 +++++++++++++++++++++++------------------- domains.txt | 1 + pac.txt | 50 +++++++++++++++++ setting.ini | 7 ++- start.bat | 1 + utils/certmanager.py | 2 +- utils/httpredirect.py | 64 ---------------------- 9 files changed, 130 insertions(+), 125 deletions(-) create mode 100644 pac.txt delete mode 100644 utils/httpredirect.py diff --git a/.gitignore b/.gitignore index 369fe2a..9b372b7 100644 --- a/.gitignore +++ b/.gitignore @@ -106,3 +106,4 @@ venv.bak/ python/ CERT/ hosts +*.exe \ No newline at end of file diff --git a/README.md b/README.md index e085c27..6182c0e 100644 --- a/README.md +++ b/README.md @@ -16,13 +16,14 @@ `python accesser.py -r` - 更新根证书和服务器证书（部分平台需手动导入证书） `python accesser.py -rr` -- 增加支持的域名： +- 增加支持的网址： +按pac文件格式编辑`pac.txt`使要网址从代理过 在`domains.txt`中添加新行再加入域名，重新启动程序 ## 当前支持 | |Windows|Mac OS|Linux| |-------------------|-------|------|-----| |基础支持 | ✔ | ✔ | ✔ | +|自动配置pac代理 | ✔ | | | |自动导入证书至系统 | ✔ | | | |自动导入证书至Firefox| | | | -|自动更新HOSTS | ✔ | | | diff --git a/accesser.py b/accesser.py index 781716e..5a81662 100644 --- a/accesser.py +++ b/accesser.py @@ -18,7 +18,7 @@ HOSTS_URL1 = 'https://raw.githubusercontent.com/googlehosts/hosts/master/hosts-files/hosts' HOSTS_URL2 = 'https://coding.net/u/scaffrey/p/hosts/git/raw/master/hosts-files/hosts' -server_address = ('127.0.0.1', 443) +server_address = ('127.0.0.1', 7654) import argparse import logging @@ -26,7 +26,7 @@ import os, re, sys import socket, ssl import select -from socketserver import * +from socketserver import StreamRequestHandler,ThreadingTCPServer,_SocketWriter sys.path.append(os.path.dirname(__file__)) from utils import certmanager as cm @@ -36,47 +36,79 @@ import urllib.error _MAXLINE = 65536 -_MAXHEADERS = 100 - +PAC_HEADER = 'HTTP/1.1 200 OK\r\nContent-Length: {}\r\nContent-Type: application/x-ns-proxy-autoconfig\r\n\r\n' +REDIRECT_HEADER = 'HTTP/1.1 301 Moved Permanently\r\nLocation: https://{}\r\n\r\n' class ProxyHandler(StreamRequestHandler): raw_request = b'' remote_ip = None + host = None def send_error(self, code, message=None, explain=None): #TODO pass - def parse_host(self): + def send_pac(self): + with open('pac.txt') as f: + body = f.read() + self.wfile.write(PAC_HEADER.format(len(body)).encode('iso-8859-1')) + self.wfile.write(body.encode()) + + def http_redirect(self, path): + if path.startswith('http://'): + path = path[7:] + for key in config['http_redirect']: + if path.startswith(key): + path = config['http_redirect'][key] + path[len(key):] + break + else: + return False + logging.info('Redirect to '+path) + self.wfile.write(REDIRECT_HEADER.format(path).encode('iso-8859-1')) + return True + + def parse_host(self, forward=False): try: raw_requestline = self.rfile.readline(_MAXLINE + 1) - self.raw_request += raw_requestline + if forward: + self.raw_request += raw_requestline if len(raw_requestline) > _MAXLINE: logging.error(HTTPStatus.REQUEST_URI_TOO_LONG) self.send_error(HTTPStatus.REQUEST_URI_TOO_LONG) if not raw_requestline: return False - logging.debug(raw_requestline.strip().decode('iso-8859-1')) - headers = [] + requestline = raw_requestline.strip().decode('iso-8859-1') + logging.warning(requestline) + words = requestline.split() + if len(words) == 0: + return False + command, path = words[:2] + if not forward: + if 'CONNECT' == command: + host, port = path.split(':') + if '443' == port: + self.host = host + self.remote_ip = rhosts[self.host] + if 'GET' == command: + if path.startswith('/pac/'): + self.send_pac() + else: + self.http_redirect(path) while True: raw_requestline = self.rfile.readline(_MAXLINE + 1) - self.raw_request += raw_requestline + if forward: + self.raw_request += raw_requestline if len(raw_requestline) > _MAXLINE: return False - headers.append(raw_requestline) - if len(headers) > _MAXHEADERS: - return False if raw_requestline in (b'\r\n', b'\n', b''): break - header, value = raw_requestline.strip().split(b': ', maxsplit=1) - if header == b'Host': - self.host = value.decode('iso-8859-1') - self.remote_ip = rhosts[self.host] - logging.debug('remote: {} {}'.format(self.host, self.remote_ip)) - if self.remote_ip: - return True + if not forward: + if self.remote_ip: + return True + else: + return False else: - return False + return not self.http_redirect(self.host+path) except socket.timeout as e: logging.error("Request timed out: {}".format(e)) return False @@ -98,7 +130,7 @@ def forward(self, sock, remote): break sock.sendall(data) except socket.error as e: - logging.warning('Forward: %s' % e) + logging.debug('Forward: %s' % e) finally: sock.close() remote.close() @@ -106,10 +138,19 @@ def forward(self, sock, remote): def handle(self): if not self.parse_host(): return + self.wfile.write(b'HTTP/1.1 200 Connection Established\r\n\r\n') + self.request = context.wrap_socket(self.request, server_side=True) + self.rfile = self.request.makefile('rb', self.rbufsize) + if self.wbufsize == 0: + self.wfile = _SocketWriter(self.request) + else: + self.wfile = self.request.makefile('wb', self.wbufsize) + if not self.parse_host(forward=True): + return self.remote_sock = socket.create_connection((self.remote_ip, 443)) - context = ssl.create_default_context() - context.check_hostname = False - self.remote_sock = context.wrap_socket(self.remote_sock) + remote_context = ssl.create_default_context() + remote_context.check_hostname = False + self.remote_sock = remote_context.wrap_socket(self.remote_sock) cert = self.remote_sock.getpeercert() if check_hostname: hostname = self.host @@ -126,7 +167,7 @@ def handle(self): parser.add_argument('-rr', '--root', help='create root cert', action="store_true") args = parser.parse_args() - config = configparser.ConfigParser() + config = configparser.ConfigParser(delimiters=('=',)) config.read('setting.ini') loglevel = getattr(logging, config['setting']['loglevel']) @@ -151,29 +192,7 @@ def handle(self): rhosts[domain] = config['HOSTS'][domain] check_hostname = int(config['setting']['check_hostname']) - domainsupdate = False - if not cm.match_domain('CERT/server.crt'): - if sys.platform.startswith('win'): - domainsupdate = True - from utils import win32elevate - if not win32elevate.areAdminRightsElevated(): - win32elevate.elevateAdminRun(' '.join(sys.argv), reattachConsole=False) - sys.exit(0) - logging.info('Updating HOSTS...') - with open(r"C:\Windows\System32\drivers\etc\hosts") as f: - host_content = f.read() - with open('domains.txt') as f: - for domain in f: - if not re.search(r'(\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3})(?P\s+'+domain.strip()+')', host_content): - host_content += '\n127.0.0.1\t'+domain.strip() - host_content = re.sub(r'(\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3})(?P\s+'+domain.strip()+')',r'127.0.0.1\g',host_content) - with open(r"C:\Windows\System32\drivers\etc\hosts", 'w') as f: - f.write(host_content) - with open('setting.ini', 'w') as f: - config.write(f) - logging.info('Updating fin') - else: - logging.warning('other platform support is under development, please update HOSTS manually and then use -r to update server cert.') + domainsupdate = not cm.match_domain('CERT/server.crt') if not os.path.exists('CERT'): os.mkdir('CERT') @@ -189,17 +208,12 @@ def handle(self): context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER) try: context.load_cert_chain("CERT/server.crt", "CERT/server.key") + cert_domains = cm.get_cert_domain("CERT/server.crt") except FileNotFoundError: logging.error('cert not exist, please use --rr to create it') - if int(config['setting']['http_redirect']): - from utils import httpredirect - import threading - th_httpredirect = threading.Thread(target=httpredirect.main) - th_httpredirect.daemon = True - th_httpredirect.start() + try: server = ThreadingTCPServer(server_address, ProxyHandler) - server.socket = context.wrap_socket(server.socket, server_side=True) logging.info("server started at {}:{}".format(*server_address)) server.serve_forever() except socket.error as e: diff --git a/domains.txt b/domains.txt index 4dbf0df..659f11a 100644 --- a/domains.txt +++ b/domains.txt @@ -40,3 +40,4 @@ ls.srvcs.tumblr.com px.srvcs.tumblr.com 96.media.tumblr.com 97.media.tumblr.com +www.google.com \ No newline at end of file diff --git a/pac.txt b/pac.txt new file mode 100644 index 0000000..9a5c4fe --- /dev/null +++ b/pac.txt @@ -0,0 +1,50 @@ +var domains = { + "steamcommunity.com": 1, + "pixiv.net": 1, + "tumblr.com": 1, + "tumblr.co": 1, + "google.com":1 +}; + +var shexps = { + "*://zh.wikipedia.org/*": 1, + "*://ja.wikipedia.org/*": 1, + "*://www.google.com/recaptcha/*": 1 +}; + +var proxy = "PROXY 127.0.0.1:7654;"; + +var direct = 'DIRECT;'; + +var hasOwnProperty = Object.hasOwnProperty; + +function shExpMatchs(str, shexps) { + for (shexp in shexps) { + if (shExpMatch(str, shexp)) { + return true; + } + } + return false; +} + +function FindProxyForURL(url, host) { + var suffix; + var pos = host.lastIndexOf('.'); + pos = host.lastIndexOf('.', pos - 1); + while(1) { + if (pos <= 0) { + if (hasOwnProperty.call(domains, host)) { + return proxy; + } else if (shExpMatchs(url, shexps)) { + return proxy; + } else { + return direct; + } + } + suffix = host.substring(pos + 1); + if (hasOwnProperty.call(domains, suffix)) { + return proxy; + } + pos = host.lastIndexOf('.', pos - 1); + } +} diff --git a/setting.ini b/setting.ini index b58f624..3adcccb 100644 --- a/setting.ini +++ b/setting.ini @@ -3,10 +3,10 @@ loglevel = DEBUG # set logfile empty will log to stderr(normally is terminal) logfile = check_hostname = 1 -http_redirect = 1 [http_redirect] -pixiv.net = www.pixiv.net +pixiv.net/ = www.pixiv.net/ +www.google.com/recaptcha/ = www.recaptcha.net/recaptcha/ [alert_hostname] # Because servers may return wrong certificate @@ -18,4 +18,5 @@ pixiv.net = www.pixiv.net [HOSTS] # the hosts here have a higher priority than the hosts file -accounts.pixiv.net = 210.129.120.46 +accounts.pixiv.net = 210.140.131.184 +www.pixiv.net =210.140.131.180 diff --git a/start.bat b/start.bat index 7966c7e..77dfb45 100644 --- a/start.bat +++ b/start.bat @@ -1,3 +1,4 @@ +@sysproxy.exe pac http://127.0.0.1:7654/pac/?t=%random% @if exist CERT ( python\python.exe accesser.py ) else ( diff --git a/utils/certmanager.py b/utils/certmanager.py index 6ca2d30..1ffc4cc 100644 --- a/utils/certmanager.py +++ b/utils/certmanager.py @@ -146,4 +146,4 @@ def get_cert_domain(certfile): for i in range(cert.get_extension_count()): extension = cert.get_extension(i) if b"subjectAltName" == extension.get_short_name(): - return _subjectAltNameTuple(extension) + return _subjectAltNameTuple(extension) \ No newline at end of file diff --git a/utils/httpredirect.py b/utils/httpredirect.py deleted file mode 100644 index f6e818e..0000000 --- a/utils/httpredirect.py +++ /dev/null @@ -1,64 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# Accesser -# Copyright (C) 2018 URenko - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -server_address = ('127.0.0.1', 80) - -import configparser -import socket -from http.server import * -from http import HTTPStatus - -config = configparser.ConfigParser() - -class RedirectHandler(BaseHTTPRequestHandler): - def handle_one_request(self): - """Handle a single HTTP request. - """ - try: - self.raw_requestline = self.rfile.readline(65537) - if len(self.raw_requestline) > 65536: - self.requestline = '' - self.request_version = '' - self.command = '' - self.send_error(HTTPStatus.REQUEST_URI_TOO_LONG) - return - if not self.raw_requestline: - self.close_connection = True - return - if not self.parse_request(): - return - self.do_all() - self.wfile.flush() - except socket.timeout as e: - self.log_error("Request timed out: %r", e) - self.close_connection = True - return - - def do_all(self): - self.send_response(HTTPStatus.MOVED_PERMANENTLY) - redirect_to = self.headers['Host'] - if redirect_to in config['http_redirect']: - redirect_to = config['http_redirect'][redirect_to] - print(redirect_to) - self.send_header('Location', 'https://'+redirect_to+self.path) - self.end_headers() - -def main(): - config.read('setting.ini') - httpd = ThreadingHTTPServer(server_address, RedirectHandler) - httpd.serve_forever() From 58d1afbd66f16e95db0b49c4d6fd5f7ecc50bea8 Mon Sep 17 00:00:00 2001 From: URenko <18209292+URenko@users.noreply.github.com> Date: Sat, 8 Dec 2018 07:17:47 +0800 Subject: [PATCH 2/5] update requirements --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 6182c0e..a73b34e 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,7 @@ ## 依赖 - Python3.7 (其他版本未测试) - [pyopenssl](https://pyopenssl.org/) +- [sysproxy](https://github.com/Noisyfox/sysproxy)(for Windows) ## 使用 - 启动服务器 From b8915049fd8e6fc0c0bbb2934ff8134746963f4d Mon Sep 17 00:00:00 2001 From: URenko <18209292+URenko@users.noreply.github.com> Date: Sat, 8 Dec 2018 08:26:52 +0800 Subject: [PATCH 3/5] fix pixiv signin, add content_fix --- accesser.py | 59 ++++++++++++++++++++++++++++++++++++++++--------- content_fix.ini | 2 ++ domains.txt | 3 ++- pac.txt | 6 ++--- setting.ini | 4 +++- 5 files changed, 59 insertions(+), 15 deletions(-) create mode 100644 content_fix.ini diff --git a/accesser.py b/accesser.py index 5a81662..ae75ae7 100644 --- a/accesser.py +++ b/accesser.py @@ -16,6 +16,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +__version__ = '0.5.0' + HOSTS_URL1 = 'https://raw.githubusercontent.com/googlehosts/hosts/master/hosts-files/hosts' HOSTS_URL2 = 'https://coding.net/u/scaffrey/p/hosts/git/raw/master/hosts-files/hosts' server_address = ('127.0.0.1', 7654) @@ -24,6 +26,7 @@ import logging import configparser import os, re, sys +import zlib import socket, ssl import select from socketserver import StreamRequestHandler,ThreadingTCPServer,_SocketWriter @@ -68,6 +71,7 @@ def http_redirect(self, path): return True def parse_host(self, forward=False): + content_lenght = None try: raw_requestline = self.rfile.readline(_MAXLINE + 1) if forward: @@ -78,7 +82,7 @@ def parse_host(self, forward=False): if not raw_requestline: return False requestline = raw_requestline.strip().decode('iso-8859-1') - logging.warning(requestline) + logging.info(requestline) words = requestline.split() if len(words) == 0: return False @@ -94,14 +98,22 @@ def parse_host(self, forward=False): self.send_pac() else: self.http_redirect(path) + elif 'POST' == command: + content_lenght = 0 while True: raw_requestline = self.rfile.readline(_MAXLINE + 1) if forward: self.raw_request += raw_requestline + if 0 == content_lenght: + key,value = raw_requestline.rstrip().split(b': ', maxsplit=1) + if b'Content-Length' == key: + content_lenght = int(value) if len(raw_requestline) > _MAXLINE: return False if raw_requestline in (b'\r\n', b'\n', b''): break + if None != content_lenght: + self.raw_request += self.rfile.read(content_lenght) if not forward: if self.remote_ip: return True @@ -113,7 +125,9 @@ def parse_host(self, forward=False): logging.error("Request timed out: {}".format(e)) return False - def forward(self, sock, remote): + def forward(self, sock, remote, fix): + content_encoding = None + left_length = 0 try: fdset = [sock, remote] while True: @@ -123,11 +137,37 @@ def forward(self, sock, remote): if len(data) <= 0: break remote.sendall(data) - if remote in r: data = remote.recv(32768) if len(data) <= 0: break + if fix: + if None == content_encoding: + headers,body = data.split(b'\r\n\r\n', maxsplit=1) + headers = headers.decode('iso-8859-1') + match = re.search(r'Content-Encoding: (\S+)\r\n', headers) + if match: + content_encoding = match.group(1) + else: + content_encoding = '' + match = re.search(r'Content-Length: (\d+)\r\n', headers) + if match: + content_length = int(match.group(1)) + else: + content_length = 0 + left_length = content_length - len(body) + else: + left_length -= len(body) + if left_length <= 0: + content_encoding = None + if 'gzip' == content_encoding: + body = zlib.decompress(body ,15+32) + for old in content_fix[self.host]: + body = body.replace(old.encode('utf8'), content_fix[self.host][old].encode('utf8')) + if None != content_encoding: + headers = re.sub(r'Content-Encoding: (\S+)\r\n', r'', headers) + headers = re.sub(r'Content-Length: (\d+)\r\n', r'Content-Length: '+str(len(body))+r'\r\n', headers) + data = headers.encode('iso-8859-1') + b'\r\n\r\n' + body sock.sendall(data) except socket.error as e: logging.debug('Forward: %s' % e) @@ -140,11 +180,7 @@ def handle(self): return self.wfile.write(b'HTTP/1.1 200 Connection Established\r\n\r\n') self.request = context.wrap_socket(self.request, server_side=True) - self.rfile = self.request.makefile('rb', self.rbufsize) - if self.wbufsize == 0: - self.wfile = _SocketWriter(self.request) - else: - self.wfile = self.request.makefile('wb', self.wbufsize) + self.setup() if not self.parse_host(forward=True): return self.remote_sock = socket.create_connection((self.remote_ip, 443)) @@ -158,10 +194,10 @@ def handle(self): hostname = config['alert_hostname'][self.remote_ip] ssl.match_hostname(cert, hostname) self.remote_sock.sendall(self.raw_request) - self.forward(self.request, self.remote_sock) + self.forward(self.request, self.remote_sock, self.host in content_fix) if __name__ == '__main__': - print("Accesser Copyright (C) 2018 URenko") + print("Accesser v{} Copyright (C) 2018 URenko".format(__version__)) parser = argparse.ArgumentParser() parser.add_argument('-r', '--renewca', help='renew cert', action="store_true") parser.add_argument('-rr', '--root', help='create root cert', action="store_true") @@ -169,6 +205,9 @@ def handle(self): config = configparser.ConfigParser(delimiters=('=',)) config.read('setting.ini') + content_fix = configparser.ConfigParser(delimiters=('=',)) + content_fix.optionxform = lambda option: option + content_fix.read('content_fix.ini') loglevel = getattr(logging, config['setting']['loglevel']) logfile = config['setting']['logfile'] diff --git a/content_fix.ini b/content_fix.ini new file mode 100644 index 0000000..ce120fe --- /dev/null +++ b/content_fix.ini @@ -0,0 +1,2 @@ +[accounts.pixiv.net] +"pixivAccount.captchaType":"KCaptcha" = "pixivAccount.captchaType":"ReCaptcha" \ No newline at end of file diff --git a/domains.txt b/domains.txt index 659f11a..cae481c 100644 --- a/domains.txt +++ b/domains.txt @@ -40,4 +40,5 @@ ls.srvcs.tumblr.com px.srvcs.tumblr.com 96.media.tumblr.com 97.media.tumblr.com -www.google.com \ No newline at end of file +www.google.com +www.recaptcha.net \ No newline at end of file diff --git a/pac.txt b/pac.txt index 9a5c4fe..10ec42b 100644 --- a/pac.txt +++ b/pac.txt @@ -3,13 +3,13 @@ var domains = { "pixiv.net": 1, "tumblr.com": 1, "tumblr.co": 1, - "google.com":1 + "google.com": 1, + "recaptcha.net": 1 }; var shexps = { "*://zh.wikipedia.org/*": 1, - "*://ja.wikipedia.org/*": 1, - "*://www.google.com/recaptcha/*": 1 + "*://ja.wikipedia.org/*": 1 }; var proxy = "PROXY 127.0.0.1:7654;"; diff --git a/setting.ini b/setting.ini index 3adcccb..dae7a81 100644 --- a/setting.ini +++ b/setting.ini @@ -15,8 +15,10 @@ www.google.com/recaptcha/ = www.recaptcha.net/recaptcha/ 124.108.101.58 = www.tumblr.com 66.6.32.162 = www.tumblr.com 119.161.4.42 = www.tumblr.com +203.208.50.87 = www.google.cn [HOSTS] # the hosts here have a higher priority than the hosts file accounts.pixiv.net = 210.140.131.184 -www.pixiv.net =210.140.131.180 +www.pixiv.net = 210.140.131.180 +www.recaptcha.net = 203.208.50.87 From 7085978036edad8f3ad6ca1f8e243956bf0c9672 Mon Sep 17 00:00:00 2001 From: URenko <18209292+URenko@users.noreply.github.com> Date: Sat, 8 Dec 2018 15:24:25 +0800 Subject: [PATCH 4/5] fix nonascii path problam --- utils/win32elevate.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/utils/win32elevate.py b/utils/win32elevate.py index 75547e8..8495e0c 100644 --- a/utils/win32elevate.py +++ b/utils/win32elevate.py @@ -23,6 +23,9 @@ import os import sys import subprocess +import locale + +sysencoding = locale.getpreferredencoding() import ctypes from ctypes.wintypes import HANDLE, BOOL, DWORD, HWND, HINSTANCE, HKEY @@ -138,7 +141,7 @@ def elevateAdminRights(waitAndClose=True, reattachConsole=True): # this is host process that doesn't have administrative rights params = subprocess.list2cmdline(sysargv + [ELEVATE_MARKER]) executeInfo = ShellExecuteInfo(fMask=SEE_MASK_NOCLOSEPROCESS, hwnd=None, lpVerb=b'runas', - lpFile=sys.executable.encode('ascii'), lpParameters=params.encode('ascii'), + lpFile=sys.executable.encode(sysencoding), lpParameters=params.encode(sysencoding), lpDirectory=None, nShow=SW_HIDE if reattachConsole else SW_SHOW) if reattachConsole and not all(stream.isatty() for stream in (sys.stdin, sys.stdout, @@ -186,7 +189,7 @@ def elevateAdminRun(args=sysargv, executable=sys.executable, args = subprocess.list2cmdline(args) executeInfo = ShellExecuteInfo(fMask=SEE_MASK_NOCLOSEPROCESS, hwnd=None, lpVerb='' if areAdminRightsElevated() else b'runas', - lpFile=executable.encode('ascii'), lpParameters=args.encode('ascii'), + lpFile=executable.encode(sysencoding), lpParameters=args.encode(sysencoding), lpDirectory=None, nShow=SW_HIDE if reattachConsole else SW_SHOW) From 8655636ca6d10d512902dff7ca492a570f4ccc8e Mon Sep 17 00:00:00 2001 From: URenko <18209292+URenko@users.noreply.github.com> Date: Sat, 8 Dec 2018 16:16:47 +0800 Subject: [PATCH 5/5] add some sites --- README.md | 10 ++++++++-- domains.txt | 7 ++++++- pac.txt | 8 ++++++-- setting.ini | 19 +++++++++++++++++++ 4 files changed, 39 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index a73b34e..93d4bc5 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,11 @@ # Accesser -一个解决GFW通过[检测server_name](https://github.com/googlehosts/hosts/issues/87)导致中文维基、Pixiv等站点无法访问的工具 +一个解决GFW通过[检测server_name](https://github.com/googlehosts/hosts/issues/87)导致中文维基、Pixiv等站点无法访问的工具 +[支持的站点](https://github.com/URenko/Accesser/wiki/目前支持的站点) ## 一键使用 ### Windows -[点此进入下载页](https://github.com/URenko/Accesser/releases/latest)，下载Windows_x64.zip，解压后运行`start.bat`即可，首次运行可能会申请管理员权限 +[点此进入下载页](https://github.com/URenko/Accesser/releases/latest)，下载Windows_x64.zip，解压后运行`start.bat`即可，首次运行可能会申请管理员权限 +[Firefox设置方法](https://github.com/URenko/Accesser/wiki/Firefox设置方法) ## 依赖 - Python3.7 (其他版本未测试) @@ -28,3 +30,7 @@ |自动配置pac代理 | ✔ | | | |自动导入证书至系统 | ✔ | | | |自动导入证书至Firefox| | | | + +## TODO +- [ ] Pixiv注册 +- [ ] 自动证书配置（不用domains.txt） \ No newline at end of file diff --git a/domains.txt b/domains.txt index cae481c..b52d5ee 100644 --- a/domains.txt +++ b/domains.txt @@ -41,4 +41,9 @@ px.srvcs.tumblr.com 96.media.tumblr.com 97.media.tumblr.com www.google.com -www.recaptcha.net \ No newline at end of file +www.recaptcha.net +instagram.com +www.instagram.com +www.quora.com +steamcommunity-a.akamaihd.net +steamuserimages-a.akamaihd.net \ No newline at end of file diff --git a/pac.txt b/pac.txt index 10ec42b..c490c85 100644 --- a/pac.txt +++ b/pac.txt @@ -4,12 +4,16 @@ var domains = { "tumblr.com": 1, "tumblr.co": 1, "google.com": 1, - "recaptcha.net": 1 + "recaptcha.net": 1, + "instagram.com": 1, + "quora.com": 1 }; var shexps = { "*://zh.wikipedia.org/*": 1, - "*://ja.wikipedia.org/*": 1 + "*://ja.wikipedia.org/*": 1, + "*://steamcommunity-a.akamaihd.net/*": 1, + "*://steamuserimages-a.akamaihd.net/*": 1 }; var proxy = "PROXY 127.0.0.1:7654;"; diff --git a/setting.ini b/setting.ini index dae7a81..983b08b 100644 --- a/setting.ini +++ b/setting.ini @@ -7,6 +7,8 @@ check_hostname = 1 [http_redirect] pixiv.net/ = www.pixiv.net/ www.google.com/recaptcha/ = www.recaptcha.net/recaptcha/ +tumblr.com/ = www.tumblr.com/ +instagram.com/ = www.instagram.com/ [alert_hostname] # Because servers may return wrong certificate @@ -16,9 +18,26 @@ www.google.com/recaptcha/ = www.recaptcha.net/recaptcha/ 66.6.32.162 = www.tumblr.com 119.161.4.42 = www.tumblr.com 203.208.50.87 = www.google.cn +151.101.1.2 = fs.quoracdn.net [HOSTS] # the hosts here have a higher priority than the hosts file accounts.pixiv.net = 210.140.131.184 www.pixiv.net = 210.140.131.180 www.recaptcha.net = 203.208.50.87 +assets.tumblr.com = 152.199.38.136 +24.media.tumblr.com = 152.199.38.136 +25.media.tumblr.com = 152.199.38.136 +31.media.tumblr.com = 152.199.38.136 +33.media.tumblr.com = 152.199.38.136 +37.media.tumblr.com = 152.199.38.136 +38.media.tumblr.com = 152.199.38.136 +40.media.tumblr.com = 152.199.38.136 +49.media.tumblr.com = 152.199.38.136 +55.media.tumblr.com = 152.199.38.136 +56.media.tumblr.com = 152.199.38.136 +57.media.tumblr.com = 152.199.38.136 +66.media.tumblr.com = 152.199.38.136 +www.quora.com = 151.101.1.2 +steamcommunity-a.akamaihd.net = 23.48.201.90 +steamuserimages-a.akamaihd.net = 23.48.201.90 \ No newline at end of file