From aead3d651005dc01c808bf5731094ebfdd8765f3 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 9 Jul 2021 14:19:55 +1000 Subject: [PATCH] force headers to be empty for onion_req request --- ts/session/snode_api/onions.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/ts/session/snode_api/onions.ts b/ts/session/snode_api/onions.ts index a2b879494..eb17097e7 100644 --- a/ts/session/snode_api/onions.ts +++ b/ts/session/snode_api/onions.ts @@ -1,4 +1,4 @@ -import { default as insecureNodeFetch } from 'node-fetch'; +import { default as insecureNodeFetch, RequestInit } from 'node-fetch'; import https from 'https'; import { dropSnodeFromSnodePool, dropSnodeFromSwarmIfNeeded, updateSwarmFor } from './snodePool'; @@ -793,15 +793,19 @@ const sendOnionRequest = async ({ const guardNode = nodePath[0]; - const guardFetchOptions = { + const guardFetchOptions: RequestInit = { method: 'POST', body: payload, // we are talking to a snode... agent: snodeHttpsAgent, - abortSignal, - timeout: 5000, + headers: {}, + timeout: 10000, }; + if (abortSignal) { + guardFetchOptions.signal = abortSignal as any; + } + const guardUrl = `https://${guardNode.ip}:${guardNode.port}/onion_req/v2`; // no logs for that one insecureNodeFetch as we do need to call insecureNodeFetch to our guardNode // window?.log?.info('insecureNodeFetch => plaintext for sendOnionRequest');