Use legacy Xray reverse config
This commit is contained in:
1 parent
151f5353bb
commit
071f299b86
2 files changed
+63
-15
No files matched your search
+40
-9
@@ -269,24 +269,29 @@ def make_server_xray_config(rows, listen_host="0.0.0.0", listen_port=DEFAULT_VLE
|
||||
}
|
||||
]
|
||||
rules = []
|
||||
portals = []
|
||||
|
||||
for row in rows:
|
||||
router_id = clean_router_id(row["id"])
|
||||
entry_port = int(row["entry_port"] or 0)
|
||||
if entry_port <= 0:
|
||||
continue
|
||||
reverse_out = f"reverse-{router_id}"
|
||||
portal_in = f"portal-{router_id}"
|
||||
portal_tag = f"portal-{router_id}"
|
||||
reverse_domain = f"{router_id}.owrt-remote.internal"
|
||||
portal_in = f"entry-{router_id}"
|
||||
client = {
|
||||
"id": row["vless_uuid"],
|
||||
"email": f"{router_id}@owrt-remote",
|
||||
"reverse": {
|
||||
"tag": reverse_out,
|
||||
},
|
||||
}
|
||||
if row["vless_flow"]:
|
||||
client["flow"] = row["vless_flow"]
|
||||
clients.append(client)
|
||||
portals.append(
|
||||
{
|
||||
"tag": portal_tag,
|
||||
"domain": reverse_domain,
|
||||
}
|
||||
)
|
||||
inbounds.append(
|
||||
{
|
||||
"tag": portal_in,
|
||||
@@ -295,6 +300,8 @@ def make_server_xray_config(rows, listen_host="0.0.0.0", listen_port=DEFAULT_VLE
|
||||
"protocol": "tunnel",
|
||||
"settings": {
|
||||
"allowedNetwork": "tcp",
|
||||
"rewriteAddress": row["admin_host"],
|
||||
"rewritePort": int(row["admin_port"]),
|
||||
},
|
||||
}
|
||||
)
|
||||
@@ -302,12 +309,20 @@ def make_server_xray_config(rows, listen_host="0.0.0.0", listen_port=DEFAULT_VLE
|
||||
{
|
||||
"type": "field",
|
||||
"inboundTag": [portal_in],
|
||||
"outboundTag": reverse_out,
|
||||
"outboundTag": portal_tag,
|
||||
}
|
||||
)
|
||||
rules.append(
|
||||
{
|
||||
"type": "field",
|
||||
"inboundTag": ["owrt-remote-vless"],
|
||||
"outboundTag": portal_tag,
|
||||
}
|
||||
)
|
||||
|
||||
return {
|
||||
"log": {"loglevel": "warning"},
|
||||
"reverse": {"portals": portals},
|
||||
"inbounds": inbounds,
|
||||
"outbounds": [{"tag": "direct", "protocol": "freedom"}],
|
||||
"routing": {"rules": rules},
|
||||
@@ -316,8 +331,18 @@ def make_server_xray_config(rows, listen_host="0.0.0.0", listen_port=DEFAULT_VLE
|
||||
|
||||
|
||||
def make_router_xray_config(row):
|
||||
bridge_tag = row["reverse_tag"]
|
||||
reverse_domain = f"{clean_router_id(row['id'])}.owrt-remote.internal"
|
||||
return {
|
||||
"log": {"loglevel": "warning"},
|
||||
"reverse": {
|
||||
"bridges": [
|
||||
{
|
||||
"tag": bridge_tag,
|
||||
"domain": reverse_domain,
|
||||
}
|
||||
]
|
||||
},
|
||||
"inbounds": [],
|
||||
"outbounds": [
|
||||
{
|
||||
@@ -336,7 +361,7 @@ def make_router_xray_config(row):
|
||||
},
|
||||
},
|
||||
{
|
||||
"tag": row["reverse_tag"],
|
||||
"tag": "vps-interconn",
|
||||
"protocol": "vless",
|
||||
"settings": {
|
||||
"address": row["vps_host"],
|
||||
@@ -344,7 +369,6 @@ def make_router_xray_config(row):
|
||||
"id": row["vless_uuid"],
|
||||
"encryption": row["vless_encryption"],
|
||||
"flow": row["vless_flow"],
|
||||
"reverse": {"tag": row["reverse_tag"]},
|
||||
},
|
||||
"streamSettings": {"network": "tcp", "security": "none"},
|
||||
},
|
||||
@@ -352,7 +376,14 @@ def make_router_xray_config(row):
|
||||
"routing": {
|
||||
"rules": [
|
||||
{
|
||||
"inboundTag": [row["reverse_tag"]],
|
||||
"type": "field",
|
||||
"inboundTag": [bridge_tag],
|
||||
"domain": [f"full:{reverse_domain}"],
|
||||
"outboundTag": "vps-interconn",
|
||||
},
|
||||
{
|
||||
"type": "field",
|
||||
"inboundTag": [bridge_tag],
|
||||
"outboundTag": "router-admin",
|
||||
}
|
||||
]
|
||||
|
||||
Reference in new issue
Block a user