Fix duplicate ACME entries for subdomains covered by wildcard ACME host

The previous fix (92fa1cb) only collapsed subdomains when an explicit
managed/imported certificate had a wildcard. When all hosts use Caddy
Auto (no certificate assigned), the wildcard ACME host was not checked
against sibling subdomain hosts, so each showed as a separate entry.

Also adds a startup migration to rename the stored IONOS DNS credential
key from api_token to auth_api_token for users who configured IONOS
before ef62ef2.

Closes #110

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
fuomag9
2026-04-20 18:04:38 +02:00
parent 96bac86934
commit 6515da666f
3 changed files with 108 additions and 1 deletions

View File

@@ -180,6 +180,28 @@ export default async function CertificatesPage({ searchParams }: PageProps) {
}
}
// Among ACME auto-managed hosts, collapse subdomain hosts under wildcard hosts.
// e.g. if *.domain.de is an ACME host, sub.domain.de should not appear separately.
const wildcardAcmeHosts = filteredAcmeHosts.filter(h => h.domains.some(d => d.startsWith('*.')));
const wildcardDomainSets = wildcardAcmeHosts.map(h => h.domains);
const deduplicatedAcmeHosts: AcmeHost[] = [];
for (const host of filteredAcmeHosts) {
// Never collapse a host that itself has a wildcard domain
if (host.domains.some(d => d.startsWith('*.'))) {
deduplicatedAcmeHosts.push(host);
continue;
}
// Check if all of this host's domains are covered by any wildcard ACME host
const coveredByWildcard = wildcardDomainSets.some(wcDomains =>
host.domains.every(d => isDomainCoveredByCert(d, wcDomains))
);
if (coveredByWildcard) {
adjustedAcmeTotal--;
} else {
deduplicatedAcmeHosts.push(host);
}
}
const importedCerts: ImportedCertView[] = [];
const managedCerts: ManagedCertView[] = [];
const issuedByCa = issuedClientCerts.reduce<Map<number, IssuedClientCertificate[]>>((map, cert) => {
@@ -214,7 +236,7 @@ export default async function CertificatesPage({ searchParams }: PageProps) {
return (
<CertificatesClient
acmeHosts={filteredAcmeHosts}
acmeHosts={deduplicatedAcmeHosts}
importedCerts={importedCerts}
managedCerts={managedCerts}
caCertificates={caCertificateViews}