@saltcorn/server 0.9.5-beta.27 → 0.9.5-beta.28

package/locales/en.json

@@ -1414,5 +1414,7 @@
 	"Do not wrap response in a success object": "Do not wrap response in a success object",
 	"Use table description instead of name as header": "Use table description instead of name as header",
 	"Description header": "Description header",
-	"Lazy load views": "Lazy load views"
+	"Lazy load views": "Lazy load views",
+	"Log IP address": "Log IP address",
+	"Record the request IP address in log messages": "Record the request IP address in log messages"
 }

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.9.5-beta.27",
+  "version": "0.9.5-beta.28",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
     "@aws-sdk/client-s3": "^3.451.0",
-    "@saltcorn/base-plugin": "0.9.5-beta.27",
-    "@saltcorn/builder": "0.9.5-beta.27",
-    "@saltcorn/data": "0.9.5-beta.27",
-    "@saltcorn/admin-models": "0.9.5-beta.27",
-    "@saltcorn/filemanager": "0.9.5-beta.27",
-    "@saltcorn/markup": "0.9.5-beta.27",
-    "@saltcorn/plugins-loader": "0.9.5-beta.27",
-    "@saltcorn/sbadmin2": "0.9.5-beta.27",
+    "@saltcorn/base-plugin": "0.9.5-beta.28",
+    "@saltcorn/builder": "0.9.5-beta.28",
+    "@saltcorn/data": "0.9.5-beta.28",
+    "@saltcorn/admin-models": "0.9.5-beta.28",
+    "@saltcorn/filemanager": "0.9.5-beta.28",
+    "@saltcorn/markup": "0.9.5-beta.28",
+    "@saltcorn/plugins-loader": "0.9.5-beta.28",
+    "@saltcorn/sbadmin2": "0.9.5-beta.28",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

package/routes/admin.js

@@ -2865,6 +2865,7 @@ admin_config_route({
         "development_mode",
         "log_sql",
         "log_client_errors",
+        "log_ip_address",
         "log_level",
         ...(isRoot || tenants_set_npm_modules ? ["npm_available_js_code"] : []),
       ],

package/routes/page.js

@@ -135,7 +135,13 @@ router.get(
   "/:pagename",
   error_catcher(async (req, res) => {
     const { pagename } = req.params;
-    getState().log(3, `Route /page/${pagename} user=${req.user?.id}`);
+    const state = getState();
+    state.log(
+      3,
+      `Route /page/${pagename} user=${req.user?.id}${
+        state.getConfig("log_ip_address", false) ? ` IP=${req.ip}` : ""
+      }`
+    );
     const tic = new Date();
     const { page, pageGroup } = findPageOrGroup(pagename);
     if (page) await runPage(page, req, res, tic);
@@ -144,7 +150,7 @@ router.get(
       if ((page || pageGroup) && !req.user) {
         res.redirect(`/auth/login?dest=${encodeURIComponent(req.originalUrl)}`);
       } else {
-        getState().log(2, `Page ${pagename} not found or not authorized`);
+        state.log(2, `Page ${pagename} not found or not authorized`);
         res
           .status(404)
           .sendWrap(

package/routes/tenant.js

@@ -96,6 +96,7 @@ const tenant_form = (req, base_url) =>
         label: req.__("Application name"),
         input_type: "text",
         postText: text("." + base_url),
+        attributes: { autofocus: true },
       },
     ],
   });

package/routes/utils.js

@@ -203,7 +203,15 @@ const setTenant = (req, res, next) => {
         } else {
           db.runWithTenant(other_domain, () => {
             setLanguage(req, res, state);
-            state.log(5, `${req.method} ${req.originalUrl}`);
+            if (state.logLevel >= 5)
+              state.log(
+                5,
+                `${req.method} ${req.originalUrl}${
+                  state.getConfig("log_ip_address", false)
+                    ? ` IP=${req.ip}`
+                    : ""
+                }`
+              );
             next();
           });
         }
@@ -216,7 +224,15 @@ const setTenant = (req, res, next) => {
         } else {
           db.runWithTenant(ten, () => {
             setLanguage(req, res, state);
-            state.log(5, `${req.method} ${req.originalUrl}`);
+            if (state.logLevel >= 5)
+              state.log(
+                5,
+                `${req.method} ${req.originalUrl}${
+                  state.getConfig("log_ip_address", false)
+                    ? ` IP=${req.ip}`
+                    : ""
+                }`
+              );
             next();
           });
         }

package/routes/view.js

@@ -45,7 +45,12 @@ router.get(
     const view = await View.findOne({ name: viewname });
     const role = req.user && req.user.id ? req.user.role_id : 100;
     const state = getState();
-    state.log(3, `Route /view/${viewname} user=${req.user?.id}`);
+    state.log(
+      3,
+      `Route /view/${viewname} user=${req.user?.id}${
+        state.getConfig("log_ip_address", false) ? ` IP=${req.ip}` : ""
+      }`
+    );
     if (!view) {
       req.flash("danger", req.__(`No such view: %s`, text(viewname)));
       state.log(2, `View ${viewname} not found`);
@@ -207,7 +212,9 @@ router.post(
     const state = getState();
     state.log(
       3,
-      `Route /view/${viewname} viewroute ${route} user=${req.user?.id}`
+      `Route /view/${viewname} viewroute ${route} user=${req.user?.id}${
+        state.getConfig("log_ip_address", false) ? ` IP=${req.ip}` : ""
+      }`
     );
 
     const view = await View.findOne({ name: viewname });
@@ -240,7 +247,12 @@ router.post(
     const role = req.user && req.user.id ? req.user.role_id : 100;
     const query = { ...req.query };
     const state = getState();
-    state.log(3, `Route /view/${viewname} POST user=${req.user?.id}`);
+    state.log(
+      3,
+      `Route /view/${viewname} POST user=${req.user?.id}${
+        state.getConfig("log_ip_address", false) ? ` IP=${req.ip}` : ""
+      }`
+    );
     const view = await View.findOne({ name: viewname });
     if (!view) {
       req.flash("danger", req.__(`No such view: %s`, text(viewname)));