dnomd343
/
shadowsocksr
mirror of https://github.com/dnomd343/shadowsocksr
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

add PyCrypto

1.4
clowwindy 12 years ago
parent
b9a84f9bad
commit
bfbe20e422
2 changed files with 31 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 35
      local.py
  2. 34
      server.py

35
local.py
View File

@ -28,8 +28,9 @@ else:
import json import json
try: try:
import gevent, gevent.monkey import gevent
gevent.monkey.patch_all(dns=gevent.version_info[0]>=1) import gevent.monkey
gevent.monkey.patch_all(dns=gevent.version_info[0] >= 1)
except ImportError: except ImportError:
gevent = None gevent = None
print >>sys.stderr, 'warning: gevent not found, using threading instead' print >>sys.stderr, 'warning: gevent not found, using threading instead'
@ -38,21 +39,11 @@ import socket
import select import select
import SocketServer import SocketServer
import struct import struct
import string
import hashlib
import os import os
import logging import logging
import getopt import getopt
import encrypt
def get_table(key):
m = hashlib.md5()
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): def send_all(sock, data):
bytes_sent = 0 bytes_sent = 0
@ -64,6 +55,7 @@ def send_all(sock, data):
if bytes_sent == len(data): if bytes_sent == len(data):
return bytes_sent return bytes_sent
class ThreadingTCPServer(SocketServer.ThreadingMixIn, SocketServer.TCPServer): class ThreadingTCPServer(SocketServer.ThreadingMixIn, SocketServer.TCPServer):
allow_reuse_address = True allow_reuse_address = True
@ -94,16 +86,17 @@ class Socks5Server(SocketServer.StreamRequestHandler):
remote.close() remote.close()
def encrypt(self, data): def encrypt(self, data):
return data.translate(encrypt_table) return self.encryptor.encrypt(data)
def decrypt(self, data): def decrypt(self, data):
return data.translate(decrypt_table) return self.encryptor.decrypt(data)
def send_encrypt(self, sock, data): def send_encrypt(self, sock, data):
sock.send(self.encrypt(data)) sock.send(self.encrypt(data))
def handle(self): def handle(self):
try: try:
self.encryptor = encrypt.Encryptor(KEY, METHOD)
sock = self.connection sock = self.connection
sock.recv(262) sock.recv(262)
sock.send("\x05\x00") sock.send("\x05\x00")
@ -167,12 +160,13 @@ if __name__ == '__main__':
REMOTE_PORT = config['server_port'] REMOTE_PORT = config['server_port']
PORT = config['local_port'] PORT = config['local_port']
KEY = config['password'] KEY = config['password']
METHOD = config.get('method', None)
argv = sys.argv[1:] argv = sys.argv[1:]
if '-6' in sys.argv[1:]: if '-6' in sys.argv[1:]:
argv.remove('-6') argv.remove('-6')
optlist, args = getopt.getopt(argv, 's:p:k:l:') optlist, args = getopt.getopt(argv, 's:p:k:l:m:')
for key, value in optlist: for key, value in optlist:
if key == '-p': if key == '-p':
REMOTE_PORT = int(value) REMOTE_PORT = int(value)
@ -182,12 +176,14 @@ if __name__ == '__main__':
PORT = int(value) PORT = int(value)
elif key == '-s': elif key == '-s':
SERVER = value SERVER = value
elif key == '-m':
METHOD = value
encrypt.init_table(KEY, METHOD)
logging.basicConfig(level=logging.DEBUG, format='%(asctime)s %(levelname)-8s %(message)s', logging.basicConfig(level=logging.DEBUG, format='%(asctime)s %(levelname)-8s %(message)s',
datefmt='%Y-%m-%d %H:%M:%S', filemode='a+') datefmt='%Y-%m-%d %H:%M:%S', filemode='a+')
encrypt_table = ''.join(get_table(KEY))
decrypt_table = string.maketrans(encrypt_table, string.maketrans('', ''))
try: try:
server = ThreadingTCPServer(('', PORT), Socks5Server) server = ThreadingTCPServer(('', PORT), Socks5Server)
logging.info("starting server at port %d ..." % PORT) logging.info("starting server at port %d ..." % PORT)
@ -197,4 +193,3 @@ if __name__ == '__main__':
except KeyboardInterrupt: except KeyboardInterrupt:
server.shutdown() server.shutdown()
sys.exit(0) sys.exit(0)

34
server.py
View File

@ -28,8 +28,9 @@ else:
import json import json
try: try:
import gevent, gevent.monkey import gevent
gevent.monkey.patch_all(dns=gevent.version_info[0]>=1) import gevent.monkey
gevent.monkey.patch_all(dns=gevent.version_info[0] >= 1)
except ImportError: except ImportError:
gevent = None gevent = None
print >>sys.stderr, 'warning: gevent not found, using threading instead' print >>sys.stderr, 'warning: gevent not found, using threading instead'
@ -38,21 +39,11 @@ import socket
import select import select
import SocketServer import SocketServer
import struct import struct
import string
import hashlib
import os import os
import logging import logging
import getopt import getopt
import encrypt
def get_table(key):
m = hashlib.md5()
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): def send_all(sock, data):
bytes_sent = 0 bytes_sent = 0
@ -64,6 +55,7 @@ def send_all(sock, data):
if bytes_sent == len(data): if bytes_sent == len(data):
return bytes_sent return bytes_sent
class ThreadingTCPServer(SocketServer.ThreadingMixIn, SocketServer.TCPServer): class ThreadingTCPServer(SocketServer.ThreadingMixIn, SocketServer.TCPServer):
allow_reuse_address = True allow_reuse_address = True
@ -94,13 +86,14 @@ class Socks5Server(SocketServer.StreamRequestHandler):
remote.close() remote.close()
def encrypt(self, data): def encrypt(self, data):
return data.translate(encrypt_table) return self.encryptor.encrypt(data)
def decrypt(self, data): def decrypt(self, data):
return data.translate(decrypt_table) return self.encryptor.decrypt(data)
def handle(self): def handle(self):
try: try:
self.encryptor = encrypt.Encryptor(KEY, METHOD)
sock = self.connection sock = self.connection
addrtype = ord(self.decrypt(sock.recv(1))) addrtype = ord(self.decrypt(sock.recv(1)))
if addrtype == 1: if addrtype == 1:
@ -137,19 +130,21 @@ if __name__ == '__main__':
SERVER = config['server'] SERVER = config['server']
PORT = config['server_port'] PORT = config['server_port']
KEY = config['password'] KEY = config['password']
METHOD = config.get('method', None)
optlist, args = getopt.getopt(sys.argv[1:], 'p:k:') optlist, args = getopt.getopt(sys.argv[1:], 'p:k:m:')
for key, value in optlist: for key, value in optlist:
if key == '-p': if key == '-p':
PORT = int(value) PORT = int(value)
elif key == '-k': elif key == '-k':
KEY = value KEY = value
elif key == '-m':
METHOD = value
logging.basicConfig(level=logging.DEBUG, format='%(asctime)s %(levelname)-8s %(message)s', logging.basicConfig(level=logging.DEBUG, format='%(asctime)s %(levelname)-8s %(message)s',
datefmt='%Y-%m-%d %H:%M:%S', filemode='a+') datefmt='%Y-%m-%d %H:%M:%S', filemode='a+')
encrypt_table = ''.join(get_table(KEY)) encrypt.init_table(KEY, METHOD)
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 ThreadingTCPServer.address_family = socket.AF_INET6
try: try:
@ -158,4 +153,3 @@ if __name__ == '__main__':
server.serve_forever() server.serve_forever()
except socket.error, e: except socket.error, e:
logging.error(e) logging.error(e)

Write Preview
Loading…
Cancel
Save