diff --git a/files/usr/sbin/owrt-remote b/files/usr/sbin/owrt-remote index 8da2488..7eac824 100644 --- a/files/usr/sbin/owrt-remote +++ b/files/usr/sbin/owrt-remote @@ -143,7 +143,7 @@ service_enabled() { } render_client_config() { - local out stdout router_id vps_host vps_port uuid encryption flow reverse_tag admin_host admin_port xray_config + local out stdout router_id vps_host vps_port uuid encryption flow reverse_tag reverse_domain admin_host admin_port xray_config stdout="0" if [ "${1:-}" = "--stdout" ]; then stdout="1" @@ -156,6 +156,7 @@ render_client_config() { encryption="$(uci_get vless_encryption none)" flow="$(uci_get vless_flow '')" reverse_tag="$(safe_id "$(uci_get reverse_tag reverse-in)")" + reverse_domain="${router_id}.owrt-remote.internal" admin_host="$(uci_get admin_host 127.0.0.1)" admin_port="$(safe_num "$(uci_get admin_port 80)" 80)" xray_config="$(uci_get xray_config /etc/xray/owrt-remote-client.json)" @@ -169,6 +170,14 @@ render_client_config() { "log": { "loglevel": "warning" }, + "reverse": { + "bridges": [ + { + "tag": "$(json_escape "$reverse_tag")", + "domain": "$(json_escape "$reverse_domain")" + } + ] + }, "inbounds": [], "outbounds": [ { @@ -187,17 +196,14 @@ render_client_config() { } }, { - "tag": "$(json_escape "$reverse_tag")", + "tag": "vps-interconn", "protocol": "vless", "settings": { "address": "$(json_escape "$vps_host")", "port": $vps_port, "id": "$(json_escape "$uuid")", "encryption": "$(json_escape "$encryption")", - "flow": "$(json_escape "$flow")", - "reverse": { - "tag": "$(json_escape "$reverse_tag")" - } + "flow": "$(json_escape "$flow")" }, "streamSettings": { "network": "tcp", @@ -208,6 +214,17 @@ render_client_config() { "routing": { "rules": [ { + "type": "field", + "inboundTag": [ + "$(json_escape "$reverse_tag")" + ], + "domain": [ + "full:$(json_escape "$reverse_domain")" + ], + "outboundTag": "vps-interconn" + }, + { + "type": "field", "inboundTag": [ "$(json_escape "$reverse_tag")" ], diff --git a/vps/owrt-remote-hub.py b/vps/owrt-remote-hub.py index 8c3c0fb..04c53a2 100644 --- a/vps/owrt-remote-hub.py +++ b/vps/owrt-remote-hub.py @@ -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", } ]