mirror
/
s3proxy
kopia lustrzana https://github.com/gaul/s3proxy
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Do not accept multipart sizes less than 5 MB 

Continue to enforce greater minimum blob sizes when storage backend
requires it.  Fixes #324.
pull/332/head
Andrew Gaul 2020-06-24 22:22:12 +09:00
rodzic 1e9c660cdf
commit 34b844fcaf
2 zmienionych plików z 9 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
src/main/java/org/gaul/s3proxy/S3ProxyHandler.java
Wyświetl plik

@ -2257,8 +2257,9 @@ public class S3ProxyHandler {
throw new S3Exception(S3ErrorCode.INVALID_PART);
}
long partSize = part.partSize();
if (partSize < blobStore.getMinimumMultipartPartSize() &&
partSize != -1 && it.hasNext()) {
if (it.hasNext() && partSize != -1 &&
(partSize < 5 * 1024 * 1024 || partSize <
blobStore.getMinimumMultipartPartSize())) {
throw new S3Exception(S3ErrorCode.ENTITY_TOO_SMALL);
}
if (part.partETag() != null &&

13
src/test/java/org/gaul/s3proxy/AwsSdkTest.java
Wyświetl plik

@ -118,6 +118,7 @@ public final class AwsSdkTest {
private static final ByteSource BYTE_SOURCE = ByteSource.wrap(new byte[1]);
private static final ClientConfiguration V2_SIGNER_CONFIG =
new ClientConfiguration().withSignerOverride("S3SignerType");
private static final long MINIMUM_MULTIPART_SIZE = 5 * 1024 * 1024;
private URI s3Endpoint;
private EndpointConfiguration s3EndpointConfig;
@ -471,7 +472,7 @@ public final class AwsSdkTest {
@Test
public void testBigMultipartUpload() throws Exception {
String key = "multipart-upload";
long partSize = context.getBlobStore().getMinimumMultipartPartSize();
long partSize = MINIMUM_MULTIPART_SIZE;
long size = partSize + 1;
ByteSource byteSource = TestUtils.randomByteSource().slice(0, size);
@ -1094,11 +1095,9 @@ public final class AwsSdkTest {
metadata));
ByteSource byteSource = TestUtils.randomByteSource().slice(
0, context.getBlobStore().getMinimumMultipartPartSize() + 1);
ByteSource byteSource1 = byteSource.slice(
0, context.getBlobStore().getMinimumMultipartPartSize());
ByteSource byteSource2 = byteSource.slice(
context.getBlobStore().getMinimumMultipartPartSize(), 1);
0, MINIMUM_MULTIPART_SIZE + 1);
ByteSource byteSource1 = byteSource.slice(0, MINIMUM_MULTIPART_SIZE);
ByteSource byteSource2 = byteSource.slice(MINIMUM_MULTIPART_SIZE, 1);
UploadPartResult part1 = client.uploadPart(new UploadPartRequest()
.withBucketName(containerName)
.withKey(blobName)
@ -1195,7 +1194,7 @@ public final class AwsSdkTest {
public void testMultipartUploadAbort() throws Exception {
String blobName = "multipart-upload-abort";
ByteSource byteSource = TestUtils.randomByteSource().slice(
0, context.getBlobStore().getMinimumMultipartPartSize());
0, MINIMUM_MULTIPART_SIZE);
InitiateMultipartUploadResult result = client.initiateMultipartUpload(
new InitiateMultipartUploadRequest(containerName, blobName));