From db998ca19fb002e711141a618bd94ffba65df7c5 Mon Sep 17 00:00:00 2001 From: "Evgeny @ SimpleX Chat" <259188159+evgeny-simplex@users.noreply.github.com> Date: Sat, 7 Nov 2026 16:29:06 +0000 Subject: [PATCH] xftp: limit the redirect file of a description to 4 MB (#2026) --- src/Simplex/FileTransfer/Description.hs | 5 +++-- tests/FileDescriptionTests.hs | 7 +++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Simplex/FileTransfer/Description.hs b/src/Simplex/FileTransfer/Description.hs index 22c1eff95..bfc1896fd 100644 --- a/src/Simplex/FileTransfer/Description.hs +++ b/src/Simplex/FileTransfer/Description.hs @@ -63,7 +63,7 @@ import Data.List.NonEmpty (NonEmpty (..)) import qualified Data.List.NonEmpty as L import Data.Map.Strict (Map) import qualified Data.Map.Strict as M -import Data.Maybe (fromMaybe) +import Data.Maybe (fromMaybe, isJust) import Data.String import Data.Text (Text) import Data.Text.Encoding (encodeUtf8) @@ -233,12 +233,13 @@ instance StrEncoding AFileDescription where strP = strDecode <$?> A.takeByteString validateFileDescription :: FileDescription p -> Either String (ValidFileDescription p) -validateFileDescription fd@FileDescription {size, chunks} +validateFileDescription fd@FileDescription {size, chunks, redirect} | chunkNos /= [1 .. length chunks] = Left "chunk numbers are not sequential" | chunksSize chunks /= unFileSize size = Left "chunks total size is different than file size" | any incorrectChunkSize chunks = Left "incorrect chunk size" | any (> 16) replicaCounts = Left "too many chunk replicas" | sum replicaCounts > 131072 = Left "too many file replicas" + | isJust redirect && unFileSize size > fromIntegral chunkSize3 = Left "redirect file description is too large" | otherwise = Right $ ValidFD fd where chunkNos = map (\FileChunk {chunkNo} -> chunkNo) chunks diff --git a/tests/FileDescriptionTests.hs b/tests/FileDescriptionTests.hs index 519d14496..9a4a594fd 100644 --- a/tests/FileDescriptionTests.hs +++ b/tests/FileDescriptionTests.hs @@ -12,7 +12,7 @@ import qualified Data.ByteString.Char8 as B import qualified Data.ByteString.Lazy.Char8 as LB import Data.Either (isRight) import qualified Data.Yaml as Y -import Simplex.FileTransfer.Chunks (chunkSize3, serverChunkSizes) +import Simplex.FileTransfer.Chunks (chunkSize0, chunkSize3, serverChunkSizes) import Simplex.FileTransfer.Client (prepareChunkSizes) import Simplex.FileTransfer.Crypto (sha512HashChunks) import Simplex.FileTransfer.Description @@ -35,7 +35,7 @@ fileDescriptionTests = do it "reject file description with YAML aliases" testRejectYAMLAliases it "reject file description with a long number" testRejectLongNumber it "accept file description with a number at the length limit" testAcceptMaxNumber - it "limit chunk sizes and replicas per chunk and per file" testFileDescriptionLimits + it "limit chunk sizes, replicas and redirect description size" testFileDescriptionLimits it "serialize file description" testSerializeFileDescription it "hash chunk files one at a time" testHashChunks describe "file description URIs" $ do @@ -205,6 +205,8 @@ testFileDescriptionLimits = do validateFileDescription (descriptionOf serverChunkSizes 1) `shouldSatisfy` isRight validateFileDescription (descriptionOf [chunkSize3, mb 2] 1) `shouldBe` Left "incorrect chunk size" validateFileDescription (descriptionOf [chunkSize3, mb 8] 1) `shouldBe` Left "incorrect chunk size" + validateFileDescription (redirectDesc [chunkSize3]) `shouldSatisfy` isRight + validateFileDescription (redirectDesc [chunkSize3, chunkSize0]) `shouldBe` Left "redirect file description is too large" where FileDescription {chunks = fixtureChunks} = fileDesc fixtureReplicas = concatMap (\FileChunk {replicas} -> replicas) fixtureChunks @@ -221,6 +223,7 @@ testFileDescriptionLimits = do } where chunk chunkNo sz = FileChunk {chunkNo, chunkSize = FileSize sz, digest = FileDigest "ghi", replicas = take n $ cycle fixtureReplicas} + redirectDesc sizes = (descriptionOf sizes 1 :: FileDescription 'FRecipient) {redirect = Just RedirectFileInfo {size = FileSize 1024, digest = FileDigest "abc"}} testSerializeFileDescription :: HasTestEnv => IO () testSerializeFileDescription = withRemoveTmpFile $ do