From 6d9af2ec1721f8b683f2fa00f5518b9a0d3828bc Mon Sep 17 00:00:00 2001
From: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com>
Date: Fri, 7 Apr 2023 16:08:31 +0400
Subject: [PATCH] xftp: use fs path when encrypting file and uploading chunks
 (#711)

---
 src/Simplex/FileTransfer/Agent.hs | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/Simplex/FileTransfer/Agent.hs b/src/Simplex/FileTransfer/Agent.hs
index 7fd6be36c..6a797fd80 100644
--- a/src/Simplex/FileTransfer/Agent.hs
+++ b/src/Simplex/FileTransfer/Agent.hs
@@ -367,12 +367,11 @@ runXFTPSndPrepareWorker c doWork = do
       SndFile {numRecipients, chunks} <-
         if status /= SFSEncrypted -- status is SFSNew or SFSEncrypting
           then do
-            let encPath = sndFileEncPath ppath
-            fsEncPath <- toFSFilePath encPath
+            fsEncPath <- toFSFilePath $ sndFileEncPath ppath
             when (status == SFSEncrypting) $
               whenM (doesFileExist fsEncPath) $ removeFile fsEncPath
             withStore' c $ \db -> updateSndFileStatus db sndFileId SFSEncrypting
-            (digest, chunkSpecsDigests) <- encryptFileForUpload sndFile encPath
+            (digest, chunkSpecsDigests) <- encryptFileForUpload sndFile fsEncPath
             withStore c $ \db -> do
               updateSndFileEncrypted db sndFileId digest chunkSpecsDigests
               getSndFile db sndFileId
@@ -384,7 +383,7 @@ runXFTPSndPrepareWorker c doWork = do
       withStore' c $ \db -> updateSndFileStatus db sndFileId SFSUploading
       where
         encryptFileForUpload :: SndFile -> FilePath -> m (FileDigest, [(XFTPChunkSpec, FileDigest)])
-        encryptFileForUpload SndFile {key, nonce, filePath} encPath = do
+        encryptFileForUpload SndFile {key, nonce, filePath} fsEncPath = do
           let fileName = takeFileName filePath
           fileSize <- fromInteger <$> getFileSize filePath
           when (fileSize > maxFileSize) $ throwError $ INTERNAL "max file size exceeded"
@@ -393,9 +392,9 @@ runXFTPSndPrepareWorker c doWork = do
               chunkSizes = prepareChunkSizes $ fileSize' + fileSizeLen + authTagSize
               chunkSizes' = map fromIntegral chunkSizes
               encSize = sum chunkSizes'
-          void $ liftError (INTERNAL . show) $ encryptFile filePath fileHdr key nonce fileSize' encSize encPath
-          digest <- liftIO $ LC.sha512Hash <$> LB.readFile encPath
-          let chunkSpecs = prepareChunkSpecs encPath chunkSizes
+          void $ liftError (INTERNAL . show) $ encryptFile filePath fileHdr key nonce fileSize' encSize fsEncPath
+          digest <- liftIO $ LC.sha512Hash <$> LB.readFile fsEncPath
+          let chunkSpecs = prepareChunkSpecs fsEncPath chunkSizes
           chunkDigests <- map FileDigest <$> mapM (liftIO . getChunkDigest) chunkSpecs
           pure (FileDigest digest, zip chunkSpecs chunkDigests)
         createChunk :: Int -> SndFileChunk -> m ()
@@ -447,9 +446,11 @@ runXFTPSndWorker c srv doWork = do
               withStore' c $ \db -> updateRcvChunkReplicaDelay db sndChunkReplicaId replicaDelay
             retryDone e = sndWorkerInternalError c sndFileId sndFileEntityId (Just filePrefixPath) (show e)
     uploadFileChunk :: SndFileChunk -> SndFileChunkReplica -> m ()
-    uploadFileChunk sndFileChunk@SndFileChunk {sndFileId, userId, chunkSpec} replica = do
+    uploadFileChunk sndFileChunk@SndFileChunk {sndFileId, userId, chunkSpec = chunkSpec@XFTPChunkSpec {filePath}} replica = do
       replica'@SndFileChunkReplica {sndChunkReplicaId} <- addRecipients sndFileChunk replica
-      agentXFTPUploadChunk c userId replica' chunkSpec
+      fsFilePath <- toFSFilePath filePath
+      let chunkSpec' = chunkSpec {filePath = fsFilePath} :: XFTPChunkSpec
+      agentXFTPUploadChunk c userId replica' chunkSpec'
       sf@SndFile {sndFileEntityId, prefixPath, chunks} <- withStore c $ \db -> do
         updateSndChunkReplicaStatus db sndChunkReplicaId SFRSUploaded
         getSndFile db sndFileId