pangolin_mirror/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-03-10 12:46:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove logging

Browse Source
This commit is contained in:
Owen
2025-10-15 13:57:42 -07:00
parent ceee978fcd
commit c50392c947
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
server/private/lib/certificates.ts
View File

@@ -17,6 +17,7 @@ import { and, eq, isNotNull, or, inArray, sql } from "drizzle-orm";
import { decryptData } from "@server/lib/encryption"; import { decryptData } from "@server/lib/encryption";
import * as fs from "fs"; import * as fs from "fs";
import NodeCache from "node-cache"; import NodeCache from "node-cache";
import logger from "@server/logger";
const encryptionKeyPath = const encryptionKeyPath =
config.getRawPrivateConfig().server.encryption_key_path; config.getRawPrivateConfig().server.encryption_key_path;
@@ -69,7 +70,8 @@ export async function getValidCertificatesForDomains(
// 2. If all domains were resolved from the cache, return early // 2. If all domains were resolved from the cache, return early
if (domainsToQuery.size === 0) { if (domainsToQuery.size === 0) {
return decryptFinalResults(finalResults); const decryptedResults = decryptFinalResults(finalResults);
return decryptedResults;
} }
// 3. Prepare domains for the database query // 3. Prepare domains for the database query
@@ -126,23 +128,30 @@ export async function getValidCertificatesForDomains(
for (const domain of domainsToQuery) { for (const domain of domainsToQuery) {
let foundCert: (typeof potentialCerts)[0] | undefined = undefined; let foundCert: (typeof potentialCerts)[0] | undefined = undefined;
// Priority 1: Check for an exact match // Priority 1: Check for an exact match (non-wildcard)
if (exactMatches.has(domain)) { if (exactMatches.has(domain)) {
foundCert = exactMatches.get(domain); foundCert = exactMatches.get(domain);
} }
// Priority 2: Check for a wildcard match on the parent domain // Priority 2: Check for a wildcard certificate that matches the exact domain
else { else {
const parts = domain.split("."); if (wildcardMatches.has(domain)) {
if (parts.length > 1) { foundCert = wildcardMatches.get(domain);
const parentDomain = parts.slice(1).join("."); }
if (wildcardMatches.has(parentDomain)) { // Priority 3: Check for a wildcard match on the parent domain
foundCert = wildcardMatches.get(parentDomain); else {
const parts = domain.split(".");
if (parts.length > 1) {
const parentDomain = parts.slice(1).join(".");
if (wildcardMatches.has(parentDomain)) {
foundCert = wildcardMatches.get(parentDomain);
}
} }
} }
} }
// If a certificate was found, format it, add to results, and cache it // If a certificate was found, format it, add to results, and cache it
if (foundCert) { if (foundCert) {
logger.debug(`Creating result cert for ${domain} using cert from ${foundCert.domain}`);
const resultCert: CertificateResult = { const resultCert: CertificateResult = {
id: foundCert.certId, id: foundCert.certId,
domain: foundCert.domain, // The actual domain of the cert record domain: foundCert.domain, // The actual domain of the cert record
@@ -163,7 +172,9 @@ export async function getValidCertificatesForDomains(
} }
} }
return decryptFinalResults(finalResults);
const decryptedResults = decryptFinalResults(finalResults);
return decryptedResults;
} }
function decryptFinalResults( function decryptFinalResults(

1
server/private/lib/traefik/getTraefikConfig.ts
View File

@@ -224,6 +224,7 @@ export async function getTraefikConfig(
} }
// get the valid certs for these domains // get the valid certs for these domains
validCerts = await getValidCertificatesForDomains(domains, true); // we are caching here because this is called often validCerts = await getValidCertificatesForDomains(domains, true); // we are caching here because this is called often
logger.debug(`Valid certs for domains: ${JSON.stringify(validCerts)}`);
} }
const config_output: any = { const config_output: any = {