Merge pull request #3133 from Bilb/update-fs-release-endpoint

fix: update fetching desktop release endpoint

package.json

@@ -97,7 +97,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.20/libsession_util_nodejs-v0.3.20.tar.gz",
+    "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.3.21/libsession_util_nodejs-v0.3.21.tar.gz",
     "libsodium-wrappers-sumo": "^0.7.9",
     "linkify-it": "^4.0.1",
     "lodash": "^4.17.21",

ts/components/leftpane/ActionsPanel.tsx

@@ -1,7 +1,6 @@
-import { ipcRenderer } from 'electron';
+import { debounce } from 'lodash';
 import { useEffect, useState } from 'react';
 
-import { debounce, isEmpty, isString } from 'lodash';
 import { useDispatch, useSelector } from 'react-redux';
 import useInterval from 'react-use/lib/useInterval';
 import useTimeoutFn from 'react-use/lib/useTimeoutFn';
@@ -37,7 +36,7 @@ import { SessionIconButton } from '../icon/SessionIconButton';
 import { LeftPaneSectionContainer } from './LeftPaneSectionContainer';
 
 import { SettingsKey } from '../../data/settings-key';
-import { getLatestReleaseFromFileServer } from '../../session/apis/file_server_api/FileServerApi';
+import { useFetchLatestReleaseFromFileServer } from '../../hooks/useFetchLatestReleaseFromFileServer';
 import {
   forceRefreshRandomSnodePool,
   getFreshSwarmFor,
@@ -143,11 +142,6 @@ const Section = (props: { type: SectionType }) => {
 
 const cleanUpMediasInterval = DURATION.MINUTES * 60;
 
-// every 1 minute we fetch from the fileserver to check for a new release
-// * if there is none, no request to github are made.
-// * if there is a version on the fileserver more recent than our current, we fetch github to get the UpdateInfos and trigger an update as usual (asking user via dialog)
-const fetchReleaseFromFileServerInterval = 1000 * 60; // try to fetch the latest release from the fileserver every minute
-
 // Do this only if we created a new account id, or if we already received the initial configuration message
 const triggerSyncIfNeeded = async () => {
   const us = UserUtils.getOurPubKeyStrFromCache();
@@ -207,22 +201,6 @@ const doAppStartUp = async () => {
   }, 20000);
 };
 
-async function fetchReleaseFromFSAndUpdateMain() {
-  try {
-    window.log.info('[updater] about to fetchReleaseFromFSAndUpdateMain');
-
-    const latest = await getLatestReleaseFromFileServer();
-    window.log.info('[updater] fetched latest release from fileserver: ', latest);
-
-    if (isString(latest) && !isEmpty(latest)) {
-      ipcRenderer.send('set-release-from-file-server', latest);
-      window.readyForUpdates();
-    }
-  } catch (e) {
-    window.log.warn(e);
-  }
-}
-
 /**
  * ActionsPanel is the far left banner (not the left pane).
  * The panel with buttons to switch between the message/contact/settings/theme views
@@ -247,12 +225,7 @@ export const ActionsPanel = () => {
 
   useInterval(cleanUpOldDecryptedMedias, startCleanUpMedia ? cleanUpMediasInterval : null);
 
-  useInterval(() => {
+  useFetchLatestReleaseFromFileServer();
-    if (!ourPrimaryConversation) {
-      return;
-    }
-    void fetchReleaseFromFSAndUpdateMain();
-  }, fetchReleaseFromFileServerInterval);
 
   useInterval(() => {
     if (!ourPrimaryConversation) {

ts/hooks/useFetchLatestReleaseFromFileServer.ts

@@ -0,0 +1,20 @@
+import { isEmpty } from 'lodash';
+import { useSelector } from 'react-redux';
+import useInterval from 'react-use/lib/useInterval';
+import { fetchLatestRelease } from '../session/fetch_latest_release';
+import { UserUtils } from '../session/utils';
+import { getOurPrimaryConversation } from '../state/selectors/conversations';
+
+export function useFetchLatestReleaseFromFileServer() {
+  const ourPrimaryConversation = useSelector(getOurPrimaryConversation);
+
+  useInterval(async () => {
+    if (!ourPrimaryConversation) {
+      return;
+    }
+    const userEd25519SecretKey = (await UserUtils.getUserED25519KeyPairBytes())?.privKeyBytes;
+    if (userEd25519SecretKey && !isEmpty(userEd25519SecretKey)) {
+      void fetchLatestRelease.fetchReleaseFromFSAndUpdateMain(userEd25519SecretKey);
+    }
+  }, fetchLatestRelease.fetchReleaseFromFileServerInterval);
+}

ts/ip2country.d.ts

@@ -1 +0,0 @@
-declare module 'ip2country';

ts/session/apis/file_server_api/FileServerApi.ts

@@ -1,9 +1,12 @@
 import AbortController from 'abort-controller';
+import { BlindingActions } from '../../../webworker/workers/browser/libsession_worker_interface';
 import { OnionSending, OnionV4JSONSnodeResponse } from '../../onions/onionSend';
 import {
   batchGlobalIsSuccess,
   parseBatchGlobalStatusCode,
 } from '../open_group_api/sogsv3/sogsV3BatchPoll';
+import { GetNetworkTime } from '../snode_api/getNetworkTime';
+import { fromUInt8ArrayToBase64 } from '../../utils/String';
 
 export const fileServerHost = 'filev2.getsession.org';
 export const fileServerURL = `http://${fileServerHost}`;
@@ -123,12 +126,27 @@ const parseStatusCodeFromOnionRequestV4 = (
  * Fetch the latest desktop release available on github from the fileserver.
  * This call is onion routed and so do not expose our ip to github nor the file server.
  */
-export const getLatestReleaseFromFileServer = async (): Promise<string | null> => {
+export const getLatestReleaseFromFileServer = async (
+  userEd25519SecretKey: Uint8Array
+): Promise<string | null> => {
+  const sigTimestampSeconds = GetNetworkTime.getNowWithNetworkOffsetSeconds();
+  const blindedPkHex = await BlindingActions.blindVersionPubkey({
+    ed25519SecretKey: userEd25519SecretKey,
+  });
+  const signature = await BlindingActions.blindVersionSign({
+    ed25519SecretKey: userEd25519SecretKey,
+    sigTimestampSeconds,
+  });
+  const body = {
+    'X-FS-Pubkey': blindedPkHex,
+    'X-FS-Timestamp': `${sigTimestampSeconds}`,
+    'X-FS-Signature': fromUInt8ArrayToBase64(signature),
+  };
   const result = await OnionSending.sendJsonViaOnionV4ToFileServer({
     abortSignal: new AbortController().signal,
     endpoint: RELEASE_VERSION_ENDPOINT,
     method: 'GET',
-    stringifiedBody: null,
+    stringifiedBody: JSON.stringify(body),
   });
 
   if (!batchGlobalIsSuccess(result) || parseStatusCodeFromOnionRequestV4(result) !== 200) {

ts/session/apis/snode_api/getNetworkTime.ts

@@ -70,9 +70,16 @@ function getNowWithNetworkOffset() {
   return Date.now() - GetNetworkTime.getLatestTimestampOffset();
 }
 
+function getNowWithNetworkOffsetSeconds() {
+  // make sure to call exports here, as we stub the exported one for testing.
+
+  return Math.floor(GetNetworkTime.getNowWithNetworkOffset() / 1000);
+}
+
 export const GetNetworkTime = {
   getNetworkTime,
   handleTimestampOffsetFromNetwork,
+  getNowWithNetworkOffsetSeconds,
   getLatestTimestampOffset,
   getNowWithNetworkOffset,
 };

ts/session/crypto/DecryptedAttachmentsManager.ts

@@ -93,6 +93,8 @@ export const getDecryptedMediaUrl = async (
     // we consider the file is encrypted.
     // if it's not, the hook caller has to fallback to setting the img src as an url to the file instead and load it
     if (urlToDecryptedBlobMap.has(url)) {
+      // typescript does not realize that the `has()` above makes sure the `get()` is not undefined
+
       // refresh the last access timestamp so we keep the one being currently in use
       const existing = urlToDecryptedBlobMap.get(url);
       const existingObjUrl = existing?.decrypted as string;
@@ -102,7 +104,6 @@ export const getDecryptedMediaUrl = async (
         lastAccessTimestamp: Date.now(),
         forceRetain: existing?.forceRetain || false,
       });
-      // typescript does not realize that the has above makes sure the get is not undefined
 
       return existingObjUrl;
     }

ts/session/fetch_latest_release/index.ts

@@ -0,0 +1,53 @@
+// every 1 minute we fetch from the fileserver to check for a new release
+// * if there is none, no request to github are made.
+// * if there is a version on the fileserver more recent than our current, we fetch github to get the UpdateInfos and trigger an update as usual (asking user via dialog)
+
+import { isEmpty, isString } from 'lodash';
+import { ipcRenderer } from 'electron';
+import { DURATION } from '../constants';
+import { getLatestReleaseFromFileServer } from '../apis/file_server_api/FileServerApi';
+
+/**
+ * We don't want to hit the fileserver too often. Only often on start, and then every 30 minutes
+ */
+const skipIfLessThan = DURATION.MINUTES * 30;
+
+let lastFetchedTimestamp = Number.MIN_SAFE_INTEGER;
+
+function resetForTesting() {
+  lastFetchedTimestamp = Number.MIN_SAFE_INTEGER;
+}
+
+async function fetchReleaseFromFSAndUpdateMain(userEd25519SecretKey: Uint8Array) {
+  try {
+    window.log.info('[updater] about to fetchReleaseFromFSAndUpdateMain');
+    const diff = Date.now() - lastFetchedTimestamp;
+    if (diff < skipIfLessThan) {
+      window.log.info(
+        `[updater] fetched release from fs ${Math.floor(diff / DURATION.MINUTES)}minutes ago, skipping until that's at least ${Math.floor(skipIfLessThan / DURATION.MINUTES)}`
+      );
+      return;
+    }
+
+    const justFetched = await getLatestReleaseFromFileServer(userEd25519SecretKey);
+    window.log.info('[updater] fetched latest release from fileserver: ', justFetched);
+
+    if (isString(justFetched) && !isEmpty(justFetched)) {
+      lastFetchedTimestamp = Date.now();
+      ipcRenderer.send('set-release-from-file-server', justFetched);
+      window.readyForUpdates();
+    }
+  } catch (e) {
+    window.log.warn(e);
+  }
+}
+
+export const fetchLatestRelease = {
+  /**
+   * Try to fetch the latest release from the fileserver every 1 minute.
+   * If we did fetch a release already in the last 30 minutes, we will skip the call.
+   */
+  fetchReleaseFromFileServerInterval: DURATION.MINUTES * 1,
+  fetchReleaseFromFSAndUpdateMain,
+  resetForTesting,
+};

ts/webworker/workers/browser/libsession_worker_functions.d.ts

@@ -30,9 +30,11 @@ type UserGroupsConfigFunctions =
 type ConvoInfoVolatileConfigFunctions =
   | [ConvoInfoVolatileConfig, ...BaseConfigActions]
   | [ConvoInfoVolatileConfig, ...ConvoInfoVolatileConfigActionsType];
+type BlindingFunctions = ['Blinding', ...BlindingFunctions];
 
 export type LibSessionWorkerFunctions =
   | UserConfigFunctions
   | ContactsConfigFunctions
   | UserGroupsConfigFunctions
-  | ConvoInfoVolatileConfigFunctions;
+  | ConvoInfoVolatileConfigFunctions
+  | BlindingFunctions;

ts/webworker/workers/browser/libsession_worker_interface.ts

@@ -2,6 +2,7 @@
 /* eslint-disable import/no-unresolved */
 import {
   BaseWrapperActionsCalls,
+  BlindingActionsCalls,
   ContactInfoSet,
   ContactsWrapperActionsCalls,
   ConvoInfoVolatileWrapperActionsCalls,
@@ -343,6 +344,17 @@ export const ConvoInfoVolatileWrapperActions: ConvoInfoVolatileWrapperActionsCal
     ]) as Promise<ReturnType<ConvoInfoVolatileWrapperActionsCalls['eraseCommunityByFullUrl']>>,
 };
 
+export const BlindingActions: BlindingActionsCalls = {
+  blindVersionPubkey: async (opts: { ed25519SecretKey: Uint8Array }) =>
+    callLibSessionWorker(['Blinding', 'blindVersionPubkey', opts]) as Promise<
+      ReturnType<BlindingActionsCalls['blindVersionPubkey']>
+    >,
+  blindVersionSign: async (opts: { ed25519SecretKey: Uint8Array; sigTimestampSeconds: number }) =>
+    callLibSessionWorker(['Blinding', 'blindVersionSign', opts]) as Promise<
+      ReturnType<BlindingActionsCalls['blindVersionSign']>
+    >,
+};
+
 export const callLibSessionWorker = async (
   callToMake: LibSessionWorkerFunctions
 ): Promise<unknown> => {

ts/webworker/workers/node/libsession/libsession.worker.ts

@@ -2,6 +2,7 @@
 /* eslint-disable no-case-declarations */
 import {
   BaseConfigWrapperNode,
+  BlindingWrapperNode,
   ContactsConfigWrapperNode,
   ConvoInfoVolatileWrapperNode,
   UserConfigWrapperNode,
@@ -55,6 +56,7 @@ function getCorrespondingWrapper(wrapperType: ConfigWrapperObjectTypes): BaseCon
         throw new Error(`${wrapperType} is not init yet`);
       }
       return wrapper;
+
     default:
       assertUnreachable(
         wrapperType,
@@ -149,32 +151,53 @@ function freeUserWrapper(wrapperType: ConfigWrapperObjectTypes) {
       );
   }
 }
-
+onmessage = async (e: {
-onmessage = async (e: { data: [number, ConfigWrapperObjectTypes, string, ...any] }) => {
+  data: [number, ConfigWrapperObjectTypes | 'Blinding', string, ...any];
+}) => {
   const [jobId, config, action, ...args] = e.data;
 
   try {
     if (action === 'init') {
-      initUserWrapper(args, config);
+      if (config === 'Blinding') {
+        // nothing to do for the blinding wrapper, all functions are static
+      } else {
+        initUserWrapper(args, config);
+      }
       postMessage([jobId, null, null]);
       return;
     }
 
     if (action === 'free') {
-      freeUserWrapper(config);
+      if (config !== 'Blinding') {
+        freeUserWrapper(config);
+      }
       postMessage([jobId, null, null]);
+
       return;
     }
 
-    const wrapper = getCorrespondingWrapper(config);
+    let result: any;
-    const fn = (wrapper as any)[action];
 
-    if (!fn) {
+    if (config === 'Blinding') {
-      throw new Error(
+      const fn = (BlindingWrapperNode as any)[action];
-        `Worker: job "${jobId}" did not find function "${action}" on config "${config}"`
+
-      );
+      if (!fn) {
+        throw new Error(
+          `Worker: job "${jobId}" did not find function "${action}" on wrapper "${config}"`
+        );
+      }
+      result = await (BlindingWrapperNode as any)[action](...args);
+    } else {
+      const wrapper = getCorrespondingWrapper(config);
+      const fn = (wrapper as any)[action];
+
+      if (!fn) {
+        throw new Error(
+          `Worker: job "${jobId}" did not find function "${action}" on config "${config}"`
+        );
+      }
+      result = await (wrapper as any)[action](...args);
     }
-    const result = await (wrapper as any)[action](...args);
     postMessage([jobId, null, result]);
   } catch (error) {
     const errorForDisplay = prepareErrorForPostMessage(error);

yarn.lock

@@ -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.20/libsession_util_nodejs-v0.3.20.tar.gz":
+"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.20"
+  version "0.3.21"
-  resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.3.20/libsession_util_nodejs-v0.3.20.tar.gz#f3ae2259c54bf414d5003ea4a9e0a38b3c974065"
+  resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.3.21/libsession_util_nodejs-v0.3.21.tar.gz#64705b1f7c934ca32f929ea8127370cc82bab97a"
   dependencies:
     cmake-js "^7.2.1"
     node-addon-api "^6.1.0"