Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Throw error when the max read amount is greater than ByteBuffer can tolerate #2911

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions Sources/NIOFileSystem/ByteCount.swift
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,21 @@ public struct ByteCount: Hashable, Sendable {
}
}

extension ByteCount {
/// A ``ByteCount`` for the maximum amount of bytes that can be written to `ByteBuffer`.
internal static var byteBufferCapacity: ByteCount {
#if arch(arm) || arch(i386) || arch(arm64_32)
// on 32-bit platforms we can't make use of a whole UInt32.max (as it doesn't fit in an Int)
let byteBufferMaxIndex = UInt32(Int.max)
#else
// on 64-bit platforms we're good
let byteBufferMaxIndex = UInt32.max
#endif

return ByteCount(bytes: Int64(byteBufferMaxIndex))
}
}

extension ByteCount: AdditiveArithmetic {
public static var zero: ByteCount { ByteCount(bytes: 0) }

Expand Down
21 changes: 17 additions & 4 deletions Sources/NIOFileSystem/FileHandleProtocol.swift
Original file line number Diff line number Diff line change
Expand Up @@ -328,10 +328,9 @@ extension ReadableFileHandleProtocol {
/// - offset: The absolute offset into the file to read from. Defaults to zero.
/// - maximumSizeAllowed: The maximum size of file to read, as a ``ByteCount``.
/// - Returns: The bytes read from the file.
/// - Throws: ``FileSystemError`` with code ``FileSystemError/Code-swift.struct/resourceExhausted`` if there
/// are more bytes to read than `maximumBytesAllowed`.
/// ``FileSystemError/Code-swift.struct/unsupported`` if file is unseekable and
/// `offset` is not 0.
/// - Throws: ``FileSystemError`` with code ``FileSystemError/Code-swift.struct/resourceExhausted``
/// if `maximumSizeAllowed` is more than can be written to `ByteBuffer`. Or if there are more bytes to read than
/// `maximumBytesAllowed`.
public func readToEnd(
fromAbsoluteOffset offset: Int64 = 0,
maximumSizeAllowed: ByteCount
Expand All @@ -340,6 +339,20 @@ extension ReadableFileHandleProtocol {
let fileSize = Int64(info.size)
let readSize = max(Int(fileSize - offset), 0)

if maximumSizeAllowed > .byteBufferCapacity {
throw FileSystemError(
code: .resourceExhausted,
message: """
The maximum size allowed (\(maximumSizeAllowed)) is more than the maximum \
amount of bytes that can be written to ByteBuffer \
(\(ByteCount.byteBufferCapacity)). You can read the file in smaller chunks by \
calling readChunks().
""",
cause: nil,
location: .here()
)
}

if readSize > maximumSizeAllowed.bytes {
throw FileSystemError(
code: .resourceExhausted,
Expand Down
15 changes: 15 additions & 0 deletions Tests/NIOFileSystemIntegrationTests/FileSystemTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -1803,6 +1803,21 @@ extension FileSystemTests {
XCTAssertEqual(byteCount, Int(size))
}
}

func testReadMoreThanByteBufferCapacity() async throws {
let path = try await self.fs.temporaryFilePath()

try await self.fs.withFileHandle(forReadingAndWritingAt: path) { fileHandle in
await XCTAssertThrowsFileSystemErrorAsync {
// Set `maximumSizeAllowed` to 1 byte more than can be written to `ByteBuffer`.
try await fileHandle.readToEnd(
maximumSizeAllowed: .byteBufferCapacity + .bytes(1)
)
} onError: { error in
XCTAssertEqual(error.code, .resourceExhausted)
}
}
}
}

#if !canImport(Darwin) && swift(<5.9.2)
Expand Down
Loading