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

fix #414

Browse source
This commit is contained in:
clowwindy 2015-08-11 17:55:16 +08:00
parent 7c08101ce8
commit a2bc6e1945
3 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
shadowsocks/server.py
View file

@ -42,12 +42,13 @@ def main():
'will be ignored') 'will be ignored')
else: else:
config['port_password'] = {} config['port_password'] = {}
server_port = config['server_port'] server_port = config.get('server_port', None)
if type(server_port) == list: if server_port:
for a_server_port in server_port: if type(server_port) == list:
config['port_password'][a_server_port] = config['password'] for a_server_port in server_port:
else: config['port_password'][a_server_port] = config['password']
config['port_password'][str(server_port)] = config['password'] else:
config['port_password'][str(server_port)] = config['password']
if config.get('manager_address', 0): if config.get('manager_address', 0):
logging.info('entering manager mode') logging.info('entering manager mode')

7
shadowsocks/shell.py
View file

@ -84,7 +84,8 @@ def check_config(config, is_local):
sys.exit(2) sys.exit(2)
if not is_local and not config.get('password', None) \ if not is_local and not config.get('password', None) \
and not config.get('port_password', None): and not config.get('port_password', None) \
and not config.get('manager_address'):
logging.error('password or port_password not specified') logging.error('password or port_password not specified')
print_help(is_local) print_help(is_local)
sys.exit(2) sys.exit(2)
@ -92,7 +93,7 @@ def check_config(config, is_local):
if 'local_port' in config: if 'local_port' in config:
config['local_port'] = int(config['local_port']) config['local_port'] = int(config['local_port'])
if 'server_port' in config and type(config['server_port']) != list: if config.get('server_port', None) and type(config['server_port']) != list:
config['server_port'] = int(config['server_port']) config['server_port'] = int(config['server_port'])
if config.get('local_address', '') in [b'0.0.0.0']: if config.get('local_address', '') in [b'0.0.0.0']:
@ -240,7 +241,7 @@ def get_config(is_local):
except Exception as e: except Exception as e:
logging.error(e) logging.error(e)
sys.exit(2) sys.exit(2)
config['server_port'] = config.get('server_port', 8388) config['server_port'] = config.get('server_port', None)
logging.getLogger('').handlers = [] logging.getLogger('').handlers = []
logging.addLevelName(VERBOSE_LEVEL, 'VERBOSE') logging.addLevelName(VERBOSE_LEVEL, 'VERBOSE')

8
tests/server-multi-passwd-empty.json Normal file
View file

@ -0,0 +1,8 @@
{
"server": "127.0.0.1",
"local_port": 1081,
"port_password": {
},
"timeout": 60,
"method": "aes-256-cfb"
}