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

fix json decode issue

Browse source
This commit is contained in:
clowwindy 2015-08-10 11:53:54 +08:00
parent 3c1154923f
commit a434eef096
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
shadowsocks/manager.py
View file

@ -140,7 +140,7 @@ class Manager(object):
return data, None return data, None
command, config_json = parts command, config_json = parts
try: try:
config = json.loads(config_json) config = shell.parse_json_in_str(config_json)
return command, config return command, config
except Exception as e: except Exception as e:
logging.error(e) logging.error(e)
@ -231,7 +231,7 @@ def test():
# test add and remove # test add and remove
time.sleep(1) time.sleep(1)
cli.send(b'add: {"server_port":7001, "password":"1234"}') cli.send(b'add: {"server_port":7001, "password":"asdfadsfasdf"}')
time.sleep(1) time.sleep(1)
assert 7001 in manager._relays assert 7001 in manager._relays
data, addr = cli.recvfrom(1506) data, addr = cli.recvfrom(1506)
@ -246,7 +246,7 @@ def test():
# test statistics for TCP # test statistics for TCP
header = common.pack_addr(b'google.com') + struct.pack('>H', 80) header = common.pack_addr(b'google.com') + struct.pack('>H', 80)
data = encrypt.encrypt_all(b'1234', 'aes-256-cfb', 1, data = encrypt.encrypt_all(b'asdfadsfasdf', 'aes-256-cfb', 1,
header + b'GET /\r\n\r\n') header + b'GET /\r\n\r\n')
tcp_cli = socket.socket() tcp_cli = socket.socket()
tcp_cli.connect(('127.0.0.1', 7001)) tcp_cli.connect(('127.0.0.1', 7001))