ghost 5.82.4 → 5.82.6

package/core/built/admin/index.html

@@ -8,7 +8,7 @@
     <title>Ghost Admin</title>
 
     
-<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22cdnUrl%22%3A%22%22%2C%22editorUrl%22%3A%22%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%225.82%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22ember-websockets%22%3A%7B%22socketIO%22%3Atrue%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%2C%22editorFilename%22%3A%22koenig-lexical.umd.js%22%2C%22editorHash%22%3A%22d4e7286cae%22%2C%22adminXDemoFilename%22%3A%22admin-x-demo.js%22%2C%22adminXDemoHash%22%3A%221338bf2f0d%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%227898cabecf%22%2C%22adminXActivitypubFilename%22%3A%22admin-x-activitypub.js%22%2C%22adminXActivitypubHash%22%3A%22f5c6e4344f%22%7D" />
+<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22cdnUrl%22%3A%22%22%2C%22editorUrl%22%3A%22%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%225.82%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22ember-websockets%22%3A%7B%22socketIO%22%3Atrue%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%2C%22editorFilename%22%3A%22koenig-lexical.umd.js%22%2C%22editorHash%22%3A%220dafa6bb9c%22%2C%22adminXDemoFilename%22%3A%22admin-x-demo.js%22%2C%22adminXDemoHash%22%3A%22cb1aa176ec%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%22a2190ecc4c%22%2C%22adminXActivitypubFilename%22%3A%22admin-x-activitypub.js%22%2C%22adminXActivitypubHash%22%3A%22ee41f6f558%22%7D" />
 
     <meta name="HandheldFriendly" content="True" />
     <meta name="MobileOptimized" content="320" />
@@ -37,7 +37,7 @@
     </style>
 
     <link integrity="" rel="stylesheet" href="assets/vendor-0ede59da8efb5e28fa929557f7ff7154.css">
-    <link integrity="" rel="stylesheet" href="assets/ghost-f84b3f229da06680df6c13ebd46ab671.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/ghost-e031f7ab21c73aa9a2a05ef2703e39cb.css" title="light">
 
     
 </head>
@@ -57,8 +57,8 @@
     <div id="ember-basic-dropdown-wormhole"></div>
 
     <script src="assets/vendor-5ef343f0a55366497ef903095548a0d5.js"></script>
-<script src="assets/chunk.799.51e503059770581f528f.js"></script>
-<script src="assets/chunk.524.bd8238874f4b73f48c54.js"></script>
-    <script src="assets/ghost-0723ddb4afa369fc0303017c40ffffe0.js"></script>
+<script src="assets/chunk.799.5012e659e3d64d043636.js"></script>
+<script src="assets/chunk.524.345dd86d27c39187264a.js"></script>
+    <script src="assets/ghost-97178f083d12f4245398362739b9eb0d.js"></script>
 </body>
 </html>

package/core/frontend/helpers/url.js

@@ -7,7 +7,6 @@
 const {metaData} = require('../services/proxy');
 const {SafeString} = require('../services/handlebars');
 const logging = require('@tryghost/logging');
-const sentry = require('../../shared/sentry');
 const errors = require('@tryghost/errors');
 
 const {getMetaDataUrl} = metaData;
@@ -26,7 +25,6 @@ module.exports = function url(options) {
             message: `The url "${outputUrl}" couldn't be escaped correctly`,
             err: err
         });
-        sentry.captureException(error);
         logging.error(error);
 
         return new SafeString('');

package/core/frontend/services/routing/RouterManager.js

@@ -8,7 +8,6 @@ const PreviewRouter = require('./PreviewRouter');
 const ParentRouter = require('./ParentRouter');
 const EmailRouter = require('./EmailRouter');
 const UnsubscribeRouter = require('./UnsubscribeRouter');
-const SubscribeRouter = require('./SubscribeRouter');
 
 // This emits its own routing events
 const events = require('../../../server/lib/common/events');
@@ -110,10 +109,6 @@ class RouterManager {
         this.siteRouter.mountRouter(unsubscribeRouter.router());
         this.registry.setRouter('unsubscribeRouter', unsubscribeRouter);
 
-        const subscribeRouter = new SubscribeRouter();
-        this.siteRouter.mountRouter(subscribeRouter.router());
-        this.registry.setRouter('subscribeRouter', subscribeRouter);
-        
         if (RESOURCE_CONFIG.QUERY.email) {
             const emailRouter = new EmailRouter(RESOURCE_CONFIG);
             this.siteRouter.mountRouter(emailRouter.router());

package/core/frontend/services/routing/controllers/index.js

@@ -29,9 +29,5 @@ module.exports = {
 
     get unsubscribe() {
         return require('./unsubscribe');
-    },
-
-    get subscribe() {
-        return require('./subscribe');
     }
 };

package/core/frontend/web/middleware/handle-image-sizes.js

@@ -9,9 +9,10 @@ const {imageSize} = require('../../../server/lib/image');
 
 const SIZE_PATH_REGEX = /^\/size\/([^/]+)\//;
 const FORMAT_PATH_REGEX = /^\/format\/([^./]+)\//;
-
 const TRAILING_SLASH_REGEX = /\/+$/;
 
+const RESIZE_TIMEOUT_SECONDS = 10;
+
 module.exports = function handleImageSizes(req, res, next) {
     // In admin we need to read images and calculate the average color (blocked by CORS otherwise)
     res.setHeader('Access-Control-Allow-Origin', '*');
@@ -123,7 +124,12 @@ module.exports = function handleImageSizes(req, res, next) {
                 if (originalImageBuffer.length <= 0) {
                     throw new NoContentError();
                 }
-                return imageTransform.resizeFromBuffer(originalImageBuffer, {withoutEnlargement: requestUrlFileExtension !== '.svg', ...imageDimensionConfig, format});
+                return imageTransform.resizeFromBuffer(originalImageBuffer, {
+                    withoutEnlargement: requestUrlFileExtension !== '.svg',
+                    ...imageDimensionConfig,
+                    format,
+                    timeout: RESIZE_TIMEOUT_SECONDS
+                });
             })
             .then((resizedImageBuffer) => {
                 return storageInstance.saveRaw(resizedImageBuffer, req.url);
@@ -147,3 +153,5 @@ module.exports = function handleImageSizes(req, res, next) {
         next(err);
     });
 };
+
+module.exports.RESIZE_TIMEOUT_SECONDS = RESIZE_TIMEOUT_SECONDS;

package/core/server/data/migrations/versions/5.0/2022-03-14-12-33-delete-duplicate-offer-redemptions.js

@@ -1,4 +1,4 @@
-const DatabaseInfo = require('@tryghost/database-info/lib/database-info');
+const DatabaseInfo = require('@tryghost/database-info');
 const logging = require('@tryghost/logging');
 
 const {createTransactionalMigration} = require('../../utils');

package/core/server/services/link-redirection/LinkRedirectRepository.js

@@ -159,9 +159,9 @@ module.exports = class LinkRedirectRepository {
 
         if (this.#cache) {
             const cachedLink = await this.#cache.get(from);
+            debug(`getByUrl ${url}: Cache ${cachedLink ? 'HIT' : 'MISS'}`);
             // Cache hit, serve from cache
             if (cachedLink) {
-                debug('Cache hit for', from);
                 return this.#fromSerialized(cachedLink);
             }
         }
@@ -174,8 +174,6 @@ module.exports = class LinkRedirectRepository {
         if (linkRedirectModel) {
             const linkRedirect = this.fromModel(linkRedirectModel);
             if (this.#cache) {
-                debug('Cache miss for', from, '. Caching');
-                // Cache the link
                 this.#cache.set(from, this.#serialize(linkRedirect));
             }
             return linkRedirect;

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

@@ -2,7 +2,6 @@ const logging = require('@tryghost/logging');
 const {URL} = require('url');
 const crypto = require('crypto');
 const createKeypair = require('keypair');
-const labs = require('../../../shared/labs');
 
 class MembersConfigProvider {
     /**
@@ -88,8 +87,7 @@ class MembersConfigProvider {
     }
 
     getSigninURL(token, type, referrer) {
-        const relativeUrl = ['signup', 'subscribe'].includes(type) && labs.isSet('membersSpamPrevention') ? '/confirm_signup/' : '/members/';
-        const siteUrl = this._urlUtils.urlFor({relativeUrl}, true);
+        const siteUrl = this._urlUtils.urlFor({relativeUrl: '/members/'}, true);
         const signinURL = new URL(siteUrl);
         signinURL.searchParams.set('token', token);
         signinURL.searchParams.set('action', type);

package/core/server/web/api/middleware/upload.js

@@ -45,7 +45,13 @@ const messages = {
 const enabledClear = config.get('uploadClear') || true;
 const upload = multer({dest: os.tmpdir()});
 
-const deleteSingleFile = file => fs.unlink(file.path).catch(err => logging.error(err));
+const deleteSingleFile = (file) => {
+    if (!file.path) {
+        return;
+    }
+
+    fs.unlink(file.path).catch(err => logging.error(err));
+};
 
 const single = name => function singleUploadFunction(req, res, next) {
     const singleUpload = upload.single(name);

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

@@ -37,9 +37,6 @@ module.exports = function setupMembersApp() {
     // Initializes members specific routes as well as assigns members specific data to the req/res objects
     // We don't want to add global bodyParser middleware as that interferes with stripe webhook requests on - `/webhooks`.
 
-    // Double opt-in subscription handling
-    membersApp.post('/api/member', membersService.api.middleware.createMemberFromToken);
-
     // Manage newsletter subscription via unsubscribe link
     membersApp.get('/api/member/newsletters', middleware.getMemberNewsletters);
     membersApp.put('/api/member/newsletters', bodyParser.json({limit: '50mb'}), middleware.updateMemberNewsletters);

package/core/shared/labs.js

@@ -51,9 +51,7 @@ const ALPHA_FEATURES = [
     'tipsAndDonations',
     'importMemberTier',
     'lexicalIndicators',
-    // 'adminXOffers',
-    'adminXDemo',
-    'membersSpamPrevention'
+    'adminXDemo'
 ];
 
 module.exports.GA_KEYS = [...GA_FEATURES];
@@ -82,6 +80,10 @@ module.exports.getAll = () => {
     return labs;
 };
 
+module.exports.getAllFlags = function () {
+    return [...GA_FEATURES, ...BETA_FEATURES, ...ALPHA_FEATURES];
+};
+
 /**
  * @param {string} flag
  * @returns {boolean}

package/core/shared/sentry.js

@@ -91,12 +91,16 @@ if (sentryConfig && !sentryConfig.disabled) {
         environment = config.get('env');
     }
 
+    /** @type {import('@sentry/node').NodeOptions} */
     const sentryInitConfig = {
         dsn: sentryConfig.dsn,
         release: 'ghost@' + version,
         environment: environment,
         maxValueLength: 1000,
-        integrations: [],
+        includeLocalVariables: true,
+        integrations: [
+            Sentry.extraErrorDataIntegration()
+        ],
         beforeSend,
         beforeSendTransaction
     };