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

activitypub: perform resolver block check on objects as well

Browse source
This commit is contained in:
Norm 2022-12-24 11:58:49 -05:00
parent 8e12b9a33e
commit a8f82050c8
Signed by untrusted user: norm
GPG key ID: 7123E30E441E80DE
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -45,12 +45,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 +81,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) {