Clean off ports for 80 and 443 hosts

This commit is contained in:
Owen 2025-02-15 17:48:27 -05:00
parent b862e1aeef
commit 7bf820a4bf
No known key found for this signature in database
GPG key ID: 8271FDFFD9E0CCBD

View file

@ -90,7 +90,15 @@ export async function verifyResourceSession(
const clientIp = requestIp?.split(":")[0]; const clientIp = requestIp?.split(":")[0];
const resourceCacheKey = `resource:${host}`; let cleanHost = host;
// if the host ends with :443 or :80 remove it
if (cleanHost.endsWith(":443")) {
cleanHost = cleanHost.slice(0, -4);
} else if (cleanHost.endsWith(":80")) {
cleanHost = cleanHost.slice(0, -3);
}
const resourceCacheKey = `resource:${cleanHost}`;
let resourceData: let resourceData:
| { | {
resource: Resource | null; resource: Resource | null;
@ -111,11 +119,11 @@ export async function verifyResourceSession(
resourcePassword, resourcePassword,
eq(resourcePassword.resourceId, resources.resourceId) eq(resourcePassword.resourceId, resources.resourceId)
) )
.where(eq(resources.fullDomain, host)) .where(eq(resources.fullDomain, cleanHost))
.limit(1); .limit(1);
if (!result) { if (!result) {
logger.debug("Resource not found", host); logger.debug("Resource not found", cleanHost);
return notAllowed(res); return notAllowed(res);
} }
@ -131,7 +139,7 @@ export async function verifyResourceSession(
const { resource, pincode, password } = resourceData; const { resource, pincode, password } = resourceData;
if (!resource) { if (!resource) {
logger.debug("Resource not found", host); logger.debug("Resource not found", cleanHost);
return notAllowed(res); return notAllowed(res);
} }