@saltcorn/server 0.6.2-beta.1 → 0.6.2-beta.2

package/routes/tenant.js

@@ -35,7 +35,7 @@ const {
 const db = require("@saltcorn/data/db");
 const url = require("url");
 const { loadAllPlugins, loadAndSaveNewPlugin } = require("../load_plugins");
-const { setTenant, isAdmin, error_catcher } = require("./utils.js");
+const { isAdmin, error_catcher } = require("./utils.js");
 const User = require("@saltcorn/data/models/user");
 const File = require("@saltcorn/data/models/file");
 const {
@@ -115,7 +115,6 @@ const is_ip_address = (hostname) => {
  */
 router.get(
   "/create",
-  setTenant,
   error_catcher(async (req, res) => {
     if (
       !db.is_it_multi_tenant() ||
@@ -207,7 +206,6 @@ const getNewURL = (req, subdomain) => {
  */
 router.post(
   "/create",
-  setTenant,
   error_catcher(async (req, res) => {
     // check that multi-tenancy is enabled
     if (
@@ -306,7 +304,6 @@ router.post(
  */
 router.get(
   "/list",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     if (
@@ -390,7 +387,6 @@ const tenant_settings_form = (req) =>
  */
 router.get(
   "/settings",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     if (
@@ -425,7 +421,6 @@ router.get(
  */
 router.post(
   "/settings",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const form = await tenant_settings_form(req);
@@ -502,7 +497,6 @@ const get_tenant_info = async (subdomain) => {
  */
 router.get(
   "/info/:subdomain",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     if (
@@ -648,7 +642,6 @@ router.get(
  */
 router.post(
   "/info/:subdomain",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     if (
@@ -680,7 +673,6 @@ router.post(
  */
 router.post(
   "/delete/:sub",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     if (

package/routes/utils.js

@@ -20,9 +20,9 @@ const { validateHeaderName, validateHeaderValue } = require("http");
 const Crash = require("@saltcorn/data/models/crash");
 
 /**
- * @param {object} req 
- * @param {object} res 
- * @param {function} next 
+ * @param {object} req
+ * @param {object} res
+ * @param {function} next
  * @returns {void}
  */
 function loggedIn(req, res, next) {
@@ -35,9 +35,9 @@ function loggedIn(req, res, next) {
 }
 
 /**
- * @param {object} req 
- * @param {object} res 
- * @param {function} next 
+ * @param {object} req
+ * @param {object} res
+ * @param {function} next
  * @returns {void}
  */
 function isAdmin(req, res, next) {
@@ -54,8 +54,8 @@ function isAdmin(req, res, next) {
 }
 
 /**
- * @param {object} req 
- * @param {object} res 
+ * @param {object} req
+ * @param {object} res
  * @param {string} state
  * @returns {void}
  */
@@ -67,8 +67,8 @@ const setLanguage = (req, res, state) => {
 };
 
 /**
- * @param {object} res 
- * @param {string} state 
+ * @param {object} res
+ * @param {string} state
  * @returns {void}
  */
 const set_custom_http_headers = (res, state) => {
@@ -90,7 +90,7 @@ const set_custom_http_headers = (res, state) => {
 };
 
 /**
- * @param {object} req 
+ * @param {object} req
  * @returns {string}
  */
 const get_tenant_from_req = (req) => {
@@ -106,9 +106,9 @@ const get_tenant_from_req = (req) => {
 };
 
 /**
- * @param {object} req 
- * @param {object} res 
- * @param {function} next 
+ * @param {object} req
+ * @param {object} res
+ * @param {function} next
  */
 const setTenant = (req, res, next) => {
   if (db.is_it_multi_tenant()) {
@@ -141,7 +141,7 @@ const setTenant = (req, res, next) => {
 };
 
 /**
- * @param {object} req 
+ * @param {object} req
  * @returns {input}
  */
 const csrfField = (req) =>
@@ -152,7 +152,7 @@ const csrfField = (req) =>
   });
 
 /**
- * @param {function} fn 
+ * @param {function} fn
  * @returns {function}
  */
 const error_catcher = (fn) => (request, response, next) => {
@@ -160,8 +160,8 @@ const error_catcher = (fn) => (request, response, next) => {
 };
 
 /**
- * @param {string|object} contents 
- * @param {string} viewname 
+ * @param {string|object} contents
+ * @param {string} viewname
  * @returns {string}
  */
 const scan_for_page_title = (contents, viewname) => {
@@ -224,10 +224,10 @@ module.exports = {
   csrfField,
   loggedIn,
   isAdmin,
-  setTenant,
   get_base_url,
   error_catcher,
   scan_for_page_title,
   getGitRevision,
   getSessionStore,
+  setTenant,
 };

package/routes/view.js

@@ -13,12 +13,12 @@ const Page = require("@saltcorn/data/models/page");
 const { div, text, i, a } = require("@saltcorn/markup/tags");
 const { renderForm, link } = require("@saltcorn/markup");
 const {
-  setTenant,
   isAdmin,
   error_catcher,
   scan_for_page_title,
 } = require("../routes/utils.js");
 const { add_edit_bar } = require("../markup/admin.js");
+const { InvalidConfiguration } = require("@saltcorn/data/utils");
 
 /**
  * @type {object}
@@ -38,7 +38,6 @@ module.exports = router;
  */
 router.get(
   "/:viewname",
-  setTenant,
   error_catcher(async (req, res) => {
     const { viewname } = req.params;
 
@@ -82,7 +81,6 @@ router.get(
  */
 router.post(
   "/:viewname/preview",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { viewname } = req.params;
@@ -120,7 +118,6 @@ router.post(
  */
 router.post(
   "/:viewname/:route",
-  setTenant,
   error_catcher(async (req, res) => {
     const { viewname, route } = req.params;
     const role = req.isAuthenticated() ? req.user.role_id : 10;
@@ -146,7 +143,6 @@ router.post(
  */
 router.post(
   "/:viewname",
-  setTenant,
   error_catcher(async (req, res) => {
     const { viewname } = req.params;
     const role = req.isAuthenticated() ? req.user.role_id : 10;
@@ -161,6 +157,12 @@ router.post(
     ) {
       req.flash("danger", req.__("Not authorized"));
       res.redirect("/");
+    } else if (!view.runPost) {
+      throw new InvalidConfiguration(
+        `View ${text(viewname)} with template ${
+          view.viewtemplate
+        } does not supply a POST handler`
+      );
     } else {
       await view.runPost(req.query, req.body, { res, req });
     }

package/routes/viewedit.js

@@ -30,7 +30,7 @@ const {
 } = require("@saltcorn/markup/tags");
 
 const { getState } = require("@saltcorn/data/db/state");
-const { setTenant, isAdmin, error_catcher } = require("./utils.js");
+const { isAdmin, error_catcher } = require("./utils.js");
 const Form = require("@saltcorn/data/models/form");
 const Field = require("@saltcorn/data/models/field");
 const Table = require("@saltcorn/data/models/table");
@@ -53,9 +53,9 @@ const router = new Router();
 module.exports = router;
 
 /**
- * @param {object} view 
- * @param {object[]} roles 
- * @param {object} req 
+ * @param {object} view
+ * @param {object[]} roles
+ * @param {object} req
  * @returns {Form}
  */
 const editViewRoleForm = (view, roles, req) =>
@@ -67,8 +67,8 @@ const editViewRoleForm = (view, roles, req) =>
   });
 
 /**
- * @param {object} view 
- * @param {object} req 
+ * @param {object} view
+ * @param {object} req
  * @returns {div}
  */
 const view_dropdown = (view, req) =>
@@ -115,7 +115,6 @@ const view_dropdown = (view, req) =>
  */
 router.get(
   "/",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     var orderBy = "name";
@@ -218,19 +217,19 @@ router.get(
 );
 
 /**
- * @param {object} o 
- * @param {function} f 
+ * @param {object} o
+ * @param {function} f
  * @returns {object}
  */
 const mapObjectValues = (o, f) =>
   Object.fromEntries(Object.entries(o).map(([k, v]) => [k, f(v)]));
 
 /**
- * @param {object} req 
- * @param {object} tableOptions 
- * @param {object[]} roles 
- * @param {object[]} pages 
- * @param {object} values 
+ * @param {object} req
+ * @param {object} tableOptions
+ * @param {object[]} roles
+ * @param {object[]} pages
+ * @param {object} values
  * @returns {Form}
  */
 const viewForm = (req, tableOptions, roles, pages, values) => {
@@ -328,7 +327,6 @@ const viewForm = (req, tableOptions, roles, pages, values) => {
  */
 router.get(
   "/edit/:viewname",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { viewname } = req.params;
@@ -376,7 +374,6 @@ router.get(
  */
 router.get(
   "/new",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const tables = await Table.find_with_external();
@@ -414,7 +411,6 @@ router.get(
  */
 router.post(
   "/save",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const tables = await Table.find_with_external();
@@ -484,11 +480,11 @@ router.post(
 );
 
 /**
- * @param {object} view 
- * @param {Workflow} wf 
- * @param {object} wfres 
- * @param {object} req 
- * @param {object} res 
+ * @param {object} view
+ * @param {Workflow} wf
+ * @param {object} wfres
+ * @param {object} req
+ * @param {object} res
  * @returns {void}
  */
 const respondWorkflow = (view, wf, wfres, req, res) => {
@@ -532,7 +528,6 @@ const respondWorkflow = (view, wf, wfres, req, res) => {
  */
 router.get(
   "/config/:name",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { name } = req.params;
@@ -565,7 +560,6 @@ router.get(
  */
 router.post(
   "/config/:name",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { name } = req.params;
@@ -585,7 +579,6 @@ router.post(
  */
 router.post(
   "/add-to-menu/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -615,7 +608,6 @@ router.post(
  */
 router.post(
   "/clone/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -637,7 +629,6 @@ router.post(
  */
 router.post(
   "/delete/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -655,7 +646,6 @@ router.post(
  */
 router.post(
   "/savebuilder/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -679,7 +669,6 @@ router.post(
  */
 router.post(
   "/setrole/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;

package/s3storage.js

@@ -0,0 +1,167 @@
+var aws = require("aws-sdk");
+var express = require("express");
+var multer = require("multer");
+var multerS3 = require("multer-s3");
+const { getState } = require("@saltcorn/data/db/state");
+const fileUpload = require("express-fileupload");
+const { v4: uuidv4 } = require("uuid");
+const { create } = require("@saltcorn/data/models/file");
+var contentDisposition = require("content-disposition");
+
+function createS3Client() {
+  return new aws.S3({
+    secretAccessKey: getState().getConfig("storage_s3_access_secret"),
+    accessKeyId: getState().getConfig("storage_s3_access_key"),
+    region: getState().getConfig("storage_s3_region"),
+    endpoint: getState().getConfig("storage_s3_endpoint"),
+  });
+}
+
+module.exports = {
+  /**
+   * Selector for file upload handler middleware. It will dispatch the
+   * file upload handler to the engine specified in the configuration.
+   *
+   * @param {*} req
+   * @param {*} res
+   * @param {*} next
+   */
+  middlewareSelect: async function (req, res, next) {
+    const useS3 = getState().getConfig("storage_s3_enabled");
+    if (useS3 === true) {
+      // Create S3 object
+
+      // Create multer function
+      const s3upload = multer({
+        storage: multerS3({
+          s3: createS3Client(),
+          bucket: getState().getConfig("storage_s3_bucket"),
+          metadata: function (req, file, cb) {
+            cb(null, { fieldName: file.fieldname });
+          },
+          key: function (req, file, cb) {
+            cb(null, "tmp/" + Date.now().toString() + uuidv4());
+          },
+        }),
+      }).any();
+
+      s3upload(req, res, next);
+    } else {
+      // Use regular file upload
+      fileUpload({
+        useTempFiles: true,
+        createParentPath: true,
+        tempFileDir: "/tmp/",
+      })(req, res, next);
+    }
+  },
+
+  /**
+   * Transform the processed req.files into that is suitable with
+   * Saltcorn File interface. It must be run after the middlewareSelect
+   *
+   * @param {*} req
+   * @param {*} res
+   * @param {*} next
+   */
+  middlewareTransform: async function (req, res, next) {
+    // If nothing to process or S3 is not enabled
+    const useS3 = getState().getConfig("storage_s3_enabled");
+    if (!req.files || !useS3) {
+      next();
+      return;
+    }
+
+    // Create S3 object
+    var s3 = createS3Client();
+    const bucket = getState().getConfig("storage_s3_bucket");
+
+    let newFileObject = {};
+    for (const file of req.files) {
+      file.mv = (newpath) => {
+        return new Promise((resolve, reject) => {
+          s3.copyObject(
+            {
+              Bucket: bucket,
+              CopySource: bucket + "/" + file.key,
+              Key: newpath,
+            },
+            function (err, data) {
+              if (err) reject(err);
+              else {
+                // Then delete
+                s3.deleteObject(
+                  {
+                    Bucket: bucket,
+                    Key: file.key,
+                  },
+                  (err, data) => {
+                    if (err) reject(err);
+                    else resolve(data);
+                  }
+                );
+              }
+            }
+          );
+        });
+      };
+      file.s3object = true;
+      file.name = file.originalname;
+      newFileObject[file.fieldname] = file;
+    }
+    req.files = newFileObject;
+    next();
+  },
+
+  /**
+   * Selector to serve object based on S3 state
+   *
+   * @param {*} file
+   * @param {*} res
+   * @param {*} download
+   */
+  serveObject: function (file, res, download) {
+    if (file.s3_store) {
+      var s3 = createS3Client();
+      const bucket = getState().getConfig("storage_s3_bucket");
+
+      var params = {
+        Bucket: bucket,
+        Key: file.location,
+      };
+
+      // Forward the object
+      s3.getObject(params)
+        .on("httpHeaders", function (statusCode, headers) {
+          if (!!download)
+            res.set("Content-Disposition", contentDisposition(file.filename));
+          res.set("Content-Length", headers["content-length"]);
+          this.response.httpResponse.createUnbufferedStream().pipe(res);
+        })
+        .send();
+    } else {
+      // Use legacy file download
+      res.download(file.location, file.filename);
+    }
+  },
+
+  unlinkObject: function (file) {
+    if (file.s3_store) {
+      var s3 = createS3Client();
+      return new Promise((resolve, reject) => {
+        s3.deleteObject(
+          {
+            Bucket: getState().getConfig("storage_s3_bucket"),
+            Key: file.location,
+          },
+          (err, data) => {
+            if (err) reject(err);
+            else resolve(data);
+          }
+        );
+      });
+    } else {
+      return fs.unlink(file.location);
+    }
+  },
+};