ghost 6.61.0 → 6.62.0

package/core/server/services/email-service/email-renderer.js

@@ -13,7 +13,7 @@ function isUnsplashImage(url) {
 }
 const { DateTime } = require('luxon');
 const htmlToPlaintext = require('@tryghost/html-to-plaintext');
-const EmailAddressParser = require('../email-address/email-address-parser');
+const emailAddressParser = require('../email-address/email-address-parser');
 const { getEmailDesign } = require('../email-rendering/email-design');
 const { registerHelpers } = require('./helpers/register-helpers');
 const crypto = require('crypto');
@@ -229,6 +229,8 @@ function cheerioLoad(html) {
  * @prop {string} id
  * @prop {RegExp} token
  * @prop {(member: MemberLike) => string} getValue
+ * @prop {boolean} [trusted] - Value is server-generated, so it is inserted into the
+ *   html body as-is instead of being HTML-escaped. Defaults to false (escaped).
  */
 
 /**
@@ -337,7 +339,7 @@ class EmailRenderer {
   }
 
   #getRawFromAddress(post, newsletter) {
-    // Pass the raw name through; EmailAddressParser.stringify() is the single
+    // Pass the raw name through; emailAddressParser.stringify() is the single
     // point that escapes it for the RFC5322 quoted-string From header. Escaping
     // here too would double-escape (e.g. a title containing a double quote).
     let senderName = this.#settingsCache.get('title') || '';
@@ -394,7 +396,7 @@ class EmailRenderer {
       { useFallbackAddress },
     );
 
-    return EmailAddressParser.stringify(addresses.from);
+    return emailAddressParser.stringify(addresses.from);
   }
 
   /**
@@ -423,7 +425,7 @@ class EmailRenderer {
     );
 
     if (addresses.replyTo) {
-      return EmailAddressParser.stringify(addresses.replyTo);
+      return emailAddressParser.stringify(addresses.replyTo);
     }
     return null;
   }
@@ -920,18 +922,21 @@ class EmailRenderer {
         getValue: (member) => {
           return this.createUnsubscribeUrl(member.uuid, { newsletterUuid });
         },
+        trusted: true, // Server-generated URL, must not be HTML-escaped
       },
       {
         id: 'manage_account_url',
         getValue: () => {
           return this.createManageAccountUrl();
         },
+        trusted: true, // Server-generated URL, must not be HTML-escaped
       },
       {
         id: 'uuid',
         getValue: (member) => {
           return member.uuid;
         },
+        trusted: true, // Server-generated identifier
       },
       {
         id: 'key',
@@ -941,6 +946,7 @@ class EmailRenderer {
             .update(member.uuid)
             .digest('hex');
         },
+        trusted: true, // Server-generated hmac
       },
       {
         id: 'first_name',
@@ -1000,6 +1006,7 @@ class EmailRenderer {
           return this.createUnsubscribeUrl(member.uuid, { newsletterUuid });
         },
         required: true, // Used in email headers
+        trusted: true, // Server-generated URL, must not be HTML-escaped
       },
       // Unique ID used for ad images to bypass ESP image proxies
       {
@@ -1007,6 +1014,7 @@ class EmailRenderer {
         getValue: () => {
           return crypto.randomUUID();
         },
+        trusted: true, // Server-generated identifier
       },
     ];
 
@@ -1043,6 +1051,7 @@ class EmailRenderer {
             getValue: fallback
               ? (member) => definition.getValue(member) || fallback
               : definition.getValue,
+            trusted: definition.trusted === true,
           });
         }
       }
@@ -1056,6 +1065,7 @@ class EmailRenderer {
           originalId: definition.id,
           token: new RegExp(`%%\\{${definition.id}\\}%%`, 'g'),
           getValue: definition.getValue,
+          trusted: definition.trusted === true,
         });
       }
     }

package/core/server/services/email-service/email-service-wrapper.js

@@ -1,5 +1,4 @@
 const debug = require('@tryghost/debug')('i18n');
-const logging = require('@tryghost/logging');
 const url = require('../../api/endpoints/utils/serializers/output/utils/url');
 const events = require('../../lib/common/events');
 
@@ -55,12 +54,6 @@ class EmailServiceWrapper {
     const emailAnalyticsJobs = require('../email-analytics/jobs');
     const { cachedImageSizeFromUrl } = require('../../lib/image');
 
-    // capture errors from mailgun client and log them in sentry
-    const errorHandler = (error) => {
-      logging.info(`Capturing error for mailgun email provider service`);
-      sentry.captureException(error);
-    };
-
     // Mailgun client instance for email provider
     const mailgunClient = new MailgunClient({
       config: configService,
@@ -78,7 +71,6 @@ class EmailServiceWrapper {
     const mailgunEmailProvider = new MailgunEmailProvider({
       mailgunClient,
       config: configService,
-      errorHandler,
     });
 
     const emailRenderer = new EmailRenderer({
@@ -134,7 +126,6 @@ class EmailServiceWrapper {
       db,
       sentry,
       getRequiredUrlRelations,
-      debugStorageFilePath: configService.getContentPath('data'),
     });
 
     if (ghostServer) {

package/core/server/services/email-service/mailgun-email-provider.js

@@ -1,6 +1,7 @@
 const logging = require('@tryghost/logging');
 const errors = require('@tryghost/errors');
 const debug = require('@tryghost/debug')('email-service:mailgun-provider-service');
+const { escapeExpression } = require('handlebars');
 
 /**
  * @typedef {object} Config
@@ -35,35 +36,41 @@ const debug = require('@tryghost/debug')('email-service:mailgun-provider-service
 class MailgunEmailProvider {
   #mailgunClient;
   #config;
-  #errorHandler;
 
   /**
    * @param {object} dependencies
    * @param {import('../lib/mailgun-client')} dependencies.mailgunClient - mailgun client to send emails
    * @param {Config} dependencies.config
-   * @param {Function} [dependencies.errorHandler] - custom error handler for logging exceptions
    */
-  constructor({ mailgunClient, config, errorHandler }) {
+  constructor({ mailgunClient, config }) {
     this.#mailgunClient = mailgunClient;
     this.#config = config;
-    this.#errorHandler = errorHandler;
   }
 
-  #createRecipientData(replacements) {
+  #createRecipientData(replacements, htmlEscapedIds) {
     let recipientData = {};
 
     recipientData = replacements.reduce((acc, replacement) => {
       const { id, value } = replacement;
       acc[id] = value;
+      // Mailgun's recipient-variables substitution is a simple string replace with
+      // no HTML awareness, and the same value is used for both the html and plaintext
+      // bodies. Member-controlled values get an extra, escaped variant that only the
+      // html body points at. Trusted server-generated values (urls, uuids, hmacs) are
+      // skipped so their URLs don't end up entity-encoded inside hrefs.
+      if (htmlEscapedIds.has(id)) {
+        acc[`${id}_html`] = typeof value === 'string' ? escapeExpression(value) : value;
+      }
       return acc;
     }, {});
 
     return recipientData;
   }
 
-  #updateRecipientVariables(data, replacementDefinitions) {
+  #updateRecipientVariables(data, replacementDefinitions, isHtml) {
     for (const def of replacementDefinitions) {
-      data = data.replace(def.token, `%recipient.${def.id}%`);
+      const useHtmlVariant = isHtml && !def.trusted;
+      data = data.replace(def.token, `%recipient.${def.id}${useHtmlVariant ? '_html' : ''}%`);
     }
     return data;
   }
@@ -128,8 +135,11 @@ class MailgunEmailProvider {
       }
 
       // create recipient data for Mailgun using replacement definitions
+      const htmlEscapedIds = new Set(
+        replacementDefinitions.filter((def) => !def.trusted).map((def) => def.id),
+      );
       const recipientData = recipients.reduce((acc, recipient) => {
-        acc[recipient.email] = this.#createRecipientData(recipient.replacements);
+        acc[recipient.email] = this.#createRecipientData(recipient.replacements, htmlEscapedIds);
         return acc;
       }, {});
 
@@ -139,6 +149,7 @@ class MailgunEmailProvider {
           messageData[key] = this.#updateRecipientVariables(
             messageData[key],
             replacementDefinitions,
+            key === 'html',
           );
         }
       });
@@ -165,7 +176,7 @@ class MailgunEmailProvider {
           message: this.#createMailgunErrorMessage(error),
           errorDetails: JSON.stringify({ error, messageData }),
           context: `Mailgun Error ${error.status}: ${error.details}`,
-          help: `https://ghost.org/docs/newsletters/#bulk-email-configuration`,
+          help: `https://docs.ghost.org/newsletters/#bulk-email-configuration`,
           code: 'BULK_EMAIL_SEND_FAILED',
         });
       } else {

package/core/server/services/gifts/email-templates/gift-delivery.hbs

@@ -31,9 +31,9 @@
                     <tr>
                       <td align="left" style="padding-bottom: 22px; text-align: left;">
                         {{#if siteIconUrl}}
-                          <a href="{{siteUrl}}"><img src="{{siteIconUrl}}" alt="{{siteTitle}}" border="0" width="48" height="48" style="border-radius: 4px;"></a>
+                          <img src="{{siteIconUrl}}" alt="{{siteTitle}}" border="0" width="48" height="48" style="border-radius: 4px;">
                         {{else}}
-                          <a href="{{siteUrl}}" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 17px; font-weight: 700; color: {{accentColor}}; text-decoration: none;">{{siteTitle}}</a>
+                          <span style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 17px; font-weight: 700; color: {{accentColor}};">{{siteTitle}}</span>
                         {{/if}}
                       </td>
                     </tr>
@@ -92,7 +92,7 @@
                     </tr>
                     <tr>
                       <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-top: 40px;">
-                        <p class="small" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 16px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0;">{{t 'This message was sent from {siteDomain} to {email} on behalf of {buyerName} ({buyerEmail}).' siteDomain=(linkTag siteUrl siteDomain class="small" style="text-decoration: underline; color: #738A94; font-size: 11px;") email=(linkTag (mailto toEmail) toEmail class="small" style="text-decoration: underline; color: #738A94; font-size: 11px;") buyerName=buyerName buyerEmail=(linkTag (mailto buyerEmail) buyerEmail class="small" style="text-decoration: underline; color: #738A94; font-size: 11px;")}}</p>
+                        <p class="small" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 16px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0;">{{t 'This message was sent from {siteDomain} to {email} on behalf of {buyerName} ({buyerEmail}).' siteDomain=siteDomain email=toEmail buyerName=buyerName buyerEmail=buyerEmail}}</p>
                       </td>
                     </tr>
                   </table>

package/core/server/services/gifts/gift-email-service.js

@@ -182,7 +182,6 @@ class GiftEmailService {
         const giftLink = `${siteUrl.replace(/\/$/, '')}/gift/${token}`;
         const { html, text } = await this.renderer.renderDelivery({
             siteTitle,
-            siteUrl,
             siteIconUrl: this.blogIcon.getIconUrl({ absolute: true, fallbackToDefault: false }),
             siteDomain,
             accentColor: this.accentColor,

package/core/server/services/gifts/index.js

@@ -14,7 +14,7 @@ const send_gift_delivery_event_1 = require("./events/send-gift-delivery-event");
 // Persistent scheduling adapters keep their queue across restarts and opt out
 // of boot-time rebuilds (same contract post scheduling honours in boot.js).
 let rescheduleDeliveriesOnBoot = true;
-async function init(options) {
+function init(options) {
     if (exports.service) {
         return;
     }
@@ -37,7 +37,7 @@ async function init(options) {
     const labsService = require('../../../shared/labs');
     const urlUtils = require('../../../shared/url-utils').default;
     const settingsHelpers = require('../settings-helpers');
-    const EmailAddressParser = require('../email-address/email-address-parser');
+    const emailAddressParser = require('../email-address/email-address-parser');
     const { blogIcon } = require('../../../server/lib/image');
     const { t } = require('../i18n');
     const repository = new gift_bookshelf_repository_1.GiftBookshelfRepository({
@@ -57,7 +57,7 @@ async function init(options) {
         bulkMailer: new MailgunClient({ config, settings: settingsCache }),
         settingsCache,
         urlUtils,
-        getFromAddress: () => EmailAddressParser.stringify(settingsHelpers.getDefaultEmail()),
+        getFromAddress: () => emailAddressParser.stringify(settingsHelpers.getDefaultEmail()),
         getReplyToAddress: () => settingsHelpers.getMembersSupportAddress(),
         blogIcon,
         t,

package/core/server/services/gifts/jobs/index.js

@@ -1,6 +1,6 @@
 const path = require('path');
 const logging = require('@tryghost/logging');
-const jobsService = require('../../jobs');
+const jobManager = require('../../jobs');
 const CleanGiftsJob = require('./clean-gifts-job').default;
 
 let hasScheduled = {
@@ -31,7 +31,7 @@ function scheduleJob(key, name, jobFile) {
   const at = randomOffPeakDailyCron();
 
   logging.info(`[Background Job] ${name} scheduled at ${at}`);
-  jobsService.addJob({
+  jobManager.addJob({
     at,
     job: path.resolve(__dirname, jobFile),
     name,
@@ -43,14 +43,14 @@ function scheduleJob(key, name, jobFile) {
 }
 
 module.exports = {
-  async scheduleGiftCleanupJob(classBasedJobs) {
+  async scheduleGiftCleanupJob(jobsService) {
     if (alreadyScheduledOrTest('cleanup')) {
       return;
     }
 
     const cron = randomOffPeakDailyCron();
     logging.info(`[Background Job] clean-gifts scheduled at ${cron}`);
-    await classBasedJobs.scheduleRecurring(new CleanGiftsJob(), { cron });
+    await jobsService.scheduleRecurring(new CleanGiftsJob(), { cron });
 
     hasScheduled.cleanup = true;
   },

package/core/server/services/indexnow-ping/indexnow-ping-service.js

@@ -160,7 +160,7 @@ class IndexNowPingService {
                     err,
                     message: err.message,
                     context: (0, tpl_1.default)(constants_1.messages.requestFailedError, { service: 'IndexNow' }),
-                    help: (0, tpl_1.default)(constants_1.messages.requestFailedHelp, { url: 'https://ghost.org/docs/' }),
+                    help: (0, tpl_1.default)(constants_1.messages.requestFailedHelp, { url: 'https://docs.ghost.org/' }),
                 }),
             };
         }
@@ -181,7 +181,7 @@ class IndexNowPingService {
                 err,
                 message: err.message,
                 context: (0, tpl_1.default)(constants_1.messages.requestFailedError, { service: 'IndexNow' }),
-                help: (0, tpl_1.default)(constants_1.messages.requestFailedHelp, { url: 'https://ghost.org/docs/' }),
+                help: (0, tpl_1.default)(constants_1.messages.requestFailedHelp, { url: 'https://docs.ghost.org/' }),
             }),
         };
     }

package/core/server/services/invitations/accept.js

@@ -30,7 +30,9 @@ async function accept(invitation) {
       throw new errors.NotFoundError({ message: tpl(messages.inviteExpired) });
     }
 
-    let user = await models.User.findOne({ email: data.email }, options);
+    const email = invite.get('email');
+
+    let user = await models.User.findOne({ email }, options);
     if (user) {
       throw new errors.ValidationError({
         message: tpl(messages.inviteEmailAlreadyExist.message),
@@ -45,7 +47,7 @@ async function accept(invitation) {
 
     await models.User.add(
       {
-        email: data.email,
+        email,
         name: data.name,
         password: data.password,
         roles: [roleId],

package/core/server/services/jobs/job-service.js

@@ -9,22 +9,13 @@ const models = require('../../models');
 const sentry = require('../../../shared/sentry');
 const domainEvents = require('@tryghost/domain-events');
 const config = require('../../../shared/config');
-const WorkerModelEventBridge = require('./worker-model-event-bridge');
 const errorHandler = (error, workerMeta) => {
   logging.error(error, `[Background Job] ${workerMeta.name} failed`);
   sentry.captureException(error);
 };
 const events = require('../../lib/common/events');
-const workerModelEventBridge = new WorkerModelEventBridge({ models, events, logging, sentry });
 
 const workerMessageHandler = ({ name, message }) => {
-  if (workerModelEventBridge.isModelEventMessage(message)) {
-    // Carries its own `eventName` rather than job-manager's reserved `event` key,
-    // so it routes through the bridge instead of being dispatched as a raw domain event.
-    workerModelEventBridge.handle(message, { jobName: name });
-    return;
-  }
-
   if (typeof message === 'string' && !['done', 'cancelled'].includes(message)) {
     logging.info(`[Background Job] ${name}: ${message}`);
   }

package/core/server/services/jobs-service/register-job-handlers.js

@@ -37,25 +37,35 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = registerJobHandlers;
-const errors_1 = __importDefault(require("@tryghost/errors"));
 const clean_tokens_job_1 = __importDefault(require("../members/jobs/clean-tokens-job"));
-const clean_tokens_task_1 = __importDefault(require("../members/jobs/clean-tokens-task"));
-const gifts = __importStar(require("../gifts"));
+const clean_expired_comped_job_1 = __importDefault(require("../members/jobs/clean-expired-comped-job"));
 const clean_gifts_job_1 = __importDefault(require("../gifts/jobs/clean-gifts-job"));
 const external_media_inliner_job_1 = __importDefault(require("../media-inliner/external-media-inliner-job"));
-function registerJobHandlers({ jobsService, db, logging, mediaInliner, }) {
+const content_csv_import_job_1 = __importDefault(require("../content-import/jobs/content-csv-import-job"));
+const contentImport = __importStar(require("../content-import"));
+const update_check_job_1 = __importDefault(require("../update-check/jobs/update-check-job"));
+const process_webmention_job_1 = __importDefault(require("../mentions/process-webmention-job"));
+const updateCheck = require('../update-check');
+function registerJobHandlers({ jobsService, memberJobs, giftService, mediaInliner, mentionsController, }) {
     jobsService.handle(clean_tokens_job_1.default, async () => {
-        await (0, clean_tokens_task_1.default)({ db, logging });
+        await memberJobs.cleanTokens();
+    });
+    jobsService.handle(clean_expired_comped_job_1.default, async () => {
+        await memberJobs.cleanExpiredComped();
     });
     jobsService.handle(clean_gifts_job_1.default, async () => {
-        if (!gifts.service) {
-            throw new errors_1.default.IncorrectUsageError({
-                message: 'clean-gifts ran before the gifts service was initialised',
-            });
-        }
-        await gifts.service.cleanup();
+        await giftService.cleanup();
     });
     jobsService.handle(external_media_inliner_job_1.default, async (job) => {
         await mediaInliner.inline(job.domains);
     });
+    jobsService.handle(content_csv_import_job_1.default, async (job) => {
+        await contentImport.handleJob(job);
+    });
+    jobsService.handle(update_check_job_1.default, async () => {
+        await updateCheck({ rethrowErrors: true });
+    });
+    jobsService.handle(process_webmention_job_1.default, async (job) => {
+        await mentionsController.processWebmention(job);
+    });
 }

package/core/server/services/mail/ghost-mailer.js

@@ -17,7 +17,7 @@ const messages = {
   reason: ' Reason: {reason}.',
   messageSent: 'Message sent. Double check inbox and spam folder!',
 };
-const EmailAddressParser = require('../email-address/email-address-parser');
+const emailAddressParser = require('../email-address/email-address-parser');
 const DEFAULT_TAGS = ['ghost-email', 'transactional-email'];
 const MAX_MAILGUN_TAGS = 10;
 
@@ -54,8 +54,8 @@ function getFromAddress(requestedFromAddress, requestedReplyToAddress) {
   }
 
   return {
-    from: EmailAddressParser.stringify(addresses.from),
-    replyTo: addresses.replyTo ? EmailAddressParser.stringify(addresses.replyTo) : null,
+    from: emailAddressParser.stringify(addresses.from),
+    replyTo: addresses.replyTo ? emailAddressParser.stringify(addresses.replyTo) : null,
   };
 }
 
@@ -100,7 +100,7 @@ function createMessage(message) {
  */
 function createMailError({ message, err, ignoreDefaultMessage } = { message: '' }) {
   const helpMessage = tpl(messages.checkEmailConfigInstructions, {
-    url: 'https://ghost.org/docs/config/#mail',
+    url: 'https://docs.ghost.org/config/#mail',
   });
   const defaultErrorMessage = tpl(messages.failedSendingEmailError);
 

package/core/server/services/member-welcome-emails/service.js

@@ -7,7 +7,7 @@ const MagicLink = require('../lib/magic-link/magic-link');
 const sentry = require('../../../shared/sentry');
 const emailAddressService = require('../email-address');
 const settingsHelpers = require('../settings-helpers');
-const EmailAddressParser = require('../email-address/email-address-parser');
+const emailAddressParser = require('../email-address/email-address-parser');
 const mail = require('../mail');
 const MailgunClient = require('../lib/mailgun-client');
 const config = require('../../../shared/config');
@@ -152,7 +152,7 @@ class MemberWelcomeEmailService {
       },
     });
 
-    const from = EmailAddressParser.stringify(fromAddresses.from);
+    const from = emailAddressParser.stringify(fromAddresses.from);
     const replyToSetting = newsletter.get('sender_reply_to');
     let replyTo = null;
 
@@ -173,7 +173,7 @@ class MemberWelcomeEmailService {
       });
 
       if (addresses.replyTo) {
-        replyTo = EmailAddressParser.stringify(addresses.replyTo);
+        replyTo = emailAddressParser.stringify(addresses.replyTo);
       }
     }
 
@@ -199,10 +199,10 @@ class MemberWelcomeEmailService {
   async #getEffectiveSenderOptions(automatedSender = {}) {
     const defaultOptions = await this.#getSenderOptions();
     const defaultFrom =
-      EmailAddressParser.parse(defaultOptions.from || '') ||
+      emailAddressParser.parse(defaultOptions.from || '') ||
       emailAddressService.service.defaultFromEmail;
     const defaultReplyTo = defaultOptions.replyTo
-      ? EmailAddressParser.parse(defaultOptions.replyTo)
+      ? emailAddressParser.parse(defaultOptions.replyTo)
       : undefined;
 
     const senderName = trimValue(automatedSender.senderName) || defaultFrom?.name || undefined;
@@ -218,10 +218,10 @@ class MemberWelcomeEmailService {
     });
 
     return {
-      from: EmailAddressParser.stringify(addresses.from),
+      from: emailAddressParser.stringify(addresses.from),
       ...(addresses.replyTo
         ? {
-            replyTo: EmailAddressParser.stringify(addresses.replyTo),
+            replyTo: emailAddressParser.stringify(addresses.replyTo),
           }
         : {}),
     };

package/core/server/services/members/api.js

@@ -274,6 +274,7 @@ function createApiInstance(config) {
     // two together in boot order. Custom fields is initialised in initCore, the
     // members API is built in initServices, so this is always the live instance.
     customFieldValues: customFieldsService.values,
+    customFieldDefinitions: customFieldsService.definitions,
   });
 
   return membersApiInstance;

package/core/server/services/members/import-export/csv/parse.js

@@ -43,19 +43,12 @@ function parse(path, headerMapping) {
                     // hasOwn, not `in`: a prototype-named header would otherwise match an
                     // inherited method on the mapping and take a function as its mapped name.
                     if (headerMapping && Object.hasOwn(headerMapping, header)) {
-                        // An empty target is the caller naming a column to leave out, which
-                        // it has to name: an unnamed column carries through below, and for a
-                        // custom_fields.* column carrying through means being imported. So
-                        // omitting a column from the mapping is the opposite of excluding it.
                         if (!headerMapping[header]) {
                             continue;
                         }
                         row[headerMapping[header]] = value;
                     }
                     else if (isSafeColumnName(header)) {
-                        // Carry any unmapped column through untouched, so the import is not
-                        // constrained to a known vocabulary: a custom_fields.* column
-                        // survives parsing even though nothing consumes it yet.
                         row[header] = value;
                     }
                 }

package/core/server/services/members/import-export/import/completion-email.js

@@ -55,8 +55,6 @@ function humaniseError(row) {
 function stringifyLabels(labels) {
     return labels.map((label) => (typeof label === 'string' ? label : label.name)).join(',');
 }
-// The custom_fields.* cells a submitted row carried, echoed untouched so a manager can
-// fix a failed row and re-upload the values they mapped.
 function customFieldCells(row) {
     return Object.fromEntries(Object.entries(row).filter(([column]) => (0, csv_2.isCustomFieldColumn)(column)));
 }
@@ -82,9 +80,8 @@ function toErrorReportRow(row) {
 }
 // The error report attached to the completion email: the failed rows as CSV, called only
 // when there are rows to list. It shares the serialiser with the export but not the
-// shaping -- the export writes db members, this echoes submitted rows. Member columns come from the shaper's keys (so the type
-// stays the single source); the custom_fields.* columns across the rows are threaded in
-// before the last error column, and each row's custom cells merged on.
+// shaping -- the export writes db members, this echoes submitted rows. Member columns
+// come from the shaper's keys, so the type stays the single source.
 function buildErrorReport(errors) {
     const memberColumns = Object.keys(toErrorReportRow(errors[0])).filter((column) => column !== 'error');
     const customColumns = [...new Set(errors.flatMap((row) => Object.keys(customFieldCells(row))))];

package/core/server/services/members/import-export/import/row.js

@@ -16,9 +16,6 @@ const optionalCell = zod_1.z
 // not defaulted), so a CSV lacking these columns leaves the member's state untouched.
 const isSubscribed = (cell) => cell.toLowerCase() !== 'false';
 const isComplimentary = (cell) => cell.toLowerCase() === 'true';
-// The member import vocabulary as a schema: the single source of truth that coerces the
-// raw string Row into typed member fields. Unknown columns (custom_fields.*, and anything
-// else a source carries) pass through via .loose() so nothing is lost before the kernel.
 exports.memberImportRowSchema = zod_1.z
     .object({
     id: optionalCell,

package/core/server/services/members/import-export/index.js

@@ -12,7 +12,6 @@ const exporter_1 = __importDefault(require("./export/exporter"));
 const MembersCSVImporterStripeUtils = require('./import/stripe-utils');
 const db = require('../../../data/db');
 const models = require('../../../models');
-const labs = require('../../../../shared/labs');
 const logging = require('@tryghost/logging');
 const sentry = require('../../../../shared/sentry');
 // Build the members CSV importer. This is the composition root: today's models and
@@ -57,11 +56,8 @@ function makeImporter(deps) {
             transacting: options.transacting,
         }),
     };
-    // Gated by the same labs flag as the export, so the two halves round-trip or stay
-    // silent together: off, activeFields resolves empty and every custom_fields.* column
-    // is dropped.
     const customFields = {
-        activeFields: async () => labs.isSet('membersCustomFields') ? deps.customFields.definitions.browse() : [],
+        activeFields: async () => deps.customFields.definitions.browse(),
         planWrite: (values) => deps.customFields.values.planWrite(values),
         // Every value the import writes came out of the file, whichever column carried it.
         // An import has no id to give until runs are tracked, so it names its kind only.
@@ -105,9 +101,7 @@ function makeImporter(deps) {
 }
 // Build the members CSV exporter. The same composition root from the other direction:
 // knex and the members id lookup are wired here, and the custom fields definitions and
-// values services are injected (boot builds them before this one). The labs flag alone
-// decides whether custom field columns appear, so nothing flag-shaped leaks into the
-// exporter itself.
+// values services are injected (boot builds them before this one).
 function makeExporter({ definitions, values, }) {
     const exporter = new exporter_1.default({
         knex: db.knex,
@@ -126,9 +120,8 @@ function makeExporter({ definitions, values, }) {
         },
         customFields: {
             // Boot builds the definitions and values services before this one, so they
-            // are always present -- no not-initialised state to guard. The flag decides
-            // whether their columns are included at all.
-            activeDefinitions: async () => labs.isSet('membersCustomFields') ? definitions.browse() : [],
+            // are always present -- no not-initialised state to guard.
+            activeDefinitions: async () => definitions.browse(),
             valuesForMembers: (memberIds) => values.getValuesForMembers(memberIds),
         },
     });

package/core/server/services/members/jobs/clean-expired-comped-job.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const job_1 = require("../../jobs-service/job");
+class CleanExpiredCompedJob extends job_1.Job {
+    static type = 'clean-expired-comped';
+}
+exports.default = CleanExpiredCompedJob;