mptcp/openmptcprouter-vps-admin
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-vps-admin.git synced 2025-03-09 15:40:05 +00:00
Code Issues Releases Wiki Activity

Add XRay VLESS Reality protocol support

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2023-10-17 15:17:22 +02:00
parent abd9cc54fe
commit afbcb55ef3
2 changed files with 58 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
debian/changelog vendored
View file

@ -1,3 +1,9 @@
omr-vps-admin (0.5+20231017) unstable; urgency=medium
* Add XRay VLESS REALITY support
-- OpenMPTCProuter <contact@openmptcprouter.com> Tue, 17 Oct 2023 15:03:35 +0200
omr-vps-admin (0.4+20231013) unstable; urgency=medium omr-vps-admin (0.4+20231013) unstable; urgency=medium
* Fix error when API try to remove a Shadowsocks port that doesn't exist * Fix error when API try to remove a Shadowsocks port that doesn't exist

69
omr-admin.py
View file

@ -1679,7 +1679,15 @@ async def config(userid: Optional[int] = Query(None), serial: Optional[str] = Qu
xray_ss_ukey = os.popen("jq -r '.inbounds[] | select(.tag==" + '"' + 'omrin-shadowsocks-tunnel' + '"' + ") | .settings.clients[] | select(.email=" + '"' + username + '"' + ") | .password' /etc/xray/xray-server.json").read().rstrip() xray_ss_ukey = os.popen("jq -r '.inbounds[] | select(.tag==" + '"' + 'omrin-shadowsocks-tunnel' + '"' + ") | .settings.clients[] | select(.email=" + '"' + username + '"' + ") | .password' /etc/xray/xray-server.json").read().rstrip()
xray_ss_key = xray_ss_skey + ':' + xray_ss_ukey xray_ss_key = xray_ss_skey + ':' + xray_ss_ukey
xray_port = os.popen('jq -r .inbounds[0].port /etc/xray/xray-server.json').read().rstrip() xray_port = os.popen('jq -r .inbounds[0].port /etc/xray/xray-server.json').read().rstrip()
xray_conf = { 'key': xray_key, 'port': xray_port, 'sskey': xray_ss_key} xray_vless_reality_public_key = ''
if os.path.isfile('/etc/xray/xray-vless-reality.json'):
xray_vless_reality_public_key = os.popen("jq -r '.inbounds[] | select(.tag==" + '"' + 'omrin-vless-reality' + '"' + ") | .streamSettings.realitySettings.publicKey' /etc/xray/xray-vless-reality.json").read().rstrip()
test_vless_reality = os.popen("jq -r '.inbounds[] | select(.tag==" + '"' + 'omrin-vless-reality' + '"' + ")' /etc/xray/xray-server.json").read().rstrip()
if test_vless_reality != '':
vless_reality = True
else:
vless_reality = False
xray_conf = { 'key': xray_key, 'port': xray_port, 'sskey': xray_ss_key, 'vless_reality': vless_reality, 'vless_reality_key': xray_vless_reality_public_key }
modif_config_user(username, {'xray': xray_conf}) modif_config_user(username, {'xray': xray_conf})
else: else:
xray_conf = omr_config_data['users'][0][username]['xray'] xray_conf = omr_config_data['users'][0][username]['xray']
@ -1818,7 +1826,7 @@ async def config(userid: Optional[int] = Query(None), serial: Optional[str] = Qu
vpn_traffic_tx = get_bytes('tx', 'omr-bonding') vpn_traffic_tx = get_bytes('tx', 'omr-bonding')
#vpn = current_user.vpn #vpn = current_user.vpn
available_proxy = ["shadowsocks", "shadowsocks-go","v2ray","v2ray-vmess","v2ray-socks","v2ray-trojan","xray","xray-vmess","xray-socks","xray-trojan","xray-shadowsocks"] available_proxy = ["shadowsocks", "shadowsocks-go","v2ray","v2ray-vmess","v2ray-socks","v2ray-trojan","xray","xray-vless-reality","xray-vmess","xray-socks","xray-trojan","xray-shadowsocks"]
if user_permissions == 'ro': if user_permissions == 'ro':
del available_vpn del available_vpn
available_vpn = [vpn] available_vpn = [vpn]
@ -2260,17 +2268,17 @@ def v2ray(*, params: V2rayconfig, current_user: User = Depends(get_current_user)
if current_user.permissions == "ro": if current_user.permissions == "ro":
return {'result': 'permission', 'reason': 'Read only user', 'route': 'v2rayredirect'} return {'result': 'permission', 'reason': 'Read only user', 'route': 'v2rayredirect'}
initial_md5 = hashlib.md5(file_as_bytes(open('/etc/v2ray/v2ray-server.json', 'rb'))).hexdigest() initial_md5 = hashlib.md5(file_as_bytes(open('/etc/v2ray/v2ray-server.json', 'rb'))).hexdigest()
with open('/etc/v2ray/v2ray-server.json') as f: #with open('/etc/v2ray/v2ray-server.json') as f:
v2ray_config = json.load(f) # v2ray_config = json.load(f)
v2ruserid = params.userid #v2ruserid = params.userid
for inbounds in v2ray_config['inbounds']: #for inbounds in v2ray_config['inbounds']:
if inbounds['tag'] == 'omrin-tunnel': # if inbounds['tag'] == 'omrin-tunnel':
inbounds['settings']['clients'][0]['id'] = v2ruserid # inbounds['settings']['clients'][0]['id'] = v2ruserid
with open('/etc/v2ray/v2ray-server.json', 'w') as outfile: #with open('/etc/v2ray/v2ray-server.json', 'w') as outfile:
json.dump(v2ray_config, outfile, indent=4) # json.dump(v2ray_config, outfile, indent=4)
username = current_user.username username = current_user.username
final_md5 = hashlib.md5(file_as_bytes(open('/etc/v2ray/v2ray-server.json', 'rb'))).hexdigest() final_md5 = hashlib.md5(file_as_bytes(open('/etc/v2ray/v2ray-server.json', 'rb'))).hexdigest()
v2ray_key = os.popen('jq -r .inbounds[0].settings.clients[0].id /etc/v2ray/v2ray-server.json').read().rstrip() v2ray_key = os.popen("jq -r '.inbounds[0].settings.clients[] | select(.email=" + '"' + username + '"' + ") | .id' /etc/v2ray/v2ray-server.json").read().rstrip()
v2ray_port = os.popen('jq -r .inbounds[0].port /etc/v2ray/v2ray-server.json').read().rstrip() v2ray_port = os.popen('jq -r .inbounds[0].port /etc/v2ray/v2ray-server.json').read().rstrip()
v2ray_conf = { 'key': v2ray_key, 'port': v2ray_port} v2ray_conf = { 'key': v2ray_key, 'port': v2ray_port}
modif_config_user(username, {'v2ray': v2ray_conf}) modif_config_user(username, {'v2ray': v2ray_conf})
@ -2283,27 +2291,54 @@ def v2ray(*, params: V2rayconfig, current_user: User = Depends(get_current_user)
class Xrayconfig(BaseModel): class Xrayconfig(BaseModel):
userid: str userid: str
vless_reality: bool = Query(False, title="Enable or disable VLESS Reality")
@app.post('/xray', summary="Set xray settings") @app.post('/xray', summary="Set xray settings")
def xray(*, params: Xrayconfig, current_user: User = Depends(get_current_user)): def xray(*, params: Xrayconfig, current_user: User = Depends(get_current_user)):
if current_user.permissions == "ro": if current_user.permissions == "ro":
return {'result': 'permission', 'reason': 'Read only user', 'route': 'xrayredirect'} return {'result': 'permission', 'reason': 'Read only user', 'route': 'xrayredirect'}
initial_md5 = hashlib.md5(file_as_bytes(open('/etc/xray/xray-server.json', 'rb'))).hexdigest() initial_md5 = hashlib.md5(file_as_bytes(open('/etc/xray/xray-server.json', 'rb'))).hexdigest()
test_vless_reality = os.popen("jq -r '.inbounds[] | select(.tag==" + '"' + 'omrin-vless-reality' + '"' + ")' /etc/xray/xray-server.json").read().rstrip()
if test_vless_reality != '':
chk_vless_reality = True
else:
chk_vless_reality = False
with open('/etc/xray/xray-server.json') as f: with open('/etc/xray/xray-server.json') as f:
xray_config = json.load(f) xray_config = json.load(f)
xruserid = params.userid if params.vless_reality and not chk_vless_reality:
for inbounds in xray_config['inbounds']: with open('/etc/xray/xray-vless-reality.json') as f:
if inbounds['tag'] == 'omrin-tunnel': vless_reality_config = json.load(f)
inbounds['settings']['clients'][0]['id'] = xruserid xray_config['inbounds'].append(vless_reality_config['inbounds'][0])
elif not params.vless_reality and chk_vless_reality:
for inbounds in xray_config['inbounds']:
if inbounds['tag'] == 'omrin-vless-reality':
xray_config['inbounds'].remove(inbounds)
with open('/etc/xray/xray-server.json', 'w') as outfile: with open('/etc/xray/xray-server.json', 'w') as outfile:
json.dump(xray_config, outfile, indent=4) json.dump(xray_config, outfile, indent=4)
#with open('/etc/xray/xray-server.json') as f:
# xray_config = json.load(f)
#xruserid = params.userid
#for inbounds in xray_config['inbounds']:
# if inbounds['tag'] == 'omrin-tunnel':
# inbounds['settings']['clients'][0]['id'] = xruserid
#with open('/etc/xray/xray-server.json', 'w') as outfile:
# json.dump(xray_config, outfile, indent=4)
username = current_user.username username = current_user.username
final_md5 = hashlib.md5(file_as_bytes(open('/etc/xray/xray-server.json', 'rb'))).hexdigest() final_md5 = hashlib.md5(file_as_bytes(open('/etc/xray/xray-server.json', 'rb'))).hexdigest()
xray_key = os.popen('jq -r .inbounds[0].settings.clients[0].id /etc/xray/xray-server.json').read().rstrip() xray_key = os.popen("jq -r '.inbounds[0].settings.clients[] | select(.email=" + '"' + username + '"' + ") | .id' /etc/xray/xray-server.json").read().rstrip()
xray_ss_skey = os.popen("jq -r '.inbounds[] | select(.tag==" + '"' + 'omrin-shadowsocks-tunnel' + '"' + ") | .settings.password' /etc/xray/xray-server.json").read().rstrip()
xray_ss_ukey = os.popen("jq -r '.inbounds[] | select(.tag==" + '"' + 'omrin-shadowsocks-tunnel' + '"' + ") | .settings.clients[] | select(.email=" + '"' + username + '"' + ") | .password' /etc/xray/xray-server.json").read().rstrip()
xray_ss_key = xray_ss_skey + ':' + xray_ss_ukey
xray_port = os.popen('jq -r .inbounds[0].port /etc/xray/xray-server.json').read().rstrip() xray_port = os.popen('jq -r .inbounds[0].port /etc/xray/xray-server.json').read().rstrip()
xray_conf = { 'key': xray_key, 'port': xray_port} if os.path.isfile('/etc/xray/xray-vless-reality.json'):
xray_vless_reality_public_key = os.popen("jq -r '.inbounds[] | select(.tag==" + '"' + 'omrin-vless-reality' + '"' + ") | .streamSettings.realitySettings.publicKey' /etc/xray/xray-vless-reality.json").read().rstrip()
xray_conf = { 'key': xray_key, 'port': xray_port, 'sskey': xray_ss_key, 'vless_reality_key': xray_vless_reality_public_key }
modif_config_user(username, {'xray': xray_conf}) modif_config_user(username, {'xray': xray_conf})
if initial_md5 != final_md5: if initial_md5 != final_md5:
if params.vless_reality and not chk_vless_reality:
shorewall_add_port(current_user, '443', 'tcp', 'xray vless-reality')
elif not params.vless_reality and chk_vless_reality:
shorewall_del_port(current_user.username, '443', 'tcp', 'xray vless-reality')
os.system("systemctl restart xray") os.system("systemctl restart xray")
set_lastchange() set_lastchange()
return {'result': 'done', 'reason': 'changes applied', 'route': 'xray'} return {'result': 'done', 'reason': 'changes applied', 'route': 'xray'}