shadowfacts
/
shadowfacts.net
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Fix errors on actors missing public keys

This commit is contained in:
Shadowfacts 2020-04-15 12:55:16 -04:00
parent 889739c880
commit f457c0162f
Signed by: shadowfacts
GPG Key ID: 94A5AB95422746E5
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/activitypub/federate.ts
View File

@ -67,7 +67,9 @@ async function cacheActor(actorObject: ActorObject) {
actor.displayName = actorObject.name;
actor.inbox = actorObject.inbox;
actor.iconURL = iconURL;
actor.publicKeyPem = actorObject.publicKey.publicKeyPem;
if (actor.publicKey && actor.publicKey.publicKeyPem) {
actor.publicKeyPem = actorObject.publicKey.publicKeyPem;
}
actor.isFollower = false;
await getConnection().manager.save(actor);
}

2
lib/activitypub/middleware/http-signature.ts
View File

@ -25,7 +25,7 @@ export = async (req: Request, res: Response, next: NextFunction) => {
console.log(`Could not retrieve actor ${req.body.actor} to validate HTTP signature for`, req.body);
res.status(401).end("Could not retrieve actor to validate HTTP signature");
}
} else if (!validate(req, actor.publicKey.publicKeyPem)) {
} else if (!actor.publicKey || !actor.publicKey.publicKeyPem || !validate(req, actor.publicKey.publicKeyPem)) {
console.log(`Could not validate HTTP signature for ${req.body.actor}`);
res.status(401).end("Could not validate HTTP signature");
} else {