Merge pull request #1644 from session-foundation/fix-qa-issues-fs-changes

fix: qa issues from fs changes

Author: Bilb

ts/components/conversation/right-panel/overlay/message-info/OverlayMessageInfo.tsx

@@ -117,9 +117,12 @@ async function getPropsForMessageInfo(
   const found = await Data.getMessageById(messageId);
   const attachmentsWithMediaDetails: Array<PropsForAttachment> = [];
   if (found) {
+    const attachmentsInMsg = found.get('attachments') || [];
+
     // process attachments so we have the fileSize, url and screenshots
     for (let i = 0; i < attachments.length; i++) {
       const props = found.getPropsForAttachment(attachments[i]);
+      const fsUrl = attachmentsInMsg?.[i].url;
       if (
         props?.contentType &&
         GoogleChrome.isVideoTypeSupported(props?.contentType) &&
@@ -134,6 +137,7 @@ async function getPropsForMessageInfo(
         attachmentsWithMediaDetails.push({
           ...props,
           duration,
+          url: fsUrl,
         });
       } else if (props?.contentType && isAudio(props.contentType) && !props.duration && props.url) {
         // eslint-disable-next-line no-await-in-loop
@@ -145,9 +149,10 @@ async function getPropsForMessageInfo(
         attachmentsWithMediaDetails.push({
           ...props,
           duration,
+          url: fsUrl,
         });
       } else if (props) {
-        attachmentsWithMediaDetails.push(props);
+        attachmentsWithMediaDetails.push({ ...props, url: fsUrl });
       }
     }
 

ts/components/conversation/right-panel/overlay/message-info/components/AttachmentInfo.tsx

@@ -4,6 +4,8 @@ import { PropsForAttachment } from '../../../../../../state/ducks/conversations'
 import { Flex } from '../../../../../basic/Flex';
 import { tr } from '../../../../../../localization/localeTools';
 import { saveLogToDesktop } from '../../../../../../util/logger/renderer_process_logging';
+import { extractDetailsFromUrlFragment } from '../../../../../../session/url';
+import { isDevProd } from '../../../../../../shared/env_vars';
 
 type Props = {
   attachment: PropsForAttachment;
@@ -16,7 +18,7 @@ const StyledLabelContainer = styled(Flex)`
   }
 `;
 
-function formatAttachmentUrl(attachment: PropsForAttachment) {
+function formatAttachmentUrl(attachment: Pick<PropsForAttachment, 'url'>) {
   // Note: desktop overwrites the url with the local path once the file is downloaded,
   // and I think this is how we know the file was downloaded.
 
@@ -38,12 +40,23 @@ function formatAttachmentUrl(attachment: PropsForAttachment) {
   return fileId;
 }
 
+function extractAttachmentDetails(attachment: Pick<PropsForAttachment, 'url'>) {
+  const fileUrl = URL.canParse(attachment?.url) && new URL(attachment.url);
+  return {
+    deterministicEncryption:
+      (fileUrl && extractDetailsFromUrlFragment(fileUrl)?.deterministicEncryption) || false,
+    fsHost: fileUrl ? fileUrl.hostname : tr('attachmentsNa'),
+  };
+}
+
 export const AttachmentInfo = (props: Props) => {
   const { attachment } = props;
 
   // NOTE the attachment.url will be an empty string if the attachment is broken
   const hasError = attachment.error || attachment.url === '';
 
+  const { deterministicEncryption, fsHost } = extractAttachmentDetails(attachment);
+
   return (
     <Flex $container={true} $flexDirection="column" $flexGap="var(--margins-xs)">
       <LabelWithInfo label={tr('attachmentsFileId')} info={formatAttachmentUrl(attachment)} />
@@ -79,6 +92,15 @@ export const AttachmentInfo = (props: Props) => {
             }}
           />
         ) : null}
+        {isDevProd() ? (
+          <>
+            <LabelWithInfo
+              label="Uses Deterministic Encryption"
+              info={deterministicEncryption ? 'Yes' : 'No'}
+            />
+            <LabelWithInfo label="Fs host" info={fsHost} />
+          </>
+        ) : null}
       </StyledLabelContainer>
     </Flex>
   );

ts/interactions/avatar-interactions/nts-avatar-interactions.ts

@@ -10,7 +10,7 @@ import {
   UserConfigWrapperActions,
 } from '../../webworker/workers/browser/libsession_worker_interface';
 import { UserUtils } from '../../session/utils';
-import { fromBase64ToArray } from '../../session/utils/String';
+import { fromHexToArray } from '../../session/utils/String';
 
 export async function uploadAndSetOurAvatarShared({
   decryptedAvatarData,
@@ -43,10 +43,10 @@ export async function uploadAndSetOurAvatarShared({
     encryptionKey = encryptedContent.encryptionKey;
   } else {
     // if this is a reupload, reuse the current profile key. Otherwise generate a new one
-    const existingProfileKey = ourConvo.getProfileKey();
+    const existingProfileKeyHex = ourConvo.getProfileKeyHex();
     const profileKey =
-      context === 'reuploadAvatar' && existingProfileKey
-        ? fromBase64ToArray(existingProfileKey)
+      context === 'reuploadAvatar' && existingProfileKeyHex
+        ? fromHexToArray(existingProfileKeyHex)
         : randombytes_buf(32);
     encryptedData = await encryptProfile(mainAvatarDetails.outputBuffer, profileKey);
     encryptionKey = profileKey;
@@ -103,6 +103,6 @@ export async function uploadAndSetOurAvatarShared({
 
   return {
     avatarPointer: ourConvo.getAvatarPointer(),
-    profileKey: ourConvo.getProfileKey(),
+    profileKey: ourConvo.getProfileKeyHex(),
   };
 }

ts/models/conversation.ts

@@ -215,16 +215,9 @@ type SetSessionProfileReturn = {
  * We need to do some extra processing for private actions, as they have a updatedAtSeconds field.
  */
 function isSetProfileWithUpdatedAtSeconds<T extends SetSessionProfileDetails>(
-  _action: T
-): _action is Extract<T, { profileUpdatedAtSeconds: number }> {
-  /**
-   * We temporarily want to not write the profileUpdatedAtSeconds as we want this behavior to
-   * be used only once a user has updated their profile picture (and resized it).
-   */
-  window.log.debug('isSetProfileWithUpdatedAtSeconds forced to return false for now');
-  return false;
-
-  // return 'profileUpdatedAtSeconds' in action;
+  action: T
+): action is Extract<T, { profileUpdatedAtSeconds: number }> {
+  return 'profileUpdatedAtSeconds' in action;
 }
 
 /**
@@ -1545,7 +1538,7 @@ export class ConversationModel extends Model<ConversationAttributes> {
             this.getAvatarInProfilePath() ||
             this.getFallbackAvatarInProfilePath() ||
             this.getAvatarPointer() ||
-            this.getProfileKey()
+            this.getProfileKeyHex()
           ) {
             this.set({
               avatarInProfile: undefined,
@@ -1573,7 +1566,7 @@ export class ConversationModel extends Model<ConversationAttributes> {
           : to_hex(newProfile.profileKey);
 
         const existingAvatarPointer = this.getAvatarPointer();
-        const existingProfileKeyHex = this.getProfileKey();
+        const existingProfileKeyHex = this.getProfileKeyHex();
         const hasAvatarInNewProfile = !!newProfile.avatarPointer || !!newProfileKeyHex;
         // if no changes are needed, return early
         if (
@@ -1603,7 +1596,7 @@ export class ConversationModel extends Model<ConversationAttributes> {
           : to_hex(newProfile.profileKey);
 
         const existingAvatarPointer = this.getAvatarPointer();
-        const existingProfileKeyHex = this.getProfileKey();
+        const existingProfileKeyHex = this.getProfileKeyHex();
         const originalAvatar = this.getAvatarInProfilePath();
         const originalFallbackAvatar = this.getFallbackAvatarInProfilePath();
 
@@ -1730,7 +1723,7 @@ export class ConversationModel extends Model<ConversationAttributes> {
    * Returns the profile key attributes of this instance.
    * If the attribute is unset, empty, or not a string, returns `undefined`.
    */
-  public getProfileKey(): string | undefined {
+  public getProfileKeyHex(): string | undefined {
     const profileKey = this.get('profileKey');
     if (!profileKey || !isString(profileKey)) {
       return undefined;
@@ -1768,11 +1761,11 @@ export class ConversationModel extends Model<ConversationAttributes> {
     }
     const avatarPointer = this.getAvatarPointer() ?? null;
     const displayName = this.getRealSessionUsername() ?? '';
-    const profileKey = this.getProfileKey() ?? null;
+    const profileKeyHex = this.getProfileKeyHex() ?? null;
     const updatedAtSeconds = this.getProfileUpdatedSeconds();
 
     return new OutgoingUserProfile({
-      profilePic: { url: avatarPointer, key: profileKey ? from_hex(profileKey) : null },
+      profilePic: { url: avatarPointer, key: profileKeyHex ? from_hex(profileKeyHex) : null },
       displayName,
       updatedAtSeconds,
     });

ts/session/apis/file_server_api/FileServerApi.ts

@@ -20,6 +20,13 @@ import { FS, type FILE_SERVER_TARGET_TYPE } from './FileServerTarget';
 const RELEASE_VERSION_ENDPOINT = '/session_version';
 const FILE_ENDPOINT = '/file';
 
+function getShortTTLHeadersIfNeeded(): Record<string, string> {
+  if (window.sessionFeatureFlags?.fsTTL30s) {
+    return { 'X-FS-TTL': '30' };
+  }
+  return {};
+}
+
 /**
  * Upload a file to the file server v2 using the onion v4 encoding
  * @param fileContent the data to send
@@ -48,7 +55,7 @@ export const uploadFileToFsWithOnionV4 = async (
     endpoint: FILE_ENDPOINT,
     method: 'POST',
     timeoutMs: 30 * DURATION.SECONDS, // longer time for file upload
-    headers: window.sessionFeatureFlags.fsTTL30s ? { 'X-FS-TTL': '30' } : {},
+    headers: getShortTTLHeadersIfNeeded(),
   });
 
   if (!batchGlobalIsSuccess(result)) {
@@ -70,11 +77,15 @@ export const uploadFileToFsWithOnionV4 = async (
 
   // we now have the `fileUrl` provide the `serverPubkey` and the deterministic flag as an url fragment.
   const urlParams = new URLSearchParams();
-  urlParams.set(queryParamServerEd25519Pubkey, FS.FILE_SERVERS[target].edPk);
+  // Note: we don't want to set the pk for the default FS (it breaks prod builds on mobile)
+  if (target !== 'DEFAULT') {
+    urlParams.set(queryParamServerEd25519Pubkey, FS.FILE_SERVERS[target].edPk);
+  }
   if (deterministicEncryption) {
     urlParams.set(queryParamDeterministicEncryption, '');
   }
-  const fileUrl = `${FS.FILE_SERVERS[target].url}${FILE_ENDPOINT}/${fileId}#${urlParams.toString()}`;
+  const urlParamStr = urlParams.toString();
+  const fileUrl = `${FS.FILE_SERVERS[target].url}${FILE_ENDPOINT}/${fileId}${urlParamStr ? `#${urlParamStr}` : ''}`;
   const expiresMs = Math.floor(expires * 1000);
   return {
     fileUrl,
@@ -193,30 +204,24 @@ export const getLatestReleaseFromFileServer = async (
  *
  */
 export const extendFileExpiry = async (fileId: string, fsTarget: FILE_SERVER_TARGET_TYPE) => {
-  // TODO: remove this once QA is done
-
-  if (!FS.supportsFsExtend(fsTarget)) {
-    throw new Error('extendFileExpiry: only works with potato for now');
-  }
   if (window.sessionFeatureFlags?.debugServerRequests) {
     window.log.info(`about to renew expiry of file: "${fileId}"`);
   }
 
   const method = 'POST';
   const endpoint = `/file/${fileId}/extend`;
-  const params = {
+
+  const result = await OnionSending.sendJsonViaOnionV4ToFileServer({
     abortSignal: new AbortController().signal,
     endpoint,
     method,
     stringifiedBody: null,
-    headers: {},
+    headers: getShortTTLHeadersIfNeeded(),
     timeoutMs: 10 * DURATION.SECONDS,
     target: fsTarget,
-  };
-
-  const result = await OnionSending.sendJsonViaOnionV4ToFileServer(params);
+  });
 
-  if (!batchGlobalIsSuccess(result) || OnionV4.parseStatusCodeFromV4Request(result) !== 200) {
+  if (!batchGlobalIsSuccess(result)) {
     return null;
   }
 

ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts

@@ -279,7 +279,7 @@ async function scheduleAvatarDownloadJobIfNeeded(groupPk: GroupPubkeyType) {
 
     if (!profileUrl || !profileKeyHex) {
       // no avatar set for this group: make sure we also remove the one we might have locally.
-      if (conversation.getAvatarPointer() || conversation.getProfileKey()) {
+      if (conversation.getAvatarPointer() || conversation.getProfileKeyHex()) {
         await conversation.setSessionProfile({
           type: 'resetAvatarGroup',
           displayName: null,
@@ -291,7 +291,7 @@ async function scheduleAvatarDownloadJobIfNeeded(groupPk: GroupPubkeyType) {
 
     // here, an avatar for this group is set. First we need to make sure if that's the same as we already have
     const prevPointer = conversation.getAvatarPointer();
-    const prevProfileKey = conversation.getProfileKey();
+    const prevProfileKey = conversation.getProfileKeyHex();
 
     if (prevPointer !== profileUrl || prevProfileKey !== profileKeyHex) {
       // set the avatar for this group, it will be downloaded by the job scheduled below

ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts

@@ -36,7 +36,7 @@ export function shouldAddAvatarDownloadJob({ conversationId }: { conversationId:
     return false;
   }
   const prevPointer = conversation.getAvatarPointer();
-  const profileKey = conversation.getProfileKey();
+  const profileKey = conversation.getProfileKeyHex();
   const hasNoAvatar = isEmpty(prevPointer) || isEmpty(profileKey);
 
   if (hasNoAvatar) {
@@ -111,7 +111,7 @@ class AvatarDownloadJob extends PersistedJob<AvatarDownloadPersistedData> {
     }
     let changes = false;
     const toDownloadPointer = conversation.getAvatarPointer();
-    const toDownloadProfileKey = conversation.getProfileKey();
+    const toDownloadProfileKey = conversation.getProfileKeyHex();
 
     // if there is an avatar and profileKey for that user/group ('', null and undefined excluded), download, decrypt and save the avatar locally.
     if (toDownloadPointer && toDownloadProfileKey) {

ts/session/utils/job_runners/jobs/AvatarMigrateJob.ts

@@ -109,7 +109,7 @@ class AvatarMigrateJob extends PersistedJob<AvatarMigratePersistedData> {
       window.log.warn('AvatarMigrateJob: no avatar pointer found for conversation');
       return RunJobResult.Success;
     }
-    const existingProfileKeyHex = conversation.getProfileKey();
+    const existingProfileKeyHex = conversation.getProfileKeyHex();
     if (!existingProfileKeyHex) {
       window.log.warn('AvatarMigrateJob: no profileKey found for conversation');
       return RunJobResult.Success;