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

custom 'forbidden_ip' for each user

Browse source 
fix cmp for IPNetwork & PortRange
This commit is contained in:
BreakWa11 2016-06-15 18:34:05 +08:00
parent 8cbca008c6
commit 5c1b90b774
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
db_transfer.py
View file

@ -120,7 +120,7 @@ class DbTransfer(object):
passwd = common.to_bytes(row['passwd']) passwd = common.to_bytes(row['passwd'])
cfg = {'password': passwd} cfg = {'password': passwd}
read_config_keys = ['method', 'obfs', 'protocol', 'forbidden_port'] read_config_keys = ['method', 'obfs', 'protocol', 'forbidden_ip', 'forbidden_port']
for name in read_config_keys: for name in read_config_keys:
if name in row and row[name]: if name in row and row[name]:
cfg[name] = row[name] cfg[name] = row[name]

9
shadowsocks/common.py
View file

@ -233,6 +233,7 @@ class IPNetwork(object):
ADDRLENGTH = {socket.AF_INET: 32, socket.AF_INET6: 128, False: 0} ADDRLENGTH = {socket.AF_INET: 32, socket.AF_INET6: 128, False: 0}
def __init__(self, addrs): def __init__(self, addrs):
self.addrs_str = addrs
self._network_list_v4 = [] self._network_list_v4 = []
self._network_list_v6 = [] self._network_list_v6 = []
if type(addrs) == str: if type(addrs) == str:
@ -283,8 +284,12 @@ class IPNetwork(object):
else: else:
return False return False
def __cmp__(self, other):
return cmp(self.addrs_str, other.addrs_str)
class PortRange(object): class PortRange(object):
def __init__(self, range_str): def __init__(self, range_str):
self.range_str = range_str
self.range = set() self.range = set()
if type(range_str) == str: if type(range_str) == str:
range_str = range_str.split(',') range_str = range_str.split(',')
@ -310,8 +315,8 @@ class PortRange(object):
def __contains__(self, val): def __contains__(self, val):
return val in self.range return val in self.range
def __eq__(self, other): def __cmp__(self, other):
return self.range == other.range return cmp(self.range_str, other.range_str)
def test_inet_conv(): def test_inet_conv():
ipv4 = b'8.8.4.4' ipv4 = b'8.8.4.4'

2
shadowsocks/shell.py
View file

@ -199,7 +199,7 @@ def get_config(is_local):
elif key == '--user': elif key == '--user':
config['user'] = to_str(value) config['user'] = to_str(value)
elif key == '--forbidden-ip': elif key == '--forbidden-ip':
config['forbidden_ip'] = to_str(value).split(',') config['forbidden_ip'] = to_str(value)
elif key in ('-h', '--help'): elif key in ('-h', '--help'):
if is_local: if is_local:
print_local_help() print_local_help()