ghost 4.23.0 → 4.26.0

package/core/frontend/web/middleware/handle-image-sizes.js

@@ -1,6 +1,6 @@
 const _ = require('lodash');
 const path = require('path');
-const {GhostError} = require('@tryghost/errors');
+const {NoContentError} = require('@tryghost/errors');
 const imageTransform = require('@tryghost/image-transform');
 const storage = require('../../../server/adapters/storage');
 const activeTheme = require('../../services/theme-engine/active');
@@ -102,10 +102,7 @@ module.exports = function (req, res, next) {
             })
             .then((originalImageBuffer) => {
                 if (originalImageBuffer.length <= 0) {
-                    throw new GhostError({
-                        errorType: 'NoContentError',
-                        statusCode: 204
-                    });
+                    throw new NoContentError();
                 }
                 return imageTransform.resizeFromBuffer(originalImageBuffer, imageDimensionConfig);
             })
@@ -115,7 +112,7 @@ module.exports = function (req, res, next) {
     }).then(() => {
         next();
     }).catch(function (err) {
-        if (err.code === 'SHARP_INSTALLATION' || err.errorType === 'NoContentError') {
+        if (err.code === 'SHARP_INSTALLATION' || err.code === 'IMAGE_PROCESSING' || err.errorType === 'NoContentError') {
             return redirectToOriginal();
         }
         next(err);

package/core/frontend/web/middleware/index.js

@@ -1,4 +1,5 @@
 module.exports = {
+    errorHandler: require('./error-handler'),
     handleImageSizes: require('./handle-image-sizes'),
     redirectGhostToAdmin: require('./redirect-ghost-to-admin'),
     serveFavicon: require('./serve-favicon'),

package/core/frontend/web/middleware/serve-public-file.js

@@ -11,8 +11,23 @@ const messages = {
     fileNotFound: 'File not found'
 };
 
+/**
+ * If this request has a ?v= param, make sure the cache has the same key
+ *
+ * @param {Object} req
+ * @param {Object} cache
+ * @returns {boolean}
+ */
+function matchCacheKey(req, cache) {
+    if (req.query && req.query.v && cache && cache.key) {
+        return req.query.v === cache.key;
+    }
+
+    return true;
+}
+
 function createPublicFileMiddleware(location, file, mime, maxAge) {
-    let content;
+    let cache;
     // These files are provided by Ghost, and therefore live inside of the core folder
     const staticFilePath = config.get('paths').publicFilePath;
     // These files are built on the fly, and must be saved in the content folder
@@ -24,9 +39,9 @@ function createPublicFileMiddleware(location, file, mime, maxAge) {
     const blogRegex = /(\{\{blog-url\}\})/g;
 
     return function servePublicFileMiddleware(req, res, next) {
-        if (content) {
-            res.writeHead(200, content.headers);
-            return res.end(content.body);
+        if (cache && matchCacheKey(req, cache)) {
+            res.writeHead(200, cache.headers);
+            return res.end(cache.body);
         }
 
         // send image files directly and let express handle content-length, etag, etc
@@ -67,17 +82,19 @@ function createPublicFileMiddleware(location, file, mime, maxAge) {
                 str = str.replace(blogRegex, urlUtils.urlFor('home', true).replace(/\/$/, ''));
             }
 
-            content = {
+            cache = {
                 headers: {
                     'Content-Type': mime,
                     'Content-Length': Buffer.from(str).length,
                     ETag: `"${crypto.createHash('md5').update(str, 'utf8').digest('hex')}"`,
                     'Cache-Control': `public, max-age=${maxAge}`
                 },
-                body: str
+                body: str,
+                key: req.query && req.query.v ? req.query.v : null
             };
-            res.writeHead(200, content.headers);
-            res.end(content.body);
+
+            res.writeHead(200, cache.headers);
+            res.end(cache.body);
         });
     };
 }

package/core/frontend/web/site.js

@@ -112,7 +112,7 @@ module.exports = function setupSiteApp(options = {}) {
 
     // Card assets
     siteApp.use(mw.servePublicFile('built', 'public/cards.min.css', 'text/css', constants.ONE_YEAR_S));
-    siteApp.use(mw.servePublicFile('built', 'public/cards.min.js', 'text/js', constants.ONE_YEAR_S));
+    siteApp.use(mw.servePublicFile('built', 'public/cards.min.js', 'application/javascript', constants.ONE_YEAR_S));
 
     // Serve blog images using the storage adapter
     siteApp.use(STATIC_IMAGE_URL_PREFIX, mw.handleImageSizes, storage.getStorage('images').serve());
@@ -153,9 +153,6 @@ module.exports = function setupSiteApp(options = {}) {
     sitemapHandler(siteApp);
     debug('Internal apps done');
 
-    // send 503 error page in case of maintenance
-    siteApp.use(shared.middleware.maintenance);
-
     // Add in all trailing slashes & remove uppercase
     // must happen AFTER asset loading and BEFORE routing
     siteApp.use(shared.middleware.prettyUrls);
@@ -187,7 +184,7 @@ module.exports = function setupSiteApp(options = {}) {
             app.setupErrorHandling(siteApp);
         }
     });
-    siteApp.use(shared.middleware.errorHandler.handleThemeResponse);
+    siteApp.use(mw.errorHandler.handleThemeResponse);
 
     debug('Site setup end');
 

package/core/server/adapters/scheduling/SchedulingDefault.js

@@ -307,7 +307,7 @@ SchedulingDefault.prototype._pingUrl = function (object) {
                 this._pingUrl(object);
             }, this.retryTimeoutInMs);
 
-            logging.error(new errors.GhostError({
+            logging.error(new errors.InternalServerError({
                 err,
                 context: 'Retrying...',
                 level: 'normal'
@@ -316,7 +316,7 @@ SchedulingDefault.prototype._pingUrl = function (object) {
             return;
         }
 
-        logging.error(new errors.GhostError({
+        logging.error(new errors.InternalServerError({
             err,
             level: 'critical'
         }));

package/core/server/adapters/storage/LocalStorageBase.js

@@ -147,7 +147,7 @@ class LocalStorageBase extends StorageBase {
                         return next(new errors.NoPermissionError({err: err}));
                     }
 
-                    return next(new errors.GhostError({err: err}));
+                    return next(new errors.InternalServerError({err: err}));
                 }
 
                 next();
@@ -196,7 +196,7 @@ class LocalStorageBase extends StorageBase {
                         return reject(new errors.NoPermissionError({err: err}));
                     }
 
-                    return reject(new errors.GhostError({
+                    return reject(new errors.InternalServerError({
                         err: err,
                         message: tpl(this.errorMessages.cannotRead, {file: options.path})
                     }));

package/core/server/api/canary/db.js

@@ -62,7 +62,7 @@ module.exports = {
             return Promise.resolve()
                 .then(() => exporter.doExport({include: frame.options.withRelated}))
                 .catch((err) => {
-                    return Promise.reject(new errors.GhostError({err: err}));
+                    return Promise.reject(new errors.InternalServerError({err: err}));
                 });
         }
     },
@@ -124,7 +124,7 @@ module.exports = {
                             }, {concurrency: 100});
                         })
                         .catch((err) => {
-                            throw new errors.GhostError({
+                            throw new errors.InternalServerError({
                                 err: err
                             });
                         });

package/core/server/api/canary/media.js

@@ -23,8 +23,9 @@ module.exports = {
 
     uploadThumbnail: {
         permissions: false,
-        options: [
-            'url'
+        data: [
+            'url',
+            'ref'
         ],
         async query(frame) {
             const mediaStorage = storage.getStorage('media');

package/core/server/api/canary/oembed.js

@@ -3,9 +3,24 @@ const externalRequest = require('../../lib/request-external');
 
 const OEmbed = require('../../services/oembed');
 const oembed = new OEmbed({config, externalRequest});
+
 const NFT = require('../../services/nft-oembed');
-const nft = new NFT();
+const nft = new NFT({
+    config: {
+        apiKey: config.get('opensea').privateReadOnlyApiKey
+    }
+});
+
+const Twitter = require('../../services/twitter-embed');
+const twitter = new Twitter({
+    config: {
+        bearerToken: config.get('twitter').privateReadOnlyToken
+    },
+    logging: require('@tryghost/logging')
+});
+
 oembed.registerProvider(nft);
+oembed.registerProvider(twitter);
 
 module.exports = {
     docName: 'oembed',

package/core/server/api/canary/session.js

@@ -42,7 +42,7 @@ const session = {
                 });
             });
         }).catch(async (err) => {
-            if (!errors.utils.isIgnitionError(err)) {
+            if (!errors.utils.isGhostError(err)) {
                 throw new errors.UnauthorizedError({
                     message: tpl(messages.accessDenied),
                     err

package/core/server/api/canary/slugs.js

@@ -43,7 +43,7 @@ module.exports = {
             return models.Base.Model.generateSlug(allowedTypes[frame.options.type], frame.data.name, {status: 'all'})
                 .then((slug) => {
                     if (!slug) {
-                        return Promise.reject(new errors.GhostError({
+                        return Promise.reject(new errors.InternalServerError({
                             message: tpl(messages.couldNotGenerateSlug)
                         }));
                     }

package/core/server/api/canary/utils/permissions.js

@@ -66,11 +66,11 @@ const nonePublicAuth = (apiConfig, frame) => {
             return Promise.reject(err);
         }
 
-        if (errors.utils.isIgnitionError(err)) {
+        if (errors.utils.isGhostError(err)) {
             return Promise.reject(err);
         }
 
-        return Promise.reject(new errors.GhostError({
+        return Promise.reject(new errors.InternalServerError({
             err: err
         }));
     });

package/core/server/api/canary/utils/serializers/output/config.js

@@ -1,5 +1,4 @@
 const _ = require('lodash');
-const labs = require('../../../../../../shared/labs');
 const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:config');
 
 module.exports = {
@@ -18,13 +17,10 @@ module.exports = {
             'stripeDirect',
             'mailgunIsConfigured',
             'emailAnalytics',
-            'hostSettings'
+            'hostSettings',
+            'tenor'
         ];
 
-        if (labs.isSet('gifsCard')) {
-            keys.push('tenor');
-        }
-
         frame.response = {
             config: _.pick(data, keys)
         };

package/core/server/api/v2/db.js

@@ -51,7 +51,7 @@ module.exports = {
             return Promise.resolve()
                 .then(() => exporter.doExport({include: frame.options.withRelated}))
                 .catch((err) => {
-                    return Promise.reject(new errors.GhostError({err: err}));
+                    return Promise.reject(new errors.InternalServerError({err: err}));
                 });
         }
     },
@@ -107,7 +107,7 @@ module.exports = {
                             }, {concurrency: 100});
                         })
                         .catch((err) => {
-                            throw new errors.GhostError({
+                            throw new errors.InternalServerError({
                                 err: err
                             });
                         });

package/core/server/api/v2/session.js

@@ -42,7 +42,7 @@ const session = {
                 });
             });
         }).catch(async (err) => {
-            if (!errors.utils.isIgnitionError(err)) {
+            if (!errors.utils.isGhostError(err)) {
                 throw new errors.UnauthorizedError({
                     message: tpl(messages.authAccessDenied),
                     err

package/core/server/api/v2/slugs.js

@@ -40,7 +40,7 @@ module.exports = {
             return models.Base.Model.generateSlug(allowedTypes[frame.options.type], frame.data.name, {status: 'all'})
                 .then((slug) => {
                     if (!slug) {
-                        return Promise.reject(new errors.GhostError({
+                        return Promise.reject(new errors.InternalServerError({
                             message: tpl(messages.couldNotGenerateSlug)
                         }));
                     }

package/core/server/api/v2/utils/permissions.js

@@ -62,11 +62,11 @@ const nonePublicAuth = (apiConfig, frame) => {
             return Promise.reject(err);
         }
 
-        if (errors.utils.isIgnitionError(err)) {
+        if (errors.utils.isGhostError(err)) {
             return Promise.reject(err);
         }
 
-        return Promise.reject(new errors.GhostError({
+        return Promise.reject(new errors.InternalServerError({
             err: err
         }));
     });

package/core/server/api/v3/db.js

@@ -62,7 +62,7 @@ module.exports = {
             return Promise.resolve()
                 .then(() => exporter.doExport({include: frame.options.withRelated}))
                 .catch((err) => {
-                    return Promise.reject(new errors.GhostError({err: err}));
+                    return Promise.reject(new errors.InternalServerError({err: err}));
                 });
         }
     },
@@ -118,7 +118,7 @@ module.exports = {
                             }, {concurrency: 100});
                         })
                         .catch((err) => {
-                            throw new errors.GhostError({
+                            throw new errors.InternalServerError({
                                 err: err
                             });
                         });

package/core/server/api/v3/session.js

@@ -42,7 +42,7 @@ const session = {
                 });
             });
         }).catch(async (err) => {
-            if (!errors.utils.isIgnitionError(err)) {
+            if (!errors.utils.isGhostError(err)) {
                 throw new errors.UnauthorizedError({
                     message: tpl(messages.accessDenied),
                     err

package/core/server/api/v3/slugs.js

@@ -39,7 +39,7 @@ module.exports = {
             return models.Base.Model.generateSlug(allowedTypes[frame.options.type], frame.data.name, {status: 'all'})
                 .then((slug) => {
                     if (!slug) {
-                        return Promise.reject(new errors.GhostError({message: tpl(messages.couldNotGenerateSlug)}));
+                        return Promise.reject(new errors.InternalServerError({message: tpl(messages.couldNotGenerateSlug)}));
                     }
                     return slug;
                 });

package/core/server/api/v3/utils/permissions.js

@@ -66,11 +66,11 @@ const nonePublicAuth = (apiConfig, frame) => {
             return Promise.reject(err);
         }
 
-        if (errors.utils.isIgnitionError(err)) {
+        if (errors.utils.isGhostError(err)) {
             return Promise.reject(err);
         }
 
-        return Promise.reject(new errors.GhostError({
+        return Promise.reject(new errors.InternalServerError({
             err: err
         }));
     });

package/core/server/data/db/state-manager.js

@@ -59,8 +59,8 @@ class DatabaseStateManager {
 
             // CASE: database connection errors, unknown cases
             let errorToThrow = error;
-            if (!errors.utils.isIgnitionError(errorToThrow)) {
-                errorToThrow = new errors.GhostError({message: errorToThrow.message, err: errorToThrow});
+            if (!errors.utils.isGhostError(errorToThrow)) {
+                errorToThrow = new errors.InternalServerError({message: errorToThrow.message, err: errorToThrow});
             }
 
             throw errorToThrow;
@@ -94,8 +94,8 @@ class DatabaseStateManager {
             }
         } catch (error) {
             let errorToThrow = error;
-            if (!errors.utils.isIgnitionError(error)) {
-                errorToThrow = new errors.GhostError({message: errorToThrow.message, err: errorToThrow});
+            if (!errors.utils.isGhostError(error)) {
+                errorToThrow = new errors.InternalServerError({message: errorToThrow.message, err: errorToThrow});
             }
 
             throw errorToThrow;

package/core/server/data/exporter/export-filename.js

@@ -26,7 +26,7 @@ const exportFileName = async function exportFileName(options) {
 
         return title + 'ghost.' + datetime + '.json';
     } catch (err) {
-        logging.error(new errors.GhostError({err: err}));
+        logging.error(new errors.InternalServerError({err: err}));
         return 'ghost.' + datetime + '.json';
     }
 };

package/core/server/data/importer/handlers/json.js

@@ -30,7 +30,7 @@ JSONHandler = {
                 // if importData follows JSON-API format `{ db: [exportedData] }`
                 if (_.keys(importData).length === 1) {
                     if (!importData.db || !Array.isArray(importData.db)) {
-                        throw new errors.GhostError({
+                        throw new errors.InternalServerError({
                             message: tpl(messages.invalidJsonFormat)
                         });
                     }

package/core/server/data/importer/import-manager.js

@@ -121,7 +121,7 @@ class ImportManager {
 
         fs.remove(self.fileToDelete, function (err) {
             if (err) {
-                logging.error(new errors.GhostError({
+                logging.error(new errors.InternalServerError({
                     err: err,
                     context: tpl(messages.couldNotCleanUpFile.error),
                     help: tpl(messages.couldNotCleanUpFile.context)

package/core/server/data/importer/importers/data/base.js

@@ -145,7 +145,7 @@ class Base {
                     });
                 }
             } else {
-                if (!errors.utils.isIgnitionError(err)) {
+                if (!errors.utils.isGhostError(err)) {
                     err = new errors.DataImportError({
                         message: err.message,
                         context: JSON.stringify(obj),

package/core/server/data/migrations/utils.js

@@ -143,7 +143,7 @@ function addPermissionToRole(config) {
             }).first();
 
             if (!permission) {
-                throw new errors.GhostError({
+                throw new errors.InternalServerError({
                     message: tpl(messages.permissionRoleActionError, {
                         action: 'add',
                         permission: config.permission,
@@ -158,7 +158,7 @@ function addPermissionToRole(config) {
             }).first();
 
             if (!role) {
-                throw new errors.GhostError({
+                throw new errors.InternalServerError({
                     message: tpl(messages.permissionRoleActionError, {
                         action: 'add',
                         permission: config.permission,

package/core/server/data/migrations/versions/1.25/1-update-koenig-beta-html.js

@@ -45,6 +45,7 @@ module.exports.up = function regenerateKoenigBetaHTML(options) {
                     || (mobiledoc && !mobiledocIsCompatibleWithV1(mobiledoc))
                 ) {
                     // change imagecard.payload.imageStyle to imagecard.payload.cardWidth
+                    // eslint-disable-next-line no-restricted-syntax
                     mobiledoc.cards.forEach((card) => {
                         if (card[0] === 'image') {
                             card[1].cardWidth = card[1].imageStyle;

package/core/server/data/migrations/versions/3.1/08-add-uuid-values-to-members.js

@@ -12,6 +12,7 @@ module.exports = {
 
         logging.info(`Adding uuid field value to ${membersWithoutUUID.length} members.`);
 
+        // eslint-disable-next-line no-restricted-syntax
         for (const member of membersWithoutUUID) {
             await conn('members').update('uuid', uuid.v4()).where('id', member.id);
         }

package/core/server/data/migrations/versions/3.22/02-settings-key-renames.js

@@ -35,6 +35,7 @@ module.exports = {
     },
 
     async up(options) {
+        // eslint-disable-next-line no-restricted-syntax
         for (const renameMapping of renameMappings) {
             const oldSetting = await options.transacting('settings')
                 .where('key', renameMapping.from)
@@ -61,6 +62,7 @@ module.exports = {
     },
 
     async down(options) {
+        // eslint-disable-next-line no-restricted-syntax
         for (const renameMapping of renameMappings) {
             const newSetting = await options.transacting('settings')
                 .where('key', renameMapping.to)

package/core/server/data/migrations/versions/3.22/05-migrate-members-subscription-settings.js

@@ -24,6 +24,7 @@ module.exports = {
             key: 'stripe_plans'
         }];
 
+        // eslint-disable-next-line no-restricted-syntax
         for (const operation of defaultOperations) {
             logging.info(`Updating ${operation.key} setting group,type,flags`);
             await knex('settings')
@@ -86,6 +87,7 @@ module.exports = {
             value: JSON.stringify(stripePlans)
         }];
 
+        // eslint-disable-next-line no-restricted-syntax
         for (const operation of valueOperations) {
             logging.info(`Updating ${operation.key} setting value`);
             await knex('settings')
@@ -170,6 +172,7 @@ module.exports = {
             'stripe_secret_key'
         ];
 
+        // eslint-disable-next-line no-restricted-syntax
         for (const setting of settingsToDelete) {
             logging.info(`Deleting ${setting} setting`);
         }

package/core/server/data/migrations/versions/3.22/06-migrate-stripe-connect-settings.js

@@ -20,6 +20,7 @@ module.exports = {
             key: 'stripe_connect_account_id'
         }];
 
+        // eslint-disable-next-line no-restricted-syntax
         for (const operation of defaultOperations) {
             logging.info(`Updating ${operation.key} setting group,type,flags`);
             await knex('settings')
@@ -62,6 +63,7 @@ module.exports = {
             value: stripeConnectIntegration.account_id || ''
         }];
 
+        // eslint-disable-next-line no-restricted-syntax
         for (const operation of valueOperations) {
             logging.info(`Updating ${operation.key} setting value`);
             await knex('settings')

package/core/server/data/migrations/versions/3.23/01-migrate-bulk-email-settings.js

@@ -35,6 +35,7 @@ module.exports = {
             value: bulkEmailSettings.baseUrl
         }];
 
+        // eslint-disable-next-line no-restricted-syntax
         for (const operation of operations) {
             logging.info(`Updating ${operation.key} setting's value, group, type & flags.`);
             await knex('settings')

package/core/server/data/migrations/versions/3.29/01-remove-duplicate-subscriptions.js

@@ -23,6 +23,7 @@ module.exports = {
         }
 
         logging.info(`Found ${duplicates.length} duplicate stripe subscriptions`);
+        // eslint-disable-next-line no-restricted-syntax
         for (const duplicate of duplicates) {
             const subscriptions = await knex('members_stripe_customers_subscriptions')
                 .select()
@@ -36,6 +37,7 @@ module.exports = {
 
             logging.info(`Keeping newest subscription ${newestSubscription.id} - ${newestSubscription.subscription_id}, last updated at ${newestSubscription.updated_at}`);
 
+            // eslint-disable-next-line no-restricted-syntax
             for (const subscriptionToDelete of olderSubscriptions) {
                 logging.info(`Deleting duplicate subscription ${subscriptionToDelete.id} - ${subscriptionToDelete.subscription_id}, last updated at ${subscriptionToDelete.updated_at}`);
                 await knex('members_stripe_customers_subscriptions')

package/core/server/data/migrations/versions/3.29/02-remove-duplicate-customers.js

@@ -23,6 +23,7 @@ module.exports = {
         }
 
         logging.info(`Found ${duplicates.length} duplicate stripe customers`);
+        // eslint-disable-next-line no-restricted-syntax
         for (const duplicate of duplicates) {
             const customers = await knex('members_stripe_customers')
                 .select()
@@ -36,6 +37,7 @@ module.exports = {
 
             logging.info(`Keeping newest customer ${newestCustomer.id} - ${newestCustomer.customer_id}, last updated at ${newestCustomer.updated_at}`);
 
+            // eslint-disable-next-line no-restricted-syntax
             for (const customerToDelete of olderCustomers) {
                 logging.info(`Deleting duplicate customer ${customerToDelete.id} - ${customerToDelete.customer_id}, last updated at ${customerToDelete.updated_at}`);
                 await knex('members_stripe_customers')

package/core/server/data/migrations/versions/3.38/04-populate-recipient-filter-column.js

@@ -25,12 +25,14 @@ module.exports = createTransactionalMigration(
         const paidPostIdChunks = chunk(paidPostIds, chunkSize);
         const membersAndPublicPostIdChunks = chunk(membersPostIds.concat(publicPostIds), chunkSize);
 
+        // eslint-disable-next-line no-restricted-syntax
         for (const paidPostIdsChunk of paidPostIdChunks) {
             await connection('emails')
                 .update('recipient_filter', 'paid')
                 .whereIn('post_id', paidPostIdsChunk);
         }
 
+        // eslint-disable-next-line no-restricted-syntax
         for (const membersAndPublicPostIdsChunk of membersAndPublicPostIdChunks) {
             await connection('emails')
                 .update('recipient_filter', 'all')

package/core/server/data/migrations/versions/4.0/01-update-mobiledoc.js

@@ -15,6 +15,7 @@ module.exports = createIrreversibleMigration(async (knex) => {
         // pushing all queries into the query builder buffer in parallel
         // https://stackoverflow.com/questions/54105280/how-to-loop-through-multi-line-sql-query-and-use-them-in-knex-transactions
 
+        // eslint-disable-next-line no-restricted-syntax
         for (const postIdRow of postIdRows) {
             const {id} = postIdRow;
             const [{mobiledoc: mobiledocJson}] = await knex('posts')
@@ -31,6 +32,7 @@ module.exports = createIrreversibleMigration(async (knex) => {
             }
 
             if (mobiledoc.cards) {
+                // eslint-disable-next-line no-restricted-syntax
                 mobiledoc.cards.forEach((card) => {
                     // card-markdown card was used in 1.0 and aliased to markdown in 2.0 onwards
                     // clean it up here whilst we're already modifying mobiledoc