johan/FoundKey
1
0
Fork 0
forked from FoundKeyGang/FoundKey
Code Issues Pull requests Projects Releases Packages Wiki Activity

activitypub: Do block checks more globally

Browse source 
Changelog: Fixed
Reviewed-on: FoundKeyGang/FoundKey#299
This commit is contained in:
Norm 2022-12-24 18:40:44 -05:00
commit 09bc3cf95a
Signed by untrusted user: norm
GPG key ID: 7123E30E441E80DE
2 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
packages/backend/src/remote/activitypub/kernel/index.ts
View file

@ -1,8 +1,10 @@
import { CacheableRemoteUser } from '@/models/entities/user.js'; import { CacheableRemoteUser } from '@/models/entities/user.js';
import { toArray } from '@/prelude/array.js'; import { toArray } from '@/prelude/array.js';
import { Resolver } from '@/remote/activitypub/resolver.js'; import { Resolver } from '@/remote/activitypub/resolver.js';
import { extractDbHost } from '@/misc/convert-host.js';
import { shouldBlockInstance } from '@/misc/should-block-instance.js';
import { apLogger } from '../logger.js'; import { apLogger } from '../logger.js';
import { IObject, isCreate, isDelete, isUpdate, isRead, isFollow, isAccept, isReject, isAdd, isRemove, isAnnounce, isLike, isUndo, isBlock, isCollectionOrOrderedCollection, isCollection, isFlag } from '../type.js'; import { IObject, isCreate, isDelete, isUpdate, isRead, isFollow, isAccept, isReject, isAdd, isRemove, isAnnounce, isLike, isUndo, isBlock, isCollectionOrOrderedCollection, isCollection, isFlag, getApId } from '../type.js';
import create from './create/index.js'; import create from './create/index.js';
import performDeleteActivity from './delete/index.js'; import performDeleteActivity from './delete/index.js';
import performUpdateActivity from './update/index.js'; import performUpdateActivity from './update/index.js';
@ -18,7 +20,7 @@ import remove from './remove/index.js';
import block from './block/index.js'; import block from './block/index.js';
import flag from './flag/index.js'; import flag from './flag/index.js';
export async function performActivity(actor: CacheableRemoteUser, activity: IObject, resolver: Resolver) { export async function performActivity(actor: CacheableRemoteUser, activity: IObject, resolver: Resolver): Promise<void> {
if (isCollectionOrOrderedCollection(activity)) { if (isCollectionOrOrderedCollection(activity)) {
for (const item of toArray(isCollection(activity) ? activity.items : activity.orderedItems)) { for (const item of toArray(isCollection(activity) ? activity.items : activity.orderedItems)) {
const act = await resolver.resolve(item); const act = await resolver.resolve(item);
@ -38,6 +40,11 @@ export async function performActivity(actor: CacheableRemoteUser, activity: IObj
async function performOneActivity(actor: CacheableRemoteUser, activity: IObject, resolver: Resolver): Promise<void> { async function performOneActivity(actor: CacheableRemoteUser, activity: IObject, resolver: Resolver): Promise<void> {
if (actor.isSuspended) return; if (actor.isSuspended) return;
if (typeof activity.id !== 'undefined') {
const host = extractDbHost(getApId(activity));
if (await shouldBlockInstance(host)) return;
}
if (isCreate(activity)) { if (isCreate(activity)) {
await create(actor, activity, resolver); await create(actor, activity, resolver);
} else if (isDelete(activity)) { } else if (isDelete(activity)) {
@ -55,7 +62,7 @@ async function performOneActivity(actor: CacheableRemoteUser, activity: IObject,
} else if (isAdd(activity)) { } else if (isAdd(activity)) {
await add(actor, activity, resolver).catch(err => apLogger.error(err)); await add(actor, activity, resolver).catch(err => apLogger.error(err));
} else if (isRemove(activity)) { } else if (isRemove(activity)) {
await remove(actor, activity).catch(err => apLogger.error(err)); await remove(actor, activity, resolver).catch(err => apLogger.error(err));
} else if (isAnnounce(activity)) { } else if (isAnnounce(activity)) {
await announce(actor, activity, resolver); await announce(actor, activity, resolver);
} else if (isLike(activity)) { } else if (isLike(activity)) {

14
packages/backend/src/remote/activitypub/resolver.ts
View file

@ -34,9 +34,7 @@ export class Resolver {
} }
public async resolveCollection(value: string | IObject): Promise<ICollection | IOrderedCollection> { public async resolveCollection(value: string | IObject): Promise<ICollection | IOrderedCollection> {
const collection = typeof value === 'string' const collection = await this.resolve(value);
? await this.resolve(value)
: value;
if (isCollectionOrOrderedCollection(collection)) { if (isCollectionOrOrderedCollection(collection)) {
return collection; return collection;
@ -45,12 +43,18 @@ export class Resolver {
} }
} }
public async resolve(value: string | IObject, allowRedirect = false): Promise<IObject> { public async resolve(value?: string | IObject | null, allowRedirect = false): Promise<IObject> {
if (value == null) { if (value == null) {
throw new Error('resolvee is null (or undefined)'); throw new Error('resolvee is null (or undefined)');
} }
if (typeof value !== 'string') { if (typeof value !== 'string') {
if (typeof value.id !== 'undefined') {
const host = extractDbHost(getApId(value));
if (await shouldBlockInstance(host)) {
throw new Error('instance is blocked');
}
}
return value; return value;
} }
@ -75,7 +79,7 @@ export class Resolver {
} }
if (await shouldBlockInstance(host)) { if (await shouldBlockInstance(host)) {
throw new Error('Instance is blocked'); throw new Error('instance is blocked');
} }
if (!this.user) { if (!this.user) {