mptcp/openmptcprouter-vps-admin
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-vps-admin.git synced 2025-03-09 15:40:05 +00:00
Code Issues Releases Wiki Activity

Fix user from userid

Browse source
This commit is contained in:
Ycarus 2020-12-02 09:22:17 +01:00
parent 83370381c0
commit 351927eec9
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
omr-admin.py
View file

@ -143,8 +143,8 @@ def get_username_from_userid(userid):
data = json.loads(content) data = json.loads(content)
except ValueError as e: except ValueError as e:
return {'error': 'Config file not readable', 'route': 'get_username'} return {'error': 'Config file not readable', 'route': 'get_username'}
for user in content['users'][0]: for user in data['users'][0]:
if 'userid' in content['users'][0][user] and content['users'][0][user]['userid'] == userid: if 'userid' in data['users'][0][user] and data['users'][0][user]['userid'] == userid:
return user return user
return '' return ''
@ -156,21 +156,21 @@ def check_username_serial(username, serial):
data = json.loads(content) data = json.loads(content)
except ValueError as e: except ValueError as e:
return {'error': 'Config file not readable', 'route': 'check_serial'} return {'error': 'Config file not readable', 'route': 'check_serial'}
if 'serial_enforce' not in content or content['serial_enforce'] == False: if 'serial_enforce' not in data or data['serial_enforce'] == False:
return True return True
if 'serial' not in content['users'][0][username]: if 'serial' not in data['users'][0][username]:
content['users'][0][username]['serial'] = serial data['users'][0][username]['serial'] = serial
with open('/etc/openmptcprouter-vps-admin/omr-admin-config.json', 'w') as outfile: with open('/etc/openmptcprouter-vps-admin/omr-admin-config.json', 'w') as outfile:
json.dump(content, outfile, indent=4) json.dump(data, outfile, indent=4)
return True return True
if content['users'][0][username]['serial'] == serial: if data['users'][0][username]['serial'] == serial:
return True return True
if 'serial_error' not in content['users'][0][username]: if 'serial_error' not in data['users'][0][username]:
content['users'][0][username]['serial_error'] = 0 data['users'][0][username]['serial_error'] = 0
else: else:
content['users'][0][username]['serial_error'] = content['users'][0][username]['serial_error'] + 1 data['users'][0][username]['serial_error'] = data['users'][0][username]['serial_error'] + 1
with open('/etc/openmptcprouter-vps-admin/omr-admin-config.json', 'w') as outfile: with open('/etc/openmptcprouter-vps-admin/omr-admin-config.json', 'w') as outfile:
json.dump(content, outfile, indent=4) json.dump(data, outfile, indent=4)
return False return False
def set_global_param(key, value): def set_global_param(key, value):