From 0780292d156cd8c00cbc83e1ca7d1ff3fde7cf5c Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Tue, 13 Feb 2024 15:04:36 +0100 Subject: [PATCH] Fix adding users in Shadowsocks-go and removing in XRay/V2Ray --- debian/changelog | 6 ++++++ omr-admin.py | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 19b9b68..ad48ef7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +omr-vps-admin (0.8+20240213) unstable; urgency=medium + + * Fix Shadowsocks-go add user and XRay/V2Ray remove user + + -- OpenMPTCProuter Tue, 13 Feb 2024 15:02:13 +0200 + omr-vps-admin (0.8+20240210) unstable; urgency=medium * Fix typo diff --git a/omr-admin.py b/omr-admin.py index 094a5d9..947d84c 100755 --- a/omr-admin.py +++ b/omr-admin.py @@ -353,7 +353,7 @@ def remove_ss_user(port): def add_ss_go_user(user, key=''): try: - r = requests.post(url="http://127.0.0.1:65279/v1/servers/ss-2022/users", data= {'username': user,'uPSK': key}) + r = requests.post(url="http://127.0.0.1:65279/v1/servers/ss-2022/users", json= {'username': user,'uPSK': key}) except requests.exceptions.Timeout: LOG.debug("Shadowsocks go add timeout") except requests.exceptions.RequestException as err: @@ -3168,9 +3168,9 @@ def remove_user(*, params: RemoveUser, current_user: User = Depends(get_current_ if os.path.isfile('/etc/shadowsocks-go/server.json'): remove_ss_go_user(params.username) if os.path.isfile('/etc/v2ray/v2ray-server.json'): - v2ray_remove_user(params.username) + v2ray_del_user(params.username) if os.path.isfile('/etc/xray/xray-server.json'): - xray_remove_user(params.username) + xray_del_user(params.username) if content: backup_config() with open('/etc/openmptcprouter-vps-admin/omr-admin-config.json', 'w') as f: