完成初始化证书事务和远程部署互斥并纳入发布构建脚本

This commit is contained in:
xuans committed 2026-09-15 20:17:34 +08:00
1 parent 05e05a1a23
commit a4dffb04d4
27 files changed
+1294 -25

No files matched your search

+4 -2
View File
@@ -2,6 +2,7 @@ package certificate
import (
"context"
"crypto/x509"
"errors"
"fmt"
"os"
@@ -55,6 +56,7 @@ type Service struct {
store FileStore
newIssuer IssuerFactory
preferredChain string
acmeRoots *x509.CertPool
}
func (s *Service) SetDNSAuthorizationChecker(checker DNSAuthorizationChecker) {
@@ -181,7 +183,7 @@ func (s *Service) Issue(ctx context.Context, domainID string) (IssueResult, erro
if err != nil {
return fail(err)
}
if err := validateIssuedResource(ctx, resource, domains); err != nil {
if err := s.validateACMEResource(ctx, resource, domains, item.ACMEEnvironment); err != nil {
return fail(err)
}
saved, err := s.store.SaveForType(ctx, item.Name, string(item.CertificateType), resource)
@@ -258,7 +260,7 @@ func (s *Service) IssueForSetup(ctx context.Context, request SetupCertificateReq
if err != nil {
return SavedResource{}, fmt.Errorf("初始化证书校验失败:%w", err)
}
if err := validateIssuedResource(ctx, resource, domains); err != nil {
if err := s.validateACMEResource(ctx, resource, domains, environment); err != nil {
return SavedResource{}, err
}
store := FileStore{Root: request.CertificateRoot, BackupRoot: request.BackupRoot}
@@ -112,6 +112,7 @@ func TestServiceIssuesSANCertificateAndUpdatesState(t *testing.T) {
repository := &serviceRepository{item: item}
issuer := &serviceIssuer{resource: testResourceForDomains(t, []string{"example.com", "www.example.com"})}
service := NewService(cfg, repository, serviceCredentials{}, serviceProviderFactory{}, serviceAccounts{})
service.acmeRoots = testResourceRoots(t, issuer.resource)
service.newIssuer = func(*AccountUser, challenge.Provider, string) Issuer { return issuer }
result, err := service.Issue(context.Background(), item.ID)
@@ -361,6 +362,7 @@ func TestServiceIssuesSetupCertificateWithTypedLayout(t *testing.T) {
cfg := certificateTestConfig(root)
issuer := &serviceIssuer{resource: testResource(t, "scert.example.com")}
service := NewService(cfg, nil, serviceCredentials{}, serviceProviderFactory{}, serviceAccounts{})
service.acmeRoots = testResourceRoots(t, issuer.resource)
service.newIssuer = func(*AccountUser, challenge.Provider, string) Issuer { return issuer }
saved, err := service.IssueForSetup(context.Background(), SetupCertificateRequest{
@@ -408,6 +410,7 @@ func TestServiceDecryptsCredentialReferenceBeforeCreatingProvider(t *testing.T)
factory := &recordingProviderFactory{}
issuer := &serviceIssuer{resource: testResource(t, "example.com")}
service := NewService(cfg, repository, store, factory, serviceAccounts{})
service.acmeRoots = testResourceRoots(t, issuer.resource)
service.newIssuer = func(*AccountUser, challenge.Provider, string) Issuer { return issuer }
if _, err := service.Issue(context.Background(), item.ID); err != nil {
+54
View File
@@ -0,0 +1,54 @@
package certificate
import (
"context"
"crypto/x509"
"embed"
"fmt"
"strings"
)
// 测试根仅供 ACME 测试签发结果校验,不加入系统、HTTP 客户端或正式环境信任库。
//
//go:embed trust/*.pem
var stagingTrust embed.FS
func acmeTrustRoots(environment string) (*x509.CertPool, error) {
switch strings.ToLower(strings.TrimSpace(environment)) {
case "production":
return nil, nil
case "staging":
roots := x509.NewCertPool()
entries, err := stagingTrust.ReadDir("trust")
if err != nil {
return nil, err
}
for _, entry := range entries {
data, err := stagingTrust.ReadFile("trust/" + entry.Name())
if err != nil || !roots.AppendCertsFromPEM(data) {
return nil, fmt.Errorf("内置 ACME 测试根证书无效:%s", entry.Name())
}
}
return roots, nil
default:
return nil, fmt.Errorf("ACME 环境无效:%s", environment)
}
}
func (s *Service) validateACMEResource(ctx context.Context, resource Resource, domains []string, environment string) error {
roots, err := acmeTrustRoots(environment)
if err != nil {
return err
}
if s.acmeRoots != nil {
roots = s.acmeRoots
}
chain := append([]byte(nil), resource.Certificate...)
chain = append(chain, resource.IssuerCertificate...)
// 即使签发器未返回单独的 issuer 字段,也必须验证完整信任链。
_, err = (LocalValidator{Roots: roots, VerifyChain: true}).ValidatePEM(ctx, chain, domains)
if err != nil {
return fmt.Errorf("ACME %s 证书信任链校验失败:%w", environment, err)
}
return nil
}
@@ -0,0 +1,32 @@
-----BEGIN CERTIFICATE-----
MIIFmDCCA4CgAwIBAgIQU9C87nMpOIFKYpfvOHFHFDANBgkqhkiG9w0BAQsFADBm
MQswCQYDVQQGEwJVUzEzMDEGA1UEChMqKFNUQUdJTkcpIEludGVybmV0IFNlY3Vy
aXR5IFJlc2VhcmNoIEdyb3VwMSIwIAYDVQQDExkoU1RBR0lORykgUHJldGVuZCBQ
ZWFyIFgxMB4XDTE1MDYwNDExMDQzOFoXDTM1MDYwNDExMDQzOFowZjELMAkGA1UE
BhMCVVMxMzAxBgNVBAoTKihTVEFHSU5HKSBJbnRlcm5ldCBTZWN1cml0eSBSZXNl
YXJjaCBHcm91cDEiMCAGA1UEAxMZKFNUQUdJTkcpIFByZXRlbmQgUGVhciBYMTCC
AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALbagEdDTa1QgGBWSYkyMhsc
ZXENOBaVRTMX1hceJENgsL0Ma49D3MilI4KS38mtkmdF6cPWnL++fgehT0FbRHZg
jOEr8UAN4jH6omjrbTD++VZneTsMVaGamQmDdFl5g1gYaigkkmx8OiCO68a4QXg4
wSyn6iDipKP8utsE+x1E28SA75HOYqpdrk4HGxuULvlr03wZGTIf/oRt2/c+dYmD
oaJhge+GOrLAEQByO7+8+vzOwpNAPEx6LW+crEEZ7eBXih6VP19sTGy3yfqK5tPt
TdXXCOQMKAp+gCj/VByhmIr+0iNDC540gtvV303WpcbwnkkLYC0Ft2cYUyHtkstO
fRcRO+K2cZozoSwVPyB8/J9RpcRK3jgnX9lujfwA/pAbP0J2UPQFxmWFRQnFjaq6
rkqbNEBgLy+kFL1NEsRbvFbKrRi5bYy2lNms2NJPZvdNQbT/2dBZKmJqxHkxCuOQ
FjhJQNeO+Njm1Z1iATS/3rts2yZlqXKsxQUzN6vNbD8KnXRMEeOXUYvbV4lqfCf8
mS14WEbSiMy87GB5S9ucSV1XUrlTG5UGcMSZOBcEUpisRPEmQWUOTWIoDQ5FOia/
GI+Ki523r2ruEmbmG37EBSBXdxIdndqrjy+QVAmCebyDx9eVEGOIpn26bW5LKeru
mJxa/CFBaKi4bRvmdJRLAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMB
Af8EBTADAQH/MB0GA1UdDgQWBBS182Xy/rAKkh/7PH3zRKCsYyXDFDANBgkqhkiG
9w0BAQsFAAOCAgEAncDZNytDbrrVe68UT6py1lfF2h6Tm2p8ro42i87WWyP2LK8Y
nLHC0hvNfWeWmjZQYBQfGC5c7aQRezak+tHLdmrNKHkn5kn+9E9LCjCaEsyIIn2j
qdHlAkepu/C3KnNtVx5tW07e5bvIjJScwkCDbP3akWQixPpRFAsnP+ULx7k0aO1x
qAeaAhQ2rgo1F58hcflgqKTXnpPM02intVfiVVkX5GXpJjK5EoQtLceyGOrkxlM/
sTPq4UrnypmsqSagWV3HcUlYtDinc+nukFk6eR4XkzXBbwKajl0YjztfrCIHOn5Q
CJL6TERVDbM/aAPly8kJ1sWGLuvvWYzMYgLzDul//rUF10gEMWaXVZV51KpS9DY/
5CunuvCXmEQJHo7kGcViT7sETn6Jz9KOhvYcXkJ7po6d93A/jy4GKPIPnsKKNEmR
xUuXY4xRdh45tMJnLTUDdC9FIU0flTeO9/vNpVA8OPU1i14vCz+MU8KX1bV3GXm/
fxlB7VBBjX9v5oUep0o/j68R/iDlCOM4VVfRa8gX6T2FU7fNdatvGro7uQzIvWof
gN9WUwCbEMBy/YhBSrXycKA8crgGg3x1mIsopn88JKwmMBa68oS7EHM9w7C4y71M
7DiA+/9Qdp9RBWJpTS9i/mDnJg1xvo8Xz49mrrgfmcAXTCJqXi24NatI3Oc=
-----END CERTIFICATE-----
@@ -0,0 +1,15 @@
-----BEGIN CERTIFICATE-----
MIICTjCCAdSgAwIBAgIRAIPgc3k5LlLVLtUUvs4K/QcwCgYIKoZIzj0EAwMwaDEL
MAkGA1UEBhMCVVMxMzAxBgNVBAoTKihTVEFHSU5HKSBJbnRlcm5ldCBTZWN1cml0
eSBSZXNlYXJjaCBHcm91cDEkMCIGA1UEAxMbKFNUQUdJTkcpIEJvZ3VzIEJyb2Nj
b2xpIFgyMB4XDTIwMDkwNDAwMDAwMFoXDTQwMDkxNzE2MDAwMFowaDELMAkGA1UE
BhMCVVMxMzAxBgNVBAoTKihTVEFHSU5HKSBJbnRlcm5ldCBTZWN1cml0eSBSZXNl
YXJjaCBHcm91cDEkMCIGA1UEAxMbKFNUQUdJTkcpIEJvZ3VzIEJyb2Njb2xpIFgy
MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEOvS+w1kCzAxYOJbA06Aw0HFP2tLBLKPo
FQqR9AMskl1nC2975eQqycR+ACvYelA8rfwFXObMHYXJ23XLB+dAjPJVOJ2OcsjT
VqO4dcDWu+rQ2VILdnJRYypnV1MMThVxo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYD
VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU3tGjWWQOwZo2o0busBB2766XlWYwCgYI
KoZIzj0EAwMDaAAwZQIwRcp4ZKBsq9XkUuN8wfX+GEbY1N5nmCRc8e80kUkuAefo
uc2j3cICeXo1cOybQ1iWAjEA3Ooawl8eQyR4wrjCofUE8h44p0j7Yl/kBlJZT8+9
vbtH7QiVzeKCOTQPINyRql6P
-----END CERTIFICATE-----
@@ -0,0 +1,13 @@
-----BEGIN CERTIFICATE-----
MIICDDCCAZKgAwIBAgIRAJacQQzEKTdLO8Jbc8CHVlQwCgYIKoZIzj0EAwMwRzEL
MAkGA1UEBhMCVVMxDTALBgNVBAoTBElTUkcxKTAnBgNVBAMTIChTVEFHSU5HKSBZ
ZWFybmluZyBZdWNjYSBSb290IFlFMB4XDTI1MDkwMzAwMDAwMFoXDTQ1MDkwMjIz
NTk1OVowRzELMAkGA1UEBhMCVVMxDTALBgNVBAoTBElTUkcxKTAnBgNVBAMTIChT
VEFHSU5HKSBZZWFybmluZyBZdWNjYSBSb290IFlFMHYwEAYHKoZIzj0CAQYFK4EE
ACIDYgAE9LGxyXLRIUhNaCaufjztgLQYSwTDaqNhkD9nrf3IOkM1o5hqKUTGOm3S
uJVqzzLrRXT7JL+UCtshYPi5VSbyaH8JXgogE+HlzMPK/jQEsjYo91J9mEjnl1RQ
yhMyI3wlo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNV
HQ4EFgQUkzsblChigfkfJ+uq35owDVquf+wwCgYIKoZIzj0EAwMDaAAwZQIwDlg5
ZRknz/QOduNyg84Dy3oZwsMw0I0R180ZBzQ6YVNZZVbmyirNg3NJ3NP/kkS5AjEA
24b8Va6T6LmSXZqAJjnQjL71IZ20L6Nt7/g98v9hPxd+jq4hSuGvm85jKQNZdK65
-----END CERTIFICATE-----
@@ -0,0 +1,31 @@
-----BEGIN CERTIFICATE-----
MIIFUzCCAzugAwIBAgIRAOlpfXfxOryRKxxm6YaAvS0wDQYJKoZIhvcNAQELBQAw
QzELMAkGA1UEBhMCVVMxDTALBgNVBAoTBElTUkcxJTAjBgNVBAMTHChTVEFHSU5H
KSBZb25kZXIgWWFtIFJvb3QgWVIwHhcNMjUwOTAzMDAwMDAwWhcNNDUwOTAyMjM1
OTU5WjBDMQswCQYDVQQGEwJVUzENMAsGA1UEChMESVNSRzElMCMGA1UEAxMcKFNU
QUdJTkcpIFlvbmRlciBZYW0gUm9vdCBZUjCCAiIwDQYJKoZIhvcNAQEBBQADggIP
ADCCAgoCggIBALae7+rQafYA6YhlSzozLNXkvQ4CLaYBVPUXicG/0soLOqvuhFAs
X4uagzipA5XYlTrZY7sABb/OttajOLpGOjpkQSAPYZwrrpyZSjRI0H1gK6sDDqKO
Yi2eKatFD+IbViZbpDqFaK0qLiv9xNV1k0d2cCJiKHwtPqdttN06Q204YYD80/2Y
7zFBNuKkEwXELSfMCCe58/5OgfzcjNvhphDDRRddQbW1GplRSVzEYvimXkaCv20E
wI3j6WP9AdQw3KoEHMAm97CDo+crBVCu6icnGvF5OWxfMBThcRhypkUT6zKW+7V3
U1x5UspgwrVMffAgn8Ka/u/r5x4GqrFuWH69wBrfT+Ui/t4XJsMOI9F8egdxOJtB
PvIPZrSdS9ZOwmmqcIHkVtIIYnSiZjfuYGN6dhuz/B6uMlgvn5ictTlgoOhg8GZg
jELvwDFGsEVeNAFGGWWAQHqG2VP7inJm1ilF7mpNW2mVqe6Ko3LCAysWzJIOiho4
S21XIR3GFLJQqC/gI0oXwAN5/FidHI1N6fgTJFo0ylbgHy2DfwwO+gr30Vl9Ng/q
4hs91bBVwsPZOZhRNM5vlYXPMSN01jYVOkJukdSq4AlNqjqYGifEZaJFCt0BVqyH
TgCEMDtJXnso03fzHr7MOtgc4NK20NZEt4fnlgXAbJDQhSSg7o87RngnAgMBAAGj
QjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRQ
sdeYAlBf2zJGG1jBaEByJG9KwTANBgkqhkiG9w0BAQsFAAOCAgEAb177bev0tqVD
JU1pu2Kgpn8007LXfcjfatJTZ4A8TFvgtkf2AyH9Qu3AMuqr9pMee7CRVMvA8Ahp
MhrWTHyzxPyFGlt8t/U+75zq9mE9IWNXMkWWrfph3wcNFDFkrEh6Hfhd1dd8UcqU
P6nJAuZYU69NVSQegthqeaZyA6owYDNmCcon4Fc4nudmfEyZsdTRXctbhy9QaXKn
dIyQ2nBWlyNLOgVLLMSHfuk3ksgNO5R68tfhevtR9nBSUORZHQc0Qc2+zBlE7tVh
SwtkyfhRa29zQy8XkcjG3EX6pLMgPkJIMKhour1mDudeJ3gkfAli9RMSUKdGRnP6
/JmSPt1iTnQstG+L5abq1QVLymkxx+gLL5P7sixWo7pXmXnejafYxK8dYgAVYF/w
HV/EiIWcxkfUG8pU4SrC/z0Yr66C5uovtvpzvcxAjV4YYNLNJg2crbB9WiriBI4b
9/L1YTbwPvrxjcoQ8/XQZ1gQIIUJAi7w3ZecOdNWX+S35EiNpjUArCELRPAyYh4g
d3WeRS1woH9aIr7qEkBWW6IhbLOntrNvrguPprsvf5dlJ93EAVJ8fgOjJTBbl5/t
uhxa0IhOwAaSDM3Ep1J8IbzTMgzOofRtrWcTMmtKkaViidQFFCs8jqvB3eBiMnWQ
dlOhc6f6VwbPwd70DybV2JlWelXlLys=
-----END CERTIFICATE-----
@@ -0,0 +1,21 @@
# ACME 测试根证书来源
获取日期:2026-09-15。
依据 Let's Encrypt 官方测试环境说明:
- https://letsencrypt.org/docs/staging-environment/
- https://github.com/letsencrypt/website/blob/main/content/en/docs/staging-environment.md
公开根证书从官方 `letsencrypt/website` 仓库通过经过系统信任校验的 HTTPS 获取:
| 本地文件 | 官方仓库路径(相对 `static/certs/staging/`) |
| --- | --- |
| `staging-x1.pem` | `letsencrypt-stg-root-x1.pem` |
| `staging-x2.pem` | `letsencrypt-stg-root-x2.pem` |
| `staging-ye.pem` | `gen-y/root-ye.pem` |
| `staging-yr.pem` | `gen-y/root-yr.pem` |
这些文件只有公开证书,不含私钥。它们仅用于校验明确选择 `staging` 的 ACME 签发结果;不得导入操作系统或普通浏览器信任库,不用于 ACME HTTP 连接,也不用于 `production` 签发。不能将服务器返回的任意根或中间证书自动提升为信任锚。
升级根证书时须复核官方来源、证书自签名、有效期及回归测试;不得因测试链失败而关闭正式环境信任验证。
@@ -0,0 +1,71 @@
package certificate
import (
"crypto/x509"
"strings"
"testing"
"time"
"git.pcux.cn/xuans/Scert/backend/internal/config"
)
func testResourceRoots(t *testing.T, resource Resource) *x509.CertPool {
t.Helper()
roots := x509.NewCertPool()
if !roots.AppendCertsFromPEM(resource.Certificate) {
t.Fatal("测试证书无法加入专用测试信任库")
}
return roots
}
func TestACMETrustRootsAreEnvironmentIsolated(t *testing.T) {
staging, err := acmeTrustRoots("staging")
if err != nil || staging == nil {
t.Fatalf("测试环境根加载失败:%v", err)
}
production, err := acmeTrustRoots("production")
if err != nil || production != nil {
t.Fatal("正式环境必须使用系统信任库,不能继承测试根")
}
entries, err := stagingTrust.ReadDir("trust")
if err != nil || len(entries) != 4 {
t.Fatalf("必须包含四个官方测试根:%v", err)
}
for _, entry := range entries {
data, err := stagingTrust.ReadFile("trust/" + entry.Name())
if err != nil {
t.Fatal(err)
}
certs, err := parseCertificates(data)
if err != nil || len(certs) != 1 {
t.Fatalf("测试根文件无效:%s", entry.Name())
}
root := certs[0]
if !root.IsCA || !strings.Contains(root.Subject.CommonName, "(STAGING)") || root.CheckSignatureFrom(root) != nil {
t.Fatalf("测试根身份或自签名无效:%s", entry.Name())
}
if err := verifyChain(certs, staging, time.Now()); err != nil {
t.Fatalf("官方测试根应受测试信任库信任:%v", err)
}
if err := verifyChain(certs, production, time.Now()); err == nil {
t.Fatal("官方测试根不能受正式信任库信任")
}
}
if _, err := acmeTrustRoots("unknown"); err == nil {
t.Fatal("未知环境必须失败关闭")
}
}
func TestACMERejectsUntrustedLeafEvenWithoutSeparateIssuer(t *testing.T) {
service := NewService(config.Default(t.TempDir()), nil, nil, nil, nil)
resource := testResource(t, "example.com")
for _, environment := range []string{"production", "staging"} {
if err := service.validateACMEResource(t.Context(), resource, []string{"example.com"}, environment); err == nil {
t.Fatalf("%s 不得因 issuer 字段为空而接受任意自签证书", environment)
}
}
service.acmeRoots = testResourceRoots(t, resource)
if err := service.validateACMEResource(t.Context(), resource, []string{"example.com"}, "staging"); err != nil {
t.Fatalf("专用测试根验证失败:%v", err)
}
}
+10 -1
View File
@@ -1,6 +1,7 @@
package certificate
import (
"bytes"
"context"
"crypto/sha256"
"crypto/tls"
@@ -52,9 +53,17 @@ func (v LocalValidator) ValidateFiles(ctx context.Context, certificatePath, full
if err != nil {
return ValidationResult{}, fmt.Errorf("读取私钥文件失败:%w", err)
}
if _, err := tls.X509KeyPair(chainData, privateKeyData); err != nil {
pair, err := tls.X509KeyPair(certificateData, privateKeyData)
if err != nil {
return ValidationResult{}, fmt.Errorf("证书与私钥不匹配:%w", err)
}
chainPair, err := tls.X509KeyPair(chainData, privateKeyData)
if err != nil {
return ValidationResult{}, fmt.Errorf("证书与私钥不匹配:%w", err)
}
if !bytes.Equal(pair.Certificate[0], chainPair.Certificate[0]) {
return ValidationResult{}, errors.New("证书文件与完整证书链的叶子证书不一致")
}
return v.validatePEM(ctx, chainData, expectedDomains)
}
@@ -11,6 +11,8 @@ import (
"math/big"
"net"
"net/http/httptest"
"os"
"path/filepath"
"testing"
"time"
)
@@ -43,6 +45,20 @@ func TestLocalValidatorRejectsMissingSAN(t *testing.T) {
}
}
func TestLocalValidatorDoesNotIgnoreCertificateFile(t *testing.T) {
cert, key, _ := validationTestCertificate(t, []string{"example.com"})
root := t.TempDir()
certPath, chainPath, keyPath := filepath.Join(root, "cert.pem"), filepath.Join(root, "chain.pem"), filepath.Join(root, "key.pem")
for name, data := range map[string][]byte{certPath: []byte("invalid-certificate"), chainPath: cert, keyPath: key} {
if err := os.WriteFile(name, data, 0o600); err != nil {
t.Fatal(err)
}
}
if _, err := (LocalValidator{}).ValidateFiles(t.Context(), certPath, chainPath, keyPath, []string{"example.com"}); err == nil {
t.Fatal("完整证书链有效不能掩盖单独证书文件无效")
}
}
func TestRemoteValidatorChecksPresentedCertificate(t *testing.T) {
certificateData, privateKeyData, leaf := validationTestCertificate(t, []string{"localhost", "127.0.0.1"})
pair, err := tls.X509KeyPair(certificateData, privateKeyData)