jxp 4.1.0 → 4.1.1

package/dist/libs/bulkwrite_guard.d.ts

@@ -2,4 +2,5 @@ export declare function validateBulkOps(ops: unknown[], options?: {
     bulk_operations_allow?: string[];
     isAdmin?: boolean;
 }): void;
+export declare function requiredPermsForBulkOps(ops: unknown[]): Set<string>;
 //# sourceMappingURL=bulkwrite_guard.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"bulkwrite_guard.d.ts","sourceRoot":"","sources":["../../src/libs/bulkwrite_guard.ts"],"names":[],"mappings":"AAgBA,wBAAgB,eAAe,CAC9B,GAAG,EAAE,OAAO,EAAE,EACd,OAAO,CAAC,EAAE;IAAE,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GAC/D,IAAI,CAuBN"}
+{"version":3,"file":"bulkwrite_guard.d.ts","sourceRoot":"","sources":["../../src/libs/bulkwrite_guard.ts"],"names":[],"mappings":"AAgBA,wBAAgB,eAAe,CAC9B,GAAG,EAAE,OAAO,EAAE,EACd,OAAO,CAAC,EAAE;IAAE,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GAC/D,IAAI,CAuBN;AAuBD,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,CAoBnE"}

package/dist/libs/bulkwrite_guard.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateBulkOps = validateBulkOps;
+exports.requiredPermsForBulkOps = requiredPermsForBulkOps;
 const errors = require("restify-errors");
 const DEFAULT_ALLOWED_OPS = new Set([
     "insertOne",
@@ -37,8 +38,50 @@ function validateBulkOps(ops, options) {
         }
     }
 }
+function permsForBulkEntry(opName, payload) {
+    if (!payload || typeof payload !== "object") {
+        throw new errors.BadRequestError("Invalid bulk write operation payload");
+    }
+    const p = payload;
+    switch (opName) {
+        case "insertOne":
+            return ["c"];
+        case "deleteOne":
+        case "deleteMany":
+            return ["d"];
+        case "updateOne":
+        case "updateMany":
+        case "replaceOne":
+            return p.upsert === true ? ["c", "u"] : ["u"];
+        default:
+            throw new errors.BadRequestError(`Bulk operation ${opName} is not allowed`);
+    }
+}
+function requiredPermsForBulkOps(ops) {
+    if (!Array.isArray(ops)) {
+        throw new errors.BadRequestError("Bulk write operations must be an array");
+    }
+    const required = new Set();
+    for (const op of ops) {
+        if (!op || typeof op !== "object") {
+            throw new errors.BadRequestError("Invalid bulk write operation");
+        }
+        const keys = Object.keys(op);
+        if (keys.length !== 1) {
+            throw new errors.BadRequestError("Each bulk write entry must have exactly one operation");
+        }
+        const opName = keys[0];
+        const perms = permsForBulkEntry(opName, op[opName]);
+        for (const perm of perms) {
+            required.add(perm);
+        }
+    }
+    return required;
+}
 module.exports = {
     validateBulkOps,
+    requiredPermsForBulkOps,
+    permsForBulkEntry,
     DEFAULT_ALLOWED_OPS: [...DEFAULT_ALLOWED_OPS],
 };
 //# sourceMappingURL=bulkwrite_guard.js.map

package/dist/libs/bulkwrite_guard.js.map

@@ -1 +1 @@
-{"version":3,"file":"bulkwrite_guard.js","sourceRoot":"","sources":["../../src/libs/bulkwrite_guard.ts"],"names":[],"mappings":";;AAgBA,0CA0BC;AA1CD,MAAM,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAEzC,MAAM,mBAAmB,GAAG,IAAI,GAAG,CAAC;IACnC,WAAW;IACX,WAAW;IACX,YAAY;IACZ,WAAW;CACX,CAAC,CAAC;AAEH,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC;AAE7D,SAAS,aAAa,CAAC,MAAiB;IACvC,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM;QAAE,OAAO,mBAAmB,CAAC;IAC1D,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AAED,SAAgB,eAAe,CAC9B,GAAc,EACd,OAAiE;IAEjE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACzB,MAAM,IAAI,MAAM,CAAC,eAAe,CAAC,wCAAwC,CAAC,CAAC;IAC5E,CAAC;IACD,MAAM,OAAO,GAAG,aAAa,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC;IAC9D,MAAM,OAAO,GAAG,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IAE1C,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;QACtB,IAAI,CAAC,EAAE,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE,CAAC;YACnC,MAAM,IAAI,MAAM,CAAC,eAAe,CAAC,8BAA8B,CAAC,CAAC;QAClE,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,EAA6B,CAAC,CAAC;QACxD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,MAAM,IAAI,MAAM,CAAC,eAAe,CAAC,uDAAuD,CAAC,CAAC;QAC3F,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACvB,IAAI,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAC5C,MAAM,IAAI,MAAM,CAAC,cAAc,CAAC,kBAAkB,MAAM,iBAAiB,CAAC,CAAC;QAC5E,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YACzD,MAAM,IAAI,MAAM,CAAC,eAAe,CAAC,kBAAkB,MAAM,iBAAiB,CAAC,CAAC;QAC7E,CAAC;IACF,CAAC;AACF,CAAC;AAED,MAAM,CAAC,OAAO,GAAG;IAChB,eAAe;IACf,mBAAmB,EAAE,CAAC,GAAG,mBAAmB,CAAC;CAC7C,CAAC"}
+{"version":3,"file":"bulkwrite_guard.js","sourceRoot":"","sources":["../../src/libs/bulkwrite_guard.ts"],"names":[],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"jxp.d.ts","sourceRoot":"","sources":["../../src/libs/jxp.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AA65BrD,QAAA,MAAM,GAAG,GAAa,SAAS,SAAS,QAwXvC,CAAC;AAEF,SAAS,GAAG,CAAC"}
+{"version":3,"file":"jxp.d.ts","sourceRoot":"","sources":["../../src/libs/jxp.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAw+BrD,QAAA,MAAM,GAAG,GAAa,SAAS,SAAS,QAgYvC,CAAC;AAEF,SAAS,GAAG,CAAC"}

package/dist/libs/jxp.js

@@ -27,6 +27,7 @@ const call_guard = require("./call_guard");
 const response_sanitize = require("./response_sanitize");
 const link_index = require("./link_index");
 const { safeErrorMessage } = require("./safe_error");
+const { logRequestError, logAndThrow } = require("./request_log");
 const schemaModule = require("./schema");
 global.JXPSchema = schemaModule.default || schemaModule;
 var models = {};
@@ -39,10 +40,12 @@ function getStripFields(req) {
 function getSecurityOpts(req) {
     return req.config?.security || {};
 }
-function advancedQueryAllowed(Model, kind) {
+function advancedQueryAllowed(Model, kind, options) {
     const opts = Model.schema.opts;
     const aq = opts?.advanced_queries;
     if (kind === "bulkwrite") {
+        if (options?.isAdmin)
+            return true;
         return aq?.bulkwrite === true;
     }
     if (kind === "aggregate") {
@@ -50,13 +53,33 @@ function advancedQueryAllowed(Model, kind) {
     }
     return aq?.query !== false;
 }
+const middlewareBulkWriteAllowed = (req, res, next) => {
+    if (!advancedQueryAllowed(req.Model, "bulkwrite", { isAdmin: !!res.user?.admin })) {
+        const err = new errors.ForbiddenError(`POST /bulkwrite is disabled for model ${req.modelname}`);
+        logRequestError(req, res, err, "bulkwrite disabled");
+        return next(err);
+    }
+    next();
+};
+const middlewareAdvancedQueryAllowed = (kind) => {
+    return (req, res, next) => {
+        if (!advancedQueryAllowed(req.Model, kind)) {
+            const err = new errors.ForbiddenError(`POST /${kind} is disabled for model ${req.modelname}`);
+            logRequestError(req, res, err, `${kind} disabled`);
+            return next(err);
+        }
+        next();
+    };
+};
 // Middleware
 const middlewareModel = (req, res, next) => {
     const modelname = req.params.modelname;
     req.modelname = modelname;
     req.Model = models[modelname];
     if (!req.Model) {
-        throw new errors.NotFoundError(`Model ${modelname} not found`);
+        const err = new errors.NotFoundError(`Model ${modelname} not found`);
+        logRequestError(req, res, err, "model");
+        return next(err);
     }
     return next();
 };
@@ -64,7 +87,9 @@ const middlewarePasswords = (req, res, next) => {
     if (req.body && req.body.password) {
         if (req.query.password_override) {
             if (!res.user?.admin) {
-                throw new errors.ForbiddenError("password_override requires admin");
+                const err = new errors.ForbiddenError("password_override requires admin");
+                logRequestError(req, res, err, "password_override");
+                return next(err);
             }
         }
         else {
@@ -96,7 +121,7 @@ const outputJSON = async (req, res) => {
         res.send(res.result);
     }
     catch (err) {
-        console.error(new Date(), err);
+        logRequestError(req, res, err, "outputJSON");
         throw new errors.InternalServerError(safeErrorMessage(err));
     }
 };
@@ -120,7 +145,7 @@ const outputCSV = (req, res, next) => {
         next();
     }
     catch (err) {
-        console.error(err);
+        logRequestError(req, res, err, "outputCSV");
         throw new errors.InternalServerError(safeErrorMessage(err));
     }
 };
@@ -134,8 +159,7 @@ const actionGet = async (req, res) => {
         filters = query_sanitize.sanitizeFilter(filters, getSecurityOpts(req));
     }
     catch (err) {
-        console.trace(new Date(), err);
-        // Preserve BadRequestError, convert others to InternalServerError
+        logRequestError(req, res, err, "filter");
         if (err instanceof errors.BadRequestError) {
             throw err;
         }
@@ -181,7 +205,7 @@ const actionGet = async (req, res) => {
         if (count >= 0) {
             result.count = count;
         }
-        const effectiveLimit = query_limits.enforceListLimit(req, estimatedCount);
+        const effectiveLimit = query_limits.enforceListLimit(req, estimatedCount, res);
         query_limits.applyListPagination(q, result, req, effectiveLimit, count >= 0 ? count : 0, changeUrlParams);
         if (req.query.sort) {
             q.sort(req.query.sort);
@@ -226,10 +250,12 @@ const actionGet = async (req, res) => {
             console.timeEnd(opname);
     }
     catch (err) {
-        console.error(new Date(), err);
         if (debug)
             console.timeEnd(opname);
-        // Preserve BadRequestError, convert others to InternalServerError
+        if (!(err instanceof errors.BadRequestError) &&
+            !(err instanceof errors.ForbiddenError)) {
+            logRequestError(req, res, err, "get");
+        }
         if (err instanceof errors.BadRequestError) {
             throw err;
         }
@@ -251,7 +277,7 @@ const actionGetOne = async (req, res) => {
             console.timeEnd(opname);
     }
     catch (err) {
-        console.error(new Date(), err);
+        logRequestError(req, res, err, "getOne");
         if (debug)
             console.timeEnd(opname);
         if (err.code)
@@ -286,7 +312,7 @@ const actionPost = async (req, res) => {
             console.timeEnd(opname);
     }
     catch (err) {
-        console.error(new Date(), err);
+        logRequestError(req, res, err, "post");
         if (debug)
             console.timeEnd(opname);
         if (err.code)
@@ -300,8 +326,7 @@ const actionPut = async (req, res) => {
     try {
         let item = await req.Model.findById(req.params.item_id);
         if (!item) {
-            console.error(new Date(), "Document not found");
-            throw new errors.NotFoundError(`Document ${req.params.item_id} not found on ${req.modelname}`);
+            logAndThrow(req, res, new errors.NotFoundError(`Document ${req.params.item_id} not found on ${req.modelname}`), "put");
         }
         _populateItem(item, datamunging.deserialize(req.body));
         _versionItem(item);
@@ -326,7 +351,7 @@ const actionPut = async (req, res) => {
             console.timeEnd(opname);
     }
     catch (err) {
-        console.error(new Date(), err);
+        logRequestError(req, res, err, "put");
         if (debug)
             console.timeEnd(opname);
         if (err.code)
@@ -366,7 +391,7 @@ const actionUpdate = async (req, res) => {
             console.timeEnd(opname);
     }
     catch (err) {
-        console.error(new Date(), err);
+        logRequestError(req, res, err, "update");
         if (debug)
             console.timeEnd(opname);
         if (err.code)
@@ -400,7 +425,7 @@ const actionDelete = async (req, res) => {
                     }
                 }
                 else {
-                    throw new errors.ConflictError(`Parent link item exists in ${linked_model.modelname}/${linked_model.field}`);
+                    logAndThrow(req, res, new errors.ConflictError(`Parent link item exists in ${linked_model.modelname}/${linked_model.field}`), "delete");
                 }
             }
         });
@@ -429,7 +454,9 @@ const actionDelete = async (req, res) => {
             console.timeEnd(opname);
     }
     catch (err) {
-        console.error(new Date(), err);
+        if (!(err instanceof errors.ConflictError)) {
+            logRequestError(req, res, err, "delete");
+        }
         if (debug)
             console.timeEnd(opname);
         if (err.code)
@@ -446,7 +473,7 @@ const actionCount = async (req, res) => {
         filters = query_sanitize.sanitizeFilter(filters, getSecurityOpts(req));
     }
     catch (err) {
-        console.trace(new Date(), err);
+        logRequestError(req, res, err, "filter");
         if (err instanceof errors.BadRequestError || err instanceof errors.ForbiddenError) {
             throw err;
         }
@@ -466,7 +493,7 @@ const actionCount = async (req, res) => {
             console.timeEnd(opname);
     }
     catch (err) {
-        console.error(new Date(), err);
+        logRequestError(req, res, err, "count");
         if (debug)
             console.timeEnd(opname);
         if (err.code)
@@ -483,7 +510,7 @@ const actionCall = async (req, res) => {
         res.json(result);
     }
     catch (err) {
-        console.error(new Date(), err);
+        logRequestError(req, res, err, "call");
         if (err.code)
             throw err;
         if (err instanceof errors.ForbiddenError || err instanceof errors.NotFoundError) {
@@ -508,7 +535,7 @@ const actionCallItem = async (req, res) => {
         res.json(result);
     }
     catch (err) {
-        console.trace(err);
+        logRequestError(req, res, err, "call");
         if (err.code)
             throw err;
         if (err instanceof errors.ForbiddenError || err instanceof errors.NotFoundError) {
@@ -519,15 +546,22 @@ const actionCallItem = async (req, res) => {
 };
 // Actions (verbs)
 const actionQuery = async (req, res) => {
-    if (!advancedQueryAllowed(req.Model, "query")) {
-        throw new errors.ForbiddenError(`POST /query is disabled for model ${req.modelname}`);
-    }
     if (!req.body || !req.body.query || typeof req.body.query !== "object") {
-        throw new errors.BadRequestError("Query missing or not of type object");
+        logAndThrow(req, res, new errors.BadRequestError("Query missing or not of type object"), "query");
     }
     const opname = `query ${req.modelname} ${ops++}`;
     console.time(opname);
-    const sanitizedQuery = query_sanitize.sanitizeFilter(req.body.query, getSecurityOpts(req));
+    let sanitizedQuery;
+    try {
+        sanitizedQuery = query_sanitize.sanitizeFilter(req.body.query, getSecurityOpts(req));
+    }
+    catch (err) {
+        logRequestError(req, res, err, "query_sanitize");
+        if (err instanceof errors.BadRequestError || err instanceof errors.ForbiddenError) {
+            throw err;
+        }
+        throw new errors.InternalServerError(safeErrorMessage(err));
+    }
     let query = [sanitizedQuery];
     let checkDeleted = { "$or": [{ _deleted: false }, { _deleted: null }] };
     if (!req.query.showDeleted) {
@@ -545,7 +579,7 @@ const actionQuery = async (req, res) => {
             result.count = count;
         }
         const estimatedCount = await req.Model.estimatedDocumentCount();
-        const effectiveLimit = query_limits.enforceListLimit(req, estimatedCount);
+        const effectiveLimit = query_limits.enforceListLimit(req, estimatedCount, res);
         query_limits.applyListPagination(q, result, req, effectiveLimit, count >= 0 ? count : 0, changeUrlParams);
         if (req.query.sort) {
             q.sort(req.query.sort);
@@ -587,9 +621,12 @@ const actionQuery = async (req, res) => {
         res.json(result);
     }
     catch (err) {
-        console.error(new Date(), err);
         if (debug)
             console.timeEnd(opname);
+        if (!(err instanceof errors.BadRequestError) &&
+            !(err instanceof errors.ForbiddenError)) {
+            logRequestError(req, res, err, "query");
+        }
         if (err instanceof errors.BadRequestError || err instanceof errors.ForbiddenError) {
             throw err;
         }
@@ -600,19 +637,24 @@ const actionQuery = async (req, res) => {
 };
 // Actions (verbs)
 const actionAggregate = async (req, res) => {
-    if (!advancedQueryAllowed(req.Model, "aggregate")) {
-        throw new errors.ForbiddenError(`POST /aggregate is disabled for model ${req.modelname}`);
-    }
-    let query = (req.body.query) ? req.body.query : req.body; // Don't require to embed in query anymore
+    let query = req.body?.query ? req.body.query : req.body;
     if (!query || !Array.isArray(query)) {
-        console.error("query missing or not of type array");
-        throw new errors.BadRequestError("Query missing or not of type array");
+        logAndThrow(req, res, new errors.BadRequestError("Query missing or not of type array"), "aggregate");
     }
     query = query_manipulation.fix_query(query);
-    aggregate_guard.validatePipeline(query, {
-        aggregate_stages_allow: getSecurityOpts(req).aggregate_stages_allow,
-        isAdmin: res.user?.admin,
-    });
+    try {
+        aggregate_guard.validatePipeline(query, {
+            aggregate_stages_allow: getSecurityOpts(req).aggregate_stages_allow,
+            isAdmin: res.user?.admin,
+        });
+    }
+    catch (err) {
+        logRequestError(req, res, err, "aggregate_guard");
+        if (err instanceof errors.BadRequestError || err instanceof errors.ForbiddenError) {
+            throw err;
+        }
+        throw new errors.InternalServerError(safeErrorMessage(err));
+    }
     const opname = `aggregate ${req.modelname} ${ops++}`;
     console.time(opname);
     try {
@@ -630,9 +672,12 @@ const actionAggregate = async (req, res) => {
         res.json(result);
     }
     catch (err) {
-        console.error(new Date(), err);
         if (debug)
             console.timeEnd(opname);
+        if (!(err instanceof errors.BadRequestError) &&
+            !(err instanceof errors.ForbiddenError)) {
+            logRequestError(req, res, err, "aggregate");
+        }
         if (err instanceof errors.BadRequestError || err instanceof errors.ForbiddenError) {
             throw err;
         }
@@ -641,12 +686,10 @@ const actionAggregate = async (req, res) => {
 };
 // Actions (verbs)
 const actionBulkWrite = async (req, res) => {
-    if (!advancedQueryAllowed(req.Model, "bulkwrite")) {
-        throw new errors.ForbiddenError(`POST /bulkwrite is disabled for model ${req.modelname}`);
-    }
     if (!req.body || !Array.isArray(req.body)) {
-        console.error("query missing or not of type array");
-        throw new errors.BadRequestError("Query missing or not of type array");
+        const err = new errors.BadRequestError("Query missing or not of type array");
+        logRequestError(req, res, err, "bulkwrite");
+        throw err;
     }
     const opname = `bulkwrite ${req.modelname} ${ops++}`;
     console.time(opname);
@@ -664,7 +707,7 @@ const actionBulkWrite = async (req, res) => {
         res.json(result);
     }
     catch (err) {
-        console.error(new Date(), err);
+        logRequestError(req, res, err, "bulkwrite");
         if (debug)
             console.timeEnd(opname);
         if (err instanceof errors.BadRequestError || err instanceof errors.ForbiddenError) {
@@ -736,7 +779,6 @@ const getOne = async (Model, item_id, params, options) => {
         return response_sanitize.sanitizeDocument(item);
     }
     catch (err) {
-        console.error(err);
         if (err.code)
             throw err;
         throw new errors.InternalServerError(safeErrorMessage(err));
@@ -1114,9 +1156,9 @@ const JXP = function (options) {
     // CSV endpoints
     server.get("/csv/:modelname", middlewareModel, security.login, security.auth, config.pre_hooks.get, actionGet, outputCSV);
     // Query endpoints
-    server.post("/query/:modelname", middlewareModel, security.login, security.auth, config.pre_hooks.get, actionQuery);
-    server.post("/aggregate/:modelname", middlewareModel, security.login, security.auth, config.pre_hooks.get, actionAggregate);
-    server.post("/bulkwrite/:modelname", middlewareModel, security.login, security.bulkAuth, config.pre_hooks.get, actionBulkWrite);
+    server.post("/query/:modelname", middlewareModel, security.login, security.auth, middlewareAdvancedQueryAllowed("query"), config.pre_hooks.get, actionQuery);
+    server.post("/aggregate/:modelname", middlewareModel, security.login, security.auth, middlewareAdvancedQueryAllowed("aggregate"), config.pre_hooks.get, actionAggregate);
+    server.post("/bulkwrite/:modelname", middlewareModel, security.login, middlewareBulkWriteAllowed, security.bulkAuth, config.pre_hooks.get, actionBulkWrite);
     server.post("/update/:modelname/:item_id", middlewareModel, security.login, security.auth, middlewarePasswords, middlewareCheckAdmin, config.pre_hooks.update, actionUpdate, cache.clearAll);
     /* Batch routes - ROLLED BACK FOR NOW */
     // server.post('/batch/create/:modelname', middlewareModel, security.login, security.auth, actionBatch);
@@ -1167,6 +1209,10 @@ const JXP = function (options) {
     server.post("/setup/data", setup.checkUserDoesNotExist, setup.data_setup);
     /* Websocket */
     server.on("upgrade", ws.upgrade);
+    server.on("restError", (req, res, err, callback) => {
+        logRequestError(req, res, err);
+        return callback();
+    });
     /* Cache */
     server.get("/cache/stats", security.login, security.admin_only, cache.stats, outputJSON);
     server.get("/cache/clear", security.login, security.admin_only, cache.clearAll, outputJSON);