Added Captcha middleware to members send-magic-link API

ref BAE-104
TryGhost · Jan 21, 2025 · a6d81a7 · a6d81a7
1 parent 789a55a
commit a6d81a7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 22 deletions.
diff --git a/ghost/core/core/server/services/members/api.js b/ghost/core/core/server/services/members/api.js
@@ -18,6 +18,7 @@ const tiersService = require('../tiers');
 const newslettersService = require('../newsletters');
 const memberAttributionService = require('../member-attribution');
 const emailSuppressionList = require('../email-suppression-list');
+const CaptchaService = require('@tryghost/captcha-service');
 const {t} = require('../i18n');
 const sentry = require('../../../shared/sentry');
 const sharedConfig = require('../../../shared/config');
@@ -240,6 +241,11 @@ function createApiInstance(config) {
         settingsCache,
         sentry,
         settingsHelpers,
+        captchaService: new CaptchaService({
+            enabled: labsService.isSet('captcha') && sharedConfig.get('captcha:enabled'),
+            scoreThreshold: sharedConfig.get('captcha:scoreThreshold'),
+            secretKey: sharedConfig.get('captcha:secretKey')
+        }),
         config: sharedConfig
     });
 

diff --git a/ghost/core/test/e2e-api/content/__snapshots__/settings.test.js.snap b/ghost/core/test/e2e-api/content/__snapshots__/settings.test.js.snap
@@ -123,24 +123,7 @@ Object {
     "facebook": "ghost",
     "firstpromoter_account": null,
     "icon": null,
-    "labs": Object {
-      "ActivityPub": true,
-      "NestPlayground": true,
-      "additionalPaymentMethods": true,
-      "adminXDemo": true,
-      "captcha": true,
-      "collectionsCard": true,
-      "contentVisibility": true,
-      "editorExcerpt": true,
-      "emailCustomization": true,
-      "importMemberTier": true,
-      "lexicalIndicators": true,
-      "mailEvents": true,
-      "postsX": true,
-      "stripeAutomaticTax": true,
-      "urlCache": true,
-      "webmentions": true,
-    },
+    "labs": Any<Object>,
     "lang": "en",
     "locale": "en",
     "logo": null,
@@ -211,7 +194,7 @@ Object {
     "twitter_image": null,
     "twitter_title": null,
     "url": "http://127.0.0.1:2369/",
-    "version": "5.106",
+    "version": Any<String>,
   },
 }
 `;

diff --git a/ghost/core/test/e2e-api/content/settings.test.js b/ghost/core/test/e2e-api/content/settings.test.js
@@ -1,6 +1,5 @@
 const {agentProvider, fixtureManager, matchers} = require('../../utils/e2e-framework');
 const {anyEtag, anyContentLength, anyContentVersion} = matchers;
-const config = require('../../../core/shared/config');
 const configUtils = require('../../utils/configUtils');
 
 const settingsMatcher = {
@@ -51,10 +50,10 @@ describe('Settings Content API', function () {
                     'content-length': anyContentLength
                 })
                 .matchBodySnapshot({
-                    settings: {
+                    settings: Object.assign({}, settingsMatcher, {
                         captcha_enabled: true,
                         captcha_sitekey: 'testkey'
-                    }
+                    })
                 });
         });
     });

diff --git a/ghost/members-api/lib/members-api.js b/ghost/members-api/lib/members-api.js
@@ -74,6 +74,7 @@ module.exports = function MembersAPI({
     settingsCache,
     sentry,
     settingsHelpers,
+    captchaService,
     config
 }) {
     const tokenService = new TokenService({
@@ -337,6 +338,7 @@ module.exports = function MembersAPI({
     const middleware = {
         sendMagicLink: Router().use(
             body.json(),
+            captchaService.getMiddleware(),
             forwardError((req, res) => routerController.sendMagicLink(req, res))
         ),
         createCheckoutSession: Router().use(