From 59adc13b030f4260654908bf4074f607af72d173 Mon Sep 17 00:00:00 2001 From: Julia Johannesen Date: Sun, 22 Sep 2024 17:13:24 -0400 Subject: [PATCH] Only accept HTML `` on success (cherry picked from commit 6ea48be84abdab66301a957c27dd5d84886dfb36) --- packages/backend/src/core/activitypub/ApRequestService.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/backend/src/core/activitypub/ApRequestService.ts b/packages/backend/src/core/activitypub/ApRequestService.ts index 7c78f3319b..839dfbee33 100644 --- a/packages/backend/src/core/activitypub/ApRequestService.ts +++ b/packages/backend/src/core/activitypub/ApRequestService.ts @@ -205,7 +205,12 @@ export class ApRequestService { //#region リクエスト先がhtmlかつactivity+jsonへのalternate linkタグがあるとき const contentType = res.headers.get('content-type'); - if ((contentType ?? '').split(';')[0].trimEnd().toLowerCase() === 'text/html' && _followAlternate === true) { + if ( + res.status >= 200 + && res.status <= 299 + && (contentType ?? '').split(';')[0].trimEnd().toLowerCase() === 'text/html' + && _followAlternate === true + ) { const html = await res.text(); const { window, happyDOM } = new Window({ settings: {