From 40e6cfd14d6e90f81686baeb4670668ec7f51933 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 16 Aug 2024 10:37:40 +1000 Subject: [PATCH] fix: fs needs headers not body --- package.json | 4 ++-- .../apis/file_server_api/FileServerApi.ts | 6 ++++-- ts/session/onions/onionSend.ts | 5 +++-- ts/test/session/unit/onion/OnionPaths_test.ts | 3 +-- yarn.lock | 18 +++++++++--------- 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index f6571047b..55592bbc5 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "session-desktop", "productName": "Session", "description": "Private messaging from your desktop", - "version": "1.13.0", + "version": "1.13.1", "license": "GPL-3.0", "author": { "name": "Oxen Labs", @@ -98,7 +98,7 @@ "fs-extra": "9.0.0", "glob": "7.1.2", "image-type": "^4.1.0", - "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.3.21/libsession_util_nodejs-v0.3.21.tar.gz", + "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.3.22/libsession_util_nodejs-v0.3.22.tar.gz", "libsodium-wrappers-sumo": "^0.7.9", "linkify-it": "^4.0.1", "lodash": "^4.17.21", diff --git a/ts/session/apis/file_server_api/FileServerApi.ts b/ts/session/apis/file_server_api/FileServerApi.ts index 67b5e079a..f9dee5bf9 100644 --- a/ts/session/apis/file_server_api/FileServerApi.ts +++ b/ts/session/apis/file_server_api/FileServerApi.ts @@ -137,7 +137,8 @@ export const getLatestReleaseFromFileServer = async ( ed25519SecretKey: userEd25519SecretKey, sigTimestampSeconds, }); - const body = { + + const headers = { 'X-FS-Pubkey': blindedPkHex, 'X-FS-Timestamp': `${sigTimestampSeconds}`, 'X-FS-Signature': fromUInt8ArrayToBase64(signature), @@ -146,7 +147,8 @@ export const getLatestReleaseFromFileServer = async ( abortSignal: new AbortController().signal, endpoint: RELEASE_VERSION_ENDPOINT, method: 'GET', - stringifiedBody: JSON.stringify(body), + stringifiedBody: null, + headers, }); if (!batchGlobalIsSuccess(result) || parseStatusCodeFromOnionRequestV4(result) !== 200) { diff --git a/ts/session/onions/onionSend.ts b/ts/session/onions/onionSend.ts index 127f37428..eb14f21c8 100644 --- a/ts/session/onions/onionSend.ts +++ b/ts/session/onions/onionSend.ts @@ -502,8 +502,9 @@ async function sendJsonViaOnionV4ToFileServer(sendOptions: { method: string; stringifiedBody: string | null; abortSignal: AbortSignal; + headers: Record; }): Promise { - const { endpoint, method, stringifiedBody, abortSignal } = sendOptions; + const { endpoint, method, stringifiedBody, abortSignal, headers } = sendOptions; if (!endpoint.startsWith('/')) { throw new Error('endpoint needs a leading /'); } @@ -514,7 +515,7 @@ async function sendJsonViaOnionV4ToFileServer(sendOptions: { builtUrl, { method, - headers: {}, + headers, body: stringifiedBody, useV4: true, }, diff --git a/ts/test/session/unit/onion/OnionPaths_test.ts b/ts/test/session/unit/onion/OnionPaths_test.ts index 37981f736..8bbec24d1 100644 --- a/ts/test/session/unit/onion/OnionPaths_test.ts +++ b/ts/test/session/unit/onion/OnionPaths_test.ts @@ -115,9 +115,8 @@ describe('OnionPaths', () => { describe('getRandomEdgeSnode', () => { it('random if multiple matches', () => { const originalSnodePool = generateFakeSnodes(5); - const filtered = originalSnodePool.filter((_m, i) => i % 5 !== 0); const winner = OnionPaths.getRandomEdgeSnode(originalSnodePool); - expect(filtered).to.deep.include(winner); + expect(originalSnodePool).to.deep.include(winner); }); }); diff --git a/yarn.lock b/yarn.lock index e89dfdafd..28c77acd2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1786,9 +1786,9 @@ available-typed-arrays@^1.0.7: possible-typed-array-names "^1.0.0" axios@^1.6.5: - version "1.7.2" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.2.tgz#b625db8a7051fbea61c35a3cbb3a1daa7b9c7621" - integrity sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw== + version "1.7.4" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.4.tgz#4c8ded1b43683c8dd362973c393f3ede24052aa2" + integrity sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw== dependencies: follow-redirects "^1.15.6" form-data "^4.0.0" @@ -2642,9 +2642,9 @@ date-fns@^3.3.1: integrity sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww== debug@4, debug@^4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: - version "4.3.5" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.5.tgz#e83444eceb9fedd4a1da56d671ae2446a01a6e1e" - integrity sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg== + version "4.3.6" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.6.tgz#2ab2c38fbaffebf8aa95fdfe6d88438c7a13c52b" + integrity sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg== dependencies: ms "2.1.2" @@ -4928,9 +4928,9 @@ levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.3.21/libsession_util_nodejs-v0.3.21.tar.gz": - version "0.3.21" - resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.3.21/libsession_util_nodejs-v0.3.21.tar.gz#64705b1f7c934ca32f929ea8127370cc82bab97a" +"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.3.22/libsession_util_nodejs-v0.3.22.tar.gz": + version "0.3.22" + resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.3.22/libsession_util_nodejs-v0.3.22.tar.gz#6d9246a7469edb6b90edd9b637726419e4a65571" dependencies: cmake-js "^7.2.1" node-addon-api "^6.1.0"