ghost 4.22.1 → 4.23.0

package/core/server/api/canary/utils/validators/input/media.js

@@ -3,5 +3,9 @@ const limitService = require('../../../../../services/limits');
 module.exports = {
     async upload(apiConfig, frame) {
         await limitService.errorIfIsOverLimit('uploads', {currentCount: frame.file.size});
+    },
+
+    async uploadThumbnail(apiConfig, frame) {
+        await limitService.errorIfIsOverLimit('uploads', {currentCount: frame.file.size});
     }
 };

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

@@ -145,7 +145,7 @@ module.exports = {
                     options = Object.assign(options, {context: {internal: true}});
                     return auth.passwordreset.doReset(options, tokenParts, api.settings)
                         .then((params) => {
-                            web.shared.middlewares.api.spamPrevention.userLogin().reset(frame.options.ip, `${tokenParts.email}login`);
+                            web.shared.middleware.api.spamPrevention.userLogin().reset(frame.options.ip, `${tokenParts.email}login`);
                             return params;
                         });
                 });

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

@@ -146,7 +146,7 @@ module.exports = {
                     options = Object.assign(options, {context: {internal: true}});
                     return auth.passwordreset.doReset(options, tokenParts, api.settings)
                         .then((params) => {
-                            web.shared.middlewares.api.spamPrevention.userLogin().reset(frame.options.ip, `${tokenParts.email}login`);
+                            web.shared.middleware.api.spamPrevention.userLogin().reset(frame.options.ip, `${tokenParts.email}login`);
                             return params;
                         });
                 });

package/core/server/data/db/connection.js

@@ -17,6 +17,13 @@ function configure(dbConfig) {
         dbConfig.pool = {
             afterCreate(conn, cb) {
                 conn.run('PRAGMA foreign_keys = ON', cb);
+
+                // These two are meant to improve performance at the cost of reliability
+                // Should be safe for tests. We add them here and leave them on
+                if (config.get('env').startsWith('testing')) {
+                    conn.run('PRAGMA synchronous = OFF;');
+                    conn.run('PRAGMA journal_mode = TRUNCATE;');
+                }
             }
         };
 

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

@@ -112,7 +112,7 @@ DataImporter = {
                 });
             });
 
-            sequence(ops)
+            return sequence(ops)
                 .then(function () {
                     results.forEach(function (promise) {
                         if (!promise.isFulfilled()) {
@@ -121,9 +121,9 @@ DataImporter = {
                     });
 
                     if (errors.length === 0) {
-                        transacting.commit();
+                        return;
                     } else {
-                        transacting.rollback(errors);
+                        throw errors;
                     }
                 });
         }).then(function () {

package/core/server/data/migrations/init/2-create-fixtures.js

@@ -1,26 +1,9 @@
-const Promise = require('bluebird');
-const _ = require('lodash');
-const fixtures = require('../../schema/fixtures');
-const logging = require('@tryghost/logging');
+const {fixtureManager} = require('../../schema/fixtures');
 
 module.exports.config = {
     transaction: true
 };
 
-module.exports.up = async (options) => {
-    const localOptions = _.merge({
-        context: {internal: true},
-        migrating: true
-    }, options);
-
-    await Promise.mapSeries(fixtures.models, async (model) => {
-        logging.info('Model: ' + model.name);
-
-        await fixtures.utils.addFixturesForModel(model, localOptions);
-    });
-
-    await Promise.mapSeries(fixtures.relations, async (relation) => {
-        logging.info('Relation: ' + relation.from.model + ' to ' + relation.to.model);
-        await fixtures.utils.addFixturesForRelation(relation, localOptions);
-    });
+module.exports.up = async function insertFixtures(options) {
+    return await fixtureManager.addAllFixtures(options);
 };

package/core/server/data/migrations/versions/1.21/1-add-contributor-role.js

@@ -1,19 +1,19 @@
 const merge = require('lodash/merge');
-const utils = require('../../../schema/fixtures/utils');
+const {fixtureManager} = require('../../../schema/fixtures');
 const models = require('../../../../models');
 const permissions = require('../../../../services/permissions');
 const logging = require('@tryghost/logging');
 const _private = {};
 
 _private.addRole = function addRole(options) {
-    const contributorRole = utils.findModelFixtureEntry('Role', {name: 'Contributor'});
+    const contributorRole = fixtureManager.findModelFixtureEntry('Role', {name: 'Contributor'});
     const message = 'Adding "Contributor" role to roles table';
 
     return models.Role.findOne({name: contributorRole.name}, options)
         .then((role) => {
             if (!role) {
                 logging.info(message);
-                return utils.addFixturesForModel({name: 'Role', entries: [contributorRole]}, options);
+                return fixtureManager.addFixturesForModel({name: 'Role', entries: [contributorRole]}, options);
             }
 
             logging.warn(message);
@@ -22,10 +22,10 @@ _private.addRole = function addRole(options) {
 };
 
 _private.addContributorPermissions = function getPermissions(options) {
-    const relations = utils.findRelationFixture('Role', 'Permission');
+    const relations = fixtureManager.findRelationFixture('Role', 'Permission');
     const message = 'Adding permissions_roles fixtures for the contributor role';
 
-    return utils.addFixturesForRelation({
+    return fixtureManager.addFixturesForRelation({
         from: relations.from,
         to: relations.to,
         entries: {

package/core/server/data/migrations/versions/2.15/2-insert-zapier-integration.js

@@ -1,7 +1,7 @@
 const logging = require('@tryghost/logging');
 const merge = require('lodash/merge');
 const models = require('../../../../models');
-const utils = require('../../../schema/fixtures/utils');
+const {fixtureManager} = require('../../../schema/fixtures');
 
 const _private = {};
 
@@ -15,12 +15,12 @@ _private.printResult = function printResult(result, message) {
 
 _private.addZapierIntegration = (options) => {
     const message = 'Adding "Zapier" integration';
-    const fixtureIntegration = utils.findModelFixtureEntry('Integration', {slug: 'zapier'});
+    const fixtureIntegration = fixtureManager.findModelFixtureEntry('Integration', {slug: 'zapier'});
 
     return models.Integration.findOne({slug: fixtureIntegration.slug}, options)
         .then((integration) => {
             if (!integration) {
-                return utils.addFixturesForModel({
+                return fixtureManager.addFixturesForModel({
                     name: 'Integration',
                     entries: [fixtureIntegration]
                 }, options).then(result => _private.printResult(result, message));

package/core/server/data/migrations/versions/2.2/3-insert-admin-integration-role.js

@@ -1,7 +1,7 @@
 const logging = require('@tryghost/logging');
 const merge = require('lodash/merge');
 const models = require('../../../../models');
-const utils = require('../../../schema/fixtures/utils');
+const {fixtureManager} = require('../../../schema/fixtures');
 
 const _private = {};
 
@@ -15,12 +15,12 @@ _private.printResult = function printResult(result, message) {
 
 _private.addApiKeyRole = (options) => {
     const message = 'Adding "Admin Integration" role to roles table';
-    const apiKeyRole = utils.findModelFixtureEntry('Role', {name: 'Admin Integration'});
+    const apiKeyRole = fixtureManager.findModelFixtureEntry('Role', {name: 'Admin Integration'});
 
     return models.Role.findOne({name: apiKeyRole.name}, options)
         .then((role) => {
             if (!role) {
-                return utils.addFixturesForModel({
+                return fixtureManager.addFixturesForModel({
                     name: 'Role',
                     entries: [apiKeyRole]
                 }, options).then(result => _private.printResult(result, message));
@@ -32,9 +32,9 @@ _private.addApiKeyRole = (options) => {
 
 _private.addApiKeyPermissions = (options) => {
     const message = 'Adding permissions for the "Admin Integration" role';
-    const relations = utils.findRelationFixture('Role', 'Permission');
+    const relations = fixtureManager.findRelationFixture('Role', 'Permission');
 
-    return utils.addFixturesForRelation({
+    return fixtureManager.addFixturesForRelation({
         from: relations.from,
         to: relations.to,
         entries: {

package/core/server/data/migrations/versions/2.27/1-insert-ghost-db-backup-role.js

@@ -1,7 +1,7 @@
 const logging = require('@tryghost/logging');
 const merge = require('lodash/merge');
 const models = require('../../../../models');
-const utils = require('../../../schema/fixtures/utils');
+const {fixtureManager} = require('../../../schema/fixtures');
 
 const _private = {};
 
@@ -15,12 +15,12 @@ _private.printResult = function printResult(result, message) {
 
 _private.addApiKeyRole = (options) => {
     const message = 'Adding "DB Backup Integration" role to roles table';
-    const apiKeyRole = utils.findModelFixtureEntry('Role', {name: 'DB Backup Integration'});
+    const apiKeyRole = fixtureManager.findModelFixtureEntry('Role', {name: 'DB Backup Integration'});
 
     return models.Role.findOne({name: apiKeyRole.name}, options)
         .then((role) => {
             if (!role) {
-                return utils.addFixturesForModel({
+                return fixtureManager.addFixturesForModel({
                     name: 'Role',
                     entries: [apiKeyRole]
                 }, options).then(result => _private.printResult(result, message));
@@ -32,9 +32,9 @@ _private.addApiKeyRole = (options) => {
 
 _private.addApiKeyPermissions = (options) => {
     const message = 'Adding permissions for the "DB Backup Integration" role';
-    const relations = utils.findRelationFixture('Role', 'Permission');
+    const relations = fixtureManager.findRelationFixture('Role', 'Permission');
 
-    return utils.addFixturesForRelation({
+    return fixtureManager.addFixturesForRelation({
         from: relations.from,
         to: relations.to,
         entries: {
@@ -81,4 +81,3 @@ module.exports.down = (options) => {
 
     return _private.removeApiKeyPermissionsAndRole(localOptions);
 };
-

package/core/server/data/migrations/versions/2.27/2-insert-db-backup-integration.js

@@ -1,7 +1,7 @@
 const logging = require('@tryghost/logging');
 const merge = require('lodash/merge');
 const models = require('../../../../models');
-const utils = require('../../../schema/fixtures/utils');
+const {fixtureManager} = require('../../../schema/fixtures');
 
 const _private = {};
 
@@ -15,12 +15,12 @@ _private.printResult = function printResult(result, message) {
 
 _private.addGhostBackupIntegration = (options) => {
     const message = 'Adding "Ghost Backup DB" integration';
-    const fixtureIntegration = utils.findModelFixtureEntry('Integration', {slug: 'ghost-backup'});
+    const fixtureIntegration = fixtureManager.findModelFixtureEntry('Integration', {slug: 'ghost-backup'});
 
     return models.Integration.findOne({slug: fixtureIntegration.slug}, options)
         .then((integration) => {
             if (!integration) {
-                return utils.addFixturesForModel({
+                return fixtureManager.addFixturesForModel({
                     name: 'Integration',
                     entries: [fixtureIntegration]
                 }, options).then(result => _private.printResult(result, message));
@@ -67,4 +67,3 @@ module.exports.down = (options) => {
 
     return _private.removeGhostBackupIntegration(localOptions);
 };
-

package/core/server/data/migrations/versions/2.28/3-insert-ghost-scheduler-role.js

@@ -1,7 +1,7 @@
 const logging = require('@tryghost/logging');
 const merge = require('lodash/merge');
 const models = require('../../../../models');
-const utils = require('../../../schema/fixtures/utils');
+const {fixtureManager} = require('../../../schema/fixtures');
 
 const resource = 'post';
 const _private = {};
@@ -16,12 +16,12 @@ _private.printResult = function printResult(result, message) {
 
 _private.addSchedulerRole = (options) => {
     const message = 'Adding "Scheduler Integration" role to roles table';
-    const apiKeyRole = utils.findModelFixtureEntry('Role', {name: 'Scheduler Integration'});
+    const apiKeyRole = fixtureManager.findModelFixtureEntry('Role', {name: 'Scheduler Integration'});
 
     return models.Role.findOne({name: apiKeyRole.name}, options)
         .then((role) => {
             if (!role) {
-                return utils.addFixturesForModel({
+                return fixtureManager.addFixturesForModel({
                     name: 'Role',
                     entries: [apiKeyRole]
                 }, options).then(result => _private.printResult(result, message));
@@ -32,19 +32,19 @@ _private.addSchedulerRole = (options) => {
 };
 
 _private.addPublishPermission = (options) => {
-    const modelToAdd = utils.findModelFixtures('Permission', {object_type: resource, action_type: 'publish'});
+    const modelToAdd = fixtureManager.findModelFixtures('Permission', {object_type: resource, action_type: 'publish'});
 
-    return utils.addFixturesForModel(modelToAdd, options)
+    return fixtureManager.addFixturesForModel(modelToAdd, options)
         .then(result => _private.printResult(result, `Adding "publish" permissions fixtures for ${resource}s`));
 };
 
 _private.removeApiKeyPermissionsAndRole = (options) => {
     const message = 'Rollback: Removing "Scheduler Integration" role and permissions';
 
-    const modelToRemove = utils.findModelFixtures('Permission', {object_type: resource, action_type: 'publish'});
+    const modelToRemove = fixtureManager.findModelFixtures('Permission', {object_type: resource, action_type: 'publish'});
 
     // permission model automatically cleans up permissions_roles on .destroy()
-    return utils.removeFixturesForModel(modelToRemove, options)
+    return fixtureManager.removeFixturesForModel(modelToRemove, options)
         .then(result => _private.printResult(result, `Removing "publish" permissions fixtures for ${resource}s`))
         .then(() => models.Role.findOne({name: 'Scheduler Integration'}, options))
         .then((role) => {

package/core/server/data/migrations/versions/2.28/4-insert-scheduler-integration.js

@@ -1,7 +1,7 @@
 const logging = require('@tryghost/logging');
 const merge = require('lodash/merge');
 const models = require('../../../../models');
-const utils = require('../../../schema/fixtures/utils');
+const {fixtureManager} = require('../../../schema/fixtures');
 
 const _private = {};
 
@@ -15,12 +15,12 @@ _private.printResult = function printResult(result, message) {
 
 _private.addGhostSchedulerIntegration = (options) => {
     const message = 'Adding "Ghost Scheduler" integration';
-    const fixtureIntegration = utils.findModelFixtureEntry('Integration', {slug: 'ghost-scheduler'});
+    const fixtureIntegration = fixtureManager.findModelFixtureEntry('Integration', {slug: 'ghost-scheduler'});
 
     return models.Integration.findOne({slug: fixtureIntegration.slug}, options)
         .then((integration) => {
             if (!integration) {
-                return utils.addFixturesForModel({
+                return fixtureManager.addFixturesForModel({
                     name: 'Integration',
                     entries: [fixtureIntegration]
                 }, options).then(result => _private.printResult(result, message));

package/core/server/data/migrations/versions/4.23/01-truncate-offer-names.js

@@ -0,0 +1,58 @@
+const logging = require('@tryghost/logging');
+const {createTransactionalMigration} = require('../../utils');
+
+/**
+ * @param {(val: string) => boolean} exists
+ * @param {string} requested
+ * @param {string} attempt
+ * @param {number} n
+ *
+ * @returns {string}
+ */
+function getUnique(exists, requested, attempt = requested, n = 1) {
+    if (!exists(attempt)) {
+        return attempt;
+    }
+    const newAttempt = requested.slice(0, -n.toString().length) + n;
+    return getUnique(exists, requested, newAttempt, n + 1);
+}
+
+module.exports = createTransactionalMigration(
+    async function up(knex) {
+        const allOffers = await knex
+            .select('id', 'name')
+            .from('offers');
+
+        const offersNeedingTrunctation = allOffers.filter((row) => {
+            return row.name.length >= 40;
+        });
+
+        if (offersNeedingTrunctation.length === 0) {
+            logging.warn('No Offers found needing truncation');
+            return;
+        } else {
+            logging.info(`Found ${offersNeedingTrunctation.length} Offers needing truncation`);
+        }
+
+        const truncatedOffers = offersNeedingTrunctation.reduce((offers, row) => {
+            function exists(name) {
+                return offers.find(offer => offer.name === name) !== undefined;
+            }
+
+            const updatedRow = {
+                id: row.id,
+                name: getUnique(exists, row.name.slice(0, 40))
+            };
+
+            return offers.concat(updatedRow);
+        }, []);
+
+        for (const truncatedOffer of truncatedOffers) {
+            await knex('offers')
+                .update('name', truncatedOffer.name)
+                .where('id', truncatedOffer.id);
+        }
+    },
+    // no-op we've lost the data required to roll this back
+    async function down() {}
+);