Skip to content

HDDS-15950. Fix NPE in S3 lifecycle GET for date-based expiration #10850

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
ChenSammi merged 1 commit into from
Jul 24, 2026
+35 −2
Merged

HDDS-15950. Fix NPE in S3 lifecycle GET for date-based expiration #10850

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
5 changes: 3 additions & 2 deletions ...s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/S3LifecycleConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ private static Expiration convertFromOzoneExpiration(
if (date != null && !date.isEmpty()) {
expiration.setDate(date);
}
if (ozoneExpiration.getDays() > 0) {
if (ozoneExpiration.getDays() != null && ozoneExpiration.getDays() > 0) {
expiration.setDays(ozoneExpiration.getDays());
}

Expand All @@ -497,7 +497,8 @@ private static AbortIncompleteMultipartUpload convertFromOzoneAbortIncompleteMul

AbortIncompleteMultipartUpload abortIncompleteMultipartUpload = new AbortIncompleteMultipartUpload();

if (ozoneAbortIncompleteMultipartUpload.getDaysAfterInitiation() > 0) {
if (ozoneAbortIncompleteMultipartUpload.getDaysAfterInitiation() != null
&& ozoneAbortIncompleteMultipartUpload.getDaysAfterInitiation() > 0) {
abortIncompleteMultipartUpload.setDaysAfterInitiation(
ozoneAbortIncompleteMultipartUpload.getDaysAfterInitiation());
}
Expand Down
32 changes: 32 additions & 0 deletions ...ay/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestS3LifecycleConfigurationGet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import static java.net.HttpURLConnection.HTTP_OK;
import static org.apache.hadoop.ozone.s3.exception.S3ErrorTable.NO_SUCH_LIFECYCLE_CONFIGURATION;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.fail;

import java.io.ByteArrayInputStream;
Expand Down Expand Up @@ -124,6 +125,24 @@ public void testGetLifecycleWithBothActions() throws Exception {
.getDaysAfterInitiation().intValue());
}

@Test
public void testGetLifecycleWithDateBasedExpiration() throws Exception {
String bucketName = "bucket1";
bucketEndpoint.put(bucketName, getBodyWithDateExpiration());
Response r = bucketEndpoint.get(bucketName);

assertEquals(HTTP_OK, r.getStatus());
S3LifecycleConfiguration lcc = (S3LifecycleConfiguration) r.getEntity();
assertEquals(1, lcc.getRules().size());
S3LifecycleConfiguration.Rule rule = lcc.getRules().get(0);

assertEquals("expire-on-date", rule.getId());
assertEquals("prefix/", rule.getPrefix());
assertEquals("Enabled", rule.getStatus());
assertEquals("2044-01-19T00:00:00+00:00", rule.getExpiration().getDate());
assertNull(rule.getExpiration().getDays());
}

private static InputStream getBody() {
String xml = ("<LifecycleConfiguration xmlns=\"http://s3.amazonaws" +
".com/doc/2006-03-01/\">" +
Expand Down Expand Up @@ -153,6 +172,19 @@ private static InputStream getBodyWithAbortAction() {
return new ByteArrayInputStream(xml.getBytes(StandardCharsets.UTF_8));
}

private static InputStream getBodyWithDateExpiration() {
String xml = "<LifecycleConfiguration xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\">" +
"<Rule>" +
"<ID>expire-on-date</ID>" +
"<Prefix>prefix/</Prefix>" +
"<Status>Enabled</Status>" +
"<Expiration><Date>2044-01-19T00:00:00+00:00</Date></Expiration>" +
"</Rule>" +
"</LifecycleConfiguration>";

return new ByteArrayInputStream(xml.getBytes(StandardCharsets.UTF_8));
}

private static InputStream getBodyWithBothActions() {
String xml = "<LifecycleConfiguration xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\">" +
"<Rule>" +
Expand Down