natty
/
misskey-awawa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2555 from mei23/mei-0831-vali3 

HTTP Signature ホスト検証エラーメッセージの調整
This commit is contained in:
syuilo 2018-08-31 18:07:08 +09:00 committed by GitHub
parent e53dde385c 18b4f74cdb
commit e89e76076a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/queue/processors/http/process-inbox.ts
View File

@ -38,7 +38,7 @@ export default async (job: bq.Job, done: any): Promise<void> => {
try {
ValidateActivity(activity, host);
} catch (e) {
console.warn(e);
console.warn(e.message);
done();
return;
}
@ -55,7 +55,7 @@ export default async (job: bq.Job, done: any): Promise<void> => {
try {
ValidateActivity(activity, host);
} catch (e) {
console.warn(e);
console.warn(e.message);
done();
return;
}
@ -100,7 +100,10 @@ function ValidateActivity(activity: any, host: string) {
// id (if exists)
if (typeof activity.id === 'string') {
const uriHost = toUnicode(new URL(activity.id).hostname.toLowerCase());
if (host !== uriHost) throw new Error('activity.id has different host');
if (host !== uriHost) {
const diag = activity.signature ? '. Has LD-Signature. Forwarded?' : '';
throw new Error(`activity.id(${activity.id}) has different host(${host})${diag}`);
}
}
// actor (if exists)