diff options
| author | mei23 <m@m544.net> | 2018-08-31 16:46:24 +0900 |
|---|---|---|
| committer | mei23 <m@m544.net> | 2018-08-31 16:46:24 +0900 |
| commit | 18b4f74cdb3f4a0c69855f1ab5b2f286984f1b13 (patch) | |
| tree | 162ce70a600f2a76c480029ba7627e31f6433a10 /src/queue/processors/http/process-inbox.ts | |
| parent | Merge pull request #2549 from syuilo/greenkeeper/@types/node-10.9.4 (diff) | |
| download | sharkey-18b4f74cdb3f4a0c69855f1ab5b2f286984f1b13.tar.gz sharkey-18b4f74cdb3f4a0c69855f1ab5b2f286984f1b13.tar.bz2 sharkey-18b4f74cdb3f4a0c69855f1ab5b2f286984f1b13.zip | |
Improve validation error message
Diffstat (limited to 'src/queue/processors/http/process-inbox.ts')
| -rw-r--r-- | src/queue/processors/http/process-inbox.ts | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/queue/processors/http/process-inbox.ts b/src/queue/processors/http/process-inbox.ts index a30efe1a3a..7e564dd32a 100644 --- a/src/queue/processors/http/process-inbox.ts +++ b/src/queue/processors/http/process-inbox.ts @@ -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) |