Merge branch 'master' into next60

.vscode/launch.json

@@ -1,19 +1,24 @@
 {
     "version": "0.2.0",
     "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",
-            "name": "start-server",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
+            "restart": true,
+            "runtimeExecutable": "nodemon",
             "env": {
                 "TRILIUM_ENV": "dev",
                 "TRILIUM_DATA_DIR": "./data"
             },
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "type": "node",
             "outputCapture": "std",
-            "program": "${workspaceFolder}/src/www"
-        }
+        },
     ]
 }

src/routes/custom.js

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

src/routes/login.js

@@ -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
         log.info(`WARNING: Wrong password from ${req.ip}, rejecting.`);
 
-        res.render('login', {
+        res.status(401).render('login', {
             failedAuth: true,
             assetPath: assetPath
         });