参数化数据库复制并记录资源清理失败
This commit is contained in:
1 parent
3e135e2b7b
commit
aa351dcb9d
10 files changed
+129
-38
No files matched your search
@@ -0,0 +1,19 @@
|
||||
package config
|
||||
|
||||
import (
|
||||
"io"
|
||||
|
||||
log "github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
// 无返回值的租约释放接口记录关闭失败,不将路径或驱动错误中的敏感信息写入日志。
|
||||
func releaseConfigLease(unlock func(), lease io.Closer) {
|
||||
unlock()
|
||||
closeConfigResource(lease)
|
||||
}
|
||||
|
||||
func closeConfigResource(resource io.Closer) {
|
||||
if err := resource.Close(); err != nil {
|
||||
log.WithField("action", "释放配置资源").Error("关闭配置资源失败,请检查文件句柄和数据库连接状态")
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
package config
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
log "github.com/sirupsen/logrus"
|
||||
logtest "github.com/sirupsen/logrus/hooks/test"
|
||||
)
|
||||
|
||||
type cleanupTestResource struct {
|
||||
close func() error
|
||||
}
|
||||
|
||||
func (r cleanupTestResource) Close() error { return r.close() }
|
||||
|
||||
func TestReleaseConfigLeaseUnlocksBeforeClosing(t *testing.T) {
|
||||
var steps []string
|
||||
resource := cleanupTestResource{close: func() error {
|
||||
steps = append(steps, "close")
|
||||
return nil
|
||||
}}
|
||||
releaseConfigLease(func() { steps = append(steps, "unlock") }, resource)
|
||||
if strings.Join(steps, ",") != "unlock,close" {
|
||||
t.Fatalf("资源释放顺序不正确: %v", steps)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCloseConfigResourceReportsFailureWithoutSensitiveDetails(t *testing.T) {
|
||||
previous := log.StandardLogger().ReplaceHooks(make(log.LevelHooks))
|
||||
t.Cleanup(func() { log.StandardLogger().ReplaceHooks(previous) })
|
||||
hook := logtest.NewGlobal()
|
||||
const sensitive = "sensitive-cleanup-value"
|
||||
closeCount := 0
|
||||
resource := cleanupTestResource{close: func() error {
|
||||
closeCount++
|
||||
return errors.New(sensitive)
|
||||
}}
|
||||
closeConfigResource(resource)
|
||||
entry := hook.LastEntry()
|
||||
if closeCount != 1 || entry == nil || entry.Level != log.ErrorLevel {
|
||||
t.Fatal("关闭失败没有记录为错误")
|
||||
}
|
||||
if strings.Contains(entry.Message+fmt.Sprint(entry.Data), sensitive) {
|
||||
t.Fatal("关闭错误日志泄露了资源内部信息")
|
||||
}
|
||||
hook.Reset()
|
||||
closeConfigResource(cleanupTestResource{close: func() error { return nil }})
|
||||
if hook.LastEntry() != nil {
|
||||
t.Fatal("成功关闭资源不应记录错误")
|
||||
}
|
||||
}
|
||||
@@ -2,6 +2,7 @@ package config
|
||||
|
||||
import (
|
||||
"crypto/tls"
|
||||
"errors"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
@@ -99,10 +100,9 @@ func stageFlatSSLAtRoot(root, mode string, privateKey, certificate, issuer []byt
|
||||
}
|
||||
unlock, err := lockStateFile(lease)
|
||||
if err != nil {
|
||||
lease.Close()
|
||||
return ManagedSSLReference{}, err
|
||||
return ManagedSSLReference{}, errors.Join(err, lease.Close())
|
||||
}
|
||||
managedSSLStorage.staged[publicPath] = func() { unlock(); lease.Close() }
|
||||
managedSSLStorage.staged[publicPath] = func() { releaseConfigLease(unlock, lease) }
|
||||
complete = true
|
||||
return ManagedSSLReference{Mode: mode, CertificateRef: "ssl/" + base + ".crt", PrivateKeyRef: "ssl/" + base + ".key", CertificatePath: publicPath, PrivateKeyPath: privatePath}, nil
|
||||
}
|
||||
@@ -204,7 +204,9 @@ func pruneFlatSSLLocked(root string, protected []SSLConfig) error {
|
||||
}
|
||||
unlock, err := lockStateFile(lease)
|
||||
if err != nil {
|
||||
lease.Close()
|
||||
if closeErr := lease.Close(); closeErr != nil {
|
||||
return errors.Join(err, closeErr)
|
||||
}
|
||||
continue
|
||||
}
|
||||
err = storage.Remove(filepath.Base(privatePath))
|
||||
@@ -212,8 +214,7 @@ func pruneFlatSSLLocked(root string, protected []SSLConfig) error {
|
||||
err = storage.Remove(filepath.Base(publicPath))
|
||||
}
|
||||
unlock()
|
||||
lease.Close()
|
||||
if err != nil {
|
||||
if err := errors.Join(err, lease.Close()); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
@@ -218,9 +218,11 @@ func pruneManagedSSLLocked(root string, protected []SSLConfig) error {
|
||||
unlock, err := lockStateFile(lease)
|
||||
if err != nil {
|
||||
keep[path] = true
|
||||
lease.Close()
|
||||
if closeErr := lease.Close(); closeErr != nil {
|
||||
return errors.Join(err, closeErr)
|
||||
}
|
||||
} else {
|
||||
leases = append(leases, func() { unlock(); lease.Close() })
|
||||
leases = append(leases, func() { releaseConfigLease(unlock, lease) })
|
||||
}
|
||||
}
|
||||
versions = append(versions, retainedSSLVersion{directory: path, modified: info.ModTime()})
|
||||
|
||||
@@ -164,16 +164,13 @@ func importManagedSSLAtRoot(root string, mode string, privateKeyPEM, certificate
|
||||
return atomicfile.WriteRoot(candidateRoot, name, data, permission)
|
||||
}
|
||||
if err := write("private.key", privateKeyPEM, 0600); err != nil {
|
||||
candidateRoot.Close()
|
||||
return ManagedSSLReference{}, err
|
||||
return ManagedSSLReference{}, errors.Join(err, candidateRoot.Close())
|
||||
}
|
||||
if err := write("public.crt", certificatePEM, 0600); err != nil {
|
||||
candidateRoot.Close()
|
||||
return ManagedSSLReference{}, err
|
||||
return ManagedSSLReference{}, errors.Join(err, candidateRoot.Close())
|
||||
}
|
||||
if err := write("issuer.crt", issuerPEM, 0600); err != nil {
|
||||
candidateRoot.Close()
|
||||
return ManagedSSLReference{}, err
|
||||
return ManagedSSLReference{}, errors.Join(err, candidateRoot.Close())
|
||||
}
|
||||
if err := candidateRoot.Close(); err != nil {
|
||||
return ManagedSSLReference{}, err
|
||||
@@ -557,10 +554,9 @@ func stageManagedSSLAtRoot(root string, mode string, privateKeyPEM, certificateP
|
||||
}
|
||||
unlock, err := lockStateFile(lease)
|
||||
if err != nil {
|
||||
lease.Close()
|
||||
return ManagedSSLReference{}, err
|
||||
return ManagedSSLReference{}, errors.Join(err, lease.Close())
|
||||
}
|
||||
managedSSLStorage.staged[directory] = func() { unlock(); lease.Close() }
|
||||
managedSSLStorage.staged[directory] = func() { releaseConfigLease(unlock, lease) }
|
||||
return ManagedSSLReference{Mode: mode, CertificateRef: filepath.ToSlash(publicRef), PrivateKeyRef: filepath.ToSlash(privateRef), CertificatePath: publicPath, PrivateKeyPath: privatePath}, nil
|
||||
}
|
||||
|
||||
@@ -656,8 +652,7 @@ func removeManagedSSLDirectory(directory string) error {
|
||||
}
|
||||
for _, entry := range entries {
|
||||
if err := storage.Remove(entry.Name()); err != nil {
|
||||
storage.Close()
|
||||
return err
|
||||
return errors.Join(err, storage.Close())
|
||||
}
|
||||
}
|
||||
if err := storage.Close(); err != nil {
|
||||
|
||||
@@ -163,19 +163,18 @@ func (s *TransactionStore) openState() (*stateDatabase, error) {
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
||||
defer cancel()
|
||||
if err := database.PingContext(ctx); err != nil {
|
||||
database.Close()
|
||||
closeConfigResource(database)
|
||||
return nil, ErrStateDatabaseUnavailable
|
||||
}
|
||||
if !s.legacyState {
|
||||
if _, err := database.Exec(configstate.Schema(driver)); err != nil {
|
||||
database.Close()
|
||||
closeConfigResource(database)
|
||||
return nil, ErrStateDatabaseUnavailable
|
||||
}
|
||||
}
|
||||
if filename != "" {
|
||||
if err := os.Chmod(filename, 0600); err != nil {
|
||||
database.Close()
|
||||
return nil, err
|
||||
return nil, errors.Join(err, database.Close())
|
||||
}
|
||||
}
|
||||
return database, nil
|
||||
|
||||
@@ -37,10 +37,9 @@ func (s *TransactionStore) lockState() (func(), error) {
|
||||
}
|
||||
unlock, err := lockStateFile(file)
|
||||
if err != nil {
|
||||
file.Close()
|
||||
return nil, errors.New("配置状态正在被其他进程使用,请稍后重试")
|
||||
return nil, errors.Join(errors.New("配置状态正在被其他进程使用,请稍后重试"), file.Close())
|
||||
}
|
||||
return func() { unlock(); file.Close() }, nil
|
||||
return func() { releaseConfigLease(unlock, file) }, nil
|
||||
}
|
||||
|
||||
func (s *TransactionStore) saveState(kind, id string, record stateRecord) error {
|
||||
|
||||
Reference in new issue
Block a user