From 7ea710b31442cd05ac75a971212a0fa09f69645a Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Tue, 25 Mar 2025 17:19:38 -0400 Subject: remerge: remove FetchAllowSoftFailMask in favor of our same-authority checks --- packages/backend/src/core/HttpRequestService.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'packages/backend/src/core/HttpRequestService.ts') diff --git a/packages/backend/src/core/HttpRequestService.ts b/packages/backend/src/core/HttpRequestService.ts index e8b0326e66..12047346fb 100644 --- a/packages/backend/src/core/HttpRequestService.ts +++ b/packages/backend/src/core/HttpRequestService.ts @@ -16,7 +16,6 @@ import type { Config } from '@/config.js'; import { StatusError } from '@/misc/status-error.js'; import { bindThis } from '@/decorators.js'; import { validateContentTypeSetAsActivityPub } from '@/core/activitypub/misc/validator.js'; -import { FetchAllowSoftFailMask } from '@/core/activitypub/misc/check-against-url.js'; import type { IObject, IObjectWithId } from '@/core/activitypub/type.js'; import { ApUtilityService } from './activitypub/ApUtilityService.js'; import type { Response } from 'node-fetch'; @@ -250,7 +249,7 @@ export class HttpRequestService { } @bindThis - public async getActivityJson(url: string, isLocalAddressAllowed = false, allowSoftfail: FetchAllowSoftFailMask = FetchAllowSoftFailMask.Strict): Promise { + public async getActivityJson(url: string, isLocalAddressAllowed = false): Promise { const res = await this.send(url, { method: 'GET', headers: { @@ -268,7 +267,7 @@ export class HttpRequestService { // Make sure the object ID matches the final URL (which is where it actually exists). // The caller (ApResolverService) will verify the ID against the original / entry URL, which ensures that all three match. - this.apUtilityService.assertIdMatchesUrlAuthority(activity, res.url, allowSoftfail); + this.apUtilityService.assertIdMatchesUrlAuthority(activity, res.url); return activity as IObjectWithId; } -- cgit v1.2.3-freya