Skip to content

HDDS-16963. Require SCM admin access for secret key rotation #11811

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
andyhuangdev wants to merge 1 commit into
base: master
Choose a base branch
from
Open

HDDS-16963. Require SCM admin access for secret key rotation #11811

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
3 changes: 2 additions & 1 deletion ...server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMSecurityProtocolServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,8 @@ private void validateSecretKeyStatus() throws SCMSecretKeyException {
}

@Override
public boolean checkAndRotate(boolean force) throws SCMSecretKeyException {
public boolean checkAndRotate(boolean force) throws IOException {
storageContainerManager.checkAdminAccess(getRpcRemoteUser(), false);
validateSecretKeyStatus();
try {
return secretKeyManager.checkAndRotate(force);
Expand Down
32 changes: 32 additions & 0 deletions ...-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,14 @@
import org.apache.hadoop.hdds.protocol.proto.SCMSecurityProtocolProtos;
import org.apache.hadoop.hdds.protocol.proto.SCMSecurityProtocolProtos.SCMGetCertResponseProto;
import org.apache.hadoop.hdds.protocolPB.SCMSecurityProtocolClientSideTranslatorPB;
import org.apache.hadoop.hdds.protocolPB.SecretKeyProtocolClientSideTranslatorPB;
import org.apache.hadoop.hdds.protocolPB.SecretKeyProtocolScmPB;
import org.apache.hadoop.hdds.scm.HddsTestUtils;
import org.apache.hadoop.hdds.scm.ScmInfo;
import org.apache.hadoop.hdds.scm.client.ScmTopologyClient;
import org.apache.hadoop.hdds.scm.protocol.ScmBlockLocationProtocol;
import org.apache.hadoop.hdds.scm.protocol.StorageContainerLocationInternalInterface;
import org.apache.hadoop.hdds.scm.proxy.SecretKeyProtocolFailoverProxyProvider;
import org.apache.hadoop.hdds.scm.server.SCMStorageConfig;
import org.apache.hadoop.hdds.scm.server.StorageContainerManager;
import org.apache.hadoop.hdds.security.SecurityConfig;
Expand Down Expand Up @@ -292,6 +295,7 @@ void testSecureScmAndOmStartupAndAccessControl() throws Exception {
assertScmIssuesCertificateOnlyToServiceUserOfRole();
assertScmAdminProtocolDeniesNonAdminUser();
assertScmAdminProtocolRejectsNonKerberosUser();
assertScmSecretKeyRotationRequiresAdmin();
assertScmSecurityProtocolRequiresAdminForScmRoleCertificate();

// Secure OM initialization against the shared SCM.
Expand Down Expand Up @@ -439,6 +443,34 @@ private void assertScmAdminProtocolRejectsNonKerberosUser() throws IOException {
.hasMessageContaining(CANNOT_AUTHENTICATE_MESSAGE);
}

/** SCM secret key protocol - rotation requires SCM admin access. */
private void assertScmSecretKeyRotationRequiresAdmin() throws Exception {
GenericTestUtils.waitFor(() -> scm.getSecretKeyManager().isInitialized(), 100, 10_000);
UserGroupInformation testUser = UserGroupInformation.loginUserFromKeytabAndReturnUGI(
getTestUserPrincipal(), getTestUserKeytab().getCanonicalPath());
UUID currentKeyId = scm.getSecretKeyManager().getCurrentSecretKey().getId();
try (SecretKeyProtocolClientSideTranslatorPB secretKeyClient = getSecretKeyClientForScm(testUser)) {
for (boolean force : new boolean[]{false, true}) {
IOException denied = assertThrows(IOException.class, () -> secretKeyClient.checkAndRotate(force));
assertThat(denied).hasMessageContaining("Access denied");
assertEquals(currentKeyId, scm.getSecretKeyManager().getCurrentSecretKey().getId());
}
}

UserGroupInformation scmUser = UserGroupInformation.loginUserFromKeytabAndReturnUGI(
conf.get(HDDS_SCM_KERBEROS_PRINCIPAL_KEY), conf.get(HDDS_SCM_KERBEROS_KEYTAB_FILE_KEY));
try (SecretKeyProtocolClientSideTranslatorPB secretKeyClient = getSecretKeyClientForScm(scmUser)) {
assertThat(secretKeyClient.checkAndRotate(true)).isTrue();
assertNotEquals(currentKeyId, scm.getSecretKeyManager().getCurrentSecretKey().getId());
}
}

private SecretKeyProtocolClientSideTranslatorPB getSecretKeyClientForScm(UserGroupInformation ugi) {
return new SecretKeyProtocolClientSideTranslatorPB(
new SecretKeyProtocolFailoverProxyProvider<>(conf, ugi, SecretKeyProtocolScmPB.class),
SecretKeyProtocolScmPB.class);
}

/**
* Secure OM initialization fails when the delegation token and secret key
* configuration don't meet requirement.
Expand Down
Loading