ghost 4.22.2 → 4.24.0

package/core/server/web/shared/{middlewares → middleware}/error-handler.js

@@ -60,6 +60,32 @@ _private.createHbsEngine = () => {
     return engine.express4();
 };
 
+_private.updateStack = (err) => {
+    let stackbits = err.stack.split(/\n/g);
+
+    // We build this up backwards, so we always insert at position 1
+
+    if (process.env.NODE_ENV === 'production' || err.statusCode === 404) {
+        // In production mode, remove the stack trace
+        stackbits.splice(1, stackbits.length - 1);
+    } else {
+        // In dev mode, clearly mark the strack trace
+        stackbits.splice(1, 0, `Stack Trace:`);
+    }
+
+    // Add in our custom cotext and help methods
+
+    if (err.help) {
+        stackbits.splice(1, 0, `${err.help}`);
+    }
+
+    if (err.context) {
+        stackbits.splice(1, 0, `${err.context}`);
+    }
+
+    return stackbits.join('\n');
+};
+
 /**
  * Get an error ready to be shown the the user
  *
@@ -79,14 +105,6 @@ _private.prepareError = (err, req, res, next) => {
             err = new errors.NotFoundError({
                 err: err
             });
-        } else if (err.stack.match(/node_modules\/handlebars\//)) {
-            // Temporary handling of theme errors from handlebars
-            // @TODO remove this when #10496 is solved properly
-            err = new errors.IncorrectUsageError({
-                err: err,
-                message: err.message,
-                statusCode: err.statusCode
-            });
         } else {
             err = new errors.GhostError({
                 err: err,
@@ -102,6 +120,8 @@ _private.prepareError = (err, req, res, next) => {
     // alternative for res.status();
     res.statusCode = err.statusCode;
 
+    err.stack = _private.updateStack(err);
+
     // never cache errors
     res.set({
         'Cache-Control': 'no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0'
@@ -123,6 +143,23 @@ _private.JSONErrorRenderer = (err, req, res, next) => { // eslint-disable-line n
     });
 };
 
+_private.JSONErrorRendererV2 = (err, req, res, next) => { // eslint-disable-line no-unused-vars
+    const userError = _private.prepareUserMessage(err, req);
+
+    res.json({
+        errors: [{
+            message: userError.message || null,
+            context: userError.context || null,
+            type: err.errorType || null,
+            details: err.errorDetails || null,
+            property: err.property || null,
+            help: err.help || null,
+            code: err.code || null,
+            id: err.id || null
+        }]
+    });
+};
+
 _private.prepareUserMessage = (err, res) => {
     const userError = {
         message: err.message,
@@ -169,23 +206,6 @@ _private.prepareUserMessage = (err, res) => {
     return userError;
 };
 
-_private.JSONErrorRendererV2 = (err, req, res, next) => { // eslint-disable-line no-unused-vars
-    const userError = _private.prepareUserMessage(err, req);
-
-    res.json({
-        errors: [{
-            message: userError.message || null,
-            context: userError.context || null,
-            type: err.errorType || null,
-            details: err.errorDetails || null,
-            property: err.property || null,
-            help: err.help || null,
-            code: err.code || null,
-            id: err.id || null
-        }]
-    });
-};
-
 _private.ErrorFallbackMessage = err => `<h1>${tpl(messages.oopsErrorTemplateHasError)}</h1>
      <p>${tpl(messages.encounteredError)}</p>
      <pre>${escapeExpression(err.message || err)}</pre>
@@ -241,39 +261,36 @@ _private.ThemeErrorRenderer = (err, req, res, next) => {
     });
 };
 
-_private.HTMLErrorRenderer = (err, req, res, next) => { // eslint-disable-line no-unused-vars
-    const data = {
-        message: err.message,
-        statusCode: err.statusCode,
-        errorDetails: err.errorDetails || []
-    };
-
-    // e.g. if you serve the admin /ghost and Ghost returns a 503 because it generates the urls at the moment.
-    // This ensures that no matter what res.render will work here
-    // @TODO: put to prepare error function?
-    if (_.isEmpty(req.app.engines)) {
-        res._template = 'error';
-        req.app.engine('hbs', _private.createHbsEngine());
-        req.app.set('view engine', 'hbs');
-        req.app.set('views', config.get('paths').defaultViews);
-    }
-
-    res.render('error', data, (_err, html) => {
-        if (!_err) {
-            return res.send(html);
-        }
+/**
+ *  Borrowed heavily from finalHandler
+ */
 
-        // re-attach new error e.g. error template has syntax error or misusage
-        req.err = _err;
+const DOUBLE_SPACE_REGEXP = /\x20{2}/g;
+const NEWLINE_REGEXP = /\n/g;
+
+function createHtmlDocument(status, message) {
+    let body = escapeExpression(message)
+        .replace(NEWLINE_REGEXP, '<br>')
+        .replace(DOUBLE_SPACE_REGEXP, ' &nbsp;');
+
+    return `<!DOCTYPE html>\n
+       <html lang="en">\n
+       <head>\n
+       <meta charset="utf-8">\n
+       <title>${status} Error</title>\n
+       </head>\n
+       <body>\n
+       <pre>${status} ${body}</pre>\n
+       </body>\n
+       </html>\n`;
+}
 
-        // And then try to explain things to the user...
-        // Cheat and output the error using handlebars escapeExpression
-        return res.status(500).send(_private.ErrorFallbackMessage(_err));
-    });
+_private.HTMLErrorRenderer = (err, req, res, next) => { // eslint-disable-line no-unused-vars
+    return res.send(createHtmlDocument(res.statusCode, err.stack));
 };
 
 _private.BasicErrorRenderer = (err, req, res, next) => { // eslint-disable-line no-unused-vars
-    return res.send(res.statusCode + ' ' + err.message);
+    return res.send(res.statusCode + ' ' + err.stack);
 };
 
 errorHandler.resourceNotFound = (req, res, next) => {

package/core/server/web/shared/{middlewares → middleware}/index.js

@@ -15,10 +15,6 @@ module.exports = {
         return require('./error-handler');
     },
 
-    get maintenance() {
-        return require('./maintenance');
-    },
-
     get prettyUrls() {
         return require('./pretty-urls');
     },

package/core/shared/config/defaults.json

@@ -15,7 +15,9 @@
     "privacy": false,
     "useMinFiles": true,
     "paths": {
-        "contentPath": "content/"
+        "contentPath": "content/",
+        "fixtures": "core/server/data/schema/fixtures/fixtures",
+        "assetSrc": "core/frontend/src"
     },
     "adapters": {
         "sso": {
@@ -127,5 +129,9 @@
     "portal": {
         "url": "https://unpkg.com/@tryghost/portal@~1.12.0/umd/portal.min.js",
         "version": "1.12"
+    },
+    "tenor": {
+        "apiKey": null,
+        "contentFilter": "off"
     }
 }

package/core/shared/config/helpers.js

@@ -1,4 +1,42 @@
 const path = require('path');
+const escapeRegExp = require('lodash/escapeRegExp');
+const {URL} = require('url');
+
+const DEFAULT_HOST_ARG = /.*/;
+
+const getHostInfo = (config) => {
+    const frontendHost = new URL(config.getSiteUrl()).hostname;
+
+    const backendHost = config.getAdminUrl() ? (new URL(config.getAdminUrl()).hostname) : '';
+    const hasSeparateBackendHost = backendHost && backendHost !== frontendHost;
+
+    return {
+        backendHost,
+        hasSeparateBackendHost
+    };
+};
+
+/**
+ *
+ * @returns {string|RegExp}
+ */
+const getBackendMountPath = function getFrontendMountPath() {
+    const {backendHost, hasSeparateBackendHost} = getHostInfo(this);
+
+    // with a separate admin url only serve on that host, otherwise serve on all hosts
+    return (hasSeparateBackendHost) && backendHost ? backendHost : DEFAULT_HOST_ARG;
+};
+
+/**
+ *
+ * @returns {string|RegExp}
+ */
+const getFrontendMountPath = function getFrontendMountPath() {
+    const {backendHost, hasSeparateBackendHost} = getHostInfo(this);
+
+    // with a separate admin url we adjust the frontend vhost to exclude requests to that host, otherwise serve on all hosts
+    return (hasSeparateBackendHost && backendHost) ? new RegExp(`^(?!${escapeRegExp(backendHost)}).*`) : DEFAULT_HOST_ARG;
+};
 
 /**
  * @callback isPrivacyDisabledFn
@@ -46,6 +84,8 @@ const getContentPath = function getContentPath(type) {
         return path.join(this.get('paths:contentPath'), 'data/');
     case 'settings':
         return path.join(this.get('paths:contentPath'), 'settings/');
+    case 'public':
+        return path.join(this.get('paths:contentPath'), 'public/');
     default:
         // new Error is allowed here, as we do not want config to depend on @tryghost/error
         // @TODO: revisit this decision when @tryghost/error is no longer dependent on all of ghost-ignition
@@ -62,4 +102,6 @@ const getContentPath = function getContentPath(type) {
 module.exports.bindAll = (nconf) => {
     nconf.isPrivacyDisabled = isPrivacyDisabled.bind(nconf);
     nconf.getContentPath = getContentPath.bind(nconf);
+    nconf.getBackendMountPath = getBackendMountPath.bind(nconf);
+    nconf.getFrontendMountPath = getFrontendMountPath.bind(nconf);
 };

package/core/shared/config/loader.js

@@ -41,8 +41,8 @@ function loadNconf(options) {
     // ## Config Methods
 
     // Expose dynamic utility methods
-    helpers.bindAll(nconf);
     urlHelpers.bindAll(nconf);
+    helpers.bindAll(nconf);
 
     // ## Sanitization
 

package/core/shared/labs.js

@@ -37,7 +37,12 @@ const ALPHA_FEATURES = [
     'calloutCard',
     'nftCard',
     'accordionCard',
-    'gifsCard'
+    'gifsCard',
+    'fileCard',
+    'audioCard',
+    'videoCard',
+    'productCard',
+    'quoteStyles'
 ];
 
 module.exports.GA_KEYS = [...GA_FEATURES];
@@ -47,7 +52,7 @@ module.exports.getAll = () => {
     const labs = _.cloneDeep(settingsCache.get('labs')) || {};
 
     ALPHA_FEATURES.forEach((alphaKey) => {
-        if (labs[alphaKey] && !(config.get('enableDeveloperExperiments') || process.env.NODE_ENV.match(/^testing/))) {
+        if (labs[alphaKey] && !(config.get('enableDeveloperExperiments') || process.env.NODE_ENV.startsWith('test'))) {
             delete labs[alphaKey];
         }
     });

package/loggingrc.js

@@ -1,25 +1,24 @@
 const config = require('./core/shared/config');
 const ghostVersion = require('@tryghost/version');
 
-module.exports = {
-    name: config.get('logging:name'),
-    env: config.get('env'),
-    path: config.get('logging:path') || config.getContentPath('logs'),
+// Config for logging
+const loggingConfig = config.get('logging') || {};
+
+if (!loggingConfig.path) {
+    loggingConfig.path = config.getContentPath('logs');
+}
+
+// Additional values used by logging
+loggingConfig.env = config.get('env');
+loggingConfig.domain = config.get('url');
+
+// Config for metrics
+loggingConfig.metrics = config.get('logging:metrics') || {};
+loggingConfig.metrics.metadata = {
+    // Undefined if unavailable
+    siteId: config.get('hostSettings:siteId'),
     domain: config.get('url'),
-    mode: config.get('logging:mode'),
-    level: config.get('logging:level'),
-    transports: config.get('logging:transports'),
-    metrics: {
-        transports: config.get('logging:metrics:transports'),
-        metadata: {
-            // Undefined if unavailable
-            siteId: config.get('hostSettings:siteId'),
-            domain: config.get('url'),
-            version: ghostVersion.safe
-        }
-    },
-    gelf: config.get('logging:gelf'),
-    loggly: config.get('logging:loggly'),
-    elasticsearch: config.get('logging:elasticsearch'),
-    rotation: config.get('logging:rotation')
+    version: ghostVersion.safe
 };
+
+module.exports = loggingConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "4.22.2",
+  "version": "4.24.0",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -29,7 +29,7 @@
     "test": "mocha --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js --timeout=60000",
     "test:all": "yarn test:unit && yarn test:integration && yarn test:e2e && yarn lint",
     "test:debug": "DEBUG=ghost:test* yarn test",
-    "test:unit": "c8 --all -n 'core/{*.js,frontend,server,shared}' --reporter text-summary --reporter cobertura mocha --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js './test/unit' --timeout=2000",
+    "test:unit": "c8 --reporter text-summary --reporter cobertura mocha --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js './test/unit' --timeout=2000",
     "test:integration": "mocha --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js  './test/integration' --timeout=5000",
     "test:e2e": "mocha --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js './test/e2e-api' './test/e2e-frontend' './test/e2e-server' --timeout=10000",
     "test:regression": "mocha --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js  './test/regression' --timeout=60000",
@@ -37,7 +37,7 @@
     "test:int:slow": "yarn test:integration --reporter=mocha-slow-test-reporter",
     "test:e2e:slow": "yarn test:e2e --reporter=mocha-slow-test-reporter",
     "test:reg:slow": "mocha --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js  './test/regression' --timeout=60000 --reporter=mocha-slow-test-reporter",
-    "cov:unit": "c8 report --all -n 'core/{*.js,frontend,server,shared}' -x 'core/frontend/public' --reporter text --reporter html",
+    "cov:unit": "c8 report --reporter text --reporter html",
     "lint:server": "eslint --ignore-path .eslintignore 'core/server/**/*.js' 'core/*.js' '*.js'",
     "lint:shared": "eslint --ignore-path .eslintignore 'core/shared/**/*.js'",
     "lint:frontend": "eslint --ignore-path .eslintignore 'core/frontend/**/*.js'",
@@ -54,12 +54,12 @@
   },
   "dependencies": {
     "@nexes/nql": "0.6.0",
-    "@sentry/node": "6.14.3",
+    "@sentry/node": "6.15.0",
     "@tryghost/adapter-manager": "0.2.18",
     "@tryghost/admin-api-schema": "2.6.1",
     "@tryghost/bookshelf-plugins": "0.3.4",
     "@tryghost/bootstrap-socket": "0.2.13",
-    "@tryghost/color-utils": "0.1.4",
+    "@tryghost/color-utils": "0.1.5",
     "@tryghost/config-url-helpers": "0.1.3",
     "@tryghost/constants": "1.0.0",
     "@tryghost/custom-theme-settings-service": "0.3.1",
@@ -68,43 +68,44 @@
     "@tryghost/email-analytics-service": "1.0.4",
     "@tryghost/errors": "0.2.17",
     "@tryghost/express-dynamic-redirects": "0.2.1",
-    "@tryghost/helpers": "1.1.53",
+    "@tryghost/helpers": "1.1.54",
     "@tryghost/image-transform": "1.0.18",
-    "@tryghost/job-manager": "0.8.12",
+    "@tryghost/job-manager": "0.8.13",
     "@tryghost/kg-card-factory": "3.1.0",
     "@tryghost/kg-default-atoms": "3.1.0",
-    "@tryghost/kg-default-cards": "5.5.1",
+    "@tryghost/kg-default-cards": "5.8.5",
     "@tryghost/kg-markdown-html-renderer": "5.1.0",
     "@tryghost/kg-mobiledoc-html-renderer": "5.2.0",
     "@tryghost/limit-service": "1.0.0",
-    "@tryghost/logging": "1.0.0",
+    "@tryghost/logging": "1.0.1",
     "@tryghost/magic-link": "1.0.14",
-    "@tryghost/members-api": "2.7.4",
+    "@tryghost/members-api": "2.7.5",
     "@tryghost/members-csv": "1.1.8",
     "@tryghost/members-importer": "0.3.4",
-    "@tryghost/members-offers": "0.10.2",
+    "@tryghost/members-offers": "0.10.3",
     "@tryghost/members-ssr": "1.0.15",
-    "@tryghost/metrics": "1.0.0",
-    "@tryghost/minifier": "0.1.0",
+    "@tryghost/metrics": "1.0.1",
+    "@tryghost/minifier": "0.1.1",
     "@tryghost/mw-session-from-token": "0.1.26",
-    "@tryghost/nodemailer": "0.3.6",
+    "@tryghost/nodemailer": "0.3.7",
     "@tryghost/package-json": "1.0.6",
     "@tryghost/promise": "0.1.13",
-    "@tryghost/request": "0.1.8",
+    "@tryghost/request": "0.1.9",
     "@tryghost/root-utils": "0.3.7",
     "@tryghost/security": "0.2.13",
     "@tryghost/session-service": "0.1.28",
+    "@tryghost/settings-path-manager": "0.1.2",
     "@tryghost/social-urls": "0.1.27",
     "@tryghost/string": "0.1.21",
     "@tryghost/tpl": "0.1.8",
     "@tryghost/update-check-service": "0.2.5",
-    "@tryghost/url-utils": "2.0.3",
+    "@tryghost/url-utils": "2.0.4",
     "@tryghost/validator": "0.1.8",
     "@tryghost/version": "0.1.7",
     "@tryghost/vhost-middleware": "1.0.19",
     "@tryghost/zip": "1.1.18",
     "amperize": "0.6.1",
-    "analytics-node": "5.1.2",
+    "analytics-node": "6.0.0",
     "bluebird": "3.7.2",
     "body-parser": "1.19.0",
     "bookshelf": "1.2.0",
@@ -129,7 +130,7 @@
     "ghost-storage-base": "1.0.0",
     "glob": "7.2.0",
     "got": "9.6.0",
-    "gscan": "4.10.1",
+    "gscan": "4.13.2",
     "html-to-text": "5.1.1",
     "image-size": "1.0.0",
     "intl": "1.2.5",
@@ -140,32 +141,32 @@
     "juice": "8.0.0",
     "keypair": "1.0.4",
     "knex": "0.21.21",
-    "knex-migrator": "4.1.1",
+    "knex-migrator": "4.1.3",
     "lodash": "4.17.21",
     "luxon": "2.1.1",
     "mailgun-js": "0.22.0",
-    "metascraper": "5.25.0",
-    "metascraper-author": "5.25.0",
-    "metascraper-description": "5.25.0",
-    "metascraper-image": "5.25.0",
-    "metascraper-logo": "5.25.0",
-    "metascraper-logo-favicon": "5.25.0",
-    "metascraper-publisher": "5.25.0",
-    "metascraper-title": "5.25.0",
-    "metascraper-url": "5.25.0",
+    "metascraper": "5.25.2",
+    "metascraper-author": "5.25.2",
+    "metascraper-description": "5.25.2",
+    "metascraper-image": "5.25.2",
+    "metascraper-logo": "5.25.2",
+    "metascraper-logo-favicon": "5.25.2",
+    "metascraper-publisher": "5.25.2",
+    "metascraper-title": "5.25.2",
+    "metascraper-url": "5.25.2",
     "moment": "2.24.0",
     "moment-timezone": "0.5.23",
     "multer": "1.4.3",
     "mysql": "2.18.1",
     "nconf": "0.11.3",
     "node-jose": "2.0.0",
-    "oembed-parser": "1.5.2",
+    "oembed-parser": "1.4.9",
     "passport": "0.5.0",
     "passport-google-oauth": "2.0.0",
     "path-match": "1.2.4",
     "probe-image-size": "5.0.0",
     "rss": "1.2.2",
-    "sanitize-html": "2.5.3",
+    "sanitize-html": "2.6.0",
     "semver": "7.3.5",
     "stoppable": "1.1.0",
     "tough-cookie": "4.0.0",
@@ -173,16 +174,16 @@
     "xml": "1.0.1"
   },
   "optionalDependencies": {
-    "@tryghost/html-to-mobiledoc": "1.2.2",
+    "@tryghost/html-to-mobiledoc": "1.3.4",
     "sqlite3": "5.0.2"
   },
   "devDependencies": {
     "@lodder/grunt-postcss": "3.1.1",
     "c8": "7.10.0",
     "coffeescript": "2.6.1",
-    "cssnano": "5.0.10",
+    "cssnano": "5.0.11",
     "eslint": "7.32.0",
-    "eslint-plugin-ghost": "2.7.0",
+    "eslint-plugin-ghost": "2.8.0",
     "grunt": "1.4.1",
     "grunt-bg-shell": "2.3.3",
     "grunt-contrib-clean": "2.0.0",
@@ -200,7 +201,7 @@
     "mock-knex": "0.4.10",
     "nock": "13.2.1",
     "papaparse": "5.3.1",
-    "postcss": "8.3.11",
+    "postcss": "8.4.1",
     "rewire": "5.0.0",
     "should": "13.2.3",
     "sinon": "11.1.2",