fix: curl入口变量遮蔽bug + 增强日志 + SSH快捷复制按钮

- entry.go: 修复 fallback 路径中变量 h 遮蔽接收者的 bug
- entry.go: 直接使用 HostSSHAuth 字段避免冗余查询
- entry.go: 添加详细日志记录解析路径和主机状态
- $hostId.tsx: SSH 直连区域增加"复制 SSH 命令"按钮

Made-with: Cursor

Author: ZaneL1u

internal/controlplane/http/entry.go

@@ -20,7 +20,6 @@ type EntryStore interface {
 	GetPrimaryHostByUserID(context.Context, string) (repository.Host, error)
 	GetHostByShortID(context.Context, string) (repository.HostSSHAuth, error)
 	GetUser(context.Context, string) (repository.User, error)
-	GetHost(context.Context, string) (repository.Host, error)
 }
 
 type EntryHandler struct {
@@ -100,24 +99,22 @@ func (h *EntryHandler) Auth() nethttp.Handler {
 		}
 
 		var user repository.User
-		var host repository.Host
+		var hostShortID, hostEntryPassword, hostStatus string
 
 		hostAuth, hostErr := h.store.GetHostByShortID(r.Context(), shortID)
 		if hostErr == nil {
+			h.logger.Info("entry auth: resolved by host short_id",
+				"short_id", shortID, "host_id", hostAuth.HostID, "host_status", hostAuth.HostStatus)
 			u, err := h.store.GetUser(r.Context(), hostAuth.UserID)
 			if err != nil {
 				h.logger.Error("entry auth: lookup host owner failed", "host_id", hostAuth.HostID, "error", err)
 				writeJSON(w, nethttp.StatusInternalServerError, map[string]string{"error": "internal error"})
 				return
 			}
 			user = u
-			fullHost, err := h.store.GetHost(r.Context(), hostAuth.HostID)
-			if err != nil {
-				h.logger.Error("entry auth: lookup host failed", "host_id", hostAuth.HostID, "error", err)
-				writeJSON(w, nethttp.StatusInternalServerError, map[string]string{"error": "internal error"})
-				return
-			}
-			host = fullHost
+			hostShortID = hostAuth.HostShortID
+			hostEntryPassword = hostAuth.EntryPassword
+			hostStatus = hostAuth.HostStatus
 		} else {
 			u, err := h.store.GetUserByShortID(r.Context(), shortID)
 			if err != nil {
@@ -130,7 +127,7 @@ func (h *EntryHandler) Auth() nethttp.Handler {
 				return
 			}
 			user = u
-			h, err := h.store.GetPrimaryHostByUserID(r.Context(), user.ID)
+			primaryHost, err := h.store.GetPrimaryHostByUserID(r.Context(), user.ID)
 			if err != nil {
 				if errors.Is(err, pgx.ErrNoRows) {
 					writeJSON(w, nethttp.StatusNotFound, map[string]string{
@@ -139,10 +136,15 @@ func (h *EntryHandler) Auth() nethttp.Handler {
 					})
 					return
 				}
+				h.logger.Error("entry auth: lookup primary host failed", "user_id", user.ID, "error", err)
 				writeJSON(w, nethttp.StatusInternalServerError, map[string]string{"error": "internal error"})
 				return
 			}
-			host = h
+			h.logger.Info("entry auth: resolved by user short_id (fallback to primary host)",
+				"short_id", shortID, "host_id", primaryHost.ID, "host_status", primaryHost.Status)
+			hostShortID = primaryHost.ShortID
+			hostEntryPassword = primaryHost.EntryPassword
+			hostStatus = primaryHost.Status
 		}
 
 		if user.Status != "active" {
@@ -155,7 +157,8 @@ func (h *EntryHandler) Auth() nethttp.Handler {
 			return
 		}
 
-		if host.Status != "running" {
+		if hostStatus != "running" {
+			h.logger.Warn("entry auth: host not running", "short_id", shortID, "host_status", hostStatus)
 			writeJSON(w, nethttp.StatusOK, map[string]any{
 				"status":  "not_ready",
 				"message": "Your machine is not running. Please contact admin.",
@@ -169,8 +172,8 @@ func (h *EntryHandler) Auth() nethttp.Handler {
 		}
 
 		writeJSON(w, nethttp.StatusOK, map[string]any{
-			"ssh_user": host.ShortID,
-			"ssh_pass": host.EntryPassword,
+			"ssh_user": hostShortID,
+			"ssh_pass": hostEntryPassword,
 			"ssh_host": sshHost,
 			"ssh_port": 2222,
 			"status":   "ready",

web/admin/src/routes/_dashboard/hosts/$hostId.tsx

@@ -245,10 +245,25 @@ function HostDetailPage() {
                 label="一键连接（curl 入口）"
                 command={data.connection_info.curl_command}
               />
-              <ConnectionBlock
-                label="SSH 直连（需要这台主机的 SSH 密码）"
-                command={data.connection_info.ssh_command}
-              />
+              <div className="p-6 space-y-3">
+                <ConnectionBlock
+                  label="SSH 直连（配置入站密钥后可免密登录）"
+                  command={data.connection_info.ssh_command}
+                  inline
+                />
+                <Button
+                  type="button"
+                  variant="default"
+                  className="h-10 gap-2"
+                  onClick={() => {
+                    navigator.clipboard.writeText(data.connection_info!.ssh_command);
+                    toast.success("SSH 命令已复制，请在终端中粘贴执行");
+                  }}
+                >
+                  <Terminal className="h-4 w-4" />
+                  复制 SSH 命令
+                </Button>
+              </div>
               {data.connection_info.vnc_url && (
                 <div className="space-y-4 p-6">
                   <ConnectionBlock