fix(protocols): 修复第三方协议授权码密码验证后解密展示并优化交互提示
Security Checks / security (push) Waiting to run

This commit is contained in:
xuans committed 2026-09-13 04:24:19 +08:00
1 parent f285b5c904
commit fcb64a34bd
4 files changed
+31 -5

No files matched your search

+6
View File
@@ -164,12 +164,18 @@ func LoadSecurityContext(ctx *context.Context) {
func credentialRuntime() *credentials.Service {
if service := currentSecurityRuntime().credentials; service != nil {
if service.VaultRoot() == "" && config.ROOT_PATH != "" {
service.SetVaultRoot(config.ROOT_PATH)
}
return service
}
if db.Instance == nil {
return nil
}
service, _ := credentials.NewService(db.Instance)
if service != nil && config.ROOT_PATH != "" {
service.SetVaultRoot(config.ROOT_PATH)
}
return service
}
+7 -4
View File
@@ -32,6 +32,7 @@ type ProtocolCredentialStatus struct {
Protocol string `json:"protocol"`
Enabled bool `json:"enabled"`
Configured bool `json:"configured"`
CanReveal bool `json:"can_reveal"`
CreatedAt *time.Time `json:"created_at,omitempty"`
UpdatedAt *time.Time `json:"updated_at,omitempty"`
LastUsedAt *time.Time `json:"last_used_at,omitempty"`
@@ -75,6 +76,7 @@ func (s *Service) ListProtocolCredentials(userID int) ([]ProtocolCredentialStatu
updatedAt := item.UpdatedAt
status.Enabled = item.Enabled
status.Configured = item.CodeHash != "" && item.RevokedAt == nil
status.CanReveal = item.CodeCiphertext != "" && item.RevokedAt == nil
status.CreatedAt = &createdAt
status.UpdatedAt = &updatedAt
status.LastUsedAt = item.LastUsedAt
@@ -255,11 +257,12 @@ func (s *Service) RevealProtocolCodes(userID int) (map[string]string, error) {
if userID <= 0 {
return nil, ErrInvalidUser
}
if s.vaultRoot == "" {
return make(map[string]string), nil
}
s.mu.Lock()
defer s.mu.Unlock()
vaultRoot := s.vaultRoot
if vaultRoot == "" {
return make(map[string]string), nil
}
var items []models.ProtocolCredential
if err := s.engine.Where("user_id = ? AND enabled = ? AND revoked_at IS NULL", userID, true).Find(&items); err != nil {
return nil, fmt.Errorf("load protocol credentials for reveal: %w", err)
@@ -269,7 +272,7 @@ func (s *Service) RevealProtocolCodes(userID int) (map[string]string, error) {
if item.CodeCiphertext == "" || item.CodeHash == "" {
continue
}
plain, err := credential.Decrypt(s.vaultRoot, item.CodeCiphertext)
plain, err := credential.Decrypt(vaultRoot, item.CodeCiphertext)
if err != nil {
continue
}