修复服务器 SSH 密钥自动部署流程
清理服务器接口中的重复代码,恢复按密码部署公钥并切换密钥认证的后端流程,保留密码回退引用。
This commit is contained in:
parent
8211ac4973
commit
1aa1e52713
@ -21,10 +21,10 @@ const (
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
SSHKeyStatusNotConfigured SSHKeyStatus = "not_configured"
|
SSHKeyStatusNotConfigured SSHKeyStatus = "not_configured"
|
||||||
SSHKeyStatusPending SSHKeyStatus = "pending"
|
SSHKeyStatusPending SSHKeyStatus = "pending"
|
||||||
SSHKeyStatusDeployed SSHKeyStatus = "deployed"
|
SSHKeyStatusDeployed SSHKeyStatus = "deployed"
|
||||||
SSHKeyStatusManual SSHKeyStatus = "manual"
|
SSHKeyStatusManual SSHKeyStatus = "manual"
|
||||||
SSHKeyStatusFailed SSHKeyStatus = "failed"
|
SSHKeyStatusFailed SSHKeyStatus = "failed"
|
||||||
)
|
)
|
||||||
|
|
||||||
type SSHKeyStatus string
|
type SSHKeyStatus string
|
||||||
|
|||||||
@ -554,20 +554,6 @@ func (s *Server) createDomain(c *gin.Context) {
|
|||||||
s.writeError(c, http.StatusInternalServerError, "保存域名失败", err)
|
s.writeError(c, http.StatusInternalServerError, "保存域名失败", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
item, provisionErr := s.provisionServerSSHKey(c.Request.Context(), item)
|
|
||||||
if provisionErr != nil {
|
|
||||||
if updateErr := s.servers.UpdateServer(c.Request.Context(), item); updateErr != nil && s.logger != nil {
|
|
||||||
`s.logger.Warn("保存 SSH 密钥部署失败状态失败", "error", updateErr)
|
|
||||||
}
|
|
||||||
c.JSON(http.StatusBadGateway, gin.H{"error": item.SSHKeyError, "server": item})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if err := s.servers.UpdateServer(c.Request.Context(), item); err != nil {
|
|
||||||
s.writeError(c, http.StatusInternalServerError, "保存 SSH 密钥部署状态失败", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
item, provisionErr := s.provisionServerSSHKey(c.Request.Context(), item) if provisionErr != nil { if updateErr := s.servers.UpdateServer(c.Request.Context(), item); updateErr != nil && s.logger != nil { s.logger.Warn("保存 SSH 密钥部署失败状态失败", "error", updateErr) } c.JSON(http.StatusBadGateway, gin.H{"error": item.SSHKeyError, "server": item}) return } if err := s.servers.UpdateServer(c.Request.Context(), item); err != nil { s.writeError(c, http.StatusInternalServerError, "保存 SSH 密钥部署状态失败", err) return }
|
|
||||||
item, provisionErr := s.provisionServerSSHKey(c.Request.Context(), item) if provisionErr != nil { if updateErr := s.servers.UpdateServer(c.Request.Context(), item); updateErr != nil && s.logger != nil { s.logger.Warn("保存 SSH 密钥部署失败状态失败", "error", updateErr) } c.JSON(http.StatusBadGateway, gin.H{"error": item.SSHKeyError, "server": item}) return } if err := s.servers.UpdateServer(c.Request.Context(), item); err != nil { s.writeError(c, http.StatusInternalServerError, "保存 SSH 密钥部署状态失败", err) return }
|
|
||||||
c.JSON(http.StatusCreated, item)
|
c.JSON(http.StatusCreated, item)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -730,6 +716,18 @@ func (s *Server) createServer(c *gin.Context) {
|
|||||||
s.writeError(c, serverErrorStatus(err), "保存服务器失败", err)
|
s.writeError(c, serverErrorStatus(err), "保存服务器失败", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
item, provisionErr := s.provisionServerSSHKey(c.Request.Context(), item)
|
||||||
|
if provisionErr != nil {
|
||||||
|
if updateErr := s.servers.UpdateServer(c.Request.Context(), item); updateErr != nil && s.logger != nil {
|
||||||
|
s.logger.Warn("保存 SSH 密钥部署失败状态失败", "error", updateErr)
|
||||||
|
}
|
||||||
|
c.JSON(http.StatusBadGateway, gin.H{"error": item.SSHKeyError, "server": item})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err := s.servers.UpdateServer(c.Request.Context(), item); err != nil {
|
||||||
|
s.writeError(c, http.StatusInternalServerError, "保存 SSH 密钥部署状态失败", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
c.JSON(http.StatusCreated, item)
|
c.JSON(http.StatusCreated, item)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -770,7 +768,7 @@ func (s *Server) updateServer(c *gin.Context) {
|
|||||||
item, provisionErr := s.provisionServerSSHKey(c.Request.Context(), item)
|
item, provisionErr := s.provisionServerSSHKey(c.Request.Context(), item)
|
||||||
if provisionErr != nil {
|
if provisionErr != nil {
|
||||||
if updateErr := s.servers.UpdateServer(c.Request.Context(), item); updateErr != nil && s.logger != nil {
|
if updateErr := s.servers.UpdateServer(c.Request.Context(), item); updateErr != nil && s.logger != nil {
|
||||||
`s.logger.Warn("保存 SSH 密钥部署失败状态失败", "error", updateErr)
|
s.logger.Warn("保存 SSH 密钥部署失败状态失败", "error", updateErr)
|
||||||
}
|
}
|
||||||
c.JSON(http.StatusBadGateway, gin.H{"error": item.SSHKeyError, "server": item})
|
c.JSON(http.StatusBadGateway, gin.H{"error": item.SSHKeyError, "server": item})
|
||||||
return
|
return
|
||||||
@ -802,6 +800,9 @@ func (s *Server) prepareServerCredential(ctx context.Context, item deployment.Se
|
|||||||
if err := s.validateSSHKeyReference(ctx, item.PrivateKeyRef); err != nil {
|
if err := s.validateSSHKeyReference(ctx, item.PrivateKeyRef); err != nil {
|
||||||
return deployment.Server{}, cleanup, err
|
return deployment.Server{}, cleanup, err
|
||||||
}
|
}
|
||||||
|
if existing != nil && item.PasswordRef == "" {
|
||||||
|
item.PasswordRef = existing.PasswordRef
|
||||||
|
}
|
||||||
return item, cleanup, nil
|
return item, cleanup, nil
|
||||||
}
|
}
|
||||||
if item.AuthMethod != deployment.SSHAuthPassword {
|
if item.AuthMethod != deployment.SSHAuthPassword {
|
||||||
@ -817,13 +818,13 @@ func (s *Server) prepareServerCredential(ctx context.Context, item deployment.Se
|
|||||||
return deployment.Server{}, cleanup, errors.New("SSH \u5bc6\u7801\u4e0d\u80fd\u4e3a\u7a7a")
|
return deployment.Server{}, cleanup, errors.New("SSH \u5bc6\u7801\u4e0d\u80fd\u4e3a\u7a7a")
|
||||||
}
|
}
|
||||||
if item.PasswordRef == "" {
|
if item.PasswordRef == "" {
|
||||||
item.PasswordRef = "secret://ssh/password/" + domain.NewID()
|
item.PasswordRef = "secret://ssh/password/" + domain.NewID()
|
||||||
if err := s.secrets.Put(ctx, item.PasswordRef, map[string]string{"kind": "ssh_password", "password": password}); err != nil {
|
if err := s.secrets.Put(ctx, item.PasswordRef, map[string]string{"kind": "ssh_password", "password": password}); err != nil {
|
||||||
return deployment.Server{}, cleanup, fmt.Errorf("\u4fdd\u5b58 SSH \u5bc6\u7801\u5931\u8d25\uff1a%w", err)
|
return deployment.Server{}, cleanup, fmt.Errorf("\u4fdd\u5b58 SSH \u5bc6\u7801\u5931\u8d25\uff1a%w", err)
|
||||||
}
|
}
|
||||||
cleanup = func() {
|
cleanup = func() {
|
||||||
_ = s.secrets.Delete(context.Background(), item.PasswordRef)
|
_ = s.secrets.Delete(context.Background(), item.PasswordRef)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if item.PrivateKeyRef == "" && s.sshKeys != nil && s.deploymentFactory != nil {
|
if item.PrivateKeyRef == "" && s.sshKeys != nil && s.deploymentFactory != nil {
|
||||||
metadata, _, err := s.sshKeys.CreateGenerated(ctx, "服务器 "+item.Name+" SSH密钥")
|
metadata, _, err := s.sshKeys.CreateGenerated(ctx, "服务器 "+item.Name+" SSH密钥")
|
||||||
|
|||||||
@ -120,26 +120,26 @@ func (s *Service) CreateGenerated(ctx context.Context, name string) (Metadata, s
|
|||||||
return metadata, strings.TrimSpace(string(ssh.MarshalAuthorizedKey(sshPublicKey))), nil
|
return metadata, strings.TrimSpace(string(ssh.MarshalAuthorizedKey(sshPublicKey))), nil
|
||||||
}
|
}
|
||||||
func (s *Service) AuthorizedPublicKey(ctx context.Context, reference string) (string, error) {
|
func (s *Service) AuthorizedPublicKey(ctx context.Context, reference string) (string, error) {
|
||||||
if s == nil || s.store == nil {
|
if s == nil || s.store == nil {
|
||||||
return "", errors.New("SSH 私钥存储未初始化")
|
return "", errors.New("SSH 私钥存储未初始化")
|
||||||
}
|
}
|
||||||
metadata, err := s.metadata(ctx, strings.TrimSpace(reference), time.Time{}, true)
|
metadata, err := s.metadata(ctx, strings.TrimSpace(reference), time.Time{}, true)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
payload, err := s.store.Get(ctx, metadata.Reference)
|
payload, err := s.store.Get(ctx, metadata.Reference)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", fmt.Errorf("读取 SSH 私钥失败:%w", err)
|
return "", fmt.Errorf("读取 SSH 私钥失败:%w", err)
|
||||||
}
|
}
|
||||||
signer, err := parsePrivateKey(payload["private_key"], payload["passphrase"])
|
signer, err := parsePrivateKey(payload["private_key"], payload["passphrase"])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
publicKey, err := ssh.NewPublicKey(signer.PublicKey())
|
publicKey, err := ssh.NewPublicKey(signer.PublicKey())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", fmt.Errorf("编码 SSH 公钥失败:%w", err)
|
return "", fmt.Errorf("编码 SSH 公钥失败:%w", err)
|
||||||
}
|
}
|
||||||
return strings.TrimSpace(string(ssh.MarshalAuthorizedKey(publicKey))), nil
|
return strings.TrimSpace(string(ssh.MarshalAuthorizedKey(publicKey))), nil
|
||||||
}
|
}
|
||||||
func (s *Service) List(ctx context.Context) ([]Metadata, error) {
|
func (s *Service) List(ctx context.Context) ([]Metadata, error) {
|
||||||
if s == nil || s.store == nil {
|
if s == nil || s.store == nil {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user