update packages

controllers/process.js

@@ -1,144 +1,160 @@
-'use strict'
+"use strict";
 
-const path = require('path')
-const config = require(path.join(__dirname, '/../config'))
-const errorHandler = require('../lib/ErrorHandler')
-const reCaptcha = require('express-recaptcha')
-const Staticman = require('../lib/Staticman')
-const universalAnalytics = require('universal-analytics')
+const path = require("path");
+const config = require(path.join(__dirname, "/../config"));
+const errorHandler = require("../lib/ErrorHandler");
+const reCaptcha = require("express-recaptcha");
+const reCaptcha3 = require("express-recaptcha").RecaptchaV3;
+const Staticman = require("../lib/Staticman");
+const universalAnalytics = require("universal-analytics");
 
-function checkRecaptcha (staticman, req) {
+function checkRecaptcha(staticman, req) {
   return new Promise((resolve, reject) => {
-    staticman.getSiteConfig().then(siteConfig => {
-      if (!siteConfig.get('reCaptcha.enabled')) {
-        return resolve(false)
-      }
-
-      const reCaptchaOptions = req.body.options && req.body.options.reCaptcha
-
-      if (!reCaptchaOptions || !reCaptchaOptions.siteKey || !reCaptchaOptions.secret) {
-        return reject(errorHandler('RECAPTCHA_MISSING_CREDENTIALS'))
-      }
-
-      let decryptedSecret
-
-      try {
-        decryptedSecret = staticman.decrypt(reCaptchaOptions.secret)
-      } catch (err) {
-        return reject(errorHandler('RECAPTCHA_CONFIG_MISMATCH'))
-      }
-
-      if (
-        reCaptchaOptions.siteKey !== siteConfig.get('reCaptcha.siteKey') ||
-        decryptedSecret !== siteConfig.get('reCaptcha.secret')
-      ) {
-        return reject(errorHandler('RECAPTCHA_CONFIG_MISMATCH'))
-      }
-
-      reCaptcha.init(reCaptchaOptions.siteKey, decryptedSecret)
-      reCaptcha.verify(req, err => {
-        if (err) {
-          return reject(errorHandler(err))
+    staticman
+      .getSiteConfig()
+      .then((siteConfig) => {
+        if (!siteConfig.get("reCaptcha.enabled")) {
+          return resolve(false);
         }
 
-        return resolve(true)
+        const reCaptchaOptions = {
+          siteKey: siteConfig.get("reCaptcha.siteKey"),
+          secret: siteConfig.get("reCaptcha.secret"),
+        };
+
+        if (
+          !reCaptchaOptions ||
+          !reCaptchaOptions.siteKey ||
+          !reCaptchaOptions.secret
+        ) {
+          return reject(errorHandler("RECAPTCHA_MISSING_CREDENTIALS"));
+        }
+
+        const recaptcha =
+          siteConfig.get("reCaptcha.version") === "v3"
+            ? new reCaptcha3(
+                reCaptchaOptions.siteKey,
+                reCaptchaOptions.secret,
+                {
+                  callback: "cb",
+                }
+              )
+            : new reCaptcha(reCaptchaOptions.siteKey, reCaptchaOptions.secret, {
+                callback: "cb",
+              });
+
+        recaptcha.verify(req, (err, data) => {
+          if (err) {
+            return reject(errorHandler(err));
+          }
+
+          return resolve(true);
+        });
       })
-    }).catch(err => reject(err))
-  })
+      .catch((err) => reject(err));
+  });
 }
 
-function createConfigObject (apiVersion, property) {
-  let remoteConfig = {}
+function createConfigObject(apiVersion, property) {
+  let remoteConfig = {};
 
-  if (apiVersion === '1') {
-    remoteConfig.file = '_config.yml'
-    remoteConfig.path = 'staticman'
+  if (apiVersion === "1") {
+    remoteConfig.file = "_config.yml";
+    remoteConfig.path = "staticman";
   } else {
-    remoteConfig.file = 'staticman.yml'
-    remoteConfig.path = property || ''
+    remoteConfig.file = "staticman.yml";
+    remoteConfig.path = property || "";
   }
 
-  return remoteConfig
+  return remoteConfig;
 }
 
-function process (staticman, req, res) {
-  const ua = config.get('analytics.uaTrackingId')
-    ? universalAnalytics(config.get('analytics.uaTrackingId'))
-    : null
-  const fields = req.query.fields || req.body.fields
-  const options = req.query.options || req.body.options || {}
+function process(staticman, req, res) {
+  const ua = config.get("analytics.uaTrackingId")
+    ? universalAnalytics(config.get("analytics.uaTrackingId"))
+    : null;
+  const fields = req.query.fields || req.body.fields;
+  const options = req.query.options || req.body.options || {};
 
-  return staticman.processEntry(fields, options).then(data => {
+  return staticman.processEntry(fields, options).then((data) => {
     sendResponse(res, {
       redirect: data.redirect,
-      fields: data.fields
-    })
+      fields: data.fields,
+    });
 
     if (ua) {
-      ua.event('Entries', 'New entry').send()
+      ua.event("Entries", "New entry").send();
     }
-  })
+  });
 }
 
-function sendResponse (res, data) {
-  const error = data && data.err
-  const statusCode = error ? 500 : 200
+function sendResponse(res, data) {
+  const error = data && data.err;
+  const statusCode = error ? 500 : 200;
 
   if (!error && data.redirect) {
-    return res.redirect(data.redirect)
+    return res.redirect(data.redirect);
   }
 
   if (error && data.redirectError) {
-    return res.redirect(data.redirectError)
+    return res.redirect(data.redirectError);
   }
 
   let payload = {
-    success: !error
-  }
+    success: !error,
+  };
 
   if (error && error._smErrorCode) {
-    const errorCode = errorHandler.getInstance().getErrorCode(error._smErrorCode)
-    const errorMessage = errorHandler.getInstance().getMessage(error._smErrorCode)
+    const errorCode = errorHandler
+      .getInstance()
+      .getErrorCode(error._smErrorCode);
+    const errorMessage = errorHandler
+      .getInstance()
+      .getMessage(error._smErrorCode);
 
     if (errorMessage) {
-      payload.message = errorMessage
+      payload.message = errorMessage;
     }
 
     if (error.data) {
-      payload.data = error.data
+      payload.data = error.data;
     }
 
     if (error) {
-      payload.rawError = error
+      payload.rawError = error;
     }
 
-    payload.errorCode = errorCode
+    payload.errorCode = errorCode;
   } else if (error) {
-    payload.rawError = data.err.toString()
+    payload.rawError = data.err.toString();
   } else {
-    payload.fields = data.fields
+    payload.fields = data.fields;
   }
 
-  res.status(statusCode).send(payload)
+  res.status(statusCode).send(payload);
 }
 
 module.exports = async (req, res, next) => {
-  const staticman = await new Staticman(req.params)
+  const staticman = await new Staticman(req.params);
 
-  staticman.setConfigPath()
-  staticman.setIp(req.headers['x-forwarded-for'] || req.connection.remoteAddress)
-  staticman.setUserAgent(req.headers['user-agent'])
+  staticman.setConfigPath();
+  staticman.setIp(
+    req.headers["x-forwarded-for"] || req.connection.remoteAddress
+  );
+  staticman.setUserAgent(req.headers["user-agent"]);
 
   return checkRecaptcha(staticman, req)
-    .then(usedRecaptcha => process(staticman, req, res))
-    .catch(err => sendResponse(res, {
-      err,
-      redirect: req.body.options && req.body.options.redirect,
-      redirectError: req.body.options && req.body.options.redirectError
-    }))
-}
+    .then((usedRecaptcha) => process(staticman, req, res))
+    .catch((err) =>
+      sendResponse(res, {
+        err,
+        redirect: req.body.options && req.body.options.redirect,
+        redirectError: req.body.options && req.body.options.redirectError,
+      })
+    );
+};
 
-module.exports.checkRecaptcha = checkRecaptcha
-module.exports.createConfigObject = createConfigObject
-module.exports.process = process
-module.exports.sendResponse = sendResponse
+module.exports.checkRecaptcha = checkRecaptcha;
+module.exports.createConfigObject = createConfigObject;
+module.exports.process = process;
+module.exports.sendResponse = sendResponse;