mirror of
https://github.com/Rain-kl/OpenFlare.git
synced 2026-11-16 23:04:24 +08:00
fix(i18n): use English runtime text and localize system UI
This commit is contained in:
@@ -15,7 +15,7 @@ const (
|
||||
errCertificateAlreadyApplying = "certificate is already applying"
|
||||
errCertificateOnlyACMERenew = "only acme certificates can be renewed"
|
||||
errCertificateFilesRequired = "certificate file and key file cannot be empty"
|
||||
errCertificatePEMInvalid = "证书 PEM 内容不合法"
|
||||
errCertificatePEMInvalid = "invalid certificate PEM content"
|
||||
|
||||
errDNSAccountInUse = "该 DNS 账号已被证书使用,无法删除"
|
||||
errDNSAccountInUse = "this DNS account is used by certificates and cannot be deleted"
|
||||
)
|
||||
|
||||
@@ -329,7 +329,7 @@ func CreateDNSAccount(ctx context.Context, input DNSAccountInput) (*model.DNSAcc
|
||||
Authorization: authorization,
|
||||
}
|
||||
if account.Name == "" || account.Type == "" || authorization == "" {
|
||||
return nil, errors.New("DNS 账号参数不完整")
|
||||
return nil, errors.New("DNS account parameters are incomplete")
|
||||
}
|
||||
if err := repository.CreateDNSAccountRecord(ctx, account); err != nil {
|
||||
return nil, err
|
||||
@@ -351,7 +351,7 @@ func UpdateDNSAccount(ctx context.Context, id uint, input DNSAccountInput) (*mod
|
||||
account.Type = strings.TrimSpace(input.Type)
|
||||
account.Authorization = authorization
|
||||
if account.Name == "" || account.Type == "" || authorization == "" {
|
||||
return nil, errors.New("DNS 账号参数不完整")
|
||||
return nil, errors.New("DNS account parameters are incomplete")
|
||||
}
|
||||
if err := repository.SaveDNSAccount(ctx, account); err != nil {
|
||||
return nil, err
|
||||
|
||||
@@ -35,25 +35,25 @@ func SetObtainCertificateFuncForTest(fn func(context.Context, *model.TLSCertific
|
||||
}
|
||||
|
||||
func obtainCertificate(ctx context.Context, cert *model.TLSCertificate) error {
|
||||
task.AppendLog(ctx, "【续签任务】开始续签,设置申请状态为 applying...")
|
||||
task.AppendLog(ctx, "[Renewal] Starting renewal; setting application status to applying...")
|
||||
cert.ApplyStatus = tlsApplyStatusApplying
|
||||
if err := repository.SaveTLSCertificate(ctx, cert); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
task.AppendLog(ctx, "【续签任务】正在解析 ACME 账户...")
|
||||
task.AppendLog(ctx, "[Renewal] Resolving ACME account...")
|
||||
acmeAccount, err := resolveAcmeAccount(ctx, cert)
|
||||
if err != nil {
|
||||
return updateCertError(ctx, cert, fmt.Sprintf("Failed to get ACME account: %v", err))
|
||||
}
|
||||
|
||||
task.AppendLog(ctx, "【续签任务】正在解析 DNS 账户信息 (ID=%d)...", cert.DNSAccountID)
|
||||
task.AppendLog(ctx, "[Renewal] Resolving DNS account information (ID=%d)...", cert.DNSAccountID)
|
||||
dnsAccount, err := repository.GetDNSAccountByID(ctx, cert.DNSAccountID)
|
||||
if err != nil {
|
||||
return updateCertError(ctx, cert, fmt.Sprintf("Failed to get DNS account: %v", err))
|
||||
}
|
||||
|
||||
task.AppendLog(ctx, "【续签任务】正在解密 DNS 账号凭据及 ACME 账户私钥...")
|
||||
task.AppendLog(ctx, "[Renewal] Decrypting DNS account credentials and ACME account private key...")
|
||||
dnsAuth, err := openSensitive(dnsAccount.Authorization)
|
||||
if err != nil {
|
||||
return updateCertError(ctx, cert, fmt.Sprintf("Failed to decrypt DNS credentials: %v", err))
|
||||
@@ -65,9 +65,9 @@ func obtainCertificate(ctx context.Context, cert *model.TLSCertificate) error {
|
||||
}
|
||||
|
||||
domains := splitAcmeDomains(cert.PrimaryDomain, cert.OtherDomains)
|
||||
task.AppendLog(ctx, "【续签任务】待申请的域名列表: %v", domains)
|
||||
task.AppendLog(ctx, "[Renewal] Requested domains: %v", domains)
|
||||
|
||||
task.AppendLog(ctx, "【续签任务】正在调用 ACME 客户端(通过 DNS-01 挑战)发起 SSL 证书签发请求,请稍候...")
|
||||
task.AppendLog(ctx, "[Renewal] Requesting SSL certificate issuance through the ACME DNS-01 challenge; please wait...")
|
||||
newAccountURL, newPrivateKeyPEM, result, err := acme.ObtainSSL(
|
||||
acmeAccount.Email,
|
||||
acmePrivateKey,
|
||||
@@ -82,7 +82,7 @@ func obtainCertificate(ctx context.Context, cert *model.TLSCertificate) error {
|
||||
domains,
|
||||
)
|
||||
|
||||
task.AppendLog(ctx, "【续签任务】正在保存 ACME 账户可能的变更...")
|
||||
task.AppendLog(ctx, "[Renewal] Saving ACME account changes...")
|
||||
if err := persistAcmeAccountUpdates(ctx, cert, acmeAccount, newAccountURL, newPrivateKeyPEM, acmePrivateKey); err != nil {
|
||||
return updateCertError(ctx, cert, err.Error())
|
||||
}
|
||||
@@ -91,11 +91,11 @@ func obtainCertificate(ctx context.Context, cert *model.TLSCertificate) error {
|
||||
return updateCertError(ctx, cert, err.Error())
|
||||
}
|
||||
|
||||
task.AppendLog(ctx, "【续签任务】证书签发成功,正在将证书内容与私钥安全写入数据库...")
|
||||
task.AppendLog(ctx, "[Renewal] Certificate issued; securely storing certificate and private key in the database...")
|
||||
if err := saveObtainedCertificate(ctx, cert, result); err != nil {
|
||||
return updateCertError(ctx, cert, err.Error())
|
||||
}
|
||||
task.AppendLog(ctx, "【续签任务】证书数据存储完成!")
|
||||
task.AppendLog(ctx, "[Renewal] Certificate data saved")
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ func handleLogicError(c *gin.Context, err error) bool {
|
||||
if err == nil {
|
||||
return false
|
||||
}
|
||||
return apiutil.AbortNotFoundIfMissing(c, err, "记录不存在")
|
||||
return apiutil.AbortNotFoundIfMissing(c, err, "Record was not found")
|
||||
}
|
||||
|
||||
// GetCertificates 列出 TLS 证书。
|
||||
@@ -170,12 +170,12 @@ func ImportCertificateFile(c *gin.Context) {
|
||||
remark := c.PostForm("remark")
|
||||
certFile, err := c.FormFile("cert_file")
|
||||
if err != nil {
|
||||
response.AbortBadRequest(c, "缺少证书文件")
|
||||
response.AbortBadRequest(c, "Missing certificate file")
|
||||
return
|
||||
}
|
||||
keyFile, err := c.FormFile("key_file")
|
||||
if err != nil {
|
||||
response.AbortBadRequest(c, "缺少私钥文件")
|
||||
response.AbortBadRequest(c, "Missing private key file")
|
||||
return
|
||||
}
|
||||
certificate, err := CreateCertificateFromFiles(c.Request.Context(), name, certFile, keyFile, remark)
|
||||
|
||||
@@ -25,8 +25,8 @@ const (
|
||||
var SSLSingleRenewMeta = task.TaskMeta{
|
||||
Type: TaskTypeSSLSingleRenew,
|
||||
AsynqTask: SSLSingleRenewTask,
|
||||
Name: "OpenFlare 单证书 SSL 续期",
|
||||
Description: "对单个指定的 ACME 证书执行续期",
|
||||
Name: "OpenFlare single-certificate SSL renewal",
|
||||
Description: "Renew a single specified ACME certificate",
|
||||
SupportsTime: false,
|
||||
MaxRetry: task.DefaultMaxRetry,
|
||||
Queue: task.QueueDefault,
|
||||
@@ -34,11 +34,11 @@ var SSLSingleRenewMeta = task.TaskMeta{
|
||||
Params: []task.TaskParam{
|
||||
{
|
||||
Name: "id",
|
||||
Label: "证书 ID",
|
||||
Label: "Certificate ID",
|
||||
Type: "number",
|
||||
Required: true,
|
||||
Placeholder: "请输入证书 ID",
|
||||
Description: "待续期的 TLS 证书 ID",
|
||||
Placeholder: "Enter the certificate ID",
|
||||
Description: "ID of the TLS certificate to renew",
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -54,16 +54,16 @@ type SSLSingleRenewHandler struct{}
|
||||
// ValidatePayload validates and normalizes the task payload.
|
||||
func (h *SSLSingleRenewHandler) ValidatePayload(payload []byte) ([]byte, error) {
|
||||
if len(payload) == 0 {
|
||||
return nil, errors.New("任务参数不能为空")
|
||||
return nil, errors.New("task parameters must not be empty")
|
||||
}
|
||||
|
||||
var req SSLSingleRenewPayload
|
||||
if err := json.Unmarshal(payload, &req); err != nil {
|
||||
return nil, fmt.Errorf("无效的 JSON 格式: %w", err)
|
||||
return nil, fmt.Errorf("invalid JSON format: %w", err)
|
||||
}
|
||||
|
||||
if req.ID == 0 {
|
||||
return nil, errors.New("证书 ID 不能为空或零")
|
||||
return nil, errors.New("certificate ID must be nonzero")
|
||||
}
|
||||
|
||||
return json.Marshal(req)
|
||||
@@ -73,29 +73,29 @@ func (h *SSLSingleRenewHandler) ValidatePayload(payload []byte) ([]byte, error)
|
||||
func (h *SSLSingleRenewHandler) Execute(ctx context.Context, payload []byte) (*task.TaskResult, error) {
|
||||
var req SSLSingleRenewPayload
|
||||
if err := json.Unmarshal(payload, &req); err != nil {
|
||||
return nil, fmt.Errorf("解析任务参数: %w", err)
|
||||
return nil, fmt.Errorf("parse task parameters: %w", err)
|
||||
}
|
||||
|
||||
task.AppendLog(ctx, "开始续期证书,ID: %d", req.ID)
|
||||
task.AppendLog(ctx, "Starting certificate renewal, ID: %d", req.ID)
|
||||
|
||||
cert, err := repository.GetTLSCertificateByID(ctx, req.ID)
|
||||
if err != nil {
|
||||
task.AppendLog(ctx, "获取证书记录失败 ID=%d: %v", req.ID, err)
|
||||
return nil, fmt.Errorf("获取证书记录失败: %w", err)
|
||||
task.AppendLog(ctx, "Failed to get certificate record ID=%d: %v", req.ID, err)
|
||||
return nil, fmt.Errorf("failed to get certificate record: %w", err)
|
||||
}
|
||||
|
||||
if cert.Provider != tlsProviderACME {
|
||||
task.AppendLog(ctx, "证书 %s (ID=%d) 不是 ACME 托管证书,无法自动续期 (Provider: %s)", cert.PrimaryDomain, req.ID, cert.Provider)
|
||||
return nil, fmt.Errorf("证书 %s 不是 ACME 托管证书,无法自动续期", cert.PrimaryDomain)
|
||||
task.AppendLog(ctx, "Certificate %s (ID=%d) is not ACME-managed and cannot be renewed automatically (provider: %s)", cert.PrimaryDomain, req.ID, cert.Provider)
|
||||
return nil, fmt.Errorf("certificate %s is not ACME-managed and cannot be renewed automatically", cert.PrimaryDomain)
|
||||
}
|
||||
|
||||
task.AppendLog(ctx, "准备为域名 [%s] 申请/续期证书", cert.PrimaryDomain)
|
||||
task.AppendLog(ctx, "Preparing to issue or renew a certificate for domains [%s]", cert.PrimaryDomain)
|
||||
if err := obtainTLSCertificate(ctx, cert); err != nil {
|
||||
task.AppendLog(ctx, "申请证书失败: %v", err)
|
||||
task.AppendLog(ctx, "Certificate issuance failed: %v", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
msg := fmt.Sprintf("证书 %s 续签成功", cert.PrimaryDomain)
|
||||
msg := fmt.Sprintf("Certificate %s renewed successfully", cert.PrimaryDomain)
|
||||
task.AppendLog(ctx, "%s", msg)
|
||||
return &task.TaskResult{Message: msg}, nil
|
||||
}
|
||||
|
||||
@@ -27,19 +27,19 @@ func TestSSLSingleRenewHandler_ValidatePayload(t *testing.T) {
|
||||
name: "empty payload",
|
||||
payload: nil,
|
||||
wantErr: true,
|
||||
errMsg: "任务参数不能为空",
|
||||
errMsg: "task parameters must not be empty",
|
||||
},
|
||||
{
|
||||
name: "invalid JSON",
|
||||
payload: []byte(`{`),
|
||||
wantErr: true,
|
||||
errMsg: "无效的 JSON 格式",
|
||||
errMsg: "invalid JSON format",
|
||||
},
|
||||
{
|
||||
name: "zero ID",
|
||||
payload: []byte(`{"id":0}`),
|
||||
wantErr: true,
|
||||
errMsg: "证书 ID 不能为空或零",
|
||||
errMsg: "certificate ID must be nonzero",
|
||||
},
|
||||
{
|
||||
name: "valid ID",
|
||||
@@ -84,7 +84,7 @@ func TestSSLSingleRenewHandler_Execute(t *testing.T) {
|
||||
require.NoError(t, err)
|
||||
_, err = handler.Execute(ctx, payload)
|
||||
require.Error(t, err)
|
||||
assert.Contains(t, err.Error(), "获取证书记录失败")
|
||||
assert.Contains(t, err.Error(), "failed to get certificate record")
|
||||
})
|
||||
|
||||
t.Run("certificate provider is not ACME", func(t *testing.T) {
|
||||
@@ -101,7 +101,7 @@ func TestSSLSingleRenewHandler_Execute(t *testing.T) {
|
||||
|
||||
_, err = handler.Execute(ctx, payload)
|
||||
require.Error(t, err)
|
||||
assert.Contains(t, err.Error(), "不是 ACME 托管证书")
|
||||
assert.Contains(t, err.Error(), "is not ACME-managed")
|
||||
})
|
||||
|
||||
t.Run("successful renewal", func(t *testing.T) {
|
||||
@@ -125,7 +125,7 @@ func TestSSLSingleRenewHandler_Execute(t *testing.T) {
|
||||
|
||||
res, err := handler.Execute(ctx, payload)
|
||||
require.NoError(t, err)
|
||||
assert.Contains(t, res.Message, "续签成功")
|
||||
assert.Contains(t, res.Message, "renewed successfully")
|
||||
|
||||
updated, err := repository.GetTLSCertificateByID(ctx, cert.ID)
|
||||
require.NoError(t, err)
|
||||
|
||||
Reference in New Issue
Block a user