Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-12 16:25:51 +01:00
Code Issues Packages Projects Releases Activity

feat(server): lint for trailing slashes in sync URL and extra slashes in customRequestHandler

Browse Source
This commit is contained in:
perf3ct
2025-06-17 19:37:40 +00:00
parent 2c87721953
commit 0fe89115d1
3 changed files with 103 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
apps/server/src/routes/custom.ts
View File

@@ -5,7 +5,7 @@ import cls from "../services/cls.js";
import sql from "../services/sql.js";
import becca from "../becca/becca.js";
import type { Request, Response, Router } from "express";
import { safeExtractMessageAndStackFromError } from "../services/utils.js";
import { safeExtractMessageAndStackFromError, normalizeCustomHandlerPattern } from "../services/utils.js";
function handleRequest(req: Request, res: Response) {
@@ -38,15 +38,23 @@ function handleRequest(req: Request, res: Response) {
continue;
}
const regex = new RegExp(`^${attr.value}$`);
let match;
// Get normalized patterns to handle both trailing slash cases
const patterns = normalizeCustomHandlerPattern(attr.value);
let match = null;
try {
match = path.match(regex);
} catch (e: unknown) {
const [errMessage, errStack] = safeExtractMessageAndStackFromError(e);
log.error(`Testing path for label '${attr.attributeId}', regex '${attr.value}' failed with error: ${errMessage}, stack: ${errStack}`);
continue;
// Try each pattern until we find a match
for (const pattern of patterns) {
try {
const regex = new RegExp(`^${pattern}$`);
match = path.match(regex);
if (match) {
break; // Found a match, exit pattern loop
}
} catch (e: unknown) {
const [errMessage, errStack] = safeExtractMessageAndStackFromError(e);
log.error(`Testing path for label '${attr.attributeId}', regex '${pattern}' failed with error: ${errMessage}, stack: ${errStack}`);
continue;
}
}
if (!match) {