gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into next60

Browse Source
This commit is contained in:
zadam 2023-04-24 20:21:45 +02:00
commit 4b074365e7
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.vscode/launch.json vendored
View File

@ -1,19 +1,24 @@
{ {
"version": "0.2.0", "version": "0.2.0",
"configurations": [ "configurations": [
// nodemon should be installed globally, use npm i -g nodemon
{ {
"type": "node", "console": "integratedTerminal",
"internalConsoleOptions": "neverOpen",
"name": "nodemon start-server",
"program": "${workspaceFolder}/src/www",
"request": "launch", "request": "launch",
"name": "start-server", "restart": true,
"skipFiles": [ "runtimeExecutable": "nodemon",
"<node_internals>/**"
],
"env": { "env": {
"TRILIUM_ENV": "dev", "TRILIUM_ENV": "dev",
"TRILIUM_DATA_DIR": "./data" "TRILIUM_DATA_DIR": "./data"
}, },
"skipFiles": [
"<node_internals>/**"
],
"type": "node",
"outputCapture": "std", "outputCapture": "std",
"program": "${workspaceFolder}/src/www" },
}
] ]
} }

2
src/routes/custom.js
View File

@ -19,7 +19,7 @@ function handleRequest(req, res) {
continue; continue;
} }
const regex = new RegExp(attr.value); const regex = new RegExp(`^${attr.value}$`);
let match; let match;
try { try {

2
src/routes/login.js
View File

@ -76,7 +76,7 @@ function login(req, res) {
// note that logged IP address is usually meaningless since the traffic should come from a reverse proxy // note that logged IP address is usually meaningless since the traffic should come from a reverse proxy
log.info(`WARNING: Wrong password from ${req.ip}, rejecting.`); log.info(`WARNING: Wrong password from ${req.ip}, rejecting.`);
res.render('login', { res.status(401).render('login', {
failedAuth: true, failedAuth: true,
assetPath: assetPath assetPath: assetPath
}); });