feat: logs for remote access

access.js

@@ -23,7 +23,25 @@ export async function checkAccess(db, userId, doorId) {
 }
 
 export async function recordAudit(db, entry) {
-  db.collection("auditLogs").insertOne({ ...entry, timestamp: new Date() }).catch((err) => {
+  return db.collection("auditLogs").insertOne({ ...entry, timestamp: new Date() }).catch((err) => {
     console.error("Failed to write audit entry", err);
+    throw err;
+  });
+}
+
+export async function recordDoorUnlock(db, { doorId, doorName, username, name }) {
+  return db.collection("accessLogs").insertOne({
+    timestamp: new Date(),
+    door: doorId,
+    doorName: doorName,
+    username,
+    name: name,
+    doorsId: null,
+    keyId: null,
+    uid: null,
+    granted: true,
+  }).catch((err) => {
+    console.error("Failed to write accessLogs", err);
+    throw err;
   });
 }

routes/doors.js

@@ -1,23 +1,34 @@
 import { Router } from "express";
 import { doorHeartbeats } from "../state.js";
-import { checkAccess } from "../access.js";
+import { checkAccess, recordDoorUnlock } from "../access.js";
+import { ObjectId } from "mongodb";
 
 const router = Router();
 
-router.get("/:doorId/status", (req, res) => {
+function getDoorStatus(doorId){
   // If it's been more than 1 minute, we assume something is broken...
-  const lastHeartbeat = doorHeartbeats.get(req.params.doorId);
+  const lastHeartbeat = doorHeartbeats.get(doorId);
   if (lastHeartbeat) {
-    res.json({
+    return {
       guess: Date.now() - lastHeartbeat > 1000 * 60 ? "offline" : "online",
       lastHeartbeat,
-    });
+    };
   } else {
-    res.json({
+    return {
       guess: "offline",
       lastHeartbeat: 0,
-    });
+    };
   }
+}
+
+function isDoorOffline(doorId) {
+    const lastHeartbeat = doorHeartbeats.get(doorId);
+    if (!lastHeartbeat) return true;
+    return Date.now() - lastHeartbeat > 1000 * 60;
+}
+
+router.get("/:doorId/status", (req, res) => {
+  res.json(getDoorStatus(req.params.doorId));
 });
 
 router.get("/", async (req, res) => {
@@ -46,6 +57,23 @@ router.post("/:doorId/unlock", async (req, res) => {
       return res.status(403).json({ message: "Access denied" });
     }
   }
+
+  if (isDoorOffline(req.params.doorId)) {
+    return res.status(400).json({ message: "Door is offline" });
+  }
+
+  if (req.ctx.authMethod === "oidc") {
+    const doorId = req.params.doorId;
+    const doorDoc = await req.ctx.db.collection("doors").findOne({ _id: req.params.doorId });
+
+    await recordDoorUnlock(req.ctx.db, {
+      doorId: req.params.doorId,
+      doorName: doorDoc?.name,
+      username: req.ctx.username ?? req.ctx.userId,
+      name: req.ctx.name,
+    });
+  }
+
   req.ctx.mqtt.publish(`gk/${req.params.doorId}/unlock`, "");
   res.status(204).send(null);
 });

routes/keys.js

@@ -1,36 +1,36 @@
-  import { Router } from "express";
-  import crypto from "crypto";
-  import { REALM_NAMES } from "../constants.js";
-  import { recordAudit } from "../access.js";
+import { Router } from "express";
+import crypto from "crypto";
+import { REALM_NAMES } from "../constants.js";
+import { recordAudit } from "../access.js";
 
-  const router = Router();
+const router = Router();
 
-  router.post("/access", async (req, res) => {
-      const { reason } = req.body;
-      if (typeof reason != "string" || !reason.trim()) {
-          return res.status(422).json({ message: "Missing reason field" });
-      }
-      console.log(`access: ${req.ctx.username} viewed keys || reason: ${reason}`);
-      await recordAudit(req.ctx.db, {
-        username: req.ctx.username,
-        name: req.ctx.name,
-        action: "Viewed Keys",
-        reason,
-      });
-      res.status(204).send(null);
-  });
-
-  router.get("/by-user", async (req, res) => {
-    if (typeof req.query.userId != "string") {
-      return res.status(422).json({ message: "Missing 'userId' query param" });
+router.post("/access", async (req, res) => {
+    const { reason } = req.body;
+    if (typeof reason != "string" || !reason.trim()) {
+        return res.status(422).json({ message: "Missing reason field" });
     }
-    const keys = await req.ctx.db.collection("keys").find({ userId: req.query.userId }).toArray();
-    res.json(keys);
-  });
-
-  // First, PUT /keys with details of user key is for
-  // Receive a keyId back which is our association
-  // Register key using association and send back the now-randomised UID
+    console.log(`access: ${req.ctx.username} viewed keys || reason: ${reason}`);
+    await recordAudit(req.ctx.db, {
+      username: req.ctx.username,
+      name: req.ctx.name,
+      action: "Viewed Keys",
+      reason,
+    });
+    res.status(204).send(null);
+});
+
+router.get("/by-user", async (req, res) => {
+  if (typeof req.query.userId != "string") {
+    return res.status(422).json({ message: "Missing 'userId' query param" });
+  }
+  const keys = await req.ctx.db.collection("keys").find({ userId: req.query.userId }).toArray();
+  res.json(keys);
+});
+
+// First, PUT /keys with details of user key is for
+// Receive a keyId back which is our association
+// Register key using association and send back the now-randomised UID
   // with PATCH /keys/:id
 
   router.put("/", async (req, res) => {

server.js

@@ -173,14 +173,7 @@ connectionPromise.then(async () => {
               return {};
             })
           : Promise.resolve({}),
-        db.collection("doors").findOne({
-          $or: [
-            { _id: doorId },
-            ...(ObjectId.isValid(doorId)
-              ? [{ _id: new ObjectId(doorId) }]
-              : []),
-          ],
-        }),
+        db.collection("doors").findOne({ _id: doorId }),
         checkAccess(db, key.userId, doorId),
       ]);
 
@@ -211,17 +204,6 @@ connectionPromise.then(async () => {
         console.error("Failed to insert into DB", err);
       });
 
-
-      if (granted) {
-        console.log(
-          `[${timestamp}] ${name} (${username}) is unlocking ${doorName || doorId}`
-        );
-        client.publish(`gk/${doorId}/unlock`);
-      } else {
-        console.log(
-          `[${timestamp}] Attempted unlock of ${doorName || doorId} by ${name} (${username})! Not allowed...`
-        );
-      }
     } else if (topic.endsWith("/heartbeat")) {
       const doorId = topic.slice(3, -10);
       doorHeartbeats.set(doorId, Date.now());