oscar-surf/misskey
oscar-surf/misskey
0
0
Fork 0
Code Issues Activity

pub-relay (#6341)

Browse source 
* pub-relay

* relay actorをApplicationにする

* Disable koa-compress

* Homeはリレーに送らない

* Disable debug

* UI

* cleanupなど
This commit is contained in:
MeiMei 2020-05-10 18:42:31 +09:00 • committed by GitHub
parent be183206e6
commit 145389768d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 510 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/queue/processors/inbox.ts
View file

@ -56,12 +56,10 @@ export default async (job: Bull.Job<InboxJobData>): Promise<string> => {
}
// HTTP-Signatureの検証
if (!httpSignature.verifySignature(signature, authUser.key.keyPem)) {
return 'signature verification failed';
}
const httpSignatureValidated = httpSignature.verifySignature(signature, authUser.key.keyPem);
// signatureのsignerは、activity.actorと一致する必要がある
if (authUser.user.uri !== activity.actor) {
// また、signatureのsignerは、activity.actorと一致する必要がある
if (!httpSignatureValidated || authUser.user.uri !== activity.actor) {
// 一致しなくても、でもLD-Signatureがありそうならそっちも見る
if (activity.signature) {
if (activity.signature.type !== 'RsaSignature2017') {
@ -93,7 +91,7 @@ export default async (job: Bull.Job<InboxJobData>): Promise<string> => {
return `skip: LD-Signature user(${authUser.user.uri}) !== activity.actor(${activity.actor})`;
}
} else {
return 'signature verification failed';
throw `skip: http-signature verification failed.`;
}
}