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>
201 lines
5.8 KiB
Go
201 lines
5.8 KiB
Go
package certificate
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"errors"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
"sync"
|
|
"testing"
|
|
|
|
"github.com/0xJacky/Nginx-UI/internal/cert"
|
|
"github.com/0xJacky/Nginx-UI/internal/validation"
|
|
"github.com/0xJacky/Nginx-UI/model"
|
|
"github.com/0xJacky/Nginx-UI/query"
|
|
"github.com/0xJacky/Nginx-UI/settings"
|
|
"github.com/gin-gonic/gin"
|
|
"github.com/go-acme/lego/v5/certcrypto"
|
|
"gorm.io/driver/sqlite"
|
|
"gorm.io/gorm"
|
|
)
|
|
|
|
var selfSignedValidationOnce sync.Once
|
|
|
|
func setupSelfSignedAPITest(t *testing.T) *gorm.DB {
|
|
t.Helper()
|
|
|
|
gin.SetMode(gin.TestMode)
|
|
selfSignedValidationOnce.Do(validation.Init)
|
|
|
|
db, err := gorm.Open(sqlite.Open("file:"+t.Name()+"?mode=memory&cache=shared"), &gorm.Config{})
|
|
if err != nil {
|
|
t.Fatalf("open test db: %v", err)
|
|
}
|
|
if err := db.AutoMigrate(&model.Cert{}); err != nil {
|
|
t.Fatalf("migrate test db: %v", err)
|
|
}
|
|
|
|
model.Use(db)
|
|
query.Use(db)
|
|
query.SetDefault(db)
|
|
|
|
return db
|
|
}
|
|
|
|
func TestSelfSignedSlugSanitizesPathTraversal(t *testing.T) {
|
|
if got := selfSignedSlug("../../etc"); got != "etc" {
|
|
t.Fatalf("selfSignedSlug() = %q, want %q", got, "etc")
|
|
}
|
|
}
|
|
|
|
func TestSelfSignedSlugFallsBackForEmptyInput(t *testing.T) {
|
|
if got := selfSignedSlug(""); got != defaultSelfSignedSlug {
|
|
t.Fatalf("selfSignedSlug() = %q, want %q", got, defaultSelfSignedSlug)
|
|
}
|
|
}
|
|
|
|
func TestSelfSignedSlugConvertsIDNToPunycode(t *testing.T) {
|
|
if got := selfSignedSlug("例如.test"); got != "xn--fsqu6v.test" {
|
|
t.Fatalf("selfSignedSlug() = %q, want %q", got, "xn--fsqu6v.test")
|
|
}
|
|
}
|
|
|
|
func TestBuildSelfSignedOptionsRejectsEmptySAN(t *testing.T) {
|
|
_, err := buildSelfSignedOptions(&SelfSignedCertRequest{
|
|
Domains: []string{" ", "\t"},
|
|
IPAddresses: []string{""},
|
|
})
|
|
if !errors.Is(err, cert.ErrSelfSignedNoSAN) {
|
|
t.Fatalf("buildSelfSignedOptions() error = %v, want %v", err, cert.ErrSelfSignedNoSAN)
|
|
}
|
|
}
|
|
|
|
func TestBuildSelfSignedOptionsNormalizesValues(t *testing.T) {
|
|
opts, err := buildSelfSignedOptions(&SelfSignedCertRequest{
|
|
Domains: []string{" example.com ", "", "www.example.com"},
|
|
IPAddresses: []string{" 127.0.0.1 "},
|
|
KeyType: string(certcrypto.EC256),
|
|
ValidityDays: 30,
|
|
})
|
|
if err != nil {
|
|
t.Fatalf("buildSelfSignedOptions() error = %v", err)
|
|
}
|
|
if opts.CommonName != "example.com" {
|
|
t.Fatalf("CommonName = %q, want %q", opts.CommonName, "example.com")
|
|
}
|
|
if len(opts.DNSNames) != 2 || opts.DNSNames[0] != "example.com" || opts.DNSNames[1] != "www.example.com" {
|
|
t.Fatalf("DNSNames = %#v, want normalized domains", opts.DNSNames)
|
|
}
|
|
if len(opts.IPAddresses) != 1 || opts.IPAddresses[0] != "127.0.0.1" {
|
|
t.Fatalf("IPAddresses = %#v, want normalized IP", opts.IPAddresses)
|
|
}
|
|
}
|
|
|
|
func TestGenerateSelfSignedCertRollsBackDBOnFileWriteFailure(t *testing.T) {
|
|
db := setupSelfSignedAPITest(t)
|
|
|
|
originalConfigDir := settings.NginxSettings.ConfigDir
|
|
blockedBase := filepath.Join(t.TempDir(), "nginx.conf.d")
|
|
if err := os.WriteFile(blockedBase, []byte("not a directory"), 0o644); err != nil {
|
|
t.Fatalf("write blocking file: %v", err)
|
|
}
|
|
settings.NginxSettings.ConfigDir = blockedBase
|
|
t.Cleanup(func() {
|
|
settings.NginxSettings.ConfigDir = originalConfigDir
|
|
})
|
|
|
|
router := gin.New()
|
|
router.POST("/self_signed_cert", GenerateSelfSignedCert)
|
|
|
|
body, err := json.Marshal(SelfSignedCertRequest{
|
|
Name: "rollback-test",
|
|
Domains: []string{"rollback.example"},
|
|
KeyType: string(certcrypto.EC256),
|
|
ValidityDays: 30,
|
|
})
|
|
if err != nil {
|
|
t.Fatalf("marshal request: %v", err)
|
|
}
|
|
|
|
recorder := httptest.NewRecorder()
|
|
req := httptest.NewRequest(http.MethodPost, "/self_signed_cert", bytes.NewReader(body))
|
|
req.Header.Set("Content-Type", "application/json")
|
|
router.ServeHTTP(recorder, req)
|
|
|
|
if recorder.Code == http.StatusOK {
|
|
t.Fatalf("expected write failure response, got HTTP %d", recorder.Code)
|
|
}
|
|
|
|
var count int64
|
|
if err := db.Model(&model.Cert{}).Count(&count).Error; err != nil {
|
|
t.Fatalf("count cert rows: %v", err)
|
|
}
|
|
if count != 0 {
|
|
t.Fatalf("expected DB rollback to remove cert row, got %d rows", count)
|
|
}
|
|
}
|
|
|
|
func TestCleanupSelfSignedCertFilesRemovesManagedDirectory(t *testing.T) {
|
|
originalConfigDir := settings.NginxSettings.ConfigDir
|
|
confDir := t.TempDir()
|
|
settings.NginxSettings.ConfigDir = confDir
|
|
t.Cleanup(func() {
|
|
settings.NginxSettings.ConfigDir = originalConfigDir
|
|
})
|
|
|
|
certDir := filepath.Join(confDir, "ssl", "example_1")
|
|
if err := os.MkdirAll(certDir, 0o755); err != nil {
|
|
t.Fatalf("create cert dir: %v", err)
|
|
}
|
|
certPath := filepath.Join(certDir, "fullchain.cer")
|
|
keyPath := filepath.Join(certDir, "private.key")
|
|
if err := os.WriteFile(certPath, []byte("cert"), 0o644); err != nil {
|
|
t.Fatalf("write cert: %v", err)
|
|
}
|
|
if err := os.WriteFile(keyPath, []byte("key"), 0o600); err != nil {
|
|
t.Fatalf("write key: %v", err)
|
|
}
|
|
|
|
cleanupSelfSignedCertFiles(&model.Cert{
|
|
AutoCert: model.AutoCertSelfSigned,
|
|
SSLCertificatePath: certPath,
|
|
SSLCertificateKeyPath: keyPath,
|
|
})
|
|
|
|
if _, err := os.Stat(certDir); !os.IsNotExist(err) {
|
|
t.Fatalf("expected managed cert directory to be removed, stat err: %v", err)
|
|
}
|
|
}
|
|
|
|
func TestGenerateSelfSignedCertRejectsEmptyName(t *testing.T) {
|
|
setupSelfSignedAPITest(t)
|
|
|
|
router := gin.New()
|
|
router.POST("/self_signed_cert", GenerateSelfSignedCert)
|
|
|
|
body, err := json.Marshal(SelfSignedCertRequest{
|
|
Domains: []string{"named.example"},
|
|
KeyType: string(certcrypto.EC256),
|
|
ValidityDays: 30,
|
|
})
|
|
if err != nil {
|
|
t.Fatalf("marshal request: %v", err)
|
|
}
|
|
|
|
req := httptest.NewRequest(http.MethodPost, "/self_signed_cert", bytes.NewReader(body))
|
|
req.Header.Set("Content-Type", "application/json")
|
|
rec := httptest.NewRecorder()
|
|
router.ServeHTTP(rec, req)
|
|
|
|
if rec.Code < 400 || rec.Code >= 500 {
|
|
t.Fatalf("status = %d, want a 4xx for missing name", rec.Code)
|
|
}
|
|
if !strings.Contains(strings.ToLower(rec.Body.String()), "name") {
|
|
t.Fatalf("response body %q did not mention the missing name field", rec.Body.String())
|
|
}
|
|
}
|