From 8caecd236d8d8239e7d77fa3f6de62619bd564ee Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 25 Oct 2024 11:52:12 +0200 Subject: [PATCH] Fix remove user --- debian/changelog | 10 ++++++++-- omr-admin.py | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7e29ef5..5209279 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,15 +1,21 @@ +omr-vps-admin (0.14+20241025) unstable; urgency=medium + + * Fix remove user + + -- OpenMPTCProuter Fri, 25 Oct 2024 11:50:30 +0200 + omr-vps-admin (0.13+20241025) unstable; urgency=medium * Fix Shadowsocks-go new API support on add/remove user - -- OpenMPTCProuter Fri, 25 Oct 2024 10:09:14 +0200 + -- OpenMPTCProuter Fri, 25 Oct 2024 10:09:14 +0200 omr-vps-admin (0.13+20241016) unstable; urgency=medium * Add Shadowsocks-go new API support * Add option to disable 6in4 - -- OpenMPTCProuter Wed, 16 Oct 2024 15:49:13 +0200 + -- OpenMPTCProuter Wed, 16 Oct 2024 15:49:13 +0200 omr-vps-admin (0.12+20240920) unstable; urgency=medium diff --git a/omr-admin.py b/omr-admin.py index ce0d476..6b9ca9e 100755 --- a/omr-admin.py +++ b/omr-admin.py @@ -3369,10 +3369,10 @@ def remove_user(*, params: RemoveUser, current_user: User = Depends(get_current_ return {'result': 'permission', 'reason': 'Need admin user', 'route': 'remove_user'} with open('/etc/openmptcprouter-vps-admin/omr-admin-config.json') as f: content = json.load(f) - shadowsocks_port = content['users'][0][params.username]['shadowsocks_port'] userid = int(content['users'][0][params.username]['userid']) del content['users'][0][params.username] if os.path.isfile('/etc/shadowsocks-libev/manager.json'): + shadowsocks_port = content['users'][0][params.username]['shadowsocks_port'] remove_ss_user(str(shadowsocks_port)) if os.path.isfile('/etc/shadowsocks-go/server.json'): remove_ss_go_user(params.username)