ghost 4.17.0 → 4.17.1

package/core/server/services/redirects/validation.js

@@ -4,6 +4,7 @@ const errors = require('@tryghost/errors');
 
 const messages = {
     redirectsWrongFormat: 'Incorrect redirects file format.',
+    invalidRedirectsFromRegex: 'Incorrect RegEx in redirects file.',
     redirectsHelp: 'https://ghost.org/docs/themes/routing/#redirects'
 };
 /**
@@ -26,6 +27,17 @@ const validate = (redirects) => {
                 help: tpl(messages.redirectsHelp)
             });
         }
+
+        try {
+            // each 'from' property should be a valid RegExp string
+            new RegExp(redirect.from);
+        } catch (error) {
+            throw new errors.ValidationError({
+                message: tpl(messages.invalidRedirectsFromRegex),
+                context: redirect,
+                help: tpl(messages.redirectsHelp)
+            });
+        }
     });
 };
 

package/core/server/web/shared/middlewares/custom-redirects.js

@@ -19,14 +19,14 @@ let customRedirectsRouter;
 
 /**
  *
+ * @param {Object} router instance of Express Router to decorate with redirects
  * @param {Object} redirects valid redirects JSON
+ *
  * @returns {Object} instance of express.Router express router handling redirects based on config
  */
-_private.registerRoutes = (redirects) => {
+_private.registerRoutes = (router, redirects) => {
     debug('redirects loading');
 
-    const redirectsRouter = express.Router('redirects');
-
     if (labsService.isSet('offers')) {
         redirects.unshift({
             from: '/zimo50',
@@ -61,7 +61,7 @@ _private.registerRoutes = (redirects) => {
         }
 
         debug('register', redirect.from);
-        redirectsRouter.get(new RegExp(redirect.from, options), function (req, res) {
+        router.get(new RegExp(redirect.from, options), function (req, res) {
             const maxAge = redirect.permanent ? config.get('caching:customRedirects:maxAge') : 0;
             const toURL = url.parse(redirect.to);
             const toURLParams = querystring.parse(toURL.query);
@@ -91,16 +91,17 @@ _private.registerRoutes = (redirects) => {
 
     debug('redirects loaded');
 
-    return redirectsRouter;
+    return router;
 };
 
 const loadRoutes = () => {
     try {
+        customRedirectsRouter = express.Router('redirects');
+
         const redirects = redirectsService.loadRedirectsFile();
         redirectsService.validate(redirects);
 
-        const redirectsRouter = _private.registerRoutes(redirects);
-        customRedirectsRouter = redirectsRouter;
+        _private.registerRoutes(customRedirectsRouter, redirects);
     } catch (err) {
         if (errors.utils.isIgnitionError(err)) {
             logging.error(err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "4.17.0",
+  "version": "4.17.1",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",