calvin.erfmann/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-05-22 08:45:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Catch the domains the right way

Browse Source
This commit is contained in:
Owen
2026-04-24 13:40:31 -07:00
parent 0473d5f639
commit 48ddc700a0
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/private/routers/certificates/getCertificate.ts
View File

@@ -41,7 +41,7 @@ async function query(domainId: string, domain: string) {
} }
let existing: any[] = []; let existing: any[] = [];
if (domainRecord.type == "ns" || domainRecord.type == "wildcard") { // the manual "wildcard" domains can have wildcard certs if (domainRecord.type == "ns" || domainRecord.type == "wildcard") {
const domainLevelDown = domain.split(".").slice(1).join("."); const domainLevelDown = domain.split(".").slice(1).join(".");
const wildcardPrefixed = `*.${domainLevelDown}`; const wildcardPrefixed = `*.${domainLevelDown}`;
@@ -64,10 +64,15 @@ async function query(domainId: string, domain: string) {
eq(certificates.domainId, domainId), eq(certificates.domainId, domainId),
or( or(
eq(certificates.domain, domain), eq(certificates.domain, domain),
and(
eq(certificates.wildcard, true),
or(
eq(certificates.domain, domainLevelDown), eq(certificates.domain, domainLevelDown),
eq(certificates.domain, wildcardPrefixed) eq(certificates.domain, wildcardPrefixed)
) )
) )
)
)
); );
} else { } else {
// For non-NS domains, we only match exact domain names // For non-NS domains, we only match exact domain names