ghost 6.53.0 → 6.54.1

package/core/server/lib/image/index.js

@@ -1,22 +1,22 @@
 const request = require('@tryghost/request');
-const urlUtils = require('../../../shared/url-utils');
-const storage = require('../../adapters/storage');
+const urlUtils = require('../../../shared/url-utils').default;
 const storageUtils = require('../../adapters/storage/utils');
 const validator = require('@tryghost/validator');
 const config = require('../../../shared/config');
 const settingsCache = require('../../../shared/settings-cache');
 const ImageUtils = require('./image-utils');
 
-const adapterManager = require('../../services/adapter-manager');
+const adapterManager = require('../../services/adapter-manager').default;
 
 const cacheStore = adapterManager.getAdapter('cache:imageSizes');
+const imageStore = adapterManager.getAdapter('storage:images');
 
 module.exports = new ImageUtils({
     config,
     urlUtils,
     settingsCache,
     storageUtils,
-    storage,
+    imageStore,
     validator,
     request,
     cacheStore

package/core/server/lib/lexical.js

@@ -1,10 +1,10 @@
 const path = require('path');
 const errors = require('@tryghost/errors');
-const urlUtils = require('../../shared/url-utils');
+const urlUtils = require('../../shared/url-utils').default;
 const config = require('../../shared/config');
 const labs = require('../../shared/labs');
 const settingsCache = require('../../shared/settings-cache');
-const storage = require('../adapters/storage');
+const adapterManager = require('../services/adapter-manager').default;
 
 let nodes;
 let lexicalHtmlRenderer;
@@ -50,7 +50,7 @@ function buildRenderOptions(userOptions) {
             // NOTE: the "saveRaw" check is smelly
             return imageTransform.canTransformFiles()
                 && imageTransform.shouldResizeFileExtension(ext)
-                && typeof storage.getStorage('images').saveRaw === 'function';
+                && typeof adapterManager.getAdapter('storage:images').saveRaw === 'function';
         },
         canTransformImageToFormat(format) {
             const imageTransform = require('@tryghost/image-transform');

package/core/server/lib/mobiledoc.js

@@ -1,6 +1,6 @@
 const path = require('path');
 const config = require('../../shared/config');
-const storage = require('../adapters/storage');
+const adapterManager = require('../services/adapter-manager').default;
 
 let cardFactory;
 let cards;
@@ -37,7 +37,7 @@ module.exports = {
                     // NOTE: the "saveRaw" check is smelly
                     return imageTransform.canTransformFiles()
                         && imageTransform.shouldResizeFileExtension(ext)
-                        && typeof storage.getStorage('images').saveRaw === 'function';
+                        && typeof adapterManager.getAdapter('storage:images').saveRaw === 'function';
                 }
             });
 

package/core/server/lib/request-external.js

@@ -248,7 +248,7 @@ function installSafeDnsLookup(options) {
     const requestHref = options.url.href;
     // Use 'lookup' (the native http.request option) rather than 'dnsLookup'
     // (got's public API property which doesn't flow to the native request).
-    options.lookup = (hostname, dnsOpts, callback) => {
+    options.dnsLookup = (hostname, dnsOpts, callback) => {
         if (typeof dnsOpts === 'function') {
             callback = dnsOpts;
             dnsOpts = {};

package/core/server/lib/validate-password.js

@@ -4,7 +4,7 @@ const validator = require('@tryghost/validator');
 
 const tpl = require('@tryghost/tpl');
 const settingsCache = require('../../shared/settings-cache');
-const urlUtils = require('../../shared/url-utils');
+const urlUtils = require('../../shared/url-utils').default;
 
 const messages = {
     passwordDoesNotComplyLength: 'Your password must be at least {minLength} characters long.',

package/core/server/models/action.js

@@ -1,5 +1,12 @@
 const ghostBookshelf = require('./base');
 
+// Member custom fields are owned by a raw-knex service rather than the Bookshelf
+// registry. Actions still need a read model for `include=resource` to recognise
+// their polymorphic resource type and load the current field definition.
+const MemberCustomFieldResource = ghostBookshelf.Model.extend({
+    tableName: 'members_custom_fields'
+});
+
 const Action = ghostBookshelf.Model.extend({
     tableName: 'actions',
 
@@ -18,6 +25,8 @@ const Action = ghostBookshelf.Model.extend({
             candidates.push([User, 'security_action']);
         }
 
+        candidates.push([MemberCustomFieldResource, 'member_custom_field']);
+
         return candidates;
     },
 

package/core/server/models/base/plugins/generate-slug.js

@@ -1,7 +1,7 @@
 const _ = require('lodash');
 const security = require('@tryghost/security');
 
-const urlUtils = require('../../../../shared/url-utils');
+const urlUtils = require('../../../../shared/url-utils').default;
 
 /**
  * @type {Bookshelf} Bookshelf

package/core/server/models/collection.js

@@ -1,5 +1,5 @@
 const ghostBookshelf = require('./base');
-const urlUtils = require('../../shared/url-utils');
+const urlUtils = require('../../shared/url-utils').default;
 
 const Collection = ghostBookshelf.Model.extend({
     tableName: 'collections',

package/core/server/models/custom-theme-setting.js

@@ -1,6 +1,6 @@
 const _ = require('lodash');
 const ghostBookshelf = require('./base');
-const urlUtils = require('../../shared/url-utils');
+const urlUtils = require('../../shared/url-utils').default;
 
 const CustomThemeSetting = ghostBookshelf.Model.extend({
     tableName: 'custom_theme_settings',

package/core/server/models/member.js

@@ -4,6 +4,70 @@ const _ = require('lodash');
 const config = require('../../shared/config');
 const {MemberCommentingCodec} = require('../services/members/commenting');
 
+const DEEP_OFFSET_THRESHOLD = 1000;
+
+// The rewrite only applies to the plain single-table browse query. Joins,
+// group by, unions etc. at the top level of the statement mean some other
+// query shape — but the same keywords inside parens (NQL filters and search
+// compile to `where members.id in (select ... join ...)`) are fine, so only
+// depth-0 SQL is inspected. Bindings are `?` placeholders, so no user data
+// appears in the inspected string.
+function sqlOutsideParens(sql) {
+    let depth = 0;
+    let result = '';
+
+    for (const char of sql) {
+        if (char === '(') {
+            depth += 1;
+        } else if (char === ')') {
+            depth -= 1;
+        } else if (depth === 0) {
+            result += char;
+        }
+    }
+
+    return result;
+}
+
+// Deferred join for deep OFFSET pagination: plain LIMIT/OFFSET does a full
+// row lookup for every discarded OFFSET row, so deep browse pages took ~10s
+// on large sites. Instead, run LIMIT/OFFSET over a subquery selecting only
+// the primary key (covered by the (created_at, id) index), then join back to
+// fetch full rows for just the final page.
+//
+// The query is inspected via its compiled SQL (`qb.toSQL()`, public knex API)
+// rather than knex's internal builder state. The prefix/suffix anchors below
+// mean anything unexpected — custom selects, a lock clause, missing
+// limit/offset — safely skips the rewrite.
+function applyDeferredJoinForDeepOffset(qb) {
+    const {sql, bindings} = qb.toSQL();
+
+    // The plain browse query compiles to
+    // `select * from `members` [where ...] order by ... limit ? offset ?`;
+    // knex passes limit and offset as the last two bindings
+    if (!sql.startsWith('select * from `members`') || !sql.endsWith('limit ? offset ?')) {
+        return;
+    }
+
+    const offset = bindings[bindings.length - 1];
+
+    if (!Number.isInteger(offset) || offset < DEEP_OFFSET_THRESHOLD) {
+        return;
+    }
+
+    const topLevelSql = sqlOutsideParens(sql);
+    if ([' join ', ' group by ', ' having ', ' union '].some(keyword => topLevelSql.includes(keyword))) {
+        return;
+    }
+
+    // Aliased so the default raw browse order (`created_at DESC, id DESC`)
+    // stays unambiguous in the outer query
+    const idSubquery = qb.clone().select('members.id as deep_page_id');
+
+    qb.clear('where').clear('limit').clear('offset')
+        .innerJoin(idSubquery.as('deep_page'), 'members.id', 'deep_page.deep_page_id');
+}
+
 const Member = ghostBookshelf.Model.extend({
     tableName: 'members',
 
@@ -357,6 +421,15 @@ const Member = ghostBookshelf.Model.extend({
         return result;
     },
 
+    // Fires with the fully-built knex query (filters/order/limit/offset
+    // applied, select columns not yet); the count query runs before this
+    // event, so pagination meta is unaffected by the rewrite
+    onFetchingCollection: function onFetchingCollection(collection, columns, options) {
+        ghostBookshelf.Model.prototype.onFetchingCollection.apply(this, arguments);
+
+        applyDeferredJoinForDeepOffset(options.query);
+    },
+
     onDestroyed: function onDestroyed(model, options) {
         const result = ghostBookshelf.Model.prototype.onDestroyed.apply(this, arguments);
 

package/core/server/models/newsletter.js

@@ -1,7 +1,7 @@
 const ghostBookshelf = require('./base');
 const ObjectID = require('bson-objectid').default;
 const crypto = require('crypto');
-const urlUtils = require('../../shared/url-utils');
+const urlUtils = require('../../shared/url-utils').default;
 
 const Newsletter = ghostBookshelf.Model.extend({
     tableName: 'newsletters',

package/core/server/models/post.js

@@ -14,7 +14,7 @@ const limitService = require('../services/limits');
 const mobiledocLib = require('../lib/mobiledoc');
 const lexicalLib = require('../lib/lexical');
 const relations = require('./relations');
-const urlUtils = require('../../shared/url-utils');
+const urlUtils = require('../../shared/url-utils').default;
 const {Tag} = require('./tag');
 const {Newsletter} = require('./newsletter');
 const {BadRequestError} = require('@tryghost/errors');
@@ -950,15 +950,29 @@ Post = ghostBookshelf.Model.extend({
     },
 
     authors: function authors() {
+        // posts_authors.id breaks sort_order ties deterministically (by attach
+        // order); without it MySQL can order tied rows differently per query,
+        // which changes the computed primary_author. See tags() below.
+        // `id` is pivoted in so it is in the SELECT list — the query uses
+        // DISTINCT, which requires ORDER BY columns to be selected.
         return this.belongsToMany('User', 'posts_authors', 'post_id', 'author_id')
-            .withPivot('sort_order')
-            .query('orderBy', 'sort_order', 'ASC');
+            .withPivot(['sort_order', 'id'])
+            .query('orderBy', 'sort_order', 'ASC')
+            .query('orderBy', 'posts_authors.id', 'ASC');
     },
 
     tags: function tags() {
+        // posts_tags.id breaks sort_order ties deterministically (by attach
+        // order). primary_tag is tags[0]-if-public, so a non-deterministic tie
+        // order (which MySQL produces for tags sharing a sort_order) makes the
+        // primary tag — and the post's URL under a {primary_tag} permalink —
+        // depend on the query shape.
+        // `id` is pivoted in so it is in the SELECT list — the query uses
+        // DISTINCT, which requires ORDER BY columns to be selected.
         return this.belongsToMany('Tag', 'posts_tags', 'post_id', 'tag_id')
-            .withPivot('sort_order')
-            .query('orderBy', 'sort_order', 'ASC');
+            .withPivot(['sort_order', 'id'])
+            .query('orderBy', 'sort_order', 'ASC')
+            .query('orderBy', 'posts_tags.id', 'ASC');
     },
 
     mobiledoc_revisions() {

package/core/server/models/posts-meta.js

@@ -1,5 +1,5 @@
 const ghostBookshelf = require('./base');
-const urlUtils = require('../../shared/url-utils');
+const urlUtils = require('../../shared/url-utils').default;
 
 const PostsMeta = ghostBookshelf.Model.extend({
     tableName: 'posts_meta',

package/core/server/models/redirect.js

@@ -1,5 +1,5 @@
 const ghostBookshelf = require('./base');
-const urlUtils = require('../../shared/url-utils');
+const urlUtils = require('../../shared/url-utils').default;
 
 const Redirect = ghostBookshelf.Model.extend({
     tableName: 'redirects',

package/core/server/models/settings.js

@@ -6,7 +6,7 @@ const ghostBookshelf = require('./base');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const validator = require('@tryghost/validator');
-const urlUtils = require('../../shared/url-utils');
+const urlUtils = require('../../shared/url-utils').default;
 const {WRITABLE_KEYS_ALLOWLIST} = require('../../shared/labs');
 const {getOrGenerateSiteUuid} = require('../services/settings/settings-utils');
 

package/core/server/models/snippet.js

@@ -1,5 +1,5 @@
 const ghostBookshelf = require('./base');
-const urlUtils = require('../../shared/url-utils');
+const urlUtils = require('../../shared/url-utils').default;
 const mobiledocLib = require('../lib/mobiledoc');
 const lexicalLib = require('../lib/lexical');
 const _ = require('lodash');

package/core/server/models/tag.js

@@ -1,7 +1,7 @@
 const ghostBookshelf = require('./base');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
-const urlUtils = require('../../shared/url-utils');
+const urlUtils = require('../../shared/url-utils').default;
 
 const messages = {
     tagNotFound: 'Tag not found.'

package/core/server/models/user.js

@@ -6,10 +6,9 @@ const limitService = require('../services/limits');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const security = require('@tryghost/security');
-const {pipeline} = require('@tryghost/promise');
 const validatePassword = require('../lib/validate-password');
 const permissions = require('../services/permissions');
-const urlUtils = require('../../shared/url-utils');
+const urlUtils = require('../../shared/url-utils').default;
 const {setIsRoles} = require('./role-utils');
 const activeStates = ['active', 'warn-1', 'warn-2', 'warn-3', 'warn-4'];
 const ASSIGNABLE_ROLES = ['Administrator', 'Super Editor', 'Editor', 'Author', 'Contributor'];
@@ -572,91 +571,68 @@ User = ghostBookshelf.Model.extend({
      * @extends ghostBookshelf.Model.edit to handle returning the full object
      * **See:** [ghostBookshelf.Model.edit](base.js.html#edit)
      */
-    edit: function edit(data, unfilteredOptions) {
+    edit: async function edit(data, unfilteredOptions) {
         const options = this.filterOptions(unfilteredOptions, 'edit');
         const self = this;
-        const ops = [];
 
         if (data.roles && data.roles.length > 1) {
-            return Promise.reject(
-                new errors.ValidationError({
-                    message: tpl(messages.onlyOneRolePerUserSupported)
-                })
-            );
+            throw new errors.ValidationError({
+                message: tpl(messages.onlyOneRolePerUserSupported)
+            });
         }
 
         if (data.email) {
-            ops.push(function checkForDuplicateEmail() {
-                return self.getByEmail(data.email, options).then(function then(user) {
-                    if (user && user.id !== options.id) {
-                        return Promise.reject(new errors.ValidationError({
-                            message: tpl(messages.userUpdateError.emailIsAlreadyInUse)
-                        }));
-                    }
+            const existingUser = await self.getByEmail(data.email, options);
+            if (existingUser && existingUser.id !== options.id) {
+                throw new errors.ValidationError({
+                    message: tpl(messages.userUpdateError.emailIsAlreadyInUse)
                 });
-            });
+            }
         }
 
-        ops.push(function update() {
-            return ghostBookshelf.Model.edit.call(self, data, options).then(async (user) => {
-                let roleId;
+        const user = await ghostBookshelf.Model.edit.call(self, data, options);
 
-                if (!data.roles || !data.roles.length) {
-                    return user;
-                }
-
-                roleId = data.roles[0].id || data.roles[0];
-
-                return user.roles().fetch().then((roles) => {
-                    // return if the role is already assigned
-                    if (roles.models[0].id === roleId) {
-                        return;
-                    }
+        if (!data.roles || !data.roles.length) {
+            return user;
+        }
 
-                    if (ASSIGNABLE_ROLES.includes(roleId)) {
-                        // return if the role is already assigned
-                        if (roles.models[0].get('name') === roleId) {
-                            return;
-                        }
+        const roleId = data.roles[0].id || data.roles[0];
+        const roles = await user.roles().fetch();
+        let roleToAssign;
 
-                        return ghostBookshelf.model('Role').findOne({
-                            name: roleId
-                        });
-                    } else if (ObjectId.isValid(roleId)){
-                        return ghostBookshelf.model('Role').findOne({
-                            id: roleId
-                        });
-                    } else {
-                        return Promise.reject(
-                            new errors.ValidationError({
-                                message: tpl(messages.invalidRoleValue.message),
-                                context: tpl(messages.invalidRoleValue.context),
-                                help: tpl(messages.invalidRoleValue.help)
-                            })
-                        );
-                    }
-                }).then((roleToAssign) => {
-                    if (roleToAssign && roleToAssign.get('name') === 'Owner') {
-                        return Promise.reject(
-                            new errors.ValidationError({
-                                message: tpl(messages.methodDoesNotSupportOwnerRole)
-                            })
-                        );
-                    } else if (roleToAssign) {
-                        // assign all other roles
-                        return user.roles().updatePivot({role_id: roleToAssign.id});
-                    }
-                }).then(() => {
-                    options.status = 'all';
-                    return self.findOne({id: user.id}, options);
-                }).then((model) => {
-                    model._changed = user._changed;
-                    return model;
+        if (roles.models[0].id !== roleId) {
+            if (ASSIGNABLE_ROLES.includes(roleId)) {
+                if (roles.models[0].get('name') !== roleId) {
+                    roleToAssign = await ghostBookshelf.model('Role').findOne({
+                        name: roleId
+                    });
+                }
+            } else if (ObjectId.isValid(roleId)) {
+                roleToAssign = await ghostBookshelf.model('Role').findOne({
+                    id: roleId
                 });
+            } else {
+                throw new errors.ValidationError({
+                    message: tpl(messages.invalidRoleValue.message),
+                    context: tpl(messages.invalidRoleValue.context),
+                    help: tpl(messages.invalidRoleValue.help)
+                });
+            }
+        }
+
+        if (roleToAssign && roleToAssign.get('name') === 'Owner') {
+            throw new errors.ValidationError({
+                message: tpl(messages.methodDoesNotSupportOwnerRole)
             });
-        });
+        } else if (roleToAssign) {
+            // assign all other roles
+            await user.roles().updatePivot({role_id: roleToAssign.id});
+        }
 
-        return pipeline(ops);
+        options.status = 'all';
+        const model = await self.findOne({id: user.id}, options);
+        model._changed = user._changed;
+        return model;
     },
 
     /**

package/core/server/models/welcome-email-automated-email.js

@@ -1,6 +1,6 @@
 const ghostBookshelf = require('./base');
 const errors = require('@tryghost/errors');
-const urlUtils = require('../../shared/url-utils');
+const urlUtils = require('../../shared/url-utils').default;
 const lexicalLib = require('../lib/lexical');
 const {DEFAULT_EMAIL_DESIGN_SETTING_SLUG} = require('../services/member-welcome-emails/constants');
 

package/core/server/services/activitypub/activity-pub-service-wrapper.js

@@ -14,7 +14,7 @@ module.exports = class ActivityPubServiceWrapper {
         const logging = require('@tryghost/logging');
         const events = require('../../lib/common/events');
         const {knex} = require('../../data/db');
-        const urlUtils = require('../../../shared/url-utils');
+        const urlUtils = require('../../../shared/url-utils').default;
         const IdentityTokenServiceWrapper = require('../identity-tokens');
         const settingsCache = require('../../../shared/settings-cache');
 

package/core/server/services/adapter-manager/adapter-manager.js

@@ -128,8 +128,12 @@ class AdapterManager {
                 // We are loading from node_modules, we can remove the `adapterType` prefix
                 pathToAdapter = node_path_1.default.join(pathToAdapters, adapterClassName);
             }
+            // An adapter directory may be a full module with its own
+            // package.json, in which case this resolves the `exports` entry
+            // point; otherwise the path passes through unchanged.
+            const moduleToLoad = (0, utils_1.resolveAdapterEntryPoint)(pathToAdapter);
             try {
-                const adapterModule = this.loadAdapterFromPath(pathToAdapter);
+                const adapterModule = this.loadAdapterFromPath(moduleToLoad);
                 Adapter = (0, utils_1.resolveAdapterExport)(adapterModule);
                 if (Adapter) {
                     break;

package/core/server/services/adapter-manager/adapter-manager.ts

@@ -1,6 +1,6 @@
 import path from 'node:path';
 import errors from '@tryghost/errors';
-import {resolveAdapterExport, resolveAdapterOptions, normalizeAdapterConfig, getConfiguredFeatures} from './utils';
+import {resolveAdapterExport, resolveAdapterEntryPoint, resolveAdapterOptions, normalizeAdapterConfig, getConfiguredFeatures} from './utils';
 import type {ConfigInstance} from '../../../shared/config/loader';
 import type {
     Adapter,
@@ -193,8 +193,13 @@ export class AdapterManager<BaseClasses extends BaseClassMap = BaseClassMap> {
                 // We are loading from node_modules, we can remove the `adapterType` prefix
                 pathToAdapter = path.join(pathToAdapters, adapterClassName);
             }
+            // An adapter directory may be a full module with its own
+            // package.json, in which case this resolves the `exports` entry
+            // point; otherwise the path passes through unchanged.
+            const moduleToLoad = resolveAdapterEntryPoint(pathToAdapter);
+
             try {
-                const adapterModule = this.loadAdapterFromPath(pathToAdapter);
+                const adapterModule = this.loadAdapterFromPath(moduleToLoad);
                 Adapter = resolveAdapterExport(adapterModule);
                 if (Adapter) {
                     break;

package/core/server/services/adapter-manager/index.js

@@ -3,37 +3,40 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const ghost_storage_base_1 = __importDefault(require("ghost-storage-base"));
+const ghost_storage_base_1 = require("ghost-storage-base");
 const adapter_base_scheduling_1 = require("@tryghost/adapter-base-scheduling");
 const adapter_base_sso_1 = require("@tryghost/adapter-base-sso");
-const adapter_base_cache_1 = __importDefault(require("@tryghost/adapter-base-cache"));
+const adapter_base_cache_1 = require("@tryghost/adapter-base-cache");
 const adapter_base_redirects_1 = require("@tryghost/adapter-base-redirects");
 const adapter_base_route_settings_1 = require("@tryghost/adapter-base-route-settings");
 const adapter_manager_1 = require("./adapter-manager");
 const config_1 = __importDefault(require("../../../shared/config"));
+const adapterPaths = new Set([
+    '', // A blank path will cause us to check node_modules for the adapter
+    config_1.default.get('paths').internalAdaptersPath,
+    // custom docker builds may install adapters in a separate path from content,
+    // since the content dir is often bind-mounted into the container. Offering
+    // an escape hatch here to allow for this
+    config_1.default.get('paths').installedAdaptersPath ?? '',
+    // load adapters from content last, so that they don't override any other
+    // internal or platform-installed adapters
+    // TODO: potentially deprecate/remove as part of Ghost 7.0
+    config_1.default.getContentPath('adapters'),
+]);
 // A singleton adapter manager, preconfigured with the base classes for every
 // known adapter type. `getAdapter` resolves the active adapter and its options
 // from config on each call, so runtime config changes are always reflected.
 const adapterManager = new adapter_manager_1.AdapterManager({
     loadAdapterFromPath: require,
     config: config_1.default,
-    pathsToAdapters: [
-        '', // A blank path will cause us to check node_modules for the adapter
-        config_1.default.getContentPath('adapters'),
-        config_1.default.get('paths').internalAdaptersPath
-    ],
+    pathsToAdapters: Array.from(adapterPaths),
     baseClasses: {
-        storage: ghost_storage_base_1.default,
+        storage: ghost_storage_base_1.StorageBase,
         scheduling: adapter_base_scheduling_1.SchedulingBase,
         sso: adapter_base_sso_1.SSOBase,
-        cache: adapter_base_cache_1.default,
+        cache: adapter_base_cache_1.CacheBase,
         redirects: adapter_base_redirects_1.RedirectsStoreBase,
         'route-settings': adapter_base_route_settings_1.RouteSettingsStoreBase
     }
 });
-// NOTE: exported via `module.exports` (rather than ESM named exports) so that
-// consumers keep `require(...).getAdapter` access AND tests can stub methods
-// with sinon — ESM named exports compile to immutable bindings that sinon
-// cannot stub. Using `module.exports` directly (not `export =`) keeps this
-// compatible with the erasableSyntaxOnly compiler option.
-module.exports = adapterManager;
+exports.default = adapterManager;