From bec293d6b7ecf35d35b9bcbc3d0d921063739bd9 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 25 Oct 2024 10:10:41 +0200 Subject: [PATCH] Fix Shadowsocks-go new API add/remove user --- debian/changelog | 6 ++++++ omr-admin.py | 20 ++++++++++++++------ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index b1335fe..7e29ef5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +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 + omr-vps-admin (0.13+20241016) unstable; urgency=medium * Add Shadowsocks-go new API support diff --git a/omr-admin.py b/omr-admin.py index 25a5bbb..ce0d476 100755 --- a/omr-admin.py +++ b/omr-admin.py @@ -391,22 +391,30 @@ 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", json= {'username': user,'uPSK': key}) - #r = requests.post(url="http://127.0.0.1:65279/api/ssm/v1/servers/ss-2022/users", json= {'username': user,'uPSK': key}) + r = requests.post(url="http://127.0.0.1:65279/api/ssm/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: - LOG.debug("Shadowsocks go add error (" + str(err) + ")") + try: + 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: + LOG.debug("Shadowsocks go add error (" + str(err) + ")") return key def remove_ss_go_user(user): try: - r = requests.delete(url="http://127.0.0.1:65279/v1/servers/ss-2022/users/" + user) - #r = requests.delete(url="http://127.0.0.1:65279/api/ssm/v1/servers/ss-2022/users/" + user) + r = requests.delete(url="http://127.0.0.1:65279/api/ssm/v1/servers/ss-2022/users/" + user) except requests.exceptions.Timeout: LOG.debug("Shadowsocks go remove timeout") except requests.exceptions.RequestException as err: - LOG.debug("Shadowsocks go remove error (" + str(err) + ")") + try: + r = requests.delete(url="http://127.0.0.1:65279/v1/servers/ss-2022/users/" + user) + except requests.exceptions.Timeout: + LOG.debug("Shadowsocks go remove timeout") + except requests.exceptions.RequestException as err: + LOG.debug("Shadowsocks go remove error (" + str(err) + ")") def v2ray_add_user(user, v2rayuuid='', restart=1): if v2rayuuid == '':