推进阿里云授权边界与验证加固
This commit is contained in:
1 parent
6e7720b53d
commit
e9c31312d4
13 files changed
+183
-397
No files matched your search
@@ -13,7 +13,12 @@ import (
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/domain"
|
||||
)
|
||||
|
||||
const dnsVerificationLifetime = 15 * time.Minute
|
||||
const (
|
||||
dnsVerificationLifetime = 15 * time.Minute
|
||||
dnsVerificationSessionCapacity = 128
|
||||
dnsVerificationInFlightCapacity = 16
|
||||
dnsVerificationCleanupTimeout = 30 * time.Second
|
||||
)
|
||||
|
||||
type DNSCredentialTester interface {
|
||||
Verify(ctx context.Context, providerID, testDomain string, credentials map[string]string) (DNSVerificationReport, error)
|
||||
@@ -53,6 +58,11 @@ type SecretWriter interface {
|
||||
Put(ctx context.Context, reference string, value map[string]string) error
|
||||
}
|
||||
|
||||
// SecretDeleter 用于回收过期、未绑定或保存失败的临时 DNS 凭据。
|
||||
type SecretDeleter interface {
|
||||
Delete(ctx context.Context, reference string) error
|
||||
}
|
||||
|
||||
type DNSVerificationInput struct {
|
||||
ProviderID string
|
||||
TestDomain string
|
||||
@@ -77,13 +87,16 @@ type DNSVerificationManager struct {
|
||||
mu sync.Mutex
|
||||
tester DNSCredentialTester
|
||||
store SecretWriter
|
||||
deleter SecretDeleter
|
||||
now func() time.Time
|
||||
sessions map[string]dnsVerificationSession
|
||||
inFlight int
|
||||
}
|
||||
|
||||
func NewDNSVerificationManager(tester DNSCredentialTester, store SecretWriter) *DNSVerificationManager {
|
||||
deleter, _ := store.(SecretDeleter)
|
||||
return &DNSVerificationManager{
|
||||
tester: tester, store: store, now: time.Now,
|
||||
tester: tester, store: store, deleter: deleter, now: time.Now,
|
||||
sessions: make(map[string]dnsVerificationSession),
|
||||
}
|
||||
}
|
||||
@@ -101,6 +114,15 @@ func (m *DNSVerificationManager) Verify(ctx context.Context, input DNSVerificati
|
||||
return DNSVerificationResult{}, fmt.Errorf("DNS 测试域名格式无效:%s", testDomain)
|
||||
}
|
||||
normalizedCredentials := normalizeCredentials(input.Credentials)
|
||||
if err := m.reserveVerificationSlot(); err != nil {
|
||||
return DNSVerificationResult{}, err
|
||||
}
|
||||
released := false
|
||||
defer func() {
|
||||
if !released {
|
||||
m.releaseVerificationSlot()
|
||||
}
|
||||
}()
|
||||
testReport, err := m.tester.Verify(ctx, providerID, testDomain, normalizedCredentials)
|
||||
if err != nil {
|
||||
return DNSVerificationResult{TestReport: testReport}, &DNSVerificationError{
|
||||
@@ -118,16 +140,23 @@ func (m *DNSVerificationManager) Verify(ctx context.Context, input DNSVerificati
|
||||
}
|
||||
credentialRef := fmt.Sprintf("secret://dns/%s/%s", providerID, credentialID)
|
||||
if err := m.store.Put(ctx, credentialRef, normalizedCredentials); err != nil {
|
||||
cleanupErr := m.deleteCredential(credentialRef)
|
||||
if cleanupErr != nil {
|
||||
return DNSVerificationResult{}, fmt.Errorf("加密保存 DNS 凭据失败,且无法确认临时凭据已回收:%w", errors.Join(err, cleanupErr))
|
||||
}
|
||||
return DNSVerificationResult{}, fmt.Errorf("加密保存 DNS 凭据失败:%w", err)
|
||||
}
|
||||
expiresAt := m.now().UTC().Add(dnsVerificationLifetime)
|
||||
m.mu.Lock()
|
||||
m.clearExpiredLocked(m.now().UTC())
|
||||
expiredRefs := m.clearExpiredLocked(m.now().UTC())
|
||||
m.sessions[verificationToken] = dnsVerificationSession{
|
||||
ProviderID: providerID, TestDomain: testDomain,
|
||||
CredentialRef: credentialRef, ExpiresAt: expiresAt,
|
||||
}
|
||||
m.inFlight--
|
||||
released = true
|
||||
m.mu.Unlock()
|
||||
m.deleteCredentials(expiredRefs)
|
||||
return DNSVerificationResult{
|
||||
CredentialRef: credentialRef, VerificationToken: verificationToken, ExpiresAt: expiresAt,
|
||||
TestReport: testReport,
|
||||
@@ -152,29 +181,86 @@ func (m *DNSVerificationManager) validateSession(token, providerID, credentialRe
|
||||
}
|
||||
now := m.now().UTC()
|
||||
m.mu.Lock()
|
||||
defer m.mu.Unlock()
|
||||
m.clearExpiredLocked(now)
|
||||
expiredRefs := m.clearExpiredLocked(now)
|
||||
session, ok := m.sessions[token]
|
||||
if !ok {
|
||||
m.mu.Unlock()
|
||||
m.deleteCredentials(expiredRefs)
|
||||
return errors.New("DNS 验证令牌无效或已经过期,请重新测试")
|
||||
}
|
||||
if session.ProviderID != strings.ToLower(strings.TrimSpace(providerID)) ||
|
||||
session.CredentialRef != strings.TrimSpace(credentialRef) ||
|
||||
session.TestDomain != normalizeTestDomain(testDomain) {
|
||||
m.mu.Unlock()
|
||||
m.deleteCredentials(expiredRefs)
|
||||
return errors.New("DNS 验证结果与当前配置不匹配,请重新测试")
|
||||
}
|
||||
if consume {
|
||||
delete(m.sessions, token)
|
||||
}
|
||||
m.mu.Unlock()
|
||||
m.deleteCredentials(expiredRefs)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *DNSVerificationManager) clearExpiredLocked(now time.Time) {
|
||||
func (m *DNSVerificationManager) reserveVerificationSlot() error {
|
||||
if m == nil {
|
||||
return errors.New("DNS 在线验证服务未初始化")
|
||||
}
|
||||
now := m.now().UTC()
|
||||
m.mu.Lock()
|
||||
expiredRefs := m.clearExpiredLocked(now)
|
||||
if m.inFlight >= dnsVerificationInFlightCapacity {
|
||||
m.mu.Unlock()
|
||||
m.deleteCredentials(expiredRefs)
|
||||
return errors.New("DNS 在线验证请求过多,请稍后重试")
|
||||
}
|
||||
if len(m.sessions)+m.inFlight >= dnsVerificationSessionCapacity {
|
||||
m.mu.Unlock()
|
||||
m.deleteCredentials(expiredRefs)
|
||||
return errors.New("DNS 验证令牌数量已达上限,请等待现有验证完成或过期后重试")
|
||||
}
|
||||
m.inFlight++
|
||||
m.mu.Unlock()
|
||||
m.deleteCredentials(expiredRefs)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *DNSVerificationManager) releaseVerificationSlot() {
|
||||
if m == nil {
|
||||
return
|
||||
}
|
||||
m.mu.Lock()
|
||||
if m.inFlight > 0 {
|
||||
m.inFlight--
|
||||
}
|
||||
m.mu.Unlock()
|
||||
}
|
||||
|
||||
func (m *DNSVerificationManager) clearExpiredLocked(now time.Time) []string {
|
||||
var references []string
|
||||
for token, session := range m.sessions {
|
||||
if !session.ExpiresAt.After(now) {
|
||||
delete(m.sessions, token)
|
||||
references = append(references, session.CredentialRef)
|
||||
}
|
||||
}
|
||||
return references
|
||||
}
|
||||
|
||||
func (m *DNSVerificationManager) deleteCredentials(references []string) {
|
||||
for _, reference := range references {
|
||||
_ = m.deleteCredential(reference)
|
||||
}
|
||||
}
|
||||
|
||||
func (m *DNSVerificationManager) deleteCredential(reference string) error {
|
||||
if m == nil || m.deleter == nil || strings.TrimSpace(reference) == "" {
|
||||
return nil
|
||||
}
|
||||
ctx, cancel := context.WithTimeout(context.Background(), dnsVerificationCleanupTimeout)
|
||||
defer cancel()
|
||||
return m.deleter.Delete(ctx, reference)
|
||||
}
|
||||
|
||||
func normalizeCredentials(credentials map[string]string) map[string]string {
|
||||
|
||||
Reference in new issue
Block a user