Skip to content
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
2 changes: 2 additions & 0 deletions src/main/java/run/halo/s3os/S3OsAttachmentHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import run.halo.app.extension.MetadataUtil;
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
import software.amazon.awssdk.awscore.presigner.SdkPresigner;
import software.amazon.awssdk.core.checksums.RequestChecksumCalculation;
import software.amazon.awssdk.core.SdkResponse;
import software.amazon.awssdk.core.sync.RequestBody;
import software.amazon.awssdk.http.SdkHttpResponse;
Expand Down Expand Up @@ -309,6 +310,7 @@ Attachment buildAttachment(S3OsProperties properties, ObjectDetail objectDetail)
S3Client buildS3Client(S3OsProperties properties) {
var builder = S3Client.builder()
.region(Region.of(properties.getRegion()))
.requestChecksumCalculation(RequestChecksumCalculation.WHEN_REQUIRED)
.endpointOverride(
URI.create(properties.getEndpointProtocol() + "://" + properties.getEndpoint()))
.credentialsProvider(() -> AwsBasicCredentials.create(properties.getAccessKey(),
Expand Down
51 changes: 51 additions & 0 deletions src/test/java/run/halo/s3os/S3OsAttachmentHandlerTest.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package run.halo.s3os;

import com.sun.net.httpserver.Headers;
import com.sun.net.httpserver.HttpServer;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.core.io.buffer.DataBuffer;
Expand All @@ -11,11 +13,15 @@
import run.halo.app.core.extension.attachment.Policy;
import run.halo.app.extension.ConfigMap;
import run.halo.app.extension.Metadata;
import software.amazon.awssdk.core.sync.RequestBody;
import software.amazon.awssdk.services.s3.model.UploadPartRequest;

import java.net.InetSocketAddress;
import java.net.URI;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicReference;

import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.jupiter.api.Assertions.assertEquals;
Expand Down Expand Up @@ -49,6 +55,47 @@ void acceptHandlingWhenPolicyTemplateIsExpected() {
assertFalse(handler.shouldHandle(null));
}

@Test
void buildS3ClientShouldNotSendOptionalChecksumHeadersForUploadPart() throws Exception {
var headersRef = new AtomicReference<Headers>();
var server = HttpServer.create(new InetSocketAddress("localhost", 0), 0);
server.createContext("/", exchange -> {
headersRef.set(exchange.getRequestHeaders());
exchange.getRequestBody().transferTo(java.io.OutputStream.nullOutputStream());
exchange.getResponseHeaders().add("ETag", "\"etag\"");
exchange.sendResponseHeaders(200, -1);
exchange.close();
});
server.start();
try {
var properties = new S3OsProperties();
properties.setBucket("bucket");
properties.setEndpointProtocol(S3OsProperties.Protocol.http);
properties.setEndpoint("localhost:" + server.getAddress().getPort());
properties.setAccessKey("access-key");
properties.setAccessSecret("secret-key");
properties.setRegion("us-east-1");
properties.setEnablePathStyleAccess(true);

try (var client = handler.buildS3Client(properties)) {
client.uploadPart(UploadPartRequest.builder()
.bucket(properties.getBucket())
.key("halo.txt")
.uploadId("upload-id")
.partNumber(1)
.contentLength(5L)
.build(),
RequestBody.fromString("hello"));
}

var headers = headersRef.get();
assertFalse(hasHeader(headers, "x-amz-sdk-checksum-algorithm"));
assertFalse(hasHeader(headers, "x-amz-checksum-crc32"));
} finally {
server.stop(0);
}
}

@Test
void reshapeDataBufferWithSmallerBufferSize() {
var handler = new S3OsAttachmentHandler();
Expand Down Expand Up @@ -209,4 +256,8 @@ static Attachment createAttachment(String mediaType, String permalink) {
return attachment;
}

private static boolean hasHeader(Headers headers, String name) {
return headers.keySet().stream().anyMatch(name::equalsIgnoreCase);
}

}