mirror of
https://github.com/0xJacky/nginx-ui.git
synced 2026-06-19 07:36:59 +00:00
69cfa82b1d
* feat(cert): add self-signed certificate type and config to model Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(cert): generate self-signed leaf certificates Add GenerateSelfSigned / SelfSignedOptions plus five new error codes (50032-50036) and a full TDD test suite covering valid cert output, multiple key types, empty-SAN rejection, and invalid-IP rejection. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(cert): regenerate self-signed certificates with key reuse Add RegenerateSelfSigned, SelfSignedOptionsFromModel, deriveSelfSignedCommonName, loadSelfSignedKey, and parsePrivateKeyPEM to support re-issuing self-signed certificates for the auto-renewal job, reusing the on-disk private key when possible. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(cert): add self-signed certificate renewal worker Add auto-renewal worker for self-signed certificates that mirrors the ACME renewal logic, using a dedicated shouldRenewSelfSignedCert threshold function verified with TDD. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(cron): schedule self-signed certificate renewal Register setupSelfSignedCertRenewalJob as a periodic cron job (every 30 minutes) in InitCronJobs, mirroring the existing setupAutoCertJob pattern. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(api): add self-signed certificate generation endpoints Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(cert): add self-signed certificate frontend API Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(cert): add shared self-signed certificate fields component Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(cert): add self-signed certificate generation modal and list entry Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(cert): support self-signed certificates in the editor Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(site): generate self-signed certificates from the site editor Extract hasTLSListen/ensureDirective/ensureTLSDirectives into a shared useTLSDirectives composable, refactor ObtainCert.vue to use it, and add SelfSignedCert.vue to the site cert tab so users can generate and apply a self-signed certificate directly from the site editor. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(cert): validate self-signed key type and name IP-only renewals Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * refactor(cert): apply code-review cleanup - reuse certcrypto.ParsePEMPrivateKey instead of a hand-rolled PEM private-key parser - stop exporting the unused ensureDirective from useTLSDirectives - use the AutoCertState enum instead of integer literals in certColumns - allocate the renewal Logger only when renewal is attempted, avoiding a per-tick goroutine and empty-log database write for non-due certificates Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(cert): address PR #1688 review feedback - clean up the partial certificate directory when the initial write fails, not just the database row - log a warning when the existing self-signed private key cannot be reused so operators notice the public-key fingerprint has changed - defensively copy the model's Domains and IPAddresses slices in SelfSignedOptionsFromModel - require an explicit "Save now" confirmation after generating from the site editor, and write the directives into the editor first so the user can review the diff before saving Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(cert): harden self-signed certificate lifecycle Reuse private keys on manual self-signed edits, make certificate writes safer, clean managed self-signed files on delete, and guard renewal against missing config. * fix(cert): harden self-signed frontend handling Avoid undefined certificate redirects, rely on payload defaults for self-signed fields, and parse TLS listen directives precisely. * fix(site): satisfy strict listen regex lint Escape the IPv6 listen closing bracket explicitly so the strict regexp lint rule accepts TLS listen parsing. * fix(cert): harden self-signed key handling Co-authored-by: Jacky <me@jackyu.cn> * docs(cert): design merging self-signed entry into issue dialog Spec for collapsing the Certificate list header from three actions to two by adding a Self-signed option inside the existing Issue Certificate dialog. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * docs(cert): plan merging self-signed into issue dialog Step-by-step plan that turns the spec into two scoped commits: extend DNSIssueCertificate with a self-signed type, then drop the standalone header button from the certificate list view. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(cert): add self-signed option in issue certificate dialog Extend the Issue Certificate dialog's Certificate Type select with a "Self-signed" option that swaps the form body to SelfSignedCertFields and routes submission through cert.generate_self_signed(). ACME paths (Wildcard / Custom Domains) are unchanged. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * refactor(cert): drop standalone self-signed button from list header Certificate creation is now consolidated under the Issue Certificate dialog (which exposes Self-signed as a Certificate Type option), so the duplicate header entry, its ref, handler, and modal mount are removed. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * docs(cert): design self-signed UX enhancements Adds a reusable StringListInput, renewal-policy hint in the self-signed form, and a required Name field (frontend + backend). Builds on the prior merge spec. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * docs(cert): plan self-signed UX enhancements Six-task plan: extract StringListInput, require Name backend + test, refactor SelfSignedCertFields with renewal hint, hide duplicate alert in editor, seed/filter payloads with Name validation, and adopt StringListInput in the ACME Custom Domains branch. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(ui): add StringListInput component Reusable multi-row text input with Add/Remove buttons. Used in the upcoming refactor of Custom Domains and self-signed Domains / IP Addresses editors so all three share a single editor pattern. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(ui): simplify StringListInput model write and add a11y label Replace the captured-index update closure with v-model:value on items[index] so input events are guaranteed to write to the array slot currently bound to the DOM input. Add an aria-label suffix on the Remove button so screen readers can distinguish rows. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(cert): require Name when generating self-signed certificates Adds binding:"required" to SelfSignedCertRequest.Name so an empty name is rejected at the request boundary, and covers the contract with a new API-level test. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(cert): unify self-signed editor and surface renewal hint Switch Domains and IP Addresses to the shared StringListInput so all self-signed field editors match the Custom Domains pattern. Add an auto-renewal hint (suppressible via hideRenewalNote) and mark Name as required to match the new backend contract. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * chore(cert): suppress duplicate renewal alert in cert editor SelfSignedCertManagement already has its own renewal-status alert; pass hide-renewal-note to SelfSignedCertFields to avoid showing two adjacent alerts saying the same thing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(cert): seed and filter self-signed payloads, validate Name StringListInput preserves empty placeholder rows for editing; seed arrays with [''] in toSelfSignedPayload / emptySelfSignedPayload / emptyForm so the editor always renders an empty row to type into. Each submit/save path trims and filters the arrays before sending and now rejects an empty Name client-side to match the new server contract. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * refactor(cert): make SelfSignedCertPayload.name required Every factory already seeds name as ''; the optional marker forced defensive (name ?? '').trim() at three call sites. Align the type with reality. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * refactor(cert): use StringListInput for Custom Domains Drop the inline multi-row template + add/remove helpers in favour of the shared StringListInput component, matching the editor used by the self-signed branch. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * chore(ui): regenerate components.d.ts for StringListInput Auto-generated by unplugin-vue-components after the new component was added under app/src/components/StringListInput/. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(cert): render key_type for both legacy and canonical forms The backend's helper.GetKeyType normalizes key_type to its canonical form (EC256, RSA2048…) on every write — self-signed generation as well as the ModifyCert BeforeExecuteHook. The frontend PrivateKeyTypeMask was keyed only by the legacy form (P256, 2048…), so maskRender returned "/" for every cert that took a write path through normalization. Two reported symptoms with the same root cause: - New self-signed cert always shows "/" in the Key Type column - Editing any ACME cert (issue #1697) flips its column to "/" after save Add formatPrivateKeyType / normalizePrivateKeyType helpers that map both forms to the frontend's legacy key. Use them in the list column renderer and when loading certs into the self-signed and ACME editor forms so the ASelect highlights the correct option. Fixes #1697. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * style(cert): cap self-signed fields width at 600px The fields stretched full-width inside the certificate editor page; cap the form at 600px to match AutoCertManagement and keep the editing area readable. Modal consumers were already bounded by their own width, so the change is invisible there. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * chore: update translations --------- Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: Cursor Agent <cursoragent@cursor.com> Co-authored-by: Hintay <hintay@me.com>
184 lines
6.2 KiB
Go
184 lines
6.2 KiB
Go
package cert
|
|
|
|
import (
|
|
"crypto"
|
|
"crypto/rand"
|
|
"crypto/rsa"
|
|
"crypto/x509"
|
|
"crypto/x509/pkix"
|
|
"encoding/pem"
|
|
"math/big"
|
|
"net"
|
|
"os"
|
|
"time"
|
|
|
|
"github.com/0xJacky/Nginx-UI/internal/helper"
|
|
"github.com/0xJacky/Nginx-UI/model"
|
|
"github.com/go-acme/lego/v5/certcrypto"
|
|
"github.com/uozi-tech/cosy"
|
|
"github.com/uozi-tech/cosy/logger"
|
|
)
|
|
|
|
const (
|
|
// SelfSignedDefaultValidityDays is used when no validity period is given.
|
|
SelfSignedDefaultValidityDays = 365
|
|
// SelfSignedMaxValidityDays caps the validity period.
|
|
SelfSignedMaxValidityDays = 3650
|
|
// selfSignedClockSkewBackdate backdates NotBefore to tolerate clock skew.
|
|
selfSignedClockSkewBackdate = 5 * time.Minute
|
|
)
|
|
|
|
// SelfSignedOptions describes the parameters for generating a self-signed
|
|
// leaf certificate.
|
|
type SelfSignedOptions struct {
|
|
CommonName string
|
|
DNSNames []string
|
|
IPAddresses []string
|
|
KeyType certcrypto.KeyType
|
|
ValidityDays int
|
|
}
|
|
|
|
// GenerateSelfSigned builds a self-signed leaf certificate and returns the
|
|
// PEM-encoded certificate and private key.
|
|
func GenerateSelfSigned(opts SelfSignedOptions) (certPEM, keyPEM []byte, err error) {
|
|
signer, err := certcrypto.GeneratePrivateKey(helper.GetKeyType(opts.KeyType))
|
|
if err != nil {
|
|
return nil, nil, cosy.WrapErrorWithParams(ErrSelfSignedGenerateKey, err.Error())
|
|
}
|
|
return signSelfSigned(opts, signer)
|
|
}
|
|
|
|
// signSelfSigned creates a self-signed certificate from the given options and
|
|
// signer, returning the PEM-encoded certificate and private key.
|
|
func signSelfSigned(opts SelfSignedOptions, signer crypto.Signer) (certPEM, keyPEM []byte, err error) {
|
|
ipAddresses := make([]net.IP, 0, len(opts.IPAddresses))
|
|
for _, raw := range opts.IPAddresses {
|
|
ip := net.ParseIP(raw)
|
|
if ip == nil {
|
|
return nil, nil, cosy.WrapErrorWithParams(ErrSelfSignedInvalidIP, raw)
|
|
}
|
|
ipAddresses = append(ipAddresses, ip)
|
|
}
|
|
|
|
if len(opts.DNSNames) == 0 && len(ipAddresses) == 0 {
|
|
return nil, nil, ErrSelfSignedNoSAN
|
|
}
|
|
|
|
validityDays := opts.ValidityDays
|
|
if validityDays <= 0 {
|
|
validityDays = SelfSignedDefaultValidityDays
|
|
}
|
|
if validityDays > SelfSignedMaxValidityDays {
|
|
validityDays = SelfSignedMaxValidityDays
|
|
}
|
|
|
|
serialNumber, err := rand.Int(rand.Reader, new(big.Int).Lsh(big.NewInt(1), 128))
|
|
if err != nil {
|
|
return nil, nil, cosy.WrapErrorWithParams(ErrSelfSignedCreateCert, err.Error())
|
|
}
|
|
|
|
now := time.Now()
|
|
// ECDSA keys do not perform key encipherment; only RSA keys get that bit.
|
|
keyUsage := x509.KeyUsageDigitalSignature
|
|
if _, isRSA := signer.Public().(*rsa.PublicKey); isRSA {
|
|
keyUsage |= x509.KeyUsageKeyEncipherment
|
|
}
|
|
|
|
template := &x509.Certificate{
|
|
SerialNumber: serialNumber,
|
|
Subject: pkix.Name{CommonName: opts.CommonName},
|
|
DNSNames: opts.DNSNames,
|
|
IPAddresses: ipAddresses,
|
|
NotBefore: now.Add(-selfSignedClockSkewBackdate),
|
|
NotAfter: now.AddDate(0, 0, validityDays),
|
|
KeyUsage: keyUsage,
|
|
ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
|
|
BasicConstraintsValid: true,
|
|
IsCA: false,
|
|
}
|
|
|
|
der, err := x509.CreateCertificate(rand.Reader, template, template, signer.Public(), signer)
|
|
if err != nil {
|
|
return nil, nil, cosy.WrapErrorWithParams(ErrSelfSignedCreateCert, err.Error())
|
|
}
|
|
|
|
keyDER, err := x509.MarshalPKCS8PrivateKey(signer)
|
|
if err != nil {
|
|
return nil, nil, cosy.WrapErrorWithParams(ErrSelfSignedCreateCert, err.Error())
|
|
}
|
|
|
|
certPEM = pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: der})
|
|
keyPEM = pem.EncodeToMemory(&pem.Block{Type: "PRIVATE KEY", Bytes: keyDER})
|
|
return certPEM, keyPEM, nil
|
|
}
|
|
|
|
// RegenerateSelfSigned re-issues an existing self-signed certificate for the
|
|
// auto-renewal job. It reuses the private key currently on disk when it can be
|
|
// parsed; otherwise it generates a fresh key.
|
|
func RegenerateSelfSigned(certModel *model.Cert) (certPEM, keyPEM []byte, err error) {
|
|
opts := SelfSignedOptionsFromModel(certModel)
|
|
return RegenerateSelfSignedWithOptions(certModel, opts)
|
|
}
|
|
|
|
// RegenerateSelfSignedWithOptions re-issues an existing self-signed certificate
|
|
// with caller-provided options while reusing the private key when possible.
|
|
func RegenerateSelfSignedWithOptions(certModel *model.Cert, opts SelfSignedOptions) (certPEM, keyPEM []byte, err error) {
|
|
signer, parseErr := loadSelfSignedKey(certModel.SSLCertificateKeyPath)
|
|
if parseErr != nil || signer == nil {
|
|
// Fall back to a fresh key when the existing key cannot be reused.
|
|
// Log a warning so operators notice that the certificate's public key
|
|
// (and therefore its fingerprint) has changed.
|
|
logger.Warnf("self-signed key %s could not be reused, generating a fresh key: %v",
|
|
certModel.SSLCertificateKeyPath, parseErr)
|
|
return GenerateSelfSigned(opts)
|
|
}
|
|
return signSelfSigned(opts, signer)
|
|
}
|
|
|
|
// SelfSignedOptionsFromModel builds SelfSignedOptions from a persisted Cert.
|
|
// The model's slices are defensively copied so options consumers cannot
|
|
// observe concurrent mutations on the persisted Cert.
|
|
func SelfSignedOptionsFromModel(certModel *model.Cert) SelfSignedOptions {
|
|
opts := SelfSignedOptions{
|
|
DNSNames: append([]string(nil), certModel.Domains...),
|
|
KeyType: certModel.GetKeyType(),
|
|
ValidityDays: SelfSignedDefaultValidityDays,
|
|
}
|
|
if certModel.SelfSignedConfig != nil {
|
|
opts.IPAddresses = append([]string(nil), certModel.SelfSignedConfig.IPAddresses...)
|
|
if certModel.SelfSignedConfig.ValidityDays > 0 {
|
|
opts.ValidityDays = certModel.SelfSignedConfig.ValidityDays
|
|
}
|
|
}
|
|
opts.CommonName = deriveSelfSignedCommonName(opts.DNSNames, opts.IPAddresses)
|
|
return opts
|
|
}
|
|
|
|
// deriveSelfSignedCommonName picks the certificate common name: the first DNS
|
|
// name, or the first IP address when no DNS name is present.
|
|
func deriveSelfSignedCommonName(dnsNames, ipAddresses []string) string {
|
|
for _, name := range dnsNames {
|
|
if name != "" {
|
|
return name
|
|
}
|
|
}
|
|
for _, ip := range ipAddresses {
|
|
if ip != "" {
|
|
return ip
|
|
}
|
|
}
|
|
return ""
|
|
}
|
|
|
|
// loadSelfSignedKey reads and parses the private key at the given path.
|
|
func loadSelfSignedKey(path string) (crypto.Signer, error) {
|
|
if path == "" {
|
|
return nil, ErrCertPathIsEmpty
|
|
}
|
|
pemBytes, err := os.ReadFile(path)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return certcrypto.ParsePEMPrivateKey(pemBytes)
|
|
}
|