From 91bb8949a5996f7cc9d3ad5cc54c75361abfbfff Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 25 Aug 2023 11:33:52 +0200 Subject: [PATCH] Add V2Ray Trojan and VMESS protocols support --- debian/changelog | 6 ++++++ omr-admin.py | 14 +++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7a41718..2112b3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +omr-vps-admin (0.3+20230825) unstable; urgency=medium + + * Add V2Ray VMESS and TROJAN protocols support + + -- OpenMPTCProuter Fri, 25 Aug 2023 11:14:46 +0200 + omr-vps-admin (0.3+20230823) unstable; urgency=medium * Fix in upload speedtest diff --git a/omr-admin.py b/omr-admin.py index 56c45a2..6c21b44 100755 --- a/omr-admin.py +++ b/omr-admin.py @@ -273,6 +273,10 @@ def v2ray_add_user(user, restart=1): for inbounds in data['inbounds']: if inbounds['tag'] == 'omrin-tunnel': inbounds['settings']['clients'].append({'id': v2rayuuid, 'level': 0, 'alterId': 0, 'email': user}) + if inbounds['tag'] == 'omrin-vmess-tunnel': + 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}) 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() @@ -280,7 +284,7 @@ def v2ray_add_user(user, restart=1): os.system("systemctl -q restart v2ray") return v2rayuuid -def v2ray_del_user(user, restart=1): +def v2ray_del_user(user, restart=1, protocol="vless"): v2rayuuid = str(uuid.uuid1()) initial_md5 = hashlib.md5(file_as_bytes(open('/etc/v2ray/v2ray-server.json', 'rb'))).hexdigest() with open('/etc/v2ray/v2ray-server.json') as f: @@ -290,6 +294,14 @@ def v2ray_del_user(user, restart=1): for v2rayuser in inbounds['settings']['clients']: if v2rayuser['email'] == user: inbounds['settings']['clients'].remove(v2rayuser) + if inbounds['tag'] == 'omrin-vmess-tunnel': + for v2rayuser in inbounds['settings']['clients']: + if v2rayuser['email'] == user: + inbounds['settings']['clients'].remove(v2rayuser) + if inbounds['tag'] == 'omrin-trojan-tunnel': + for v2rayuser in inbounds['settings']['clients']: + if v2rayuser['email'] == user: + inbounds['settings']['clients'].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()