@saltcorn/server 0.6.3-beta.2 → 0.6.4-beta.2

package/app.js

@@ -28,6 +28,7 @@ const {
   getSessionStore,
   setTenant,
 } = require("./routes/utils.js");
+const { getAllTenants } = require("@saltcorn/admin-models/models/tenant");
 const path = require("path");
 const fileUpload = require("express-fileupload");
 const helmet = require("helmet");
@@ -38,7 +39,7 @@ const { h1 } = require("@saltcorn/markup/tags");
 const is = require("contractis/is");
 const Trigger = require("@saltcorn/data/models/trigger");
 const s3storage = require("./s3storage");
-
+const TotpStrategy = require("passport-totp").Strategy;
 const locales = Object.keys(available_languages);
 // i18n configuration
 const i18n = new I18n({
@@ -84,7 +85,8 @@ const getApp = async (opts = {}) => {
   app.use(i18n.init);
   // init multitenant mode
   if (db.is_it_multi_tenant()) {
-    await init_multi_tenant(loadAllPlugins, opts.disableMigrate);
+    const tenants = await getAllTenants();
+    await init_multi_tenant(loadAllPlugins, opts.disableMigrate, tenants);
   }
   //
   // todo ability to configure session_secret Age
@@ -148,7 +150,9 @@ const getApp = async (opts = {}) => {
             req.flash("danger", req.__("Incorrect user or password"))
           );
         const mu = await User.authenticate(userobj);
-        if (mu) return done(null, mu.session_object);
+        if (mu && mu._attributes.totp_enabled)
+          return done(null, { pending_user: mu.session_object });
+        else if (mu) return done(null, mu.session_object);
         else {
           const { password, ...nopw } = userobj;
           Trigger.emitEvent("LoginFailed", null, null, nopw);
@@ -188,6 +192,14 @@ const getApp = async (opts = {}) => {
       }
     })
   );
+  passport.use(
+    new TotpStrategy(function (user, done) {
+      // setup function, supply key and period to done callback
+      User.findOne({ id: user.pending_user.id }).then((u) => {
+        return done(null, u._attributes.totp_key, 30);
+      });
+    })
+  );
   passport.serializeUser(function (user, done) {
     done(null, user);
   });

package/auth/roleadmin.js

@@ -85,6 +85,28 @@ const editRoleLayoutForm = (role, layouts, layout_by_role, req) =>
     )
   );
 
+/**
+ * @param {Role} role
+ * @param {Layout[]} layouts
+ * @param {*} layout_by_role
+ * @param {object} req
+ * @returns {Form}
+ */
+const editRole2FAPolicyForm = (role, twofa_policy_by_role, req) =>
+  form(
+    {
+      action: `/roleadmin/setrole2fapolicy/${role.id}`,
+      method: "post",
+    },
+    csrfField(req),
+    select(
+      { name: "policy", onchange: "form.submit()" },
+      ["Optional", "Disabled", "Mandatory"].map((p) =>
+        option({ selected: twofa_policy_by_role[role.id] === p }, p)
+      )
+    )
+  );
+
 /**
  * @param {object} req
  * @returns {Form}
@@ -125,6 +147,7 @@ router.get(
       (l) => l !== "emergency"
     );
     const layout_by_role = getState().getConfig("layout_by_role");
+    const twofa_policy_by_role = getState().getConfig("twofa_policy_by_role");
     send_users_page({
       res,
       req,
@@ -142,6 +165,13 @@ router.get(
                 key: (role) =>
                   editRoleLayoutForm(role, layouts, layout_by_role, req),
               },
+              {
+                label: req.__("2FA policy"),
+                key: (role) =>
+                  role.id === 10
+                    ? ""
+                    : editRole2FAPolicyForm(role, twofa_policy_by_role, req),
+              },
               {
                 label: req.__("Delete"),
                 key: (r) =>
@@ -240,6 +270,26 @@ router.post(
   })
 );
 
+/**
+ * @name post/setrolelayout/:id
+ * @function
+ * @memberof module:auth/roleadmin~roleadminRouter
+ */
+router.post(
+  "/setrole2fapolicy/:id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { id } = req.params;
+    const twofa_policy_by_role = getState().getConfigCopy(
+      "twofa_policy_by_role"
+    );
+    twofa_policy_by_role[+id] = req.body.policy;
+    await getState().setConfig("twofa_policy_by_role", twofa_policy_by_role);
+    req.flash("success", req.__(`Saved 2FA policy for role`));
+
+    res.redirect(`/roleadmin`);
+  })
+);
 const unDeletableRoles = [1, 8, 10];
 /**
  * @name post/delete/:id

package/auth/routes.js

@@ -24,12 +24,14 @@ const { renderForm, post_btn } = require("@saltcorn/markup");
 const passport = require("passport");
 const {
   a,
+  img,
   text,
   table,
   tbody,
   th,
   td,
   tr,
+  h4,
   form,
   select,
   option,
@@ -37,6 +39,8 @@ const {
   i,
   div,
   code,
+  pre,
+  p,
 } = require("@saltcorn/markup/tags");
 const {
   available_languages,
@@ -49,10 +53,12 @@ const Table = require("@saltcorn/data/models/table");
 const { InvalidConfiguration } = require("@saltcorn/data/utils");
 const Trigger = require("@saltcorn/data/models/trigger");
 const { restore_backup } = require("../markup/admin.js");
-const { restore } = require("@saltcorn/data/models/backup");
+const { restore } = require("@saltcorn/admin-models/models/backup");
 const load_plugins = require("../load_plugins");
 const fs = require("fs");
-
+const base32 = require("thirty-two");
+const qrcode = require("qrcode");
+const totp = require("notp").totp;
 /**
  * @type {object}
  * @const
@@ -599,6 +605,8 @@ const signup_login_with_user = (u, req, res) =>
       if (!err) {
         Trigger.emitEvent("Login", null, u);
         if (getState().verifier) res.redirect("/auth/verification-flow");
+        else if (getState().get2FApolicy(u) === "Mandatory")
+          res.redirect("/auth/twofa/setup/totp");
         else res.redirect("/");
       } else {
         req.flash("danger", err);
@@ -920,6 +928,11 @@ router.post(
   error_catcher(async (req, res) => {
     ipLimiter.resetKey(req.ip);
     userLimiter.resetKey(userIdKey(req.body));
+    if (req.user.pending_user) {
+      res.redirect("/auth/twofa/login/totp");
+      return;
+    }
+
     if (req.session.cookie)
       if (req.body.remember) {
         const setDur = +getState().getConfig("cookie_duration_remember", 0);
@@ -932,7 +945,9 @@ router.post(
       }
     Trigger.emitEvent("Login", null, req.user);
     req.flash("success", req.__("Welcome, %s!", req.user.email));
-    res.redirect("/");
+    if (getState().get2FApolicy(req.user) === "Mandatory") {
+      res.redirect("/auth/twofa/setup/totp");
+    } else res.redirect("/");
   })
 );
 
@@ -1095,6 +1110,9 @@ const userSettings = async ({ req, res, pwform, user }) => {
   }
   let apikeycard;
   const min_role_apikeygen = +getState().getConfig("min_role_apikeygen", 1);
+  const twoFaPolicy = getState().get2FApolicy(user);
+  const show2FAPolicy =
+    twoFaPolicy !== "Disabled" || user._attributes.totp_enabled;
   if (user.role_id <= min_role_apikeygen)
     apikeycard = {
       type: "card",
@@ -1163,6 +1181,40 @@ const userSettings = async ({ req, res, pwform, user }) => {
         title: req.__("Change password"),
         contents: renderForm(pwform, req.csrfToken()),
       },
+      ...(show2FAPolicy
+        ? [
+            {
+              type: "card",
+              title: req.__("Two-factor authentication"),
+              contents: [
+                div(
+                  user._attributes.totp_enabled
+                    ? req.__("Two-factor authentication is enabled")
+                    : req.__("Two-factor authentication is disabled")
+                ),
+                div(
+                  user._attributes.totp_enabled
+                    ? post_btn(
+                        "/auth/twofa/disable/totp",
+                        "Disable",
+                        req.csrfToken(),
+                        {
+                          btnClass: "btn-danger mt-2",
+                          req,
+                        }
+                      )
+                    : a(
+                        {
+                          href: "/auth/twofa/setup/totp",
+                          class: "btn btn-primary mt-2",
+                        },
+                        "Enable"
+                      )
+                ),
+              ],
+            },
+          ]
+        : []),
       ...(apikeycard ? [apikeycard] : []),
     ],
   };
@@ -1253,6 +1305,12 @@ router.get(
   loggedIn,
   error_catcher(async (req, res) => {
     const user = await User.findOne({ id: req.user.id });
+    if (!user) {
+      req.logout();
+      req.flash("danger", req.__("Must be logged in first"));
+      res.redirect("/auth/login");
+      return;
+    }
     res.sendWrap(
       req.__("User settings"),
       await userSettings({ req, res, pwform: changPwForm(req), user })
@@ -1436,3 +1494,171 @@ router.all(
     res.redirect(wfres.redirect || "/");
   })
 );
+
+/**
+ * @name get/settings
+ * @function
+ * @memberof module:auth/routes~routesRouter
+ */
+router.get(
+  "/twofa/setup/totp",
+  loggedIn,
+  error_catcher(async (req, res) => {
+    const user = await User.findOne({ id: req.user.id });
+    let key;
+    if (user._attributes.totp_key) key = user._attributes.totp_key;
+    else {
+      key = randomKey(10);
+      user._attributes.totp_key = key;
+      await user.update({ _attributes: user._attributes });
+    }
+
+    const encodedKey = base32.encode(key);
+
+    // generate QR code for scanning into Google Authenticator
+    // reference: https://code.google.com/p/google-authenticator/wiki/KeyUriFormat
+    const site_name = getState().getConfig("site_name");
+    const otpUrl = `otpauth://totp/${
+      user.email
+    }?secret=${encodedKey}&period=30&issuer=${encodeURIComponent(site_name)}`;
+    const image = await qrcode.toDataURL(otpUrl);
+    res.sendWrap(req.__("Setup two-factor authentication"), {
+      type: "card",
+      title: req.__(
+        "Setup two-factor authentication with Time-based One-Time Password (TOTP)"
+      ),
+      contents: [
+        h4(req.__("1. Scan this QR code in your Authenticator app")),
+        img({ src: image }),
+        p("Or enter this code:"),
+        code(pre(encodedKey.toString())),
+        h4(
+          req.__(
+            "2. Enter the six-digit code generated in your Authenticator app"
+          )
+        ),
+        renderForm(totpForm(req), req.csrfToken()),
+      ],
+    });
+  })
+);
+
+router.post(
+  "/twofa/setup/totp",
+  loggedIn,
+  error_catcher(async (req, res) => {
+    const user = await User.findOne({ id: req.user.id });
+
+    if (!user._attributes.totp_key) {
+      //key not set
+      req.flash("danger", req.__("2FA TOTP Key not set"));
+      res.redirect("/auth/twofa/setup/totp");
+      return;
+    }
+
+    const form = totpForm(req);
+    form.validate(req.body);
+    if (form.hasErrors) {
+      req.flash("danger", req.__("Error processing form"));
+      res.redirect("/auth/twofa/setup/totp");
+      return;
+    }
+    const code = `${form.values.totpCode}`;
+    const rv = totp.verify(code, user._attributes.totp_key, {
+      time: 30,
+    });
+    if (!rv) {
+      req.flash("danger", req.__("Could not verify code"));
+      res.redirect("/auth/twofa/setup/totp");
+      return;
+    }
+    user._attributes.totp_enabled = true;
+    await user.update({ _attributes: user._attributes });
+    req.flash(
+      "success",
+      req.__(
+        "Two-factor authentication with Time-based One-Time Password enabled"
+      )
+    );
+
+    res.redirect("/auth/settings");
+  })
+);
+
+router.post(
+  "/twofa/disable/totp",
+  loggedIn,
+  error_catcher(async (req, res) => {
+    const user = await User.findOne({ id: req.user.id });
+    user._attributes.totp_enabled = false;
+    delete user._attributes.totp_key;
+    await user.update({ _attributes: user._attributes });
+    req.flash(
+      "success",
+      req.__(
+        "Two-factor authentication with Time-based One-Time Password disabled"
+      )
+    );
+    res.redirect("/auth/settings");
+  })
+);
+const totpForm = (req) =>
+  new Form({
+    action: "/auth/twofa/setup/totp",
+    fields: [
+      {
+        name: "totpCode",
+        label: req.__("Code"),
+        type: "Integer",
+        required: true,
+      },
+    ],
+  });
+
+const randomKey = function (len) {
+  function getRandomInt(min, max) {
+    return Math.floor(Math.random() * (max - min + 1)) + min;
+  }
+  var buf = [],
+    chars = "abcdefghijklmnopqrstuvwxyz0123456789",
+    charlen = chars.length;
+
+  for (var i = 0; i < len; ++i) {
+    buf.push(chars[getRandomInt(0, charlen - 1)]);
+  }
+
+  return buf.join("");
+};
+
+router.get(
+  "/twofa/login/totp",
+  error_catcher(async (req, res) => {
+    const form = new Form({
+      action: "/auth/twofa/login/totp",
+      submitLabel: "Verify",
+      fields: [
+        {
+          name: "code",
+          label: req.__("Code"),
+          type: "Integer",
+          required: true,
+        },
+      ],
+    });
+    res.sendAuthWrap(req.__(`Two-factor authentication`), form, {});
+  })
+);
+
+router.post(
+  "/twofa/login/totp",
+  passport.authenticate("totp", {
+    failureRedirect: "/auth/twofa/login/totp",
+    failureFlash: true,
+  }),
+  error_catcher(async (req, res) => {
+    const user = await User.findOne({ id: req.user.pending_user.id });
+    user.relogin(req);
+    Trigger.emitEvent("Login", null, user);
+    res.redirect("/");
+  })
+);

package/locales/en.json

@@ -847,5 +847,23 @@
 	"Row inclusion formula": "Row inclusion formula",
 	"Only include rows where this formula is true": "Only include rows where this formula is true",
 	"Slug": "Slug",
-	"Field that can be used for a prettier URL structure": "Field that can be used for a prettier URL structure"
+	"Field that can be used for a prettier URL structure": "Field that can be used for a prettier URL structure",
+	"Setup two-factor authentication": "Setup two-factor authentication",
+	"Setup two-factor authentication with Time-based One-Time Password (TOTP)": "Setup two-factor authentication with Time-based One-Time Password (TOTP)",
+	"1. Scan this QR code in your Authenticator app": "1. Scan this QR code in your Authenticator app",
+	"2. Enter the six-digit code generated in your Authenticator app": "2. Enter the six-digit code generated in your Authenticator app",
+	"Code": "Code",
+	"Two-factor authentication with Time-based One-Time Password enabled": "Two-factor authentication with Time-based One-Time Password enabled",
+	"Two-factor authentication": "Two-factor authentication",
+	"Two-factor authentication is enabled": "Two-factor authentication is enabled",
+	"Two-factor authentication with Time-based One-Time Password disabled": "Two-factor authentication with Time-based One-Time Password disabled",
+	"Two-factor authentication is disabled": "Two-factor authentication is disabled",
+	"Auto save": "Auto save",
+	"Save any changes immediately": "Save any changes immediately",
+	"Transpose": "Transpose",
+	"Display one column per line": "Display one column per line",
+	"Vertical column width": "Vertical column width",
+	"Vertical width units": "Vertical width units",
+	"Save before going back": "Save before going back",
+	"Reload after going back": "Reload after going back"
 }

package/package.json

@@ -1,17 +1,18 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.6.3-beta.2",
+  "version": "0.6.4-beta.2",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@saltcorn/base-plugin": "0.6.3-beta.2",
-    "@saltcorn/builder": "0.6.3-beta.2",
-    "@saltcorn/data": "0.6.3-beta.2",
+    "@saltcorn/base-plugin": "0.6.4-beta.2",
+    "@saltcorn/builder": "0.6.4-beta.2",
+    "@saltcorn/data": "0.6.4-beta.2",
+    "@saltcorn/admin-models": "0.6.4-beta.2",
     "greenlock-express": "^4.0.3",
-    "@saltcorn/markup": "0.6.3-beta.2",
-    "@saltcorn/sbadmin2": "0.6.3-beta.2",
+    "@saltcorn/markup": "0.6.4-beta.2",
+    "@saltcorn/sbadmin2": "0.6.4-beta.2",
     "@socket.io/cluster-adapter": "^0.1.0",
     "@socket.io/sticky": "^1.0.1",
     "connect-flash": "^0.1.1",
@@ -34,13 +35,17 @@
     "moment": "^2.27.0",
     "node-fetch": "2.6.2",
     "node-watch": "^0.7.2",
+    "notp": "2.0.3",
     "passport": "^0.4.1",
     "passport-custom": "^1.1.1",
     "passport-http-bearer": "^1.0.1",
+    "passport-totp": "0.0.2",
     "pg": "^8.2.1",
     "pluralize": "^8.0.0",
+    "qrcode": "1.5.0",
     "socket.io": "4.2.0",
     "tmp-promise": "^3.0.2",
+    "thirty-two": "1.0.2",
     "multer-s3": "^2.10.0",
     "multer": "^1.4.3",
     "aws-sdk": "^2.1037.0",
@@ -77,7 +82,9 @@
       "@saltcorn/data/(.*)": "@saltcorn/data/dist/$1",
       "@saltcorn/types/(.*)": "@saltcorn/types/dist/$1",
       "@saltcorn/markup$": "@saltcorn/markup/dist",
-      "@saltcorn/markup/(.*)": "@saltcorn/markup/dist/$1"
+      "@saltcorn/markup/(.*)": "@saltcorn/markup/dist/$1",
+      "@saltcorn/server/(.*)": "@saltcorn/server/dist/$1",
+      "@saltcorn/admin-models/(.*)": "@saltcorn/admin-models/dist/$1"
     }
   },
   "publishConfig": {

package/public/gridedit.js

@@ -179,7 +179,9 @@ DateField.prototype = new jsGrid.Field({
     setTimeout(function () {
       flatpickr(insertPicker, {
         enableTime: true,
-        dateFormat: "Y-m-d H:i",
+        dateFormat: "Z",
+        altInput: true,
+        altFormat: "Y-m-d h:i K",
       });
     });
     return insertPicker;
@@ -192,7 +194,9 @@ DateField.prototype = new jsGrid.Field({
     setTimeout(function () {
       flatpickr(editPicker, {
         enableTime: true,
-        dateFormat: "Y-m-d H:i",
+        dateFormat: "Z",
+        altInput: true,
+        altFormat: "Y-m-d h:i K",
       });
     });
     return editPicker;

package/public/saltcorn.js

@@ -30,7 +30,10 @@ function add_repeater(nm) {
 function apply_showif() {
   $("[data-show-if]").each(function (ix, element) {
     var e = $(element);
-    var to_show = new Function("e", "return " + e.attr("data-show-if"));
+    var to_show = new Function(
+      "e",
+      "return " + decodeURIComponent(e.attr("data-show-if"))
+    );
     if (to_show(e))
       e.show()
         .find("input, textarea, button, select")
@@ -225,13 +228,15 @@ function initialize_page() {
   });
   if (codes.length > 0)
     enable_codemirror(() => {
-      codes.forEach((el) => {
-        console.log($(el).attr("mode"), el);
-        CodeMirror.fromTextArea(el, {
-          lineNumbers: true,
-          mode: $(el).attr("mode"),
+      setTimeout(() => {
+        codes.forEach((el) => {
+          //console.log($(el).attr("mode"), el);
+          CodeMirror.fromTextArea(el, {
+            lineNumbers: true,
+            mode: $(el).attr("mode"),
+          });
         });
-      });
+      }, 100);
     });
   const locale =
     navigator.userLanguage ||
@@ -479,7 +484,7 @@ function press_store_button(clicked) {
 
 function ajax_modal(url, opts = {}) {
   if ($("#scmodal").length === 0) {
-    $("body").append(`<div id="scmodal", class="modal" tabindex="-1">
+    $("body").append(`<div id="scmodal", class="modal">
     <div class="modal-dialog">
       <div class="modal-content">
         <div class="modal-header">
@@ -503,6 +508,7 @@ function ajax_modal(url, opts = {}) {
       if (title) $("#scmodal .modal-title").html(decodeURIComponent(title));
       $("#scmodal .modal-body").html(res);
       $("#scmodal").modal();
+      initialize_page();
       (opts.onOpen || function () {})(res);
       $("#scmodal").on("hidden.bs.modal", function (e) {
         (opts.onClose || function () {})(res);
@@ -510,6 +516,36 @@ function ajax_modal(url, opts = {}) {
     },
   });
 }
+
+function saveAndContinue(e, k) {
+  var form = $(e).closest("form");
+  var url = form.attr("action");
+  var form_data = form.serialize();
+  $.ajax(url, {
+    type: "POST",
+    headers: {
+      "CSRF-Token": _sc_globalCsrf,
+    },
+    data: form_data,
+    success: function (res) {
+      if (res.id && form.find("input[name=id")) {
+        form.append(
+          `<input type="hidden" class="form-control  " name="id" value="${res.id}">`
+        );
+      }
+    },
+    error: function (request) {
+      $("#page-inner-content").html(request.responseText);
+      initialize_page();
+    },
+    complete: function () {
+      if (k) k();
+    },
+  });
+
+  return false;
+}
+
 function ajaxSubmitForm(e) {
   var form = $(e).closest("form");
   var url = form.attr("action");
@@ -574,7 +610,33 @@ function ajax_post_btn(e, reload_on_done, reload_delay) {
 
   return false;
 }
-
+function make_unique_field(id, table_id, field_name, value) {
+  if (!value) return;
+  $.ajax(
+    `/api/${table_id}?approximate=true&${encodeURIComponent(
+      field_name
+    )}=${encodeURIComponent(value)}&fields=${encodeURIComponent(field_name)}`,
+    {
+      type: "GET",
+      success: function (res) {
+        if (res.success) {
+          const vals = res.success
+            .map((o) => o[field_name])
+            .filter((s) => s.startsWith(value));
+          if (vals.includes(value)) {
+            for (let i = 1; i < vals.length + 1; i++) {
+              const newname = `${value} ${i}`;
+              if (!vals.includes(newname)) {
+                $("#" + id).val(newname);
+                return;
+              }
+            }
+          }
+        }
+      },
+    }
+  );
+}
 function test_formula(tablename, stored) {
   var formula = $("input[name=expression]").val();
   ajax_post(`/field/test-formula`, {

package/restart_watcher.js

@@ -8,7 +8,7 @@ const { spawnSync } = require("child_process");
 const watch = require("node-watch");
 const Plugin = require("@saltcorn/data/models/plugin");
 const db = require("@saltcorn/data/db");
-const { eachTenant } = require("@saltcorn/data/models/tenant");
+const { eachTenant } = require("@saltcorn/admin-models/models/tenant");
 
 /**
  * packages that should trigger a server re-start
@@ -120,6 +120,9 @@ const listenForChanges = (projectDirs, pluginDirs) => {
         (event, file) => {
           console.log("'%s' changed \n re-starting now", file);
           closeWatchers();
+          spawnSync("npm", ["run", "tsc"], {
+            stdio: "inherit",
+          });
           process.exit();
         }
       )