Refactor certificate output parsing and add unit tests for parseCertOutput function

This commit is contained in:
2026-07-11 23:25:47 +00:00
parent 5d8fe6a754
commit ff6d6bbd0b
3 changed files with 61 additions and 5 deletions

View File

@@ -126,7 +126,15 @@ func (m *Manager) GetStatus(domain string) *CertStatus {
return status return status
} }
for line := range strings.SplitSeq(string(out), "\n") { parseCertOutput(string(out), status)
return status
}
// parseCertOutput parses the output of `openssl x509 -noout -enddate -issuer -subject`
// and populates the given CertStatus.
func parseCertOutput(output string, status *CertStatus) {
for line := range strings.SplitSeq(output, "\n") {
line = strings.TrimSpace(line) line = strings.TrimSpace(line)
if strings.HasPrefix(line, "notAfter=") { if strings.HasPrefix(line, "notAfter=") {
dateStr := strings.TrimPrefix(line, "notAfter=") dateStr := strings.TrimPrefix(line, "notAfter=")
@@ -142,13 +150,11 @@ func (m *Manager) GetStatus(domain string) *CertStatus {
status.IssuerCN = strings.TrimPrefix(line, "issuer=") status.IssuerCN = strings.TrimPrefix(line, "issuer=")
} }
if strings.HasPrefix(line, "subject=") { if strings.HasPrefix(line, "subject=") {
if strings.Contains(line, "CN = *.") { if strings.Contains(line, "CN=*.") || strings.Contains(line, "CN = *.") {
status.Wildcard = true status.Wildcard = true
} }
} }
} }
return status
} }
// CertPath returns the fullchain.pem path for a domain. // CertPath returns the fullchain.pem path for a domain.

View File

@@ -70,3 +70,53 @@ func TestEnsureCredentials_EmptyToken(t *testing.T) {
t.Error("expected error for empty token") t.Error("expected error for empty token")
} }
} }
func TestParseCertOutput(t *testing.T) {
tests := []struct {
name string
output string
wildcard bool
issuer string
}{
{
name: "wildcard cert (no spaces around =)",
output: "subject=CN=*.cloud.payne.io\nnotAfter=Sep 4 23:22:30 2026 GMT\nissuer=C=US, O=Let's Encrypt, CN=YR1\n",
wildcard: true,
issuer: "C=US, O=Let's Encrypt, CN=YR1",
},
{
name: "wildcard cert (spaces around =)",
output: "subject=CN = *.example.com\nnotAfter=Jan 15 12:00:00 2027 GMT\nissuer=CN=R3\n",
wildcard: true,
issuer: "CN=R3",
},
{
name: "single domain cert",
output: "subject=CN=example.com\nnotAfter=Jan 15 12:00:00 2027 GMT\nissuer=CN=R3\n",
wildcard: false,
issuer: "CN=R3",
},
{
name: "single domain with subdomain",
output: "subject=CN=app.example.com\nnotAfter=Jan 15 12:00:00 2027 GMT\nissuer=CN=R3\n",
wildcard: false,
issuer: "CN=R3",
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
status := &CertStatus{}
parseCertOutput(tt.output, status)
if status.Wildcard != tt.wildcard {
t.Errorf("Wildcard = %v, want %v", status.Wildcard, tt.wildcard)
}
if status.IssuerCN != tt.issuer {
t.Errorf("IssuerCN = %q, want %q", status.IssuerCN, tt.issuer)
}
if status.Expiry.IsZero() {
t.Error("Expiry should be parsed")
}
})
}
}

View File

@@ -255,7 +255,7 @@ function FlowNode({ data }: NodeProps) {
tooltip={ tooltip={
hasCert ? ( hasCert ? (
<div className="space-y-1"> <div className="space-y-1">
<div>Certificate: {certDomain} ({isWildcard ? 'wildcard' : 'single domain'})</div> <div>Certificate: {certDomain}</div>
<div>Expires: {expiry ?? 'unknown'} ({daysLeft}d)</div> <div>Expires: {expiry ?? 'unknown'} ({daysLeft}d)</div>
{issuer && <div>Issuer: {issuer}</div>} {issuer && <div>Issuer: {issuer}</div>}
</div> </div>