ghost 5.129.1 → 5.129.2

package/core/server/data/tinybird/scripts/configure-ghost.sh

@@ -0,0 +1,65 @@
+#!/bin/bash
+set -euo pipefail
+
+# This script is used to get important values from the Tinybird Local container, and setup Ghost's config
+## It is used in the e2e test CI workflow to configure Ghost to use the Tinybird local instance
+## It can also be used locally to configure Ghost to use a tinybird local instance
+
+# Store tb info output as JSON to parse multiple values
+## This includes the workspace ID and a workspace token we can use to authenticate with the Tinybird API
+TB_INFO=$(tb --output json info)
+
+# Get the workspace ID from the JSON output
+WORKSPACE_ID=$(echo "$TB_INFO" | jq -r '.local.workspace_id')
+
+# Check if workspace ID is valid
+if [ -z "$WORKSPACE_ID" ] || [ "$WORKSPACE_ID" = "null" ]; then
+    echo "Error: Failed to get workspace ID from Tinybird. Please ensure Tinybird is running and initialized." >&2
+    exit 1
+fi
+
+export TINYBIRD_WORKSPACE_ID="$WORKSPACE_ID"
+
+WORKSPACE_TOKEN=$(echo "$TB_INFO" | jq -r '.local.token')
+
+# Check if workspace token is valid
+if [ -z "$WORKSPACE_TOKEN" ] || [ "$WORKSPACE_TOKEN" = "null" ]; then
+    echo "Error: Failed to get workspace token from Tinybird. Please ensure Tinybird is running and initialized." >&2
+    exit 1
+fi
+
+# Get the admin token from the Tinybird API
+## This is different from the workspace admin token
+ADMIN_TOKEN=$(curl -s -H "Authorization: Bearer $WORKSPACE_TOKEN" http://localhost:7181/v0/tokens | jq -r '.tokens[] | select(.name == "admin token") | .token')
+
+# Check if admin token is valid
+if [ -z "$ADMIN_TOKEN" ] || [ "$ADMIN_TOKEN" = "null" ]; then
+    echo "Error: Failed to get admin token from Tinybird API. Please ensure Tinybird is properly configured." >&2
+    exit 1
+fi
+
+export TINYBIRD_ADMIN_TOKEN="$ADMIN_TOKEN"
+
+# Get the tracker token from the Tinybird API
+TRACKER_TOKEN=$(curl -s -H "Authorization: Bearer $WORKSPACE_TOKEN" http://localhost:7181/v0/tokens | jq -r '.tokens[] | select(.name == "tracker") | .token')
+
+# Check if tracker token is valid
+if [ -z "$TRACKER_TOKEN" ] || [ "$TRACKER_TOKEN" = "null" ]; then
+    echo "Error: Failed to get tracker token from Tinybird API. Please ensure Tinybird is properly configured." >&2
+    exit 1
+fi
+
+export TINYBIRD_TRACKER_TOKEN="$TRACKER_TOKEN"
+
+# Export Ghost configuration as environment variables
+export tinybird__adminToken="$TINYBIRD_ADMIN_TOKEN"
+export tinybird__workspaceId="$TINYBIRD_WORKSPACE_ID"
+export tinybird__stats__endpoint="http://localhost:7181"
+
+# If running in GitHub Actions, also export to GITHUB_ENV
+if [ -n "$GITHUB_ENV" ]; then
+    echo "tinybird__adminToken=$TINYBIRD_ADMIN_TOKEN" >> $GITHUB_ENV
+    echo "tinybird__workspaceId=$TINYBIRD_WORKSPACE_ID" >> $GITHUB_ENV
+    echo "tinybird__stats__endpoint=http://localhost:7181" >> $GITHUB_ENV
+    echo "TINYBIRD_TRACKER_TOKEN=$TINYBIRD_TRACKER_TOKEN" >> $GITHUB_ENV
+fi

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

@@ -20,7 +20,7 @@ class ActivityPubService {
     getExpectedWebhooks(secret) {
         return [{
                 event: 'post.published',
-                target_url: new URL('.ghost/activitypub/webhooks/post/published', this.siteUrl),
+                target_url: new URL('.ghost/activitypub/v1/webhooks/post/published', this.siteUrl),
                 api_version: 'v5.100.0',
                 secret
             }];
@@ -55,7 +55,7 @@ class ActivityPubService {
                 .where('roles.name', 'Owner')
                 .first();
             const token = await this.identityTokenService.getTokenForUser(ownerUser.email, 'Owner');
-            const res = await (0, node_fetch_1.default)(new URL('.ghost/activitypub/site', this.siteUrl), {
+            const res = await (0, node_fetch_1.default)(new URL('.ghost/activitypub/v1/site', this.siteUrl), {
                 headers: {
                     Authorization: `Bearer ${token}`
                 }

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

@@ -27,7 +27,7 @@ export class ActivityPubService {
     getExpectedWebhooks(secret: string): ExpectedWebhook[] {
         return [{
             event: 'post.published',
-            target_url: new URL('.ghost/activitypub/webhooks/post/published', this.siteUrl),
+            target_url: new URL('.ghost/activitypub/v1/webhooks/post/published', this.siteUrl),
             api_version: 'v5.100.0',
             secret
         }];
@@ -69,7 +69,7 @@ export class ActivityPubService {
                 .first();
             const token = await this.identityTokenService.getTokenForUser(ownerUser.email, 'Owner');
 
-            const res = await fetch(new URL('.ghost/activitypub/site', this.siteUrl), {
+            const res = await fetch(new URL('.ghost/activitypub/v1/site', this.siteUrl), {
                 headers: {
                     Authorization: `Bearer ${token}`
                 }

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

@@ -32,16 +32,22 @@ module.exports = class ActivityPubServiceWrapper {
             IdentityTokenServiceWrapper.instance
         );
 
-        if (settingsCache.get('social_web_enabled')) {
+        const initActivityPubService = async () => {
             await ActivityPubServiceWrapper.instance.initialiseWebhooks();
             ActivityPubServiceWrapper.initialised = true;
+        };
+
+        if (settingsCache.get('social_web_enabled')) {
+            await initActivityPubService();
         } else {
-            events.on('settings.labs.edited', async () => {
+            const initActivityPubServiceLater = async () => {
                 if (settingsCache.get('social_web_enabled') && !ActivityPubServiceWrapper.initialised) {
-                    await ActivityPubServiceWrapper.instance.initialiseWebhooks();
-                    ActivityPubServiceWrapper.initialised = true;
+                    await initActivityPubService();
                 }
-            });
+            };
+
+            events.on('settings.labs.edited', initActivityPubServiceLater);
+            events.on('settings.social_web.edited', initActivityPubServiceLater);
         }
     }
 };

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

@@ -1301,6 +1301,17 @@ class EmailRenderer {
             linkStyle,
             hasOutlineButtons,
 
+            // useful data
+            ctaBgColors: [
+                'grey',
+                'blue',
+                'green',
+                'yellow',
+                'red',
+                'pink',
+                'purple'
+            ],
+
             classes: {
                 container: clsx('container', {
                     'title-serif': titleFont === 'serif'

package/core/server/services/email-service/email-templates/partials/styles.hbs

@@ -381,6 +381,17 @@ h6 + .kg-paywall .kg-paywall-hr td {
 }
 
 /* Exclude CTA cards with colored backgrounds from custom text color, but allow transparent ones */
+{{#hasFeature "emailCustomization"}}
+{{#each ctaBgColors}}
+.post-content-row .kg-cta-bg-{{this}} .kg-cta-text p,
+.post-content-row .kg-cta-bg-{{this}} .kg-cta-text ul,
+.post-content-row .kg-cta-bg-{{this}} .kg-cta-text ul li,
+.post-content-row .kg-cta-bg-{{this}} .kg-cta-text ol,
+.post-content-row .kg-cta-bg-{{this}} .kg-cta-text ol li {
+    color: inherit !important;
+}
+{{/each}}
+{{else}}
 .post-content-row .kg-cta-bg-grey .kg-cta-text p,
 .post-content-row .kg-cta-bg-blue .kg-cta-text p,
 .post-content-row .kg-cta-bg-green .kg-cta-text p,
@@ -390,6 +401,7 @@ h6 + .kg-paywall .kg-paywall-hr td {
 .post-content-row .kg-cta-bg-purple .kg-cta-text p {
     color: inherit !important;
 }
+{{/hasFeature}}
 
 .kg-cta-bg-none .kg-cta-sponsor-label span,
 .kg-cta-bg-white .kg-cta-sponsor-label span {
@@ -2530,3 +2542,10 @@ table.btn-accent a {
 {{/if}}
 
 </style>
+{{#hasFeature "emailCustomization"}}
+<!--[if mso]>
+<style type="text/css">
+    ul, ol { margin-left: 1.5em !important; } {{!-- fix bullets/numbers not appearing for lists in older Outlook versions --}}
+</style>
+<![endif]-->
+{{/hasFeature}}

package/core/server/services/members/members-api/repositories/MemberRepository.js

@@ -947,10 +947,7 @@ module.exports = class MemberRepository {
             ghostProduct = await this._productRepository.get({stripe_product_id: subscriptionPriceData.product}, options);
             // Use first Ghost product as default product in case of missing link
             if (!ghostProduct) {
-                ghostProduct = await this._productRepository.getDefaultProduct({
-                    forUpdate: true,
-                    ...options
-                });
+                ghostProduct = await this._productRepository.getDefaultProduct(options);
             }
 
             // Link Stripe Product & Price to Ghost Product

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

@@ -109,6 +109,10 @@ module.exports = {
         // Social web (ActivityPub)
         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_configured', type: 'boolean', group: 'analytics', fn: settingsHelpers.isWebAnalyticsConfigured.bind(settingsHelpers), dependents: ['web_analytics']}));
+
         return fields;
     },
 

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

@@ -1,19 +1,22 @@
+const net = require('net');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const EmailAddressParser = require('../email-address/EmailAddressParser');
 const logging = require('@tryghost/logging');
 const crypto = require('crypto');
+const debug = require('@tryghost/debug')('services:settings-helpers');
 
 const messages = {
     incorrectKeyType: 'type must be one of "direct" or "connect".'
 };
 
 class SettingsHelpers {
-    constructor({settingsCache, urlUtils, config, labs}) {
+    constructor({settingsCache, urlUtils, config, labs, limitService}) {
         this.settingsCache = settingsCache;
         this.urlUtils = urlUtils;
         this.config = config;
         this.labs = labs;
+        this.limitService = limitService;
     }
 
     isMembersEnabled() {
@@ -220,20 +223,124 @@ class SettingsHelpers {
     }
 
     /**
-     * Social web (ActivityPub) is enabled if:
-     * - Social web is enabled in the settings
-     * - 'ActivityPub' flag is enabled in the labs, for compatibility with Ghost 5.x
-     * - Config allows it (TODO)
-     * - Billing allows it (TODO)
+     * Calculated setting for Social web (ActivityPub)
      *
      * @returns {boolean}
      */
     isSocialWebEnabled() {
-        return this.settingsCache.get('social_web') === true && this.labs.isSet('ActivityPub');
+        // UI setting
+        if (this.settingsCache.get('social_web') !== true) {
+            debug('Social web is disabled in settings');
+            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');
+            return false;
+        }
+
+        // Social web (ActivityPub) currently does not support Ghost sites hosted on a subdirectory, e.g. https://example.com/blog/
+        const subdirectory = this.urlUtils.getSubdir();
+        if (subdirectory) {
+            debug('Social web is not available for Ghost sites hosted on a subdirectory');
+            return false;
+        }
+
+        // Self-hosters cannot connect to production ActivityPub servers from localhost or IPs addresses
+        const siteUrl = new URL(this.urlUtils.getSiteUrl());
+        const isLocalhost = siteUrl.hostname === 'localhost' || siteUrl.hostname === '127.0.0.1' || siteUrl.hostname === '::1';
+        const isIP = net.isIP(siteUrl.hostname);
+        if (process.env.NODE_ENV === 'production' && (isLocalhost || isIP)) {
+            debug('Social web is not available from localhost or IPs addresses in production');
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Calculated setting for Web analytics
+     *
+     *  Setting > Labs Flag > Config > Limit Service
+     * 
+     * @returns {boolean}
+     */
+    isWebAnalyticsEnabled() {
+        // UI setting
+        if (this.settingsCache.get('web_analytics') !== true) {
+            debug('Web analytics is disabled in settings');
+            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;
+        }
+
+        return true;
+    }
+
+    /**
+     * Check if web analytics can be configured (used for UI enable/disable state)
+     * 
+     * @returns {boolean}
+     */
+    isWebAnalyticsConfigured() {
+        // Correct config is required
+        if (!this._isValidTinybirdConfig()) {
+            return false;
+        }
+
+        // Ghost (Pro) limits
+        if (this.limitService.isDisabled('limitAnalytics')) {
+            debug('Web analytics configuration is not available for Ghost (Pro) sites without a custom domain, or hosted on a subdirectory');
+            return false;
+        }
+
+        return true;
     }
 
     // PRIVATE
 
+    /**
+     * Validates tinybird configuration for web analytics
+     * @returns {boolean} True if config is valid, false otherwise
+     * @private
+     */
+    _isValidTinybirdConfig() {
+        const tinybirdConfig = this.config.get('tinybird');
+        
+        // First requirement: tinybird:tracker:endpoint is always required
+        if (!tinybirdConfig || !tinybirdConfig.tracker?.endpoint) {
+            debug('Web analytics is not available without tinybird:tracker:endpoint');
+            return false;
+        }
+
+        // Second requirement: Either JWT config OR local stats config
+        const hasJwtConfig = !!(tinybirdConfig.workspaceId && tinybirdConfig.adminToken);
+        const hasLocalConfig = !!(tinybirdConfig.stats?.local?.enabled);
+        
+        if (!hasJwtConfig && !hasLocalConfig) {
+            debug('Web analytics requires either (workspaceId + adminToken) or stats.local.enabled');
+            return false;
+        }
+
+        return true;
+    }
+
     #managedEmailEnabled() {
         return !!this.config.get('hostSettings:managedEmail:enabled');
     }

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

@@ -3,5 +3,6 @@ const urlUtils = require('../../../shared/url-utils');
 const config = require('../../../shared/config');
 const SettingsHelpers = require('./SettingsHelpers');
 const labs = require('../../../shared/labs');
+const limitService = require('../limits');
 
-module.exports = new SettingsHelpers({settingsCache, urlUtils, config, labs});
+module.exports = new SettingsHelpers({settingsCache, urlUtils, config, labs, limitService});

package/core/server/services/stats/StatsService.js

@@ -245,8 +245,7 @@ class StatsService {
         const request = deps.request || require('../../lib/request-external');
         const settingsCache = deps.settingsCache || require('../../../shared/settings-cache');
 
-        // Only create the client if Tinybird is configured
-        if (config.get('tinybird') && config.get('tinybird:stats')) {
+        if (settingsCache.get('web_analytics_enabled')) {
             // TODO: move the tinybird client to the tinybird service
             const TinybirdServiceWrapper = require('../tinybird');
             TinybirdServiceWrapper.init();

package/core/shared/labs.js

@@ -47,7 +47,6 @@ const PRIVATE_FEATURES = [
     'urlCache',
     'mailEvents',
     'lexicalIndicators',
-    'trafficAnalyticsAlpha',
     'ui60',
     'contentVisibilityAlpha',
     'explore',

package/core/shared/settings-cache/CacheManager.js

@@ -62,6 +62,8 @@ const _ = require('lodash');
  * @property {string|null} editor_default_email_recipients - Default email recipients for editor
  * @property {string|null} labs - JSON string of enabled labs features
  * @property {boolean|null} social_web_enabled - Whether social web is enabled
+ * @property {boolean|null} web_analytics_enabled - Whether web analytics is enabled
+ * @property {boolean|null} web_analytics_configured - Whether web analytics is configured
  * @property {never} [x] - Prevent accessing undefined properties
  */
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "5.129.1",
+  "version": "5.129.2",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -75,20 +75,20 @@
     "@tryghost/admin-api-schema": "4.5.10",
     "@tryghost/api-framework": "1.0.2",
     "@tryghost/bookshelf-plugins": "0.6.27",
-    "@tryghost/color-utils": "0.2.8",
+    "@tryghost/color-utils": "0.2.9",
     "@tryghost/config-url-helpers": "1.0.17",
     "@tryghost/custom-fonts": "1.0.2",
     "@tryghost/database-info": "0.3.30",
     "@tryghost/debug": "0.1.35",
-    "@tryghost/domain-events": "1.0.1",
+    "@tryghost/domain-events": "1.0.2",
     "@tryghost/email-mock-receiver": "0.3.11",
     "@tryghost/errors": "1.3.8",
     "@tryghost/helpers": "1.1.97",
     "@tryghost/html-to-plaintext": "1.0.4",
     "@tryghost/http-cache-utils": "0.1.20",
-    "@tryghost/i18n": "file:components/tryghost-i18n-5.129.1.tgz",
+    "@tryghost/i18n": "file:components/tryghost-i18n-5.129.2.tgz",
     "@tryghost/image-transform": "1.4.6",
-    "@tryghost/job-manager": "1.0.2",
+    "@tryghost/job-manager": "1.0.3",
     "@tryghost/kg-card-factory": "5.1.2",
     "@tryghost/kg-clean-basic-html": "4.2.7",
     "@tryghost/kg-converters": "1.1.7",
@@ -100,8 +100,8 @@
     "@tryghost/kg-lexical-html-renderer": "1.3.24",
     "@tryghost/kg-markdown-html-renderer": "7.1.3",
     "@tryghost/kg-mobiledoc-html-renderer": "7.1.3",
-    "@tryghost/limit-service": "1.3.2",
-    "@tryghost/logging": "2.4.22",
+    "@tryghost/limit-service": "1.4.0",
+    "@tryghost/logging": "2.4.23",
     "@tryghost/members-csv": "2.0.3",
     "@tryghost/metrics": "1.0.38",
     "@tryghost/mw-error-handler": "1.0.7",
@@ -109,13 +109,13 @@
     "@tryghost/nodemailer": "0.3.48",
     "@tryghost/nql": "0.12.7",
     "@tryghost/pretty-cli": "1.2.47",
-    "@tryghost/prometheus-metrics": "1.0.1",
+    "@tryghost/prometheus-metrics": "1.0.2",
     "@tryghost/promise": "0.3.15",
     "@tryghost/referrer-parser": "0.1.8",
-    "@tryghost/request": "1.0.11",
+    "@tryghost/request": "1.0.12",
     "@tryghost/root-utils": "0.3.33",
     "@tryghost/security": "1.0.1",
-    "@tryghost/social-urls": "0.1.52",
+    "@tryghost/social-urls": "0.1.53",
     "@tryghost/string": "0.2.17",
     "@tryghost/tpl": "0.1.35",
     "@tryghost/url-utils": "4.4.14",
@@ -182,7 +182,7 @@
     "knex-migrator": "5.3.2",
     "leaky-bucket": "2.2.0",
     "lodash": "4.17.21",
-    "luxon": "3.6.1",
+    "luxon": "3.7.1",
     "mailgun.js": "10.4.0",
     "metascraper": "5.45.15",
     "metascraper-author": "5.45.10",
@@ -197,7 +197,7 @@
     "moment": "2.24.0",
     "moment-timezone": "0.5.45",
     "multer": "2.0.1",
-    "mysql2": "3.14.1",
+    "mysql2": "3.14.2",
     "nconf": "0.13.0",
     "node-fetch": "2.7.0",
     "node-jose": "2.2.0",
@@ -233,7 +233,7 @@
     "@types/bookshelf": "1.2.9",
     "@types/common-tags": "1.8.4",
     "@types/jsonwebtoken": "9.0.10",
-    "@types/node": "22.16.0",
+    "@types/node": "22.16.3",
     "@types/node-jose": "1.1.13",
     "@types/nodemailer": "6.4.17",
     "@types/sinon": "17.0.4",
@@ -270,11 +270,11 @@
   },
   "resolutions": {
     "@tryghost/errors": "1.3.8",
-    "@tryghost/logging": "2.4.22",
+    "@tryghost/logging": "2.4.23",
     "jackspeak": "2.3.6",
     "moment": "2.24.0",
     "moment-timezone": "0.5.45",
-    "@tryghost/i18n": "file:components/tryghost-i18n-5.129.1.tgz"
+    "@tryghost/i18n": "file:components/tryghost-i18n-5.129.2.tgz"
   },
   "nx": {
     "targets": {