ActivityPub-federated video streaming platform using P2P directly in your web browser
Retry actor request on owner public key
Chocobozzz64a4017a0964
diff --git a/client/eslint.config.mjs b/client/eslint.config.mjsindex 3c8de7b06f..32623833b4 100644--- a/client/eslint.config.mjs+++ b/client/eslint.config.mjs@@ -173,6 +173,8 @@ export default defineConfig(['@typescript-eslint/no-deprecated': 'off',// TODO: enable'@typescript-eslint/no-floating-promises': 'off',+ // TODO: enable but it fails in our CI+ '@typescript-eslint/no-redundant-type-constituents': 'off',// We use many nested callbacks in our tests'max-nested-callbacks': 'off'diff --git a/server/core/lib/activitypub/actors/shared/url-to-object.ts b/server/core/lib/activitypub/actors/shared/url-to-object.tsindex 6dc04e396e..1a0be5e7f9 100644--- a/server/core/lib/activitypub/actors/shared/url-to-object.ts+++ b/server/core/lib/activitypub/actors/shared/url-to-object.ts@@ -3,14 +3,26 @@ import { logger } from '@server/helpers/logger.js'import { ActivityPubActor, ActivityPubOrderedCollection } from '@peertube/peertube-models'import { fetchAP } from '../../activity.js'import { checkUrlsSameHost } from '../../url.js'+import { isUrlValid } from '@server/helpers/custom-validators/activitypub/misc.js'-async function fetchRemoteActor (actorUrl: string): Promise<{ statusCode: number, actorObject: ActivityPubActor }> {+export async function fetchRemoteActor (+ actorUrl: string,+ canRefetchPublicKeyOwner = true+): Promise<{ statusCode: number, actorObject: ActivityPubActor }> {logger.info('Fetching remote actor %s.', actorUrl)const { body, statusCode } = await fetchAP<ActivityPubActor>(actorUrl)if (sanitizeAndCheckActorObject(body) === false) {logger.debug('Remote actor JSON is not valid.', { actorJSON: body })++ // Retry with the public key owner+ if (canRefetchPublicKeyOwner && hasPublicKeyOwner(body)) {+ logger.debug('Retrying with public key owner ' + body.publicKey.owner)++ return fetchRemoteActor(body.publicKey.owner, false)+ }+return { actorObject: undefined, statusCode }}@@ -26,7 +38,7 @@ async function fetchRemoteActor (actorUrl: string): Promise<{ statusCode: number}}-async function fetchActorFollowsCount (actorObject: ActivityPubActor) {+export async function fetchActorFollowsCount (actorObject: ActivityPubActor) {let followersCount = 0let followingCount = 0@@ -37,11 +49,7 @@ async function fetchActorFollowsCount (actorObject: ActivityPubActor) {}// ----------------------------------------------------------------------------export {- fetchActorFollowsCount,- fetchRemoteActor-}-+// Private// ---------------------------------------------------------------------------async function fetchActorTotalItems (url: string) {@@ -54,3 +62,7 @@ async function fetchActorTotalItems (url: string) {return 0}}++function hasPublicKeyOwner (actor: ActivityPubActor) {+ return isUrlValid(actor?.publicKey?.owner)+}