From b3bdd02e08844efe6ffed799ca5e5597f8c72310 Mon Sep 17 00:00:00 2001 From: John Niang Date: Thu, 1 Jun 2023 16:13:16 +0800 Subject: [PATCH] Fix incorrect setting on TTL of share URL (#39) Share URL mechanism was provided in https://github.com/halo-sigs/plugin-s3/pull/35, and I set the TTL of the URL with 5 mins incorrectly. ```release-note None ``` --- src/main/java/run/halo/s3os/S3OsAttachmentHandler.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/run/halo/s3os/S3OsAttachmentHandler.java b/src/main/java/run/halo/s3os/S3OsAttachmentHandler.java index c84a1be..d49fd93 100644 --- a/src/main/java/run/halo/s3os/S3OsAttachmentHandler.java +++ b/src/main/java/run/halo/s3os/S3OsAttachmentHandler.java @@ -120,7 +120,7 @@ public class S3OsAttachmentHandler implements AttachmentHandler { .key(objectKey) .build(); var presignedRequest = GetObjectPresignRequest.builder() - .signatureDuration(Duration.ofMinutes(5)) + .signatureDuration(ttl) .getObjectRequest(getObjectRequest) .build(); var presignedGetObjectRequest = s3Presigner.presignGetObject(presignedRequest); @@ -170,9 +170,9 @@ public class S3OsAttachmentHandler implements AttachmentHandler { var metadata = new Metadata(); metadata.setName(UUID.randomUUID().toString()); - metadata.setAnnotations( + metadata.setAnnotations(new HashMap<>( Map.of(OBJECT_KEY, objectDetail.uploadState.objectKey, Constant.EXTERNAL_LINK_ANNO_KEY, - UriUtils.encodePath(externalLink, StandardCharsets.UTF_8))); + UriUtils.encodePath(externalLink, StandardCharsets.UTF_8)))); var objectMetadata = objectDetail.objectMetadata(); var spec = new AttachmentSpec();