此前开启异步生图必须改服务器上的 config.yaml 并重启容器(#4542),且若想 复用已配置的备份 S3,还得把同一套凭证再填一遍(#4458)。 - 新增 ImageStorageSettingService:配置存 settings 表,SecretAccessKey 经 SecretEncryptor 加密落库、读回脱敏、留空表示沿用旧值,与备份 S3 配置同一套做法。 - reuse_backup_s3(默认开)直接借用 backup_s3_config 的端点与密钥,只用自己的 bucket/prefix 区分对象,因此备份走 backups/、图片走 images/,且密钥不会在库里存两份。 - ImageTaskService 的启用状态改由 ImageStorageResolver 在运行时解析并缓存, 保存设置后 Invalidate 使下次请求重建客户端——不再需要重启。 - repository 侧由提供实例改为提供工厂,客户端才可能在运行期重建。 - 轮询接口的门控从 enabled() 放宽为 Pollable():关掉开关只拒绝新提交, 已受理的任务仍可取回结果,不再被中途吞掉。 - config.yaml 的 image_storage 保留为回落,后台从未保存过时沿用, 升级前已用配置文件开启的部署不受影响。 - 管理端 GET/PUT/POST /admin/backups/image-storage,PUT 与备份 S3 配置一样要求 step-up 2FA:改写存储目标同样能把生成内容导向外部账号。 注:go generate ./cmd/server 在当前 upstream 基线上即失败(securityaudit. PromptAdminService 缺 provider),故 wire_gen.go 为手工同步。 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01VHreE5pzCkSYz7J45fmd2Y
221 lines
8.0 KiB
Go
221 lines
8.0 KiB
Go
//go:build unit
|
|
|
|
package service
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"strings"
|
|
"sync"
|
|
"testing"
|
|
|
|
"github.com/Wei-Shaw/sub2api/internal/config"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
type stubSettingRepo struct {
|
|
mu sync.Mutex
|
|
values map[string]string
|
|
}
|
|
|
|
func newStubSettingRepo() *stubSettingRepo {
|
|
return &stubSettingRepo{values: map[string]string{}}
|
|
}
|
|
|
|
func (r *stubSettingRepo) Get(context.Context, string) (*Setting, error) { return nil, nil }
|
|
func (r *stubSettingRepo) GetValue(_ context.Context, key string) (string, error) {
|
|
r.mu.Lock()
|
|
defer r.mu.Unlock()
|
|
return r.values[key], nil
|
|
}
|
|
|
|
func (r *stubSettingRepo) Set(_ context.Context, key, value string) error {
|
|
r.mu.Lock()
|
|
defer r.mu.Unlock()
|
|
r.values[key] = value
|
|
return nil
|
|
}
|
|
func (r *stubSettingRepo) GetMultiple(context.Context, []string) (map[string]string, error) {
|
|
return map[string]string{}, nil
|
|
}
|
|
func (r *stubSettingRepo) SetMultiple(context.Context, map[string]string) error { return nil }
|
|
func (r *stubSettingRepo) GetAll(context.Context) (map[string]string, error) {
|
|
return map[string]string{}, nil
|
|
}
|
|
func (r *stubSettingRepo) Delete(context.Context, string) error { return nil }
|
|
|
|
// reversibleEncryptor stands in for AES: prefixed so a test can tell ciphertext
|
|
// from plaintext, and so decrypting a plaintext value fails like the real one.
|
|
type reversibleEncryptor struct{}
|
|
|
|
func (reversibleEncryptor) Encrypt(plaintext string) (string, error) {
|
|
return "enc:" + plaintext, nil
|
|
}
|
|
|
|
func (reversibleEncryptor) Decrypt(ciphertext string) (string, error) {
|
|
rest, ok := strings.CutPrefix(ciphertext, "enc:")
|
|
if !ok {
|
|
return "", errors.New("not encrypted")
|
|
}
|
|
return rest, nil
|
|
}
|
|
|
|
type recordingStorage struct{ saved []string }
|
|
|
|
func (s *recordingStorage) Save(_ context.Context, key, _ string, _ []byte) (string, error) {
|
|
s.saved = append(s.saved, key)
|
|
return "https://cdn.example.com/" + key, nil
|
|
}
|
|
|
|
func newImageStorageFixture(t *testing.T, fallback config.ImageStorageConfig) (*ImageStorageSettingService, *stubSettingRepo, *[]config.ImageStorageConfig) {
|
|
t.Helper()
|
|
repo := newStubSettingRepo()
|
|
encryptor := reversibleEncryptor{}
|
|
backup := NewBackupService(repo, &config.Config{}, encryptor, nil, nil)
|
|
|
|
var built []config.ImageStorageConfig
|
|
factory := func(_ context.Context, cfg *config.ImageStorageConfig) (ImageStorage, error) {
|
|
built = append(built, *cfg)
|
|
return &recordingStorage{}, nil
|
|
}
|
|
return NewImageStorageSettingService(repo, encryptor, backup, factory, fallback), repo, &built
|
|
}
|
|
|
|
func seedBackupS3(t *testing.T, repo *stubSettingRepo, cfg BackupS3Config) {
|
|
t.Helper()
|
|
cfg.SecretAccessKey = "enc:" + cfg.SecretAccessKey
|
|
data, err := json.Marshal(cfg)
|
|
require.NoError(t, err)
|
|
require.NoError(t, repo.Set(context.Background(), settingKeyBackupS3Config, string(data)))
|
|
}
|
|
|
|
// The admin switch must take effect without a restart: that is the entire point
|
|
// of moving image_storage out of config.yaml (#4542).
|
|
func TestImageStorageSettingsToggleTakesEffectWithoutRestart(t *testing.T) {
|
|
svc, repo, built := newImageStorageFixture(t, config.ImageStorageConfig{})
|
|
ctx := context.Background()
|
|
seedBackupS3(t, repo, BackupS3Config{
|
|
Endpoint: "https://acct.r2.cloudflarestorage.com", Region: "auto",
|
|
Bucket: "backup-bucket", AccessKeyID: "ak", SecretAccessKey: "sk",
|
|
Prefix: "backups/",
|
|
})
|
|
|
|
uploader, enabled := svc.resolve()
|
|
require.False(t, enabled, "disabled until an admin turns it on")
|
|
require.Nil(t, uploader)
|
|
|
|
_, err := svc.Update(ctx, ImageStorageSettings{Enabled: true, ReuseBackupS3: true})
|
|
require.NoError(t, err)
|
|
|
|
uploader, enabled = svc.resolve()
|
|
require.True(t, enabled, "saving the setting must enable the feature immediately")
|
|
require.NotNil(t, uploader)
|
|
|
|
_, err = svc.Update(ctx, ImageStorageSettings{Enabled: false, ReuseBackupS3: true})
|
|
require.NoError(t, err)
|
|
_, enabled = svc.resolve()
|
|
require.False(t, enabled, "turning it back off must also apply immediately")
|
|
|
|
require.Len(t, *built, 1, "the S3 client is built only when the feature is on")
|
|
}
|
|
|
|
func TestImageStorageSettingsReuseBackupCredentials(t *testing.T) {
|
|
svc, repo, built := newImageStorageFixture(t, config.ImageStorageConfig{})
|
|
ctx := context.Background()
|
|
seedBackupS3(t, repo, BackupS3Config{
|
|
Endpoint: "https://acct.r2.cloudflarestorage.com", Region: "wnam",
|
|
Bucket: "backup-bucket", AccessKeyID: "backup-ak", SecretAccessKey: "backup-sk",
|
|
Prefix: "backups/", ForcePathStyle: true,
|
|
})
|
|
|
|
_, err := svc.Update(ctx, ImageStorageSettings{Enabled: true, ReuseBackupS3: true, Prefix: "images"})
|
|
require.NoError(t, err)
|
|
_, enabled := svc.resolve()
|
|
require.True(t, enabled)
|
|
|
|
require.Len(t, *built, 1)
|
|
got := (*built)[0]
|
|
require.Equal(t, "https://acct.r2.cloudflarestorage.com", got.Endpoint)
|
|
require.Equal(t, "wnam", got.Region)
|
|
require.Equal(t, "backup-ak", got.AccessKeyID)
|
|
require.Equal(t, "backup-sk", got.SecretAccessKey, "the backup secret must be decrypted before use")
|
|
require.True(t, got.ForcePathStyle)
|
|
require.Equal(t, "backup-bucket", got.Bucket, "an empty bucket falls back to the backup bucket")
|
|
require.Equal(t, "images/", got.Prefix, "images stay under their own prefix so they never collide with backups/")
|
|
|
|
// Reusing must not duplicate the secret into a second row.
|
|
raw, err := repo.GetValue(ctx, settingKeyImageStorageConfig)
|
|
require.NoError(t, err)
|
|
require.NotContains(t, raw, "backup-sk")
|
|
require.NotContains(t, raw, "enc:")
|
|
}
|
|
|
|
func TestImageStorageSettingsOwnCredentialsAreEncryptedAndMasked(t *testing.T) {
|
|
svc, repo, built := newImageStorageFixture(t, config.ImageStorageConfig{})
|
|
ctx := context.Background()
|
|
|
|
saved, err := svc.Update(ctx, ImageStorageSettings{
|
|
Enabled: true, Bucket: "my-images",
|
|
Endpoint: "https://acct.r2.cloudflarestorage.com",
|
|
AccessKeyID: "ak", SecretAccessKey: "super-secret",
|
|
})
|
|
require.NoError(t, err)
|
|
require.Empty(t, saved.SecretAccessKey, "the response must never echo the secret back")
|
|
|
|
raw, err := repo.GetValue(ctx, settingKeyImageStorageConfig)
|
|
require.NoError(t, err)
|
|
require.NotContains(t, raw, `"secret_access_key":"super-secret"`, "the secret must be encrypted at rest")
|
|
require.Contains(t, raw, "enc:super-secret")
|
|
|
|
fetched, err := svc.Get(ctx)
|
|
require.NoError(t, err)
|
|
require.Empty(t, fetched.SecretAccessKey)
|
|
require.True(t, svc.SecretConfigured(ctx))
|
|
|
|
_, enabled := svc.resolve()
|
|
require.True(t, enabled)
|
|
require.Equal(t, "super-secret", (*built)[0].SecretAccessKey, "the stored secret must be decrypted before use")
|
|
|
|
// An update that omits the secret keeps the stored one rather than wiping it.
|
|
_, err = svc.Update(ctx, ImageStorageSettings{
|
|
Enabled: true, Bucket: "my-images",
|
|
Endpoint: "https://acct.r2.cloudflarestorage.com", AccessKeyID: "ak",
|
|
})
|
|
require.NoError(t, err)
|
|
svc.resolve()
|
|
require.Equal(t, "super-secret", (*built)[1].SecretAccessKey)
|
|
}
|
|
|
|
func TestImageStorageSettingsIncompleteStaysDisabled(t *testing.T) {
|
|
svc, _, built := newImageStorageFixture(t, config.ImageStorageConfig{})
|
|
ctx := context.Background()
|
|
|
|
_, err := svc.Update(ctx, ImageStorageSettings{Enabled: true, Bucket: "my-images"})
|
|
require.NoError(t, err)
|
|
|
|
_, enabled := svc.resolve()
|
|
require.False(t, enabled, "missing credentials must not enable the feature")
|
|
require.Empty(t, *built, "no client is built from an incomplete configuration")
|
|
}
|
|
|
|
// Deployments that already enabled the feature through config.yaml must keep
|
|
// working after the setting moves into the database.
|
|
func TestImageStorageSettingsFallBackToConfigFile(t *testing.T) {
|
|
svc, _, built := newImageStorageFixture(t, config.ImageStorageConfig{
|
|
Enabled: true, Endpoint: "https://acct.r2.cloudflarestorage.com", Region: "auto",
|
|
Bucket: "yaml-bucket", AccessKeyID: "yaml-ak", SecretAccessKey: "yaml-sk",
|
|
Prefix: "images/", MaxDownloadByte: 1024,
|
|
})
|
|
|
|
_, enabled := svc.resolve()
|
|
require.True(t, enabled, "config.yaml still enables the feature when nothing is stored yet")
|
|
require.Equal(t, "yaml-bucket", (*built)[0].Bucket)
|
|
|
|
fetched, err := svc.Get(context.Background())
|
|
require.NoError(t, err)
|
|
require.True(t, fetched.Enabled)
|
|
require.Equal(t, "yaml-bucket", fetched.Bucket)
|
|
require.Empty(t, fetched.SecretAccessKey)
|
|
}
|