mirrors/barkey
1
0
Fork 0
mirror of https://codeberg.org/yeentown/barkey.git synced 2025-12-13 10:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix URL errors from incorrect validation in validateActor

Browse source
This commit is contained in:
Hazelnoot 2025-07-04 15:17:09 -04:00 • committed by dakkar
parent d3f672657e
commit d36b94c8cf
1 changed files with 80 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

99
packages/backend/src/core/activitypub/models/ApPersonService.ts
View file

@ -45,7 +45,8 @@ import { HttpRequestService } from '@/core/HttpRequestService.js';
import { verifyFieldLinks } from '@/misc/verify-field-link.js'; import { verifyFieldLinks } from '@/misc/verify-field-link.js';
import { isRetryableError } from '@/misc/is-retryable-error.js'; import { isRetryableError } from '@/misc/is-retryable-error.js';
import { renderInlineError } from '@/misc/render-inline-error.js'; import { renderInlineError } from '@/misc/render-inline-error.js';
import { getApId, getApType, isActor, isCollection, isCollectionOrOrderedCollection, isPropertyValue } from '../type.js'; import { IdentifiableError } from '@/misc/identifiable-error.js';
import { getApId, getApType, getNullableApId, isActor, isCollection, isCollectionOrOrderedCollection, isPropertyValue } from '../type.js';
import { extractApHashtags } from './tag.js'; import { extractApHashtags } from './tag.js';
import type { OnModuleInit } from '@nestjs/common'; import type { OnModuleInit } from '@nestjs/common';
import type { ApNoteService } from './ApNoteService.js'; import type { ApNoteService } from './ApNoteService.js';
@ -176,27 +177,85 @@ export class ApPersonService implements OnModuleInit, OnApplicationShutdown {
throw new UnrecoverableError(`invalid Actor ${uri}: wrong inbox host ${inboxHost}`); throw new UnrecoverableError(`invalid Actor ${uri}: wrong inbox host ${inboxHost}`);
} }
const sharedInboxObject = x.sharedInbox ?? (x.endpoints ? x.endpoints.sharedInbox : undefined); // Sanitize sharedInbox
if (sharedInboxObject != null) { try {
const sharedInbox = getApId(sharedInboxObject); if (x.sharedInbox) {
this.utilityService.assertUrl(sharedInbox); const sharedInbox = getNullableApId(x.sharedInbox);
if (!(typeof sharedInbox === 'string' && sharedInbox.length > 0 && this.utilityService.punyHostPSLDomain(sharedInbox) === expectHost)) { if (sharedInbox) {
throw new UnrecoverableError(`invalid Actor ${uri}: wrong shared inbox ${sharedInbox}`); const parsed = this.utilityService.assertUrl(sharedInbox);
if (this.utilityService.punyHostPSLDomain(parsed) !== expectHost) {
this.logger.warn(`Excluding sharedInbox for actor ${uri}: wrong host in ${sharedInbox}`);
x.sharedInbox = undefined;
}
} else {
this.logger.warn(`Excluding sharedInbox for actor ${uri}: missing ID`);
x.sharedInbox = undefined;
}
} else {
// Collapse all falsy values to undefined
x.sharedInbox = undefined;
}
} catch {
// Shared inbox is unparseable - strip out
x.sharedInbox = undefined;
}
// Sanitize endpoints object
if (typeof(x.endpoints) === 'object') {
x.endpoints = {
sharedInbox: x.endpoints.sharedInbox,
};
} else {
x.endpoints = undefined;
}
// Sanitize endpoints.sharedInbox
if (x.endpoints) {
try {
if (x.endpoints.sharedInbox) {
const sharedInbox = getNullableApId(x.endpoints.sharedInbox);
if (sharedInbox) {
const parsed = this.utilityService.assertUrl(sharedInbox);
if (this.utilityService.punyHostPSLDomain(parsed) !== expectHost) {
this.logger.warn(`Excluding endpoints.sharedInbox for actor ${uri}: wrong host in ${sharedInbox}`);
x.endpoints.sharedInbox = undefined;
}
} else {
this.logger.warn(`Excluding endpoints.sharedInbox for actor ${uri}: missing ID`);
x.endpoints.sharedInbox = undefined;
}
} else {
// Collapse all falsy values to undefined
x.endpoints.sharedInbox = undefined;
}
} catch {
// Shared inbox is unparseable - strip out
x.endpoints.sharedInbox = undefined;
} }
} }
for (const collection of ['outbox', 'followers', 'following'] as (keyof IActor)[]) { // Sanitize collections
const xCollection = (x as IActor)[collection]; for (const collection of ['outbox', 'followers', 'following', 'featured'] as (keyof IActor)[]) {
if (xCollection != null) { try {
const collectionUri = getApId(xCollection); if (x[collection]) {
if (typeof collectionUri === 'string' && collectionUri.length > 0) { const collectionUri = getNullableApId(x[collection]);
this.utilityService.assertUrl(collectionUri); if (collectionUri) {
if (this.utilityService.punyHostPSLDomain(collectionUri) !== expectHost) { const parsed = this.utilityService.assertUrl(collectionUri);
throw new UnrecoverableError(`invalid Actor ${uri}: wrong ${collection} host ${collectionUri}`); if (this.utilityService.punyHostPSLDomain(parsed) !== expectHost) {
this.logger.warn(`Excluding ${collection} for actor ${uri}: wrong host in ${collectionUri}`);
x[collection] = undefined;
}
} else {
this.logger.warn(`Excluding ${collection} for actor ${uri}: missing ID`);
x[collection] = undefined;
} }
} else if (collectionUri != null) { } else {
throw new UnrecoverableError(`invalid Actor ${uri}: wrong ${collection} type`); // Collapse all falsy values to undefined
x[collection] = undefined;
} }
} catch {
// Collection is unparseable - strip out
x[collection] = undefined;
} }
} }
@ -223,7 +282,8 @@ export class ApPersonService implements OnModuleInit, OnApplicationShutdown {
x.summary = truncate(x.summary, summaryLength); x.summary = truncate(x.summary, summaryLength);
} }
const idHost = this.utilityService.punyHostPSLDomain(x.id); const parsedId = this.utilityService.assertUrl(x.id);
const idHost = this.utilityService.punyHostPSLDomain(parsedId);
if (idHost !== expectHost) { if (idHost !== expectHost) {
throw new UnrecoverableError(`invalid Actor ${uri}: wrong id ${x.id}`); throw new UnrecoverableError(`invalid Actor ${uri}: wrong id ${x.id}`);
} }
@ -233,7 +293,8 @@ export class ApPersonService implements OnModuleInit, OnApplicationShutdown {
throw new UnrecoverableError(`invalid Actor ${uri}: wrong publicKey.id type`); throw new UnrecoverableError(`invalid Actor ${uri}: wrong publicKey.id type`);
} }
const publicKeyIdHost = this.utilityService.punyHostPSLDomain(x.publicKey.id); const parsed = this.utilityService.assertUrl(x.publicKey.id);
const publicKeyIdHost = this.utilityService.punyHostPSLDomain(parsed);
if (publicKeyIdHost !== expectHost) { if (publicKeyIdHost !== expectHost) {
throw new UnrecoverableError(`invalid Actor ${uri}: wrong publicKey.id ${x.publicKey.id}`); throw new UnrecoverableError(`invalid Actor ${uri}: wrong publicKey.id ${x.publicKey.id}`);
} }