Skip to content

fix(s3): prevent compliance retention downgrade #2755

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

Open
aniketshukla1 wants to merge 2 commits into
base: main
Choose a base branch
from
+115 −3
Open

fix(s3): prevent compliance retention downgrade #2755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e91bac6
fix(s3): prevent compliance retention downgrade
aniketshukla1 Aug 30, 2026
d157e2c
fix(s3): allow updates after compliance expiry
aniketshukla1 Aug 30, 2026
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
14 changes: 12 additions & 2 deletions src/main/java/io/github/hectorvent/floci/services/s3/S3Service.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1859,9 +1859,19 @@ public void putObjectRetention(String bucketName, String key, String versionId,
.orElseThrow(() -> new AwsException("NoSuchKey",
"The specified key does not exist.", 404));

// COMPLIANCE mode: retainUntil cannot be shortened
if ("COMPLIANCE".equals(obj.getObjectLockMode())
boolean activeComplianceRetention = "COMPLIANCE".equals(obj.getObjectLockMode())
&& obj.getRetainUntilDate() != null
&& Instant.now().isBefore(obj.getRetainUntilDate());

// Active COMPLIANCE mode cannot be changed or removed, even when the
// retention date is unchanged or extended.
if (activeComplianceRetention && !"COMPLIANCE".equals(mode)) {
throw new AwsException("AccessDenied",
"COMPLIANCE retention mode cannot be changed", 403);
}

// Active COMPLIANCE mode: retainUntil cannot be shortened.
if (activeComplianceRetention
&& retainUntil != null
&& retainUntil.isBefore(obj.getRetainUntilDate())) {
throw new AwsException("AccessDenied",
Expand Down
104 changes: 103 additions & 1 deletion src/test/java/io/github/hectorvent/floci/services/s3/S3ObjectLockIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ void putObjectRetentionWithValidIsoDateReturns200() {
String body = """
<?xml version="1.0" encoding="UTF-8"?>
<Retention xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
<Mode>GOVERNANCE</Mode>
<Mode>COMPLIANCE</Mode>
<RetainUntilDate>2030-01-01T00:00:00Z</RetainUntilDate>
</Retention>
""";
Expand Down Expand Up @@ -199,6 +199,108 @@ void putObjectRetentionWithGarbageDateReturns400MalformedXml() {

@Test
@Order(14)
void putGovernanceObjectForRetentionUpgrade() {
given()
.header("x-amz-object-lock-mode", "GOVERNANCE")
.header("x-amz-object-lock-retain-until-date", "2030-01-01T00:00:00Z")
.body("governance object")
.when()
.put("/" + LOCK_BUCKET + "/governance-object.txt")
.then()
.statusCode(200);
}

@Test
@Order(15)
void governanceRetentionCanBeUpgradedToCompliance() {
String body = """
<?xml version="1.0" encoding="UTF-8"?>
<Retention xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
<Mode>COMPLIANCE</Mode>
<RetainUntilDate>2030-01-01T00:00:00Z</RetainUntilDate>
</Retention>
""";
given()
.body(body)
.when()
.put("/" + LOCK_BUCKET + "/governance-object.txt?retention")
.then()
.statusCode(200);

given()
.when()
.get("/" + LOCK_BUCKET + "/governance-object.txt?retention")
.then()
.statusCode(200)
.body(containsString("<Mode>COMPLIANCE</Mode>"));
}

@Test
@Order(16)
void complianceRetentionCannotBeDowngradedToGovernance() {
String body = """
<?xml version="1.0" encoding="UTF-8"?>
<Retention xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
<Mode>GOVERNANCE</Mode>
<RetainUntilDate>2030-01-01T00:00:00Z</RetainUntilDate>
</Retention>
""";
given()
.body(body)
.when()
.put("/" + LOCK_BUCKET + "/" + RETENTION_KEY + "?retention")
.then()
.statusCode(403)
.body(containsString("AccessDenied"));

given()
.when()
.get("/" + LOCK_BUCKET + "/" + RETENTION_KEY + "?retention")
.then()
.statusCode(200)
.body(containsString("<Mode>COMPLIANCE</Mode>"));
}

@Test
@Order(17)
void putObjectWithExpiredComplianceRetention() {
given()
.header("x-amz-object-lock-mode", "COMPLIANCE")
.header("x-amz-object-lock-retain-until-date", "2020-01-01T00:00:00Z")
.body("expired compliance object")
.when()
.put("/" + LOCK_BUCKET + "/expired-compliance-object.txt")
.then()
.statusCode(200);
}

@Test
@Order(18)
void expiredComplianceRetentionCanChangeMode() {
String body = """
<?xml version="1.0" encoding="UTF-8"?>
<Retention xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
<Mode>GOVERNANCE</Mode>
<RetainUntilDate>2030-01-01T00:00:00Z</RetainUntilDate>
</Retention>
""";
given()
.body(body)
.when()
.put("/" + LOCK_BUCKET + "/expired-compliance-object.txt?retention")
.then()
.statusCode(200);

given()
.when()
.get("/" + LOCK_BUCKET + "/expired-compliance-object.txt?retention")
.then()
.statusCode(200)
.body(containsString("<Mode>GOVERNANCE</Mode>"));
}

@Test
@Order(19)
void nonExistentBucketReturnsNoSuchBucket() {
given()
.when()
Expand Down
Loading