Rewrite with Tornado
This commit is contained in:
parent
956169fdea
commit
add7a122ac
1 changed files with 101 additions and 101 deletions
202
server.py
202
server.py
|
@ -22,8 +22,6 @@
|
||||||
|
|
||||||
import sys
|
import sys
|
||||||
import socket
|
import socket
|
||||||
import select
|
|
||||||
import SocketServer
|
|
||||||
import struct
|
import struct
|
||||||
import string
|
import string
|
||||||
import hashlib
|
import hashlib
|
||||||
|
@ -32,122 +30,124 @@ import json
|
||||||
import logging
|
import logging
|
||||||
import getopt
|
import getopt
|
||||||
|
|
||||||
|
from tornado import ioloop
|
||||||
def get_table(key):
|
from tornado import iostream
|
||||||
m = hashlib.md5()
|
from tornado import netutil
|
||||||
m.update(key)
|
|
||||||
s = m.digest()
|
|
||||||
(a, b) = struct.unpack('<QQ', s)
|
|
||||||
table = [c for c in string.maketrans('', '')]
|
|
||||||
for i in xrange(1, 1024):
|
|
||||||
table.sort(lambda x, y: int(a % (ord(x) + i) - a % (ord(y) + i)))
|
|
||||||
return table
|
|
||||||
|
|
||||||
|
|
||||||
def send_all(sock, data):
|
class Crypto(object):
|
||||||
bytes_sent = 0
|
def __init__(self, password):
|
||||||
while True:
|
m = hashlib.md5()
|
||||||
r = sock.send(data[bytes_sent:])
|
m.update(password)
|
||||||
if r < 0:
|
s = m.digest()
|
||||||
return r
|
a, b = struct.unpack('<QQ', s)
|
||||||
bytes_sent += r
|
trans = string.maketrans('', '')
|
||||||
if bytes_sent == len(data):
|
table = list(trans)
|
||||||
return bytes_sent
|
for i in xrange(1, 1024):
|
||||||
|
table.sort(lambda x, y: int(a % (ord(x) + i) - a % (ord(y) + i)))
|
||||||
|
self._encrypt_table = ''.join(table)
|
||||||
class ThreadingTCPServer(SocketServer.ThreadingMixIn, SocketServer.TCPServer):
|
self._decrypt_table = string.maketrans(self._encrypt_table, trans)
|
||||||
allow_reuse_address = True
|
|
||||||
|
|
||||||
|
|
||||||
class Socks5Server(SocketServer.StreamRequestHandler):
|
|
||||||
def handle_tcp(self, sock, remote):
|
|
||||||
try:
|
|
||||||
fdset = [sock, remote]
|
|
||||||
while True:
|
|
||||||
r, w, e = select.select(fdset, [], [])
|
|
||||||
if sock in r:
|
|
||||||
data = sock.recv(4096)
|
|
||||||
if len(data) <= 0:
|
|
||||||
break
|
|
||||||
result = send_all(remote, self.decrypt(data))
|
|
||||||
if result < len(data):
|
|
||||||
raise Exception('failed to send all data')
|
|
||||||
if remote in r:
|
|
||||||
data = remote.recv(4096)
|
|
||||||
if len(data) <= 0:
|
|
||||||
break
|
|
||||||
result = send_all(sock, self.encrypt(data))
|
|
||||||
if result < len(data):
|
|
||||||
raise Exception('failed to send all data')
|
|
||||||
|
|
||||||
finally:
|
|
||||||
sock.close()
|
|
||||||
remote.close()
|
|
||||||
|
|
||||||
def encrypt(self, data):
|
def encrypt(self, data):
|
||||||
return data.translate(encrypt_table)
|
return data.translate(self._encrypt_table)
|
||||||
|
|
||||||
def decrypt(self, data):
|
def decrypt(self, data):
|
||||||
return data.translate(decrypt_table)
|
return data.translate(self._decrypt_table)
|
||||||
|
|
||||||
def handle(self):
|
|
||||||
try:
|
|
||||||
sock = self.connection
|
|
||||||
addrtype = ord(self.decrypt(sock.recv(1)))
|
|
||||||
if addrtype == 1:
|
|
||||||
addr = socket.inet_ntoa(self.decrypt(self.rfile.read(4)))
|
|
||||||
elif addrtype == 3:
|
|
||||||
addr = self.decrypt(
|
|
||||||
self.rfile.read(ord(self.decrypt(sock.recv(1)))))
|
|
||||||
else:
|
|
||||||
# not support
|
|
||||||
logging.warn('addr_type not support')
|
|
||||||
return
|
|
||||||
port = struct.unpack('>H', self.decrypt(self.rfile.read(2)))
|
|
||||||
try:
|
|
||||||
logging.info('connecting %s:%d' % (addr, port[0]))
|
|
||||||
remote = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
|
||||||
remote.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
|
|
||||||
remote.connect((addr, port[0]))
|
|
||||||
except socket.error, e:
|
|
||||||
# Connection refused
|
|
||||||
logging.warn(e)
|
|
||||||
return
|
|
||||||
self.handle_tcp(sock, remote)
|
|
||||||
except socket.error, e:
|
|
||||||
logging.warn(e)
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
class Socks5Server(netutil.TCPServer):
|
||||||
os.chdir(os.path.dirname(__file__) or '.')
|
def handle_stream(self, stream, address):
|
||||||
|
soc = stream.socket
|
||||||
|
soc.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, True)
|
||||||
|
ConnHandler(soc).wait_for_data()
|
||||||
|
|
||||||
print 'shadowsocks v0.9.3'
|
|
||||||
|
|
||||||
with open('config.json', 'rb') as f:
|
class PairedStream(iostream.IOStream):
|
||||||
|
def on_close(self):
|
||||||
|
remote = getattr(self, "remote")
|
||||||
|
if isinstance(remote, PairedStream) and not remote.closed():
|
||||||
|
remote.close()
|
||||||
|
|
||||||
|
|
||||||
|
class ConnHandler(PairedStream):
|
||||||
|
def wait_for_data(self):
|
||||||
|
self.read_bytes(1, self.on_addrtype)
|
||||||
|
|
||||||
|
def on_addrtype(self, addrtype):
|
||||||
|
addrtype = ord(crypto.decrypt(addrtype))
|
||||||
|
if addrtype == 1:
|
||||||
|
self.read_bytes(4, self.on_addr1)
|
||||||
|
elif addrtype == 3:
|
||||||
|
self.read_bytes(1, self.on_addr3_length)
|
||||||
|
else:
|
||||||
|
# not support
|
||||||
|
logging.warn('addr_type not support')
|
||||||
|
self.close()
|
||||||
|
|
||||||
|
def on_addr1(self, addr):
|
||||||
|
self.remote_addr = socket.inet_ntoa(crypto.decrypt(addr))
|
||||||
|
self.read_bytes(2, self.on_port)
|
||||||
|
|
||||||
|
def on_addr3_length(self, length):
|
||||||
|
length = ord(crypto.decrypt(length))
|
||||||
|
self.read_bytes(length, self.on_addr3)
|
||||||
|
|
||||||
|
def on_addr3(self, addr):
|
||||||
|
self.remote_addr = crypto.decrypt(addr)
|
||||||
|
self.read_bytes(2, self.on_port)
|
||||||
|
|
||||||
|
def on_port(self, port):
|
||||||
|
self.remote_port = struct.unpack('>H', crypto.decrypt(port))[0]
|
||||||
|
logging.debug("Connecting to %s:%d" % (self.remote_addr, self.remote_port))
|
||||||
|
remote_soc = socket.socket()
|
||||||
|
remote_soc.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, True)
|
||||||
|
self.remote = PairedStream(remote_soc)
|
||||||
|
self.set_close_callback(self.remote.on_close)
|
||||||
|
self.remote.set_close_callback(self.on_close)
|
||||||
|
|
||||||
|
self.remote.connect((self.remote_addr, self.remote_port), self.on_remote_connected)
|
||||||
|
|
||||||
|
def on_remote_connected(self):
|
||||||
|
self.read_until_close(callback=self.on_client_read, streaming_callback=self.on_client_read)
|
||||||
|
self.remote.read_until_close(callback=self.on_remote_read, streaming_callback=self.on_remote_read)
|
||||||
|
|
||||||
|
def on_client_read(self, data):
|
||||||
|
self.remote.write(crypto.encrypt(data))
|
||||||
|
|
||||||
|
def on_remote_read(self, data):
|
||||||
|
self.write(crypto.decrypt(data))
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
logging.basicConfig(level=logging.DEBUG, format='%(asctime)s %(levelname)-8s %(message)s',
|
||||||
|
datefmt='%Y-%m-%d %H:%M:%S', filemode='a+')
|
||||||
|
with open(os.path.join(os.path.dirname(__file__), "config.json"), "rb") as f:
|
||||||
config = json.load(f)
|
config = json.load(f)
|
||||||
|
|
||||||
SERVER = config['server']
|
server_port = config['server_port']
|
||||||
PORT = config['server_port']
|
server_password = config['password']
|
||||||
KEY = config['password']
|
|
||||||
|
|
||||||
optlist, args = getopt.getopt(sys.argv[1:], 'p:k:')
|
optlist, args = getopt.getopt(sys.argv[1:], 'p:k:')
|
||||||
for key, value in optlist:
|
for key, value in optlist:
|
||||||
if key == '-p':
|
if key == '-p':
|
||||||
PORT = int(value)
|
server_port = int(value)
|
||||||
elif key == '-k':
|
elif key == '-k':
|
||||||
KEY = value
|
server_password = value
|
||||||
|
|
||||||
logging.basicConfig(level=logging.DEBUG, format='%(asctime)s %(levelname)-8s %(message)s',
|
|
||||||
datefmt='%Y-%m-%d %H:%M:%S', filemode='a+')
|
|
||||||
|
|
||||||
encrypt_table = ''.join(get_table(KEY))
|
|
||||||
decrypt_table = string.maketrans(encrypt_table, string.maketrans('', ''))
|
|
||||||
if '-6' in sys.argv[1:]:
|
if '-6' in sys.argv[1:]:
|
||||||
ThreadingTCPServer.address_family = socket.AF_INET6
|
address_family = socket.AF_INET6
|
||||||
try:
|
else:
|
||||||
server = ThreadingTCPServer(('', PORT), Socks5Server)
|
address_family = socket.AF_INET
|
||||||
logging.info("starting server at port %d ..." % PORT)
|
|
||||||
server.serve_forever()
|
|
||||||
except socket.error, e:
|
|
||||||
logging.error(e)
|
|
||||||
|
|
||||||
|
crypto = Crypto(server_password)
|
||||||
|
|
||||||
|
logging.info("starting server at port %d ..." % server_port)
|
||||||
|
server = Socks5Server()
|
||||||
|
server.bind(port=server_port, family=address_family)
|
||||||
|
server.start()
|
||||||
|
try:
|
||||||
|
ioloop.IOLoop.instance().start()
|
||||||
|
except KeyboardInterrupt:
|
||||||
|
pass
|
||||||
|
except Exception:
|
||||||
|
logging.exception("Uncaught Exception")
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue