Skip to content

[stable-2.26.x] guard against misconfigured servers (e.g. max_size = 10 bytes) #2160

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.

Sign up for GitHub

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

Merged
alperozturk96 merged 1 commit into from
Oct 1, 2026
Merged

[stable-2.26.x] guard against misconfigured servers (e.g. max_size = 10 bytes) #2160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...rc/main/java/com/owncloud/android/lib/resources/files/ChunkedFileUploadRemoteOperation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ class ChunkedFileUploadRemoteOperation
return if (onWifiConnection) DEFAULT_CHUNK_SIZE else MIN_CHUNK_SIZE
}

return serverMaxChunkSize
return serverMaxChunkSize.coerceAtLeast(MIN_CHUNK_SIZE)
}

private const val ASSEMBLED_FILE_SUFFIX = "/.file"
Expand Down
20 changes: 20 additions & 0 deletions ...est/java/com/owncloud/android/lib/resources/files/ChunkedFileUploadRemoteOperationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,26 @@ class ChunkedFileUploadRemoteOperationTest {
assertEquals(chunk1.hashCode(), chunk2.hashCode())
}

@Test
fun testChunkSize() {
val min = ChunkedFileUploadRemoteOperation.MIN_CHUNK_SIZE
val default = ChunkedFileUploadRemoteOperation.DEFAULT_CHUNK_SIZE
val unknown = ChunkedFileUploadRemoteOperation.SERVER_MAX_CHUNK_SIZE_UNKNOWN

// unknown server value falls back to defaults
assertEquals(default, ChunkedFileUploadRemoteOperation.chunkSize(true, unknown))
assertEquals(min, ChunkedFileUploadRemoteOperation.chunkSize(false, unknown))
assertEquals(default, ChunkedFileUploadRemoteOperation.chunkSize(true, 0))

// misconfigured tiny server value is clamped to the minimum
assertEquals(min, ChunkedFileUploadRemoteOperation.chunkSize(true, 10))
assertEquals(min, ChunkedFileUploadRemoteOperation.chunkSize(false, min - 1))

// sane server values are used as-is
assertEquals(min, ChunkedFileUploadRemoteOperation.chunkSize(true, min))
assertEquals(100 * MB, ChunkedFileUploadRemoteOperation.chunkSize(false, 100 * MB))
}

@Test
fun testChunking() {
listOf(1 * MB, 10 * MB, 100 * MB, 1 * GB).forEach { length ->
Expand Down
Loading