vbatts/shadowsocks
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

better rand size

Browse source
This commit is contained in:
破娃酱 2017-03-24 17:07:52 +08:00
parent bf0055be40
commit 6cbcd855ff
2 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
shadowsocks/obfsplugin/auth.py
View file

@ -1172,6 +1172,7 @@ class auth_aes128_sha1(auth_base):
self.recv_id = 1 self.recv_id = 1
self.user_id = None self.user_id = None
self.user_key = None self.user_key = None
self.last_rnd_len = 0
def init_data(self): def init_data(self):
return obfs_auth_mu_data() return obfs_auth_mu_data()
@ -1184,21 +1185,25 @@ class auth_aes128_sha1(auth_base):
max_client = 64 max_client = 64
self.server_info.data.set_max_client(max_client) self.server_info.data.set_max_client(max_client)
def rnd_data_len(self, buf_size):
if buf_size > 1300 or self.last_rnd_len > 1300:
return 0
if buf_size > 1100:
return common.ord(os.urandom(1)[0]) % 128
#self.pack_id
if buf_size > 400:
return struct.unpack('>H', os.urandom(2))[0] % 256
else:
return struct.unpack('>H', os.urandom(2))[0] % 1024
def rnd_data(self, buf_size): def rnd_data(self, buf_size):
if buf_size > 1200: data_len = self.rnd_data_len(buf_size)
return b'\x01' self.last_rnd_len = data_len
if self.pack_id > 4: if data_len < 128:
rnd_data = os.urandom(common.ord(os.urandom(1)[0]) % 32) return common.chr(data_len + 1) + os.urandom(data_len)
elif buf_size > 900:
rnd_data = os.urandom(common.ord(os.urandom(1)[0]) % 128)
else:
rnd_data = os.urandom(struct.unpack('>H', os.urandom(2))[0] % 512)
if len(rnd_data) < 128: return common.chr(255) + struct.pack('<H', data_len + 1) + os.urandom(data_len - 2)
return common.chr(len(rnd_data) + 1) + rnd_data
else:
return common.chr(255) + struct.pack('<H', len(rnd_data) + 3) + rnd_data
def pack_data(self, buf): def pack_data(self, buf):
data = self.rnd_data(len(buf)) + buf data = self.rnd_data(len(buf)) + buf
@ -1255,6 +1260,7 @@ class auth_aes128_sha1(auth_base):
def client_pre_encrypt(self, buf): def client_pre_encrypt(self, buf):
ret = b'' ret = b''
self.last_rnd_len = 0
if not self.has_sent_header: if not self.has_sent_header:
head_size = self.get_head_size(buf, 30) head_size = self.get_head_size(buf, 30)
datalen = min(len(buf), random.randint(0, 31) + head_size) datalen = min(len(buf), random.randint(0, 31) + head_size)
@ -1305,6 +1311,7 @@ class auth_aes128_sha1(auth_base):
if self.raw_trans: if self.raw_trans:
return buf return buf
ret = b'' ret = b''
self.last_rnd_len = 0
while len(buf) > self.unit_len: while len(buf) > self.unit_len:
ret += self.pack_data(buf[:self.unit_len]) ret += self.pack_data(buf[:self.unit_len])
buf = buf[self.unit_len:] buf = buf[self.unit_len:]

4
shadowsocks/tcprelay.py
View file

@ -165,7 +165,7 @@ class TCPRelayHandler(object):
server_info.key_str = common.to_bytes(config['password']) server_info.key_str = common.to_bytes(config['password'])
server_info.key = self._encryptor.cipher_key server_info.key = self._encryptor.cipher_key
server_info.head_len = 30 server_info.head_len = 30
server_info.tcp_mss = 1460 server_info.tcp_mss = 1448
self._obfs.set_server_info(server_info) self._obfs.set_server_info(server_info)
self._protocol = obfs.obfs(config['protocol']) self._protocol = obfs.obfs(config['protocol'])
@ -183,7 +183,7 @@ class TCPRelayHandler(object):
server_info.key_str = common.to_bytes(config['password']) server_info.key_str = common.to_bytes(config['password'])
server_info.key = self._encryptor.cipher_key server_info.key = self._encryptor.cipher_key
server_info.head_len = 30 server_info.head_len = 30
server_info.tcp_mss = 1460 server_info.tcp_mss = 1448
self._protocol.set_server_info(server_info) self._protocol.set_server_info(server_info)
self._redir_list = config.get('redirect', ["*#0.0.0.0:0"]) self._redir_list = config.get('redirect', ["*#0.0.0.0:0"])