From b0da254f0196b38552c31cf9bc8b70349544161a Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 25 Aug 2023 15:27:58 +0200 Subject: [PATCH] Add V2RAY Socks protocol support --- debian/changelog | 4 ++-- omr-admin.py | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2112b3d..81a2e8d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ omr-vps-admin (0.3+20230825) unstable; urgency=medium - * Add V2Ray VMESS and TROJAN protocols support + * Add V2Ray VMESS, SOCKS and TROJAN protocols support - -- OpenMPTCProuter Fri, 25 Aug 2023 11:14:46 +0200 + -- OpenMPTCProuter Fri, 25 Aug 2023 15:27:23 +0200 omr-vps-admin (0.3+20230823) unstable; urgency=medium diff --git a/omr-admin.py b/omr-admin.py index 6c21b44..be898a2 100755 --- a/omr-admin.py +++ b/omr-admin.py @@ -277,6 +277,8 @@ def v2ray_add_user(user, restart=1): inbounds['settings']['clients'].append({'id': v2rayuuid, 'level': 0, 'alterId': 0, 'email': user}) if inbounds['tag'] == 'omrin-trojan-tunnel': inbounds['settings']['clients'].append({'password': v2rayuuid, 'email': user}) + if inbounds['tag'] == 'omrin-socks-tunnel': + inbounds['settings']['accounts'].append({'pass': v2rayuuid, 'user': user}) with open('/etc/v2ray/v2ray-server.json', 'w') as f: json.dump(data, f, indent=4) final_md5 = hashlib.md5(file_as_bytes(open('/etc/v2ray/v2ray-server.json', 'rb'))).hexdigest() @@ -302,6 +304,10 @@ def v2ray_del_user(user, restart=1, protocol="vless"): for v2rayuser in inbounds['settings']['clients']: if v2rayuser['email'] == user: inbounds['settings']['clients'].remove(v2rayuser) + if inbounds['tag'] == 'omrin-socks-tunnel': + for v2rayuser in inbounds['settings']['accounts']: + if v2rayuser['user'] == user: + inbounds['settings']['accounts'].remove(v2rayuser) with open('/etc/v2ray/v2ray-server.json', 'w') as f: json.dump(data, f, indent=4) final_md5 = hashlib.md5(file_as_bytes(open('/etc/v2ray/v2ray-server.json', 'rb'))).hexdigest()