Files
caddy-proxy-manager/app/(dashboard)/certificates/page.tsx
fuomag9 92fa1cb9d8 Fix duplicate certificate display for wildcard-covered subdomains
When a wildcard cert (e.g. *.domain.de) existed and a proxy host was created
for a subdomain (e.g. sub.domain.de) without explicitly linking it, the
certificates page showed it as a separate ACME entry. Now hosts covered by
an existing wildcard cert are attributed to that cert's "Used by" list instead.

Closes #110

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-04-18 12:10:17 +02:00

227 lines
7.2 KiB
TypeScript

import { X509Certificate } from 'node:crypto';
import db from '@/src/lib/db';
import { proxyHosts, certificates } from '@/src/lib/db/schema';
import { isNull, isNotNull, count } from 'drizzle-orm';
import { requireAdmin } from '@/src/lib/auth';
import CertificatesClient from './CertificatesClient';
import { listCaCertificates, type CaCertificate } from '@/src/lib/models/ca-certificates';
import { listIssuedClientCertificates, type IssuedClientCertificate } from '@/src/lib/models/issued-client-certificates';
import { listMtlsRoles, type MtlsRole } from '@/src/lib/models/mtls-roles';
import { isDomainCoveredByCert } from '@/src/lib/cert-domain-match';
export type { CaCertificate };
export type { IssuedClientCertificate };
export type { MtlsRole };
export type CaCertificateView = CaCertificate & {
issuedCerts: IssuedClientCertificate[];
};
export type CertExpiryStatus = 'ok' | 'expiring_soon' | 'expired';
export type AcmeHost = {
id: number;
name: string;
domains: string[];
sslForced: boolean;
enabled: boolean;
};
export type ImportedCertView = {
id: number;
name: string;
domains: string[];
validTo: string | null;
validFrom: string | null;
issuer: string | null;
expiryStatus: CertExpiryStatus | null;
usedBy: { id: number; name: string; domains: string[] }[];
};
export type ManagedCertView = { id: number; name: string; domainNames: string[] };
const PER_PAGE = 25;
interface PageProps {
searchParams: Promise<{ page?: string }>;
}
function parsePemInfo(pem: string): { validTo: string; validFrom: string; issuer: string; sanDomains: string[] } | null {
try {
const c = new X509Certificate(pem);
const sanDomains =
c.subjectAltName
?.split(',')
.map(s => s.trim())
.filter(s => s.startsWith('DNS:'))
.map(s => s.slice(4)) ?? [];
const issuerLine = c.issuer ?? '';
const issuer = (
issuerLine.match(/O=([^\n,]+)/)?.[1] ??
issuerLine.match(/CN=([^\n,]+)/)?.[1] ??
issuerLine
).trim();
return {
validTo: new Date(c.validTo).toISOString(),
validFrom: new Date(c.validFrom).toISOString(),
issuer,
sanDomains,
};
} catch {
return null;
}
}
function getExpiryStatus(validToIso: string): CertExpiryStatus {
const diff = new Date(validToIso).getTime() - Date.now();
if (diff < 0) return 'expired';
if (diff < 30 * 86400 * 1000) return 'expiring_soon';
return 'ok';
}
export default async function CertificatesPage({ searchParams }: PageProps) {
await requireAdmin();
const { page: pageParam } = await searchParams;
const page = Math.max(1, parseInt(pageParam ?? "1", 10) || 1);
const offset = (page - 1) * PER_PAGE;
const [caCerts, issuedClientCerts] = await Promise.all([
listCaCertificates(),
listIssuedClientCertificates(),
]);
const mtlsRoles = await listMtlsRoles().catch(() => []);
const [acmeRows, acmeTotal, certRows, usageRows] = await Promise.all([
db
.select({
id: proxyHosts.id,
name: proxyHosts.name,
domains: proxyHosts.domains,
sslForced: proxyHosts.sslForced,
enabled: proxyHosts.enabled,
})
.from(proxyHosts)
.where(isNull(proxyHosts.certificateId))
.orderBy(proxyHosts.name)
.limit(PER_PAGE)
.offset(offset),
db
.select({ value: count() })
.from(proxyHosts)
.where(isNull(proxyHosts.certificateId))
.then(([r]) => r?.value ?? 0),
db.select().from(certificates),
db
.select({
certId: proxyHosts.certificateId,
hostId: proxyHosts.id,
hostName: proxyHosts.name,
hostDomains: proxyHosts.domains,
})
.from(proxyHosts)
.where(isNotNull(proxyHosts.certificateId)),
]);
const acmeHosts: AcmeHost[] = acmeRows.map(r => ({
id: r.id,
name: r.name,
domains: JSON.parse(r.domains) as string[],
sslForced: r.sslForced,
enabled: r.enabled,
}));
const usageMap = new Map<number, { id: number; name: string; domains: string[] }[]>();
for (const u of usageRows) {
if (u.certId == null) continue;
const hosts = usageMap.get(u.certId) ?? [];
hosts.push({
id: u.hostId,
name: u.hostName,
domains: JSON.parse(u.hostDomains) as string[],
});
usageMap.set(u.certId, hosts);
}
// Build a map of cert ID -> its domain list (including wildcard entries)
const certDomainMap = new Map<number, string[]>();
for (const cert of certRows) {
const domainNames = JSON.parse(cert.domainNames) as string[];
// For imported certs, also check PEM SANs which may include wildcards
if (cert.type === 'imported' && cert.certificatePem) {
const pemInfo = parsePemInfo(cert.certificatePem);
if (pemInfo?.sanDomains.length) {
certDomainMap.set(cert.id, pemInfo.sanDomains);
continue;
}
}
certDomainMap.set(cert.id, domainNames);
}
// Filter out ACME hosts whose domains are fully covered by an existing certificate's wildcard,
// and attribute them to that certificate's usedBy list instead.
let adjustedAcmeTotal = acmeTotal;
const filteredAcmeHosts: AcmeHost[] = [];
for (const host of acmeHosts) {
let coveredByCertId: number | null = null;
for (const [certId, certDomains] of certDomainMap) {
if (host.domains.every(d => isDomainCoveredByCert(d, certDomains))) {
coveredByCertId = certId;
break;
}
}
if (coveredByCertId !== null) {
// Move this host to the cert's usedBy list
const hosts = usageMap.get(coveredByCertId) ?? [];
hosts.push({ id: host.id, name: host.name, domains: host.domains });
usageMap.set(coveredByCertId, hosts);
adjustedAcmeTotal--;
} else {
filteredAcmeHosts.push(host);
}
}
const importedCerts: ImportedCertView[] = [];
const managedCerts: ManagedCertView[] = [];
const issuedByCa = issuedClientCerts.reduce<Map<number, IssuedClientCertificate[]>>((map, cert) => {
const current = map.get(cert.caCertificateId) ?? [];
current.push(cert);
map.set(cert.caCertificateId, current);
return map;
}, new Map());
const caCertificateViews: CaCertificateView[] = caCerts.map((cert) => ({
...cert,
issuedCerts: issuedByCa.get(cert.id) ?? [],
}));
for (const cert of certRows) {
const domainNames = JSON.parse(cert.domainNames) as string[];
if (cert.type === 'imported') {
const pemInfo = cert.certificatePem ? parsePemInfo(cert.certificatePem) : null;
importedCerts.push({
id: cert.id,
name: cert.name,
domains: pemInfo?.sanDomains.length ? pemInfo.sanDomains : domainNames,
validTo: pemInfo?.validTo ?? null,
validFrom: pemInfo?.validFrom ?? null,
issuer: pemInfo?.issuer ?? null,
expiryStatus: pemInfo?.validTo ? getExpiryStatus(pemInfo.validTo) : null,
usedBy: usageMap.get(cert.id) ?? [],
});
} else {
managedCerts.push({ id: cert.id, name: cert.name, domainNames: domainNames });
}
}
return (
<CertificatesClient
acmeHosts={filteredAcmeHosts}
importedCerts={importedCerts}
managedCerts={managedCerts}
caCertificates={caCertificateViews}
acmePagination={{ total: adjustedAcmeTotal, page, perPage: PER_PAGE }}
mtlsRoles={mtlsRoles}
issuedClientCerts={issuedClientCerts}
/>
);
}