ghost 5.130.2 → 6.0.0-alpha.2

package/core/server/models/base/plugins/events.js

@@ -138,26 +138,12 @@ module.exports = function (Bookshelf) {
 
         /**
          * Adding resources implies setting these properties on the server side
-         * - set `created_by` based on the context
-         * - set `updated_by` based on the context
          * - the bookshelf `timestamps` plugin sets `created_at` and `updated_at`
          *   - if plugin is disabled (e.g. import) we have a fallback condition
          *
          * Exceptions: internal context or importing
          */
         onCreating: function onCreating(model, attr, options) {
-            if (Object.prototype.hasOwnProperty.call(schema.tables[this.tableName], 'created_by')) {
-                if (!options.importing || (options.importing && !this.get('created_by'))) {
-                    this.set('created_by', String(this.contextUser(options)));
-                }
-            }
-
-            if (Object.prototype.hasOwnProperty.call(schema.tables[this.tableName], 'updated_by')) {
-                if (!options.importing) {
-                    this.set('updated_by', String(this.contextUser(options)));
-                }
-            }
-
             if (Object.prototype.hasOwnProperty.call(schema.tables[this.tableName], 'created_at')) {
                 if (!model.get('created_at')) {
                     model.set('created_at', new Date());
@@ -199,9 +185,7 @@ module.exports = function (Bookshelf) {
 
         /**
          * Changing resources implies setting these properties on the server side
-         * - set `updated_by` based on the context
          * - ensure `created_at` never changes
-         * - ensure `created_by` never changes
          * - the bookshelf `timestamps` plugin sets `updated_at` automatically
          *
          * Exceptions:
@@ -216,24 +200,12 @@ module.exports = function (Bookshelf) {
                 model.changed = _.omit(model.changed, this.relationships);
             }
 
-            if (Object.prototype.hasOwnProperty.call(schema.tables[this.tableName], 'updated_by')) {
-                if (!options.importing && !options.migrating) {
-                    this.set('updated_by', String(this.contextUser(options)));
-                }
-            }
-
             if (options && options.context && !options.context.internal && !options.importing) {
                 if (Object.prototype.hasOwnProperty.call(schema.tables[this.tableName], 'created_at')) {
                     if (model.hasDateChanged('created_at', {beforeWrite: true})) {
                         model.set('created_at', this.previous('created_at'));
                     }
                 }
-
-                if (Object.prototype.hasOwnProperty.call(schema.tables[this.tableName], 'created_by')) {
-                    if (model.hasChanged('created_by')) {
-                        model.set('created_by', String(this.previous('created_by')));
-                    }
-                }
             }
 
             // CASE: do not allow setting only the `updated_at` field, exception: importing

package/core/server/models/base/plugins/user-type.js

@@ -8,7 +8,7 @@ const messages = {
 /**
  * @param {import('bookshelf')} Bookshelf
  */
-module.exports = function (Bookshelf) {
+module.exports = function (Bookshelf, pluginOptions) {
     Bookshelf.Model = Bookshelf.Model.extend({
         getActor(options = {context: {}}) {
             if (options.context && options.context.integration) {
@@ -29,37 +29,22 @@ module.exports = function (Bookshelf) {
         },
 
         // Get the user from the options object
-        contextUser: function contextUser(options) {
+        contextUser: async function contextUser(options) {
             options = options || {};
             options.context = options.context || {};
 
             if (options.context.user) {
                 return options.context.user;
             } else if (options.context.integration) {
-            /**
-             * @NOTE:
-             *
-             * This is a dirty fix until we get rid of all the x_by columns
-             * @deprecated x_by columns are deprecated as of v1.0 - instead we should use the actions table
-             * see https://github.com/TryGhost/Ghost/issues/10286.
-             *
-             * We return the owner ID '1' in case an integration updates or creates resources.
-             *
-             * ---
-             *
-             * Why using ID '1'? WAIT. What???????
-             *
-             * See https://github.com/TryGhost/Ghost/issues/9299.
-             *
-             * We currently don't read the correct owner ID from the database and assume it's '1'.
-             * This is a leftover from switching from auto increment ID's to Object ID's.
-             * But this takes too long to refactor out now. If an internal update happens, we also
-             * use ID '1'. This logic exists for a LONG while now. The owner ID only changes from '1' to something else,
-             * if you transfer ownership.
-             */
-                return Bookshelf.Model.internalUser;
+                return pluginOptions.resolveIntegrationUserId({
+                    transacting: options.transacting,
+                    context: options.context
+                });
             } else if (options.context.internal) {
-                return Bookshelf.Model.internalUser;
+                return pluginOptions.resolveInternalUserId({
+                    transacting: options.transacting,
+                    context: options.context
+                });
             } else if (this.get('id')) {
                 return this.get('id');
             } else {
@@ -69,16 +54,5 @@ module.exports = function (Bookshelf) {
                 });
             }
         }
-    }, {
-        /**
-         * please use these static definitions when comparing id's
-         * we keep type Number, because we have too many check's where we rely on Number
-         * context.user ? true : false (if context.user is 0 as number, this condition is false)
-         */
-        internalUser: 1,
-
-        isInternalUser: function isInternalUser(id) {
-            return id === Bookshelf.Model.internalUser || id === Bookshelf.Model.internalUser.toString();
-        }
     });
 };

package/core/server/models/post.js

@@ -601,6 +601,28 @@ Post = ghostBookshelf.Model.extend({
             }
         }
 
+        // CASE: Force a change for scheduled posts within 2 minutes of
+        // publishing. This ensures the scheduler can detect last-minute
+        // touches to the post
+        const isScheduled = newStatus === 'scheduled';
+        const isUpdate = options.method === 'update';
+        const isWithin2Minutes = publishedAt && moment(publishedAt).diff(moment(), 'minutes') <= 2;
+        const isNotImporting = !options.importing;
+        const isNotMigrating = !options.migrating;
+
+        if (isScheduled && isUpdate && isWithin2Minutes && isNotImporting && isNotMigrating) {
+            // Check if no actual changes have been made
+            if (!this.changed || Object.keys(this.changed).length === 0) {
+                // Force a "touch" by setting a dummy property that will be stored in _changed
+                this.set('_touch', true);
+                // Immediately unset it so it doesn't get saved to the database
+                this.unset('_touch');
+                // But ensure the changed object still has it for event detection
+                this.changed = this.changed || {};
+                this.changed._touch = true;
+            }
+        }
+
         // CASE: detect lowercase/uppercase tag slugs
         if (!_.isUndefined(this.get('tags')) && !_.isNull(this.get('tags'))) {
             tagsToSave = [];
@@ -744,7 +766,8 @@ Post = ghostBookshelf.Model.extend({
         if ((newStatus === 'published' || newStatus === 'sent') && this.hasChanged('status')) {
             // unless published_by is set and we're importing, set published_by to contextUser
             if (!(this.get('published_by') && options.importing)) {
-                this.set('published_by', String(this.contextUser(options)));
+                const userId = await this.contextUser(options);
+                this.set('published_by', String(userId));
             }
         } else {
             // In any other case (except import), `published_by` should not be changed
@@ -888,7 +911,7 @@ Post = ghostBookshelf.Model.extend({
                     revision_interval_ms: POST_REVISIONS_INTERVAL_MS
                 }
             });
-            let authorId = this.contextUser(options);
+            let authorId = await this.contextUser(options);
             const authorExists = await ghostBookshelf.model('User').findOne({id: authorId}, {transacting: options.transacting});
             if (!authorExists) {
                 authorId = await ghostBookshelf.model('User').getOwnerUser().get('id');
@@ -954,14 +977,6 @@ Post = ghostBookshelf.Model.extend({
         return sequence(ops);
     },
 
-    created_by: function createdBy() {
-        return this.belongsTo('User', 'created_by');
-    },
-
-    updated_by: function updatedBy() {
-        return this.belongsTo('User', 'updated_by');
-    },
-
     published_by: function publishedBy() {
         return this.belongsTo('User', 'published_by');
     },

package/core/server/models/relations/authors.js

@@ -75,10 +75,10 @@ module.exports.extendModel = function extendModel(Post, Posts, ghostBookshelf) {
             return proto.onFetchedCollection.call(this, collection, attrs, options);
         },
 
-        onCreating: function onCreating(model, attrs, options) {
+        onCreating: async function onCreating(model, attrs, options) {
             if (!model.get('authors')) {
                 model.set('authors', [{
-                    id: this.contextUser(options)
+                    id: await this.contextUser(options)
                 }]);
             }
 

package/core/server/models/settings.js

@@ -292,25 +292,12 @@ Settings = ghostBookshelf.Model.extend({
 
             // fetch other data that is used when inserting new settings
             const date = ghostBookshelf.knex.raw('CURRENT_TIMESTAMP');
-            let owner;
-            try {
-                owner = await ghostBookshelf.model('User').getOwnerUser();
-            } catch (e) {
-                // in some tests the owner is deleted and not recreated before setup
-                if (e.errorType === 'NotFoundError') {
-                    owner = {id: 1};
-                } else {
-                    throw e;
-                }
-            }
 
             const settingsDataToInsert = settingsToInsert.map((setting) => {
                 const settingValues = Object.assign({}, setting, {
                     id: ObjectID().toHexString(),
                     created_at: date,
-                    created_by: owner.id,
-                    updated_at: date,
-                    updated_by: owner.id
+                    updated_at: date
                 });
 
                 return _.pick(settingValues, columns);

package/core/server/models/user.js

@@ -76,7 +76,7 @@ User = ghostBookshelf.Model.extend({
     },
 
     format(options) {
-        if (options.website && 
+        if (options.website &&
             !validator.isURL(options.website, {
                 require_protocol: true,
                 protocols: ['http', 'https']
@@ -295,10 +295,6 @@ User = ghostBookshelf.Model.extend({
         return attrs;
     },
 
-    posts: function posts() {
-        return this.hasMany('Posts', 'created_by');
-    },
-
     sessions: function sessions() {
         return this.hasMany('Session');
     },
@@ -778,9 +774,38 @@ User = ghostBookshelf.Model.extend({
         });
     },
 
+    ownerIdCache: {
+        value: null,
+        set(value) {
+            this.value = value;
+        },
+        get() {
+            return this.value;
+        },
+        clear() {
+            this.value = null;
+        }
+    },
+
+    getOwnerId: function getOwnerId(options) {
+        if (this.ownerIdCache.value !== null) {
+            return Promise.resolve(this.ownerIdCache.value);
+        }
+
+        return this.getOwnerUser(options).then((owner) => {
+            this.ownerIdCache.set(owner.id);
+
+            return owner.id;
+        });
+    },
+
+    generateId: function generateId() {
+        return ObjectId().toHexString();
+    },
+
     /**
      * Checks if a user has permission to perform an action on another user
-     * 
+     *
      * @param {Object|string|number} userModelOrId - The user model or ID being acted upon
      * @param {'edit'|'destroy'} action - The action being performed:
      *                                     - 'edit': Edit user details, status, or role
@@ -1112,6 +1137,8 @@ User = ghostBookshelf.Model.extend({
                 ]);
             })
             .then((results) => {
+                this.ownerIdCache.clear();
+
                 return Users.forge()
                     .query('whereIn', 'id', [contextUser.id, results[2]])
                     .fetch({withRelated: ['roles']});

package/core/server/services/activitypub/ActivityPubService.js

@@ -124,8 +124,7 @@ class ActivityPubService {
                 name: `ActivityPub ${expectedWebhook.event} Webhook`,
                 secret: secret,
                 integration_id: integration.id,
-                created_at: this.knex.raw('current_timestamp'),
-                created_by: '1'
+                created_at: this.knex.raw('current_timestamp')
             };
         });
         await this.knex

package/core/server/services/activitypub/ActivityPubService.ts

@@ -147,8 +147,7 @@ export class ActivityPubService {
                 name: `ActivityPub ${expectedWebhook.event} Webhook`,
                 secret: secret,
                 integration_id: integration.id,
-                created_at: this.knex.raw('current_timestamp'),
-                created_by: '1'
+                created_at: this.knex.raw('current_timestamp')
             };
         });
 

package/core/server/services/explore-ping/ExplorePingService.js

@@ -33,7 +33,9 @@ module.exports = class ExplorePingService {
             ghost: this.ghostVersion.full,
             site_uuid: this.settingsCache.get('site_uuid'),
             url: this.config.get('url'),
-            theme: this.settingsCache.get('active_theme')
+            theme: this.settingsCache.get('active_theme'),
+            facebook: this.settingsCache.get('facebook'),
+            twitter: this.settingsCache.get('twitter')
         };
 
         try {

package/core/server/services/link-redirection/README.md

@@ -77,7 +77,7 @@ select `newsletters`.*, `members_newsletters`.`member_id` as `_pivot_member_id`,
 
 Then we update the member:
 ```
-update `members` set `uuid` = ?, `transient_id` = ?, `email` = ?, `status` = ?, `name` = ?, `expertise` = ?, `note` = ?, `geolocation` = ?, `enable_comment_notifications` = ?, `email_count` = ?, `email_opened_count` = ?, `email_open_rate` = ?, `email_disabled` = ?, `last_seen_at` = ?, `last_commented_at` = ?, `created_at` = ?, `created_by` = ?, `updated_at` = ?, `updated_by` = ? where `id` = ? trx34
+update `members` set `uuid` = ?, `transient_id` = ?, `email` = ?, `status` = ?, `name` = ?, `expertise` = ?, `note` = ?, `geolocation` = ?, `enable_comment_notifications` = ?, `email_count` = ?, `email_opened_count` = ?, `email_open_rate` = ?, `email_disabled` = ?, `last_seen_at` = ?, `last_commented_at` = ?, `created_at` = ?, `updated_at` = ? where `id` = ? trx34
 ```
 
 Then we select the member by ID again to get the freshly updated values from the DB:

package/core/server/services/mentions/MentionSendingService.js

@@ -45,7 +45,7 @@ module.exports = class MentionSendingService {
         // for now we don't want to evaluate mentions when importing data (at least needs queueing set up)
         // we do not want to evaluate mentions with fixture (internal) data, e.g. generating posts
         // TODO: real solution is likely suppressing event emission when building fixture data
-        if (options && (options.importing || options.context.internal)) {
+        if (options && (options.importing || (options.context && options.context.internal))) {
             return;
         }
 

package/core/server/services/settings/SettingsBREADService.js

@@ -24,12 +24,14 @@ class SettingsBREADService {
      * @param {Object} options.singleUseTokenProvider
      * @param {Object} options.urlUtils
      * @param {Object} options.labsService - labs service instance
+     * @param {Object} options.limitsService - limits service instance
      * @param {{service: Object}} options.emailAddressService
      */
-    constructor({SettingsModel, settingsCache, labsService, mail, singleUseTokenProvider, urlUtils, emailAddressService}) {
+    constructor({SettingsModel, settingsCache, labsService, limitsService, mail, singleUseTokenProvider, urlUtils, emailAddressService}) {
         this.SettingsModel = SettingsModel;
         this.settingsCache = settingsCache;
         this.labs = labsService;
+        this.limitsService = limitsService;
         this.emailAddressService = emailAddressService;
 
         /* email verification setup */
@@ -194,6 +196,8 @@ class SettingsBREADService {
         }
 
         if (stripeConnectData) {
+            await this.limitsService.errorIfWouldGoOverLimit('limitStripeConnect');
+
             filteredSettings.push({
                 key: 'stripe_connect_publishable_key',
                 value: stripeConnectData.public_key

package/core/server/services/settings/settings-service.js

@@ -5,6 +5,7 @@
 const events = require('../../lib/common/events');
 const models = require('../../models');
 const labs = require('../../../shared/labs');
+const limits = require('../limits');
 const config = require('../../../shared/config');
 const adapterManager = require('../adapter-manager');
 const SettingsCache = require('../../../shared/settings-cache');
@@ -30,6 +31,7 @@ const getSettingsBREADServiceInstance = () => {
         SettingsModel: models.Settings,
         settingsCache: SettingsCache,
         labsService: labs,
+        limitsService: limits,
         mail,
         singleUseTokenProvider: new SingleUseTokenProvider({
             SingleUseTokenModel: models.SingleUseToken,
@@ -110,7 +112,7 @@ module.exports = {
         fields.push(new CalculatedField({key: 'social_web_enabled', type: 'boolean', group: 'social_web', fn: settingsHelpers.isSocialWebEnabled.bind(settingsHelpers), dependents: ['social_web', 'labs']}));
 
         // Web analytics
-        fields.push(new CalculatedField({key: 'web_analytics_enabled', type: 'boolean', group: 'analytics', fn: settingsHelpers.isWebAnalyticsEnabled.bind(settingsHelpers), dependents: ['web_analytics', 'labs']}));
+        fields.push(new CalculatedField({key: 'web_analytics_enabled', type: 'boolean', group: 'analytics', fn: settingsHelpers.isWebAnalyticsEnabled.bind(settingsHelpers), dependents: ['web_analytics']}));
         fields.push(new CalculatedField({key: 'web_analytics_configured', type: 'boolean', group: 'analytics', fn: settingsHelpers.isWebAnalyticsConfigured.bind(settingsHelpers), dependents: ['web_analytics']}));
 
         return fields;

package/core/server/services/settings-helpers/SettingsHelpers.js

@@ -234,12 +234,6 @@ class SettingsHelpers {
             return false;
         }
 
-        // Labs setting
-        if (!this.labs.isSet('ActivityPub')) {
-            debug('Social web is disabled in labs');
-            return false;
-        }
-
         // Ghost (Pro) limits
         if (this.limitService.isDisabled('limitSocialWeb')) {
             debug('Social web is not available for Ghost (Pro) sites without a custom domain, or hosted on a subdirectory');
@@ -279,12 +273,6 @@ class SettingsHelpers {
             return false;
         }
 
-        // Labs setting
-        if (!this.labs.isSet('trafficAnalytics')) {
-            debug('Web analytics is disabled in labs');
-            return false;
-        }
-
         // Check if web analytics can be configured (limit service and required config)
         if (!this.isWebAnalyticsConfigured()) {
             return false;

package/core/server/services/update-check/UpdateCheckService.js

@@ -116,7 +116,10 @@ class UpdateCheckService {
             const hash = (await this.api.settings.read(_.extend({key: 'db_hash'}, internal))).settings[0];
             const theme = (await this.api.settings.read(_.extend({key: 'active_theme'}, internal))).settings[0];
             const posts = await this.api.posts.browse();
-            const users = await this.api.users.browse(internal);
+            const users = await this.api.users.browse({
+                ...internal,
+                include: ['roles']
+            });
             const npm = await util.promisify(exec)('npm -v');
 
             const blogUrl = this.config.siteUrl;
@@ -128,7 +131,20 @@ class UpdateCheckService {
             data.theme = theme ? theme.value : '';
             data.post_count = posts && posts.meta && posts.meta.pagination ? posts.meta.pagination.total : 0;
             data.user_count = users && users.users && users.users.length ? users.users.length : 0;
-            data.blog_created_at = users && users.users && users.users[0] && users.users[0].created_at ? moment(users.users[0].created_at).unix() : '';
+
+            let blogCreatedAt = null;
+
+            if (users && users.users && users.users.length > 0) {
+                const ownerUser = users.users.find(user => user.roles.some(role => role.name === 'Owner'));
+
+                if (ownerUser) {
+                    blogCreatedAt = ownerUser.created_at;
+                } else {
+                    blogCreatedAt = users.users[0].created_at;
+                }
+            }
+
+            data.blog_created_at = blogCreatedAt ? moment(blogCreatedAt).unix() : '';
             data.npm_version = npm.stdout.trim();
 
             return data;

package/core/server/services/url/config.js

@@ -19,7 +19,6 @@ module.exports = [
                 // @TODO: https://github.com/TryGhost/Ghost/issues/10335
                 // 'page',
                 'status',
-                'amp',
                 'codeinjection_head',
                 'codeinjection_foot',
                 'meta_title',
@@ -68,7 +67,6 @@ module.exports = [
                 // @TODO: https://github.com/TryGhost/Ghost/issues/10335
                 // 'page',
                 // 'status',
-                'amp',
                 'codeinjection_head',
                 'codeinjection_foot',
                 'meta_title',

package/core/server/web/api/app.js

@@ -2,6 +2,7 @@ const debug = require('@tryghost/debug')('web:api:default:app');
 const config = require('../../../shared/config');
 const express = require('../../../shared/express');
 const sentry = require('../../../shared/sentry');
+const middleware = require('../shared/middleware');
 const errorHandler = require('@tryghost/mw-error-handler');
 const APIVersionCompatibilityService = require('../../services/api-version-compatibility');
 
@@ -19,6 +20,9 @@ module.exports = function setupApiApp() {
     apiApp.use(APIVersionCompatibilityService.versionRewrites);
     apiApp.use(APIVersionCompatibilityService.contentVersion);
 
+    // Enforce capped limit parameter
+    apiApp.use(middleware.maxLimitCap);
+
     apiApp.lazyUse('/content/', require('./endpoints/content/app'));
     apiApp.lazyUse('/admin/', require('./endpoints/admin/app'));
 

package/core/server/web/api/endpoints/admin/middleware.js

@@ -5,7 +5,7 @@ const shared = require('../../../shared');
 const apiMw = require('../../middleware');
 
 const messages = {
-    notImplemented: 'The server does not support the functionality required to fulfill the request.',
+    apiTokenBlocked: 'API tokens do not have permission to access this endpoint',
     staffTokenBlocked: 'Staff tokens are not allowed to access this endpoint'
 };
 
@@ -14,7 +14,7 @@ const messages = {
  * @param {import('express').Response} res
  * @param {import('express').NextFunction} next
  */
-const notImplemented = function notImplemented(req, res, next) {
+const tokenPermissionCheck = function tokenPermissionCheck(req, res, next) {
     // CASE: user is logged in with user auth, skip to permission system
     if (!req.api_key) {
         return next();
@@ -81,10 +81,9 @@ const notImplemented = function notImplemented(req, res, next) {
         }
     }
 
-    next(new errors.InternalServerError({
-        errorType: 'NotImplementedError',
-        message: tpl(messages.notImplemented),
-        statusCode: 501
+    next(new errors.NoPermissionError({
+        message: tpl(messages.apiTokenBlocked),
+        statusCode: 403
     }));
 };
 
@@ -102,7 +101,7 @@ module.exports.authAdminApi = [
     apiMw.cors,
     shared.middleware.urlRedirects.adminSSLAndHostRedirect,
     shared.middleware.prettyUrls,
-    notImplemented
+    tokenPermissionCheck
 ];
 
 /**
@@ -118,7 +117,7 @@ module.exports.authAdminApiWithUrl = [
     apiMw.cors,
     shared.middleware.urlRedirects.adminSSLAndHostRedirect,
     shared.middleware.prettyUrls,
-    notImplemented
+    tokenPermissionCheck
 ];
 
 /**
@@ -130,5 +129,5 @@ module.exports.publicAdminApi = [
     apiMw.cors,
     shared.middleware.urlRedirects.adminSSLAndHostRedirect,
     shared.middleware.prettyUrls,
-    notImplemented
+    tokenPermissionCheck
 ];

package/core/server/web/api/endpoints/admin/routes.js

@@ -19,7 +19,6 @@ module.exports = function apiRoutes() {
 
     // ## Public
     router.get('/site', mw.publicAdminApi, http(api.site.read));
-    router.post('/mail_events', mw.publicAdminApi, http(api.mailEvents.add));
 
     // ## Configuration
     router.get('/config', mw.authAdminApi, http(api.config.read));
@@ -247,7 +246,6 @@ module.exports = function apiRoutes() {
     router.get('/tinybird/token', mw.authAdminApi, http(api.tinybird.token));
 
     // ## Sessions
-    router.get('/session', mw.authAdminApi, http(api.session.read));
     // We don't need auth when creating a new session (logging in)
     router.post('/session',
         shared.middleware.brute.globalBlock,

package/core/server/web/comments/routes.js

@@ -23,6 +23,9 @@ module.exports = function apiRoutes() {
     // Authenticated Routes
     router.use(membersService.middleware.loadMemberSession);
 
+    // Enforce capped limit parameter
+    router.use(shared.middleware.maxLimitCap);
+
     router.get('/', http(api.commentsMembers.browse));
     router.get('/post/:post_id', http(api.commentsMembers.browse));
     router.get('/:id', http(api.commentsMembers.read));

package/core/server/web/shared/middleware/index.js

@@ -11,6 +11,10 @@ module.exports = {
         return require('./cache-control');
     },
 
+    get maxLimitCap() {
+        return require('./max-limit-cap');
+    },
+
     get prettyUrls() {
         return require('./pretty-urls');
     },

package/core/server/web/shared/middleware/max-limit-cap.js

@@ -0,0 +1,27 @@
+const {applyLimitCap, limitConfig} = require('../../../../shared/max-limit-cap');
+
+// Prior to Ghost 6.x we allowed any limit value, including 'all', but as sites
+// grew in size it led to performance issues and mis-use of the API.
+
+// After Ghost 6.x we only allow a max limit of 100. This middleware enforces
+// that limit by rewriting the limit parameter before it reaches any API code.
+
+function maxLimitCap(req, res, next) {
+    const limit = req.query.limit;
+
+    if (!limit) {
+        return next();
+    }
+
+    // Apply the shared limit capping logic with URL for exception endpoint checking
+    const cappedLimit = applyLimitCap(limit, {url: req.originalUrl});
+
+    req.query.limit = cappedLimit;
+    next();
+}
+
+// Create middleware stack with limitConfig property for test access
+/** @type {Array<Function> & {limitConfig: object}} */
+const middlewareStack = Object.assign([maxLimitCap], {limitConfig});
+
+module.exports = middlewareStack;

package/core/server/web/shared/middleware/pretty-urls.js

@@ -1,8 +1,9 @@
 // Pretty URL redirects
 //
-// These are two pieces of middleware that handle ensuring that
+// These are three pieces of middleware that handle ensuring that
 // URLs get formatted correctly.
 // Slashes ensures that we get trailing slashes
+// redirectAmpUrls removes /amp from the end of urls if it exists (AMP support removed in v6) 
 // Uncapitalise changes case to lowercase
 // @TODO optimize this to reduce the number of redirects required to get to a pretty URL
 // @TODO move this to being used by routers?
@@ -15,5 +16,6 @@ module.exports = [
             'Cache-Control': `public, max-age=${config.get('caching:301:maxAge')}`
         }
     }),
+    require('./redirect-amp-urls'),
     require('./uncapitalise')
 ];