fix(subscription): implement host-specific xray template overrides and add corresponding tests

Author: x0sina

app/subscription/share.py

@@ -353,6 +353,16 @@ async def process_inbounds_and_tags(
     hosts = await filter_hosts(list((await host_manager.get_hosts()).values()), user.status)
     if randomize_order and len(hosts) > 1:
         random.shuffle(hosts)
+    def _resolve_host_xray_template_content(inbound: SubscriptionInboundData) -> str | None:
+        if xray_template_overrides is None:
+            return None
+        if not isinstance(inbound.subscription_templates, dict):
+            return None
+        template_id = inbound.subscription_templates.get("xray")
+        if not isinstance(template_id, int):
+            return None
+        return xray_template_overrides.get(template_id)
+
     for host_data in hosts:
         result = await process_host(host_data, format_variables, user.inbounds, proxy_settings)
         if not result:
@@ -379,14 +389,7 @@ async def process_inbounds_and_tags(
                 inbound_copy.transport_config.download_settings = processed_download_settings
 
         if isinstance(conf, XrayConfiguration):
-            template_content = None
-            if (
-                xray_template_overrides is not None
-                and isinstance(inbound_copy.subscription_templates, dict)
-                and isinstance((template_id := inbound_copy.subscription_templates.get("xray")), int)
-            ):
-                template_content = xray_template_overrides.get(template_id)
-
+            template_content = _resolve_host_xray_template_content(inbound_copy)
             conf.add(
                 remark=remark,
                 address=formatted_address,

dashboard/src/components/dialogs/host-modal.tsx

@@ -828,21 +828,18 @@ const HostModal: React.FC<HostModalProps> = ({ isDialogOpen, onOpenChange, onSub
                           </PopoverContent>
                         </Popover>
                       </div>
-                      <Select
-                        dir={dir}
-                        value={field.value != null ? String(field.value) : '__default__'}
-                        onValueChange={value => field.onChange(value === '__default__' ? undefined : Number.parseInt(value, 10))}
-                        disabled={isLoadingXrayTemplates}
-                      >
+                        <Select
+                          dir={dir}
+                          value={field.value != null ? String(field.value) : ''}
+                          onValueChange={value => field.onChange(value ? Number.parseInt(value, 10) : undefined)}
+                          disabled={isLoadingXrayTemplates}
+                        >
                         <FormControl>
                           <SelectTrigger className="py-5">
                             <SelectValue placeholder={isLoadingXrayTemplates ? t('loading', { defaultValue: 'Loading...' }) : t('hostsDialog.selectXrayTemplate')} />
                           </SelectTrigger>
                         </FormControl>
                         <SelectContent dir={dir}>
-                          <SelectItem className="cursor-pointer px-4" value="__default__">
-                            {t('hostsDialog.inboundDefault')}
-                          </SelectItem>
                           {isLoadingXrayTemplates ? (
                             <SelectItem className="px-4" value="__loading_xray_templates__" disabled>
                               <span className="flex items-center gap-2">

tests/api/test_user.py

@@ -509,6 +509,80 @@ def test_xray_subscription_uses_host_specific_template_override(access_token):
         delete_core(access_token, core["id"])
 
 
+def test_xray_subscription_template_override_isolated_per_host(access_token):
+    core = create_core(access_token)
+    inbound = get_inbounds(access_token)[0]
+    override_template = create_client_template(
+        access_token,
+        name=unique_name("xray_host_isolated_template"),
+        template_type="xray_subscription",
+        content=json.dumps(
+            {
+                "log": {"loglevel": "warning"},
+                "inbounds": [{"tag": "placeholder", "protocol": "vmess", "settings": {"clients": []}}],
+                "outbounds": [{"tag": "template-marker", "protocol": "freedom", "settings": {}}],
+            }
+        ),
+    )
+
+    first_host_response = client.post(
+        "/api/host",
+        headers=auth_headers(access_token),
+        json={
+            "remark": "Host With Template {USERNAME}",
+            "address": ["198.51.100.60"],
+            "port": 443,
+            "sni": ["host-template.example.com"],
+            "inbound_tag": inbound,
+            "priority": 1,
+            "subscription_templates": {"xray": override_template["id"]},
+        },
+    )
+    assert first_host_response.status_code == status.HTTP_201_CREATED
+    first_host_id = first_host_response.json()["id"]
+
+    second_host_response = client.post(
+        "/api/host",
+        headers=auth_headers(access_token),
+        json={
+            "remark": "Host Without Template {USERNAME}",
+            "address": ["198.51.100.61"],
+            "port": 443,
+            "sni": ["host-default.example.com"],
+            "inbound_tag": inbound,
+            "priority": 2,
+        },
+    )
+    assert second_host_response.status_code == status.HTTP_201_CREATED
+    second_host_id = second_host_response.json()["id"]
+
+    group = create_group(access_token, name=unique_name("xray_isolated_group"), inbound_tags=[inbound])
+    user = create_user(access_token, group_ids=[group["id"]], payload={"username": unique_name("xray_isolated_user")})
+
+    try:
+        response = client.get(f"{user['subscription_url']}/xray")
+        assert response.status_code == status.HTTP_200_OK
+
+        configs = response.json()
+        assert isinstance(configs, list)
+        assert len(configs) == 2
+
+        marker_count = 0
+        for config in configs:
+            outbounds = config.get("outbounds", [])
+            if any(outbound.get("tag") == "template-marker" for outbound in outbounds):
+                marker_count += 1
+
+        assert marker_count == 1
+    finally:
+        delete_user(access_token, user["username"])
+        delete_group(access_token, group["id"])
+        client.delete(f"/api/host/{first_host_id}", headers=auth_headers(access_token))
+        client.delete(f"/api/host/{second_host_id}", headers=auth_headers(access_token))
+        delete_client_template(access_token, override_template["id"])
+        delete_core(access_token, core["id"])
+
+
 def test_singbox_subscription_includes_wireguard_outbound(access_token):
     interface_private_key, interface_public_key = generate_wireguard_keypair()
     pre_shared_key, _ = generate_wireguard_keypair()