jxp 4.1.0 → 4.2.0

package/dist/libs/query_limits.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const errors = require("restify-errors");
+const { logRequestError } = require("./request_log");
+const { parseByteSize } = require("./parse_byte_size");
+const DEFAULT_MAX_RESPONSE_SIZE = "10mb";
+const DEFAULT_MAX_RESPONSE_BYTES = parseByteSize(DEFAULT_MAX_RESPONSE_SIZE, "query_limits.max_response_size");
 const DEFAULTS = {
     enabled: true,
     large_collection_threshold: 10000,
@@ -9,48 +13,97 @@ const DEFAULTS = {
     require_limit_always: true,
     skip_count_unless_paginated: true,
 };
+function resolveMaxResponseBytes(limits) {
+    const raw = limits.max_response_size ?? limits.max_response_bytes ?? DEFAULT_MAX_RESPONSE_SIZE;
+    try {
+        return parseByteSize(raw, "query_limits.max_response_size");
+    }
+    catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        throw new errors.BadRequestError(message);
+    }
+}
 function getLimits(req) {
     const limits = Object.assign({}, DEFAULTS, req.config?.query_limits);
     const modelLimits = req.Model?.schema?.opts?.query_limits;
     if (modelLimits && typeof modelLimits === "object") {
         Object.assign(limits, modelLimits);
     }
+    limits.max_response_bytes = resolveMaxResponseBytes(limits);
     return limits;
 }
 function parseRequestedLimit(req) {
     const n = parseInt(String(req.query.limit ?? ""), 10);
     return Number.isFinite(n) && n > 0 ? n : null;
 }
-function shouldRunCount(req) {
+function hasMeaningfulFilter(filter) {
+    if (filter == null || filter === "") {
+        return false;
+    }
+    if (typeof filter === "object" && !Array.isArray(filter)) {
+        return Object.keys(filter).length > 0;
+    }
+    return true;
+}
+/** GET ?filter= or non-empty POST /query body query */
+function hasClientFilter(req, bodyQuery) {
+    if (hasMeaningfulFilter(bodyQuery)) {
+        return true;
+    }
+    return hasMeaningfulFilter(req.query?.filter);
+}
+function shouldRunCount(req, opts = {}) {
     const limits = getLimits(req);
     if (limits.skip_count_unless_paginated === false)
         return true;
     if (req.query.count === "true" || req.query.count === true)
         return true;
     const page = parseInt(String(req.query.page ?? ""), 10);
-    return Number.isFinite(page) && page > 0;
+    if (Number.isFinite(page) && page > 0)
+        return true;
+    if (opts.filterExemption || opts.limitCapped)
+        return true;
+    return false;
 }
-function enforceListLimit(req, estimatedCount) {
+function enforceListLimit(req, estimatedCount, res, opts = {}) {
     const limits = getLimits(req);
+    const result = opts.result;
+    const hasFilter = hasClientFilter(req, opts.bodyQuery);
     if (limits.enabled === false) {
-        return parseRequestedLimit(req);
+        return { limit: parseRequestedLimit(req), limitCapped: false, filterExemption: false };
     }
     const requested = parseRequestedLimit(req);
     const isLarge = estimatedCount >= limits.large_collection_threshold;
-    if (isLarge && !requested && limits.require_limit_always !== false) {
-        throw new errors.BadRequestError(`Collection "${req.modelname}" has ~${estimatedCount} documents. ` +
+    const sizeHint = `~${estimatedCount} docs threshold=${limits.large_collection_threshold}`;
+    let limitCapped = false;
+    let filterExemption = false;
+    if (isLarge && !requested && limits.require_limit_always !== false && !hasFilter) {
+        const err = new errors.BadRequestError(`Collection "${req.modelname}" has ~${estimatedCount} documents. ` +
             `Use ?limit=1..${limits.max} (required). For totals use GET /count/${req.modelname}.`);
+        logRequestError(req, res, err, "query_limit", sizeHint);
+        throw err;
+    }
+    if (isLarge && !requested && hasFilter) {
+        filterExemption = true;
     }
+    let effectiveLimit;
     if (requested && requested > limits.max) {
-        throw new errors.BadRequestError(`?limit=${requested} exceeds maximum ${limits.max} for "${req.modelname}".`);
+        effectiveLimit = limits.max;
+        limitCapped = true;
+        if (result) {
+            result.limit_capped = true;
+        }
+    }
+    else if (requested) {
+        effectiveLimit = requested;
     }
-    if (requested) {
-        return requested;
+    else if (limits.require_limit_always !== false && limits.default) {
+        effectiveLimit = limits.default;
     }
-    if (limits.require_limit_always !== false && limits.default) {
-        return limits.default;
+    else {
+        effectiveLimit = null;
     }
-    return null;
+    return { limit: effectiveLimit, limitCapped, filterExemption };
 }
 function applyListPagination(q, result, req, limit, count, changeUrlParams) {
     if (!limit) {
@@ -73,12 +126,51 @@ function applyListPagination(q, result, req, limit, count, changeUrlParams) {
         q.skip(limit * (page - 1));
     }
 }
+function finalizeListPagination(result, req, dataLength, limit, count, changeUrlParams) {
+    if (!limit || dataLength !== limit) {
+        return;
+    }
+    const page = typeof result.page === "number" ? result.page : 1;
+    if (count >= 0) {
+        const page_count = Math.ceil(count / limit);
+        if (page < page_count && !result.next) {
+            result.next = changeUrlParams(req, "page", page + 1);
+        }
+        return;
+    }
+    result.has_more = true;
+    if (!result.next) {
+        result.next = changeUrlParams(req, "page", page + 1);
+    }
+}
+function responseByteSize(payload) {
+    return Buffer.byteLength(JSON.stringify(payload), "utf8");
+}
+function enforceResponseSize(result, req, res) {
+    const limits = getLimits(req);
+    const maxBytes = limits.max_response_bytes;
+    if (!maxBytes || maxBytes <= 0) {
+        return;
+    }
+    const size = responseByteSize(result);
+    if (size > maxBytes) {
+        const err = new errors.PayloadTooLargeError(`Response size ${size} bytes exceeds maximum ${maxBytes} bytes for "${req.modelname}". ` +
+            `Reduce ?limit=, use ?fields=, or paginate.`);
+        logRequestError(req, res, err, "response_size", `${size}B max=${maxBytes}B`);
+        throw err;
+    }
+}
 module.exports = {
     getLimits,
     parseRequestedLimit,
+    hasClientFilter,
+    hasMeaningfulFilter,
     shouldRunCount,
     enforceListLimit,
     applyListPagination,
+    finalizeListPagination,
+    enforceResponseSize,
+    responseByteSize,
     DEFAULTS,
 };
 //# sourceMappingURL=query_limits.js.map

package/dist/libs/query_limits.js.map

@@ -1 +1 @@
-{"version":3,"file":"query_limits.js","sourceRoot":"","sources":["../../src/libs/query_limits.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"query_limits.js","sourceRoot":"","sources":["../../src/libs/query_limits.ts"],"names":[],"mappings":"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"}

package/dist/libs/request_log.d.ts

@@ -0,0 +1,44 @@
+type ReqLike = {
+    method?: string;
+    url?: string;
+    path?: string;
+    modelname?: string;
+    params?: {
+        item_id?: string;
+        modelname?: string;
+        method_name?: string;
+    };
+    body?: unknown;
+    query?: Record<string, unknown>;
+    route?: {
+        path?: string;
+    };
+    ip?: string;
+    headers?: Record<string, string | string[] | undefined>;
+    connection?: {
+        remoteAddress?: string;
+    };
+    socket?: {
+        remoteAddress?: string;
+    };
+};
+type ResLike = {
+    user?: {
+        _id?: {
+            toString(): string;
+        };
+        email?: string;
+        admin?: boolean;
+    };
+};
+/** Client IP; prefers Restify `req.ip`, then first X-Forwarded-For hop, then socket address. */
+export declare function clientIp(req: ReqLike): string | undefined;
+/** How the request authenticated (no secrets logged). */
+export declare function authHint(req: ReqLike): string | undefined;
+export declare function requestClientInfo(req: ReqLike): string | undefined;
+export declare function requestQueryHints(req: ReqLike): string | undefined;
+export declare function requestSummary(req: ReqLike, res?: ResLike): string;
+export declare function logRequestError(req: ReqLike, res: ResLike | undefined, err: unknown, context?: string, extra?: string): void;
+export declare function logAndThrow(req: ReqLike, res: ResLike | undefined, err: Error, context?: string, extra?: string): never;
+export {};
+//# sourceMappingURL=request_log.d.ts.map

package/dist/libs/request_log.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"request_log.d.ts","sourceRoot":"","sources":["../../src/libs/request_log.ts"],"names":[],"mappings":"AAEA,KAAK,OAAO,GAAG;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACxE,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,KAAK,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC1B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC,CAAC;IACxD,UAAU,CAAC,EAAE;QAAE,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACxC,MAAM,CAAC,EAAE;QAAE,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CACpC,CAAC;AAEF,KAAK,OAAO,GAAG;IACd,IAAI,CAAC,EAAE;QAAE,GAAG,CAAC,EAAE;YAAE,QAAQ,IAAI,MAAM,CAAA;SAAE,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;CACzE,CAAC;AAmBF,gGAAgG;AAChG,wBAAgB,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAUzD;AAQD,yDAAyD;AACzD,wBAAgB,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAYzD;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CASlE;AA6CD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAgBlE;AAyBD,wBAAgB,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,OAAO,GAAG,MAAM,CAUlE;AAED,wBAAgB,eAAe,CAC9B,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,OAAO,GAAG,SAAS,EACxB,GAAG,EAAE,OAAO,EACZ,OAAO,CAAC,EAAE,MAAM,EAChB,KAAK,CAAC,EAAE,MAAM,GACZ,IAAI,CA4BN;AAED,wBAAgB,WAAW,CAC1B,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,OAAO,GAAG,SAAS,EACxB,GAAG,EAAE,KAAK,EACV,OAAO,CAAC,EAAE,MAAM,EAChB,KAAK,CAAC,EAAE,MAAM,GACZ,KAAK,CAGP"}

package/dist/libs/request_log.js

@@ -0,0 +1,229 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.clientIp = clientIp;
+exports.authHint = authHint;
+exports.requestClientInfo = requestClientInfo;
+exports.requestQueryHints = requestQueryHints;
+exports.requestSummary = requestSummary;
+exports.logRequestError = logRequestError;
+exports.logAndThrow = logAndThrow;
+const errors = require("restify-errors");
+function filterLogUser(user) {
+    if (!user)
+        return "anonymous";
+    if (user.email)
+        return user.email;
+    if (user._id)
+        return user._id.toString();
+    return "unknown";
+}
+function headerValue(headers, name) {
+    if (!headers)
+        return undefined;
+    const v = headers[name] ?? headers[name.toLowerCase()];
+    if (v === undefined || v === null)
+        return undefined;
+    return Array.isArray(v) ? v[0] : String(v);
+}
+/** Client IP; prefers Restify `req.ip`, then first X-Forwarded-For hop, then socket address. */
+function clientIp(req) {
+    if (req.ip)
+        return String(req.ip);
+    const xff = headerValue(req.headers, "x-forwarded-for");
+    if (xff) {
+        const first = xff.split(",")[0]?.trim();
+        if (first)
+            return first;
+    }
+    const xri = headerValue(req.headers, "x-real-ip");
+    if (xri)
+        return xri.trim();
+    return req.socket?.remoteAddress || req.connection?.remoteAddress || undefined;
+}
+function truncate(value, max = 120) {
+    const oneLine = value.replace(/[\r\n]+/g, " ").trim();
+    if (oneLine.length <= max)
+        return oneLine;
+    return `${oneLine.slice(0, max - 1)}…`;
+}
+/** How the request authenticated (no secrets logged). */
+function authHint(req) {
+    if (req.query?.apikey)
+        return "apikey-query";
+    const apiHeader = headerValue(req.headers, "x-api-key") || headerValue(req.headers, "X-API-Key");
+    if (apiHeader)
+        return "apikey-header";
+    const auth = headerValue(req.headers, "authorization");
+    if (auth) {
+        const lower = auth.trim().toLowerCase();
+        if (lower.startsWith("bearer "))
+            return "bearer";
+        if (lower.startsWith("basic "))
+            return "basic";
+    }
+    return undefined;
+}
+function requestClientInfo(req) {
+    const parts = [];
+    const ip = clientIp(req);
+    if (ip)
+        parts.push(`ip=${ip}`);
+    const ua = headerValue(req.headers, "user-agent");
+    if (ua)
+        parts.push(`ua=${truncate(ua, 80)}`);
+    const auth = authHint(req);
+    if (auth)
+        parts.push(`auth=${auth}`);
+    return parts.length ? parts.join(" ") : undefined;
+}
+function summarizeBulkBody(body) {
+    if (!Array.isArray(body))
+        return undefined;
+    const counts = {};
+    for (const op of body) {
+        if (!op || typeof op !== "object") {
+            counts.invalid = (counts.invalid || 0) + 1;
+            continue;
+        }
+        const keys = Object.keys(op);
+        const name = keys.length === 1 ? keys[0] : "?";
+        counts[name] = (counts[name] || 0) + 1;
+    }
+    const parts = Object.entries(counts).map(([k, n]) => `${k}:${n}`);
+    return `bulk[${body.length} ${parts.join(" ")}]`;
+}
+function summarizeAggregatePipeline(body) {
+    let pipeline = body;
+    if (body && typeof body === "object" && !Array.isArray(body)) {
+        const q = body.query;
+        if (Array.isArray(q))
+            pipeline = q;
+    }
+    if (!Array.isArray(pipeline))
+        return undefined;
+    const counts = {};
+    for (const stage of pipeline) {
+        if (!stage || typeof stage !== "object")
+            continue;
+        for (const key of Object.keys(stage)) {
+            if (key.startsWith("$")) {
+                counts[key] = (counts[key] || 0) + 1;
+            }
+        }
+    }
+    const parts = Object.entries(counts).map(([k, n]) => `${k}:${n}`);
+    return `aggregate[${pipeline.length} ${parts.join(" ")}]`;
+}
+function summarizePostQueryBody(body) {
+    if (!body || typeof body !== "object")
+        return undefined;
+    const q = body.query;
+    if (!q || typeof q !== "object" || Array.isArray(q))
+        return "postQuery=invalid";
+    return `postQuery keys=${Object.keys(q).length}`;
+}
+function requestQueryHints(req) {
+    const q = req.query;
+    if (!q)
+        return undefined;
+    const parts = [];
+    if (q.limit !== undefined && q.limit !== "")
+        parts.push(`?limit=${q.limit}`);
+    if (q.page !== undefined && q.page !== "")
+        parts.push(`?page=${q.page}`);
+    if (q.count === true || q.count === "true")
+        parts.push("?count=true");
+    if (q.search)
+        parts.push("?search");
+    if (q.filter !== undefined && q.filter !== null && q.filter !== "") {
+        if (typeof q.filter === "object" && !Array.isArray(q.filter)) {
+            parts.push(`filterKeys=${Object.keys(q.filter).length}`);
+        }
+        else {
+            parts.push("?filter");
+        }
+    }
+    return parts.length ? parts.join(" ") : undefined;
+}
+function summarizeRequestDetail(req) {
+    const path = req.url || req.path || "";
+    const routePath = req.route?.path || "";
+    const route = path || routePath;
+    if (route.includes("/bulkwrite"))
+        return summarizeBulkBody(req.body);
+    if (route.includes("/aggregate"))
+        return summarizeAggregatePipeline(req.body);
+    if (route.includes("/query"))
+        return summarizePostQueryBody(req.body);
+    if (route.includes("/call/") && req.params?.method_name) {
+        return `call=${req.params.method_name}`;
+    }
+    if (req.method === "GET" &&
+        (route.includes("/api/") || route.includes("/csv/") || route.includes("/count/"))) {
+        return requestQueryHints(req);
+    }
+    if (req.method === "POST" && route.includes("/query")) {
+        return summarizePostQueryBody(req.body);
+    }
+    return requestQueryHints(req);
+}
+function requestSummary(req, res) {
+    const method = req.method || "?";
+    const path = req.url || req.path || "?";
+    const bits = [`${method} ${path}`];
+    const model = req.modelname || req.params?.modelname;
+    if (model)
+        bits.push(`model=${model}`);
+    if (req.params?.item_id)
+        bits.push(`id=${req.params.item_id}`);
+    bits.push(`user=${filterLogUser(res?.user)}`);
+    if (res?.user?.admin)
+        bits.push("admin");
+    return bits.join(" ");
+}
+function logRequestError(req, res, err, context, extra) {
+    const detail = extra || summarizeRequestDetail(req);
+    const errMsg = err instanceof Error
+        ? err.message
+        : typeof err === "string"
+            ? err
+            : String(err);
+    const headline = [
+        new Date().toISOString(),
+        requestClientInfo(req),
+        requestSummary(req, res),
+        context,
+        detail,
+        errMsg,
+    ]
+        .filter(Boolean)
+        .join(" | ");
+    console.error(headline);
+    if (err instanceof Error && err.stack) {
+        const skipStack = err instanceof errors.ForbiddenError ||
+            err instanceof errors.NotFoundError ||
+            err instanceof errors.BadRequestError;
+        if (!skipStack) {
+            console.error(err.stack);
+        }
+    }
+}
+function logAndThrow(req, res, err, context, extra) {
+    logRequestError(req, res, err, context, extra);
+    throw err;
+}
+module.exports = {
+    filterLogUser,
+    clientIp,
+    authHint,
+    requestClientInfo,
+    requestSummary,
+    requestQueryHints,
+    summarizeBulkBody,
+    summarizeAggregatePipeline,
+    summarizePostQueryBody,
+    summarizeRequestDetail,
+    logRequestError,
+    logAndThrow,
+};
+//# sourceMappingURL=request_log.js.map

package/dist/libs/request_log.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"request_log.js","sourceRoot":"","sources":["../../src/libs/request_log.ts"],"names":[],"mappings":"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"}

package/dist/libs/schema.js

@@ -77,9 +77,9 @@ class JXPSchema extends mongoose_1.default.Schema {
                 continue;
             const virtual_name = def.map_to || def.virtual || String(def.link).toLowerCase();
             if (!loaded_files.includes(def.link)) {
+                // Side-effect load only; do not read .default (circular models e.g. User → User).
                 // eslint-disable-next-line @typescript-eslint/no-require-imports
-                const linked = require(getModelFileFromRef(def.link));
-                void (linked.default || linked);
+                require(getModelFileFromRef(def.link));
                 loaded_files.push(def.link);
             }
             this.virtual(virtual_name, {

package/dist/libs/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/libs/schema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/libs/schema.ts"],"names":[],"mappings":"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"}

package/dist/libs/security.js

@@ -2,24 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const bcrypt = require("bcryptjs");
 const randToken = require("rand-token");
-const path = require("path");
 const errors = require("restify-errors");
+const { getModelFromRegistry } = require("./builtin_models");
 var APIKey = null;
 var Token = null;
 var Groups = null;
 var User = null;
 var RefreshToken = null;
 var provider = "";
-const loadModel = (modelDir, file) => {
-    const mod = require(path.join(modelDir, file));
-    return mod.default || mod;
-};
-const init = function (config) {
-    APIKey = loadModel(config.model_dir, "apikey_model");
-    Groups = loadModel(config.model_dir, "usergroups_model.js");
-    User = loadModel(config.model_dir, "user_model");
-    Token = loadModel(config.model_dir, "token_model");
-    RefreshToken = loadModel(config.model_dir, "refreshtoken_model");
+const bulkwrite_guard = require("./bulkwrite_guard");
+const { logRequestError } = require("./request_log");
+const init = function (models, config) {
+    APIKey = getModelFromRegistry(models, "apikey");
+    Groups = getModelFromRegistry(models, "usergroups");
+    User = getModelFromRegistry(models, "user");
+    Token = getModelFromRegistry(models, "token");
+    RefreshToken = getModelFromRegistry(models, "refreshtoken");
     if (config.url)
         provider = config.url;
 };
@@ -319,22 +317,25 @@ const auth = async (req, res) => {
         return await check_perms(res.user, res.groups, req.Model, method, req.params.item_id);
     }
     catch (err) {
-        console.error(err);
+        logRequestError(req, res, err, "auth");
         if (err.code)
             throw err;
         throw new errors.ForbiddenError(err.toString());
     }
 };
-// Bulk auth requires all CRUD permissions
+// Bulk auth: admins bypass; others need perms matching each operation (e.g. updateOne → create + update).
 const bulkAuth = async (req, res) => {
+    if (res.user?.admin) {
+        return;
+    }
     try {
-        await check_perms(res.user, res.groups, req.Model, "c");
-        await check_perms(res.user, res.groups, req.Model, "r");
-        await check_perms(res.user, res.groups, req.Model, "u");
-        await check_perms(res.user, res.groups, req.Model, "d");
+        const required = bulkwrite_guard.requiredPermsForBulkOps(req.body);
+        for (const method of required) {
+            await check_perms(res.user, res.groups, req.Model, method);
+        }
     }
     catch (err) {
-        console.error(err);
+        logRequestError(req, res, err, "bulkAuth");
         if (err.code)
             throw err;
         throw new errors.ForbiddenError(err.toString());
@@ -392,10 +393,14 @@ const check_perms = async (user, groups, model, method, item_id) => {
 };
 const admin_only = (req, res, next) => {
     if (!res.user) {
-        return next(new errors.ForbiddenError("User not logged in"));
+        const err = new errors.ForbiddenError("User not logged in");
+        logRequestError(req, res, err, "admin_only");
+        return next(err);
     }
     if (!res.user.admin) {
-        return next(new errors.ForbiddenError("User not admin"));
+        const err = new errors.ForbiddenError("User not admin");
+        logRequestError(req, res, err, "admin_only");
+        return next(err);
     }
     next();
 };