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

Compare commits

base: shadowfacts:77ee1329837d2fb087089ff9f7ac1c58ef645e68
Branches Tags
shadowfacts:master
...
compare: shadowfacts:bc98637dcfeab6aae2ba9a19053e65882d8b7582
Branches Tags
shadowfacts:master

1 Commits
77ee132983 ... bc98637dcf

Author SHA1 Message Date
Shadowfacts bc98637dcf
Fix errors on actors missing public keys 2020-04-15 12:57:17 -04:00
2 changed files with 4 additions and 2 deletions
Show Stats 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.displayName = actorObject.name;
actor.inbox = actorObject.inbox; actor.inbox = actorObject.inbox;
actor.iconURL = iconURL; actor.iconURL = iconURL;
actor.publicKeyPem = actorObject.publicKey.publicKeyPem; if (actorObject.publicKey && actorObject.publicKey.publicKeyPem) {
actor.publicKeyPem = actorObject.publicKey.publicKeyPem;
}
actor.isFollower = false; actor.isFollower = false;
await getConnection().manager.save(actor); 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); 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"); 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}`); console.log(`Could not validate HTTP signature for ${req.body.actor}`);
res.status(401).end("Could not validate HTTP signature"); res.status(401).end("Could not validate HTTP signature");
} else { } else {