You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by si...@apache.org on 2026/10/17 18:36:59 UTC
(ozone) 01/12: Handle missing RPC user in S3SecretRequestHelper.
This is an automated email from the ASF dual-hosted git repository.
smengcl pushed a commit to branch ozone-2.1
in repository https://gitbox.apache.org/repos/asf/ozone.git
commit c1b68c4c66f70df26113de335976c005a1e9ce4e
Author: Siyao Meng <50...@users.noreply.github.com>
AuthorDate: Tue Oct 6 16:16:27 2026 -0700
Handle missing RPC user in S3SecretRequestHelper.
Co-authored-by: Claude Opus 5.5 <no...@anthropic.com>
(cherry picked from commit f7b7985243fa461745e10d636ee46dca63fe4416)
Conflicts:
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/security/S3RevokeSTSTokenRequest.java
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/security/TestS3RevokeSTSTokenRequest.java
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/security/TestS3SecretRequestHelper.java
Co-Authored-By: Claude Opus 5.5 <no...@anthropic.com>
---
.../om/request/s3/security/OMSetSecretRequest.java | 2 +-
.../om/request/s3/security/S3GetSecretRequest.java | 2 +-
.../request/s3/security/S3RevokeSecretRequest.java | 2 +-
.../request/s3/security/S3SecretRequestHelper.java | 8 +++++-
.../s3/security/TestS3GetSecretRequest.java | 30 +++++++++++++++++++++
.../s3/security/TestS3SecretRequestHelper.java | 31 +++++++++++++++++-----
6 files changed, 65 insertions(+), 10 deletions(-)
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/security/OMSetSecretRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/security/OMSetSecretRequest.java
index 4b0fceb821a..6e79c3e14a6 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/security/OMSetSecretRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/security/OMSetSecretRequest.java
@@ -89,7 +89,7 @@ public OMRequest preExecute(OzoneManager ozoneManager) throws IOException {
}
final UserGroupInformation ugi =
- S3SecretRequestHelper.getOrCreateUgi(accessId);
+ S3SecretRequestHelper.getOrCreateUgi(ozoneManager, accessId);
// Permission check
S3SecretRequestHelper.checkAccessIdSecretOpPermission(
ozoneManager, ugi, accessId);
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/security/S3GetSecretRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/security/S3GetSecretRequest.java
index 2c698abefe0..adb0b269873 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/security/S3GetSecretRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/security/S3GetSecretRequest.java
@@ -71,7 +71,7 @@ public OMRequest preExecute(OzoneManager ozoneManager) throws IOException {
final String accessId = s3GetSecretRequest.getKerberosID();
final UserGroupInformation ugi =
- S3SecretRequestHelper.getOrCreateUgi(accessId);
+ S3SecretRequestHelper.getOrCreateUgi(ozoneManager, accessId);
// Permission check
S3SecretRequestHelper.checkAccessIdSecretOpPermission(
ozoneManager, ugi, accessId);
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/security/S3RevokeSecretRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/security/S3RevokeSecretRequest.java
index 24e9b1a3b46..24dd1f0e5e5 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/security/S3RevokeSecretRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/security/S3RevokeSecretRequest.java
@@ -54,7 +54,7 @@ public OMRequest preExecute(OzoneManager ozoneManager) throws IOException {
getOmRequest().getRevokeS3SecretRequest();
final String accessId = s3RevokeSecretRequest.getKerberosID();
final UserGroupInformation ugi =
- S3SecretRequestHelper.getOrCreateUgi(accessId);
+ S3SecretRequestHelper.getOrCreateUgi(ozoneManager, accessId);
// Permission check
S3SecretRequestHelper.checkAccessIdSecretOpPermission(
ozoneManager, ugi, accessId);
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/security/S3SecretRequestHelper.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/security/S3SecretRequestHelper.java
index 643c5e10b6e..6d3eaa6a860 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/security/S3SecretRequestHelper.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/security/S3SecretRequestHelper.java
@@ -46,11 +46,17 @@ private S3SecretRequestHelper() {
* Retrieves thread-local UGI for request or construct new one
* based on provided accessId.
*
+ * @param ozoneManager OzoneManager instance.
* @param accessId user identifier from request.
* @return {@link UserGroupInformation} instance.
+ * @throws OMException if security is enabled and the request has no RPC user.
*/
- public static UserGroupInformation getOrCreateUgi(String accessId) {
+ public static UserGroupInformation getOrCreateUgi(OzoneManager ozoneManager, String accessId) throws OMException {
final UserGroupInformation ugi = ProtobufRpcEngine.Server.getRemoteUser();
+ if (ugi == null && ozoneManager.isSecurityEnabled()) {
+ throw new OMException("S3 secret operations on accessId '" + accessId + "' require an RPC user."
+ + " Send the request over the OM RPC transport.", ResultCodes.PERMISSION_DENIED);
+ }
if (ugi == null && Strings.isNotEmpty(accessId)) {
return UserGroupInformation.createRemoteUser(accessId, KERBEROS);
} else {
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/security/TestS3GetSecretRequest.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/security/TestS3GetSecretRequest.java
index b5080d24eb1..d90c6084486 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/security/TestS3GetSecretRequest.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/security/TestS3GetSecretRequest.java
@@ -372,6 +372,36 @@ public void testGetSecretOfAnotherUserAsNonAdmin() throws IOException {
processFailedSecretRequest(USER_CAROL);
}
+ @Test
+ public void testSecretRequestsWithoutRpcUser() throws IOException {
+ // Create the secret first so that the set request passes its existence check.
+ processSuccessSecretRequest(USER_ALICE, 1, true);
+ when(ozoneManager.isSecurityEnabled()).thenReturn(true);
+ Server.getCurCall().remove();
+
+ assertPreExecuteDenied(new S3GetSecretRequest(s3GetSecretRequest(USER_ALICE)));
+ assertPreExecuteDenied(new OMSetSecretRequest(OMRequest.newBuilder()
+ .setClientId(UUID.randomUUID().toString())
+ .setCmdType(Type.SetS3Secret)
+ .setSetS3SecretRequest(OzoneManagerProtocolProtos.SetS3SecretRequest.newBuilder()
+ .setAccessId(USER_ALICE)
+ .setSecretKey("secretKey12345")
+ .build())
+ .build()));
+ assertPreExecuteDenied(new S3RevokeSecretRequest(OMRequest.newBuilder()
+ .setClientId(UUID.randomUUID().toString())
+ .setCmdType(Type.RevokeS3Secret)
+ .setRevokeS3SecretRequest(OzoneManagerProtocolProtos.RevokeS3SecretRequest.newBuilder()
+ .setKerberosID(USER_ALICE)
+ .build())
+ .build()));
+ }
+
+ private void assertPreExecuteDenied(OMClientRequest request) {
+ OMException e = assertThrows(OMException.class, () -> request.preExecute(ozoneManager));
+ assertEquals(ResultCodes.PERMISSION_DENIED, e.getResult());
+ }
+
@Test
public void testGetSecretOfAnotherUserAsS3Admin() throws IOException {
// This effectively makes alice an S3 admin.
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/security/TestS3SecretRequestHelper.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/security/TestS3SecretRequestHelper.java
index f3dc184f069..dab4d32083b 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/security/TestS3SecretRequestHelper.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/security/TestS3SecretRequestHelper.java
@@ -21,9 +21,14 @@
import static org.apache.hadoop.security.UserGroupInformation.createRemoteUser;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import org.apache.hadoop.ipc.ExternalCall;
import org.apache.hadoop.ipc.Server;
+import org.apache.hadoop.ozone.om.OzoneManager;
+import org.apache.hadoop.ozone.om.exceptions.OMException;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.authentication.util.KerberosName;
import org.junit.jupiter.api.AfterEach;
@@ -34,6 +39,7 @@ class TestS3SecretRequestHelper {
private static final String TEST_ACCESS_ID = "access/server@EXAMPLE.COM";
private UserGroupInformation testUgi;
private UserGroupInformation expectedUgi;
+ private OzoneManager ozoneManager;
@BeforeEach
void setUp() {
@@ -43,6 +49,7 @@ void setUp() {
"DEFAULT");
testUgi = createRemoteUser(TEST_ACCESS_ID, KERBEROS);
expectedUgi = createRemoteUser(TEST_ACCESS_ID, KERBEROS);
+ ozoneManager = mock(OzoneManager.class);
}
@AfterEach
@@ -51,21 +58,33 @@ void tearDown() {
}
@Test
- void testGettingUgiFromCall() {
+ void testGettingUgiFromCall() throws Exception {
Server.getCurCall().set(new StubCall(testUgi));
compareUgi(expectedUgi,
- S3SecretRequestHelper.getOrCreateUgi(TEST_ACCESS_ID));
+ S3SecretRequestHelper.getOrCreateUgi(ozoneManager, TEST_ACCESS_ID));
}
@Test
- void testGettingUgiFromAccessId() {
+ void testGettingUgiFromAccessId() throws Exception {
compareUgi(expectedUgi,
- S3SecretRequestHelper.getOrCreateUgi(TEST_ACCESS_ID));
+ S3SecretRequestHelper.getOrCreateUgi(ozoneManager, TEST_ACCESS_ID));
}
@Test
- void testGettingUgiWithNoAccessId() {
- assertNull(S3SecretRequestHelper.getOrCreateUgi(null));
+ void testGettingUgiWithNoAccessId() throws Exception {
+ assertNull(S3SecretRequestHelper.getOrCreateUgi(ozoneManager, null));
+ }
+
+ @Test
+ void testGettingUgiWithSecurityEnabled() throws Exception {
+ when(ozoneManager.isSecurityEnabled()).thenReturn(true);
+
+ OMException e = assertThrows(OMException.class,
+ () -> S3SecretRequestHelper.getOrCreateUgi(ozoneManager, TEST_ACCESS_ID));
+ assertEquals(OMException.ResultCodes.PERMISSION_DENIED, e.getResult());
+
+ Server.getCurCall().set(new StubCall(testUgi));
+ compareUgi(expectedUgi, S3SecretRequestHelper.getOrCreateUgi(ozoneManager, TEST_ACCESS_ID));
}
private static void compareUgi(UserGroupInformation expected,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org