Skip to content

HDDS-17200. Treat deleted S3 secret cache entries as absent #11812

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
jojochuang merged 1 commit into from
Oct 29, 2026
Merged

HDDS-17200. Treat deleted S3 secret cache entries as absent #11812

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
7 changes: 1 addition & 6 deletions hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/S3SecretManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,11 @@ public String getSecretString(String awsAccessKey)
"awsAccessKeyId cannot be null or empty.");
LOG.trace("Get secret for awsAccessKey:{}", awsAccessKey);

S3SecretValue cacheValue = s3SecretCache.get(awsAccessKey);
if (cacheValue != null) {
return cacheValue.getAwsSecret();
}
S3SecretValue s3Secret = s3SecretStore.getSecret(awsAccessKey);
S3SecretValue s3Secret = getSecret(awsAccessKey);
if (s3Secret == null) {
throw new OzoneSecurityException("S3 secret not found for " +
"awsAccessKeyId " + awsAccessKey, S3_SECRET_NOT_FOUND);
}
updateCache(awsAccessKey, s3Secret);
return s3Secret.getAwsSecret();
}

Expand Down
30 changes: 30 additions & 0 deletions .../src/test/java/org/apache/hadoop/ozone/om/request/s3/security/TestS3GetSecretRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package org.apache.hadoop.ozone.om.request.s3.security;

import static org.apache.hadoop.hdds.security.exception.OzoneSecurityException.ResultCodes.S3_SECRET_NOT_FOUND;
import static org.apache.hadoop.security.authentication.util.KerberosName.DEFAULT_MECHANISM;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
Expand All @@ -40,6 +41,7 @@
import java.util.Optional;
import java.util.UUID;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.security.exception.OzoneSecurityException;
import org.apache.hadoop.ipc_.RPC;
import org.apache.hadoop.ipc_.Server;
import org.apache.hadoop.ipc_.Server.Call;
Expand Down Expand Up @@ -313,6 +315,34 @@ public void testFetchSecretForRevokedUser() throws IOException {
s3GetSecretResponse.getS3SecretValue().getAwsSecret());
}

@Test
public void testGetSecretStringOfRevokedSecret() throws IOException {
when(ozoneManager.isS3Admin(ugiAlice)).thenReturn(true);
S3Secret secret = processSuccessSecretRequest(USER_ALICE, 1, true);
S3SecretManager secretManager = ozoneManager.getS3SecretManager();
assertEquals(secret.getAwsSecret(), secretManager.getSecretString(USER_ALICE));
// Keep the persisted secret until the revoke is flushed.
omMetadataManager.storeSecret(USER_ALICE, S3SecretValue.of(USER_ALICE, secret.getAwsSecret()));

OMRequest revokeRequest = OMRequest.newBuilder()
.setClientId(UUID.randomUUID().toString())
.setCmdType(Type.RevokeS3Secret)
.setRevokeS3SecretRequest(OzoneManagerProtocolProtos.RevokeS3SecretRequest.newBuilder()
.setKerberosID(USER_ALICE))
.build();
OMClientRequest request = new S3RevokeSecretRequest(revokeRequest);
request = new S3RevokeSecretRequest(request.preExecute(ozoneManager));
OMClientResponse response = request.validateAndUpdateCache(ozoneManager, 2);
assertEquals(OzoneManagerProtocolProtos.Status.OK, response.getOMResponse().getStatus());

assertTrue(secretManager.cache().get(USER_ALICE).isDeleted());
assertNotNull(omMetadataManager.getSecret(USER_ALICE));
assertNull(secretManager.getSecret(USER_ALICE));
OzoneSecurityException exception = assertThrows(OzoneSecurityException.class,
() -> secretManager.getSecretString(USER_ALICE));
assertEquals(S3_SECRET_NOT_FOUND, exception.getResult());
}

@Test
public void testGetSecretOfAnotherUserAsAdmin() throws IOException {

Expand Down