Skip to content

HDDS-1796. Add admin access check for write opertaions in SCMClientProtocolServer and SCMBlockProtocolServer. #5203

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 18 commits into from
Sep 7, 2023
Merged

HDDS-1796. Add admin access check for write opertaions in SCMClientProtocolServer and SCMBlockProtocolServer. #5203

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
2cad7af
HDDS-1796. SCMClientProtocolServer#getContainerWithPipeline should ch…
Aug 21, 2023
08ee455
HDDS-1796. SCMClientProtocolServer#getContainerWithPipeline should ch…
Aug 23, 2023
ff4b93f
HDDS-1796. Fix for s3g secure acceptance tests failing.
Aug 24, 2023
24be0da
HDDS-1796. Fix for s3g secure acceptance tests failing.
Aug 24, 2023
b4f8d7e
HDDS-1796. Fix for s3g secure acceptance tests failing.
Aug 24, 2023
5a9a9e4
HDDS-1796. Fix for s3g secure acceptance tests failing.
Aug 24, 2023
b4ebf91
HDDS-1796. Fix for s3g secure acceptance tests failing.
Aug 25, 2023
a2af114
HDDS-1796. Fix for s3g secure acceptance tests failing.
Aug 26, 2023
adfa985
HDDS-1796. Fix for s3g secure acceptance tests failing.
Aug 26, 2023
e44f89f
HDDS-1796. Fix for s3g secure acceptance tests failing.
Aug 26, 2023
e656507
HDDS-1796. Fix for s3g secure acceptance tests failing.
Aug 28, 2023
8118063
HDDS-1796. Fix for s3g secure acceptance tests failing.
Aug 28, 2023
9d55be2
reset user in container.robot
ChenSammi Aug 29, 2023
78cb77b
HDDS-1796. Removed checkAdminAccess for some SCM APIs.
Aug 31, 2023
6a9ef65
Merge remote-tracking branch 'origin/master' into HDDS-1796
Aug 31, 2023
3c7ba63
Merge branch 'HDDS-1796' of github.com:devmadhuu/ozone into HDDS-1796
Aug 31, 2023
ee5fc9e
HDDS-1796. Removed checkAdminAccess for some SCM APIs.
Sep 6, 2023
6875544
HDDS-1796. Removed checkAdminAccess for some SCM APIs.
Sep 6, 2023
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: 6 additions & 1 deletion ...ds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMBlockProtocolServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@
import static org.apache.hadoop.hdds.scm.server.StorageContainerManager.startRpcServer;
import static org.apache.hadoop.hdds.server.ServerUtils.getRemoteUserName;
import static org.apache.hadoop.hdds.server.ServerUtils.updateRPCListenAddress;
import static org.apache.hadoop.hdds.utils.HddsServerUtil.getRemoteUser;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -177,6 +179,7 @@ public List<AllocatedBlock> allocateBlock(
ReplicationConfig replicationConfig,
String owner, ExcludeList excludeList
) throws IOException {
scm.checkAdminAccess(getRemoteUser(), false);
Map<String, String> auditMap = Maps.newHashMap();
auditMap.put("size", String.valueOf(size));
auditMap.put("num", String.valueOf(num));
Expand Down Expand Up @@ -229,6 +232,7 @@ public List<AllocatedBlock> allocateBlock(
@Override
public List<DeleteBlockGroupResult> deleteKeyBlocks(
List<BlockGroup> keyBlocksInfoList) throws IOException {
scm.checkAdminAccess(getRemoteUser(), false);
if (LOG.isDebugEnabled()) {
LOG.debug("SCM is informed by OM to delete {} blocks",
keyBlocksInfoList.size());
Expand Down Expand Up @@ -305,6 +309,7 @@ public ScmInfo getScmInfo() throws IOException {

@Override
public boolean addSCM(AddSCMRequest request) throws IOException {
scm.checkAdminAccess(getRemoteUser(), false);
LOG.debug("Adding SCM {} addr {} cluster id {}",
request.getScmId(), request.getRatisAddr(), request.getClusterId());

Expand Down Expand Up @@ -332,7 +337,7 @@ public boolean addSCM(AddSCMRequest request) throws IOException {

@Override
public List<DatanodeDetails> sortDatanodes(List<String> nodes,
String clientMachine) throws IOException {
String clientMachine) {
boolean auditSuccess = true;
try {
NodeManager nodeManager = scm.getScmNodeManager();
Expand Down
16 changes: 7 additions & 9 deletions ...s/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,8 +300,6 @@ private ContainerWithPipeline getContainerWithPipelineCommon(
@Override
public ContainerWithPipeline getContainerWithPipeline(long containerID)
throws IOException {
getScm().checkAdminAccess(null, true);

try {
ContainerWithPipeline cp = getContainerWithPipelineCommon(containerID);
AUDIT.logReadSuccess(buildAuditMessageForSuccess(
Expand Down Expand Up @@ -344,8 +342,6 @@ public List<HddsProtos.SCMContainerReplicaProto> getContainerReplicas(
@Override
public List<ContainerWithPipeline> getContainerWithPipelineBatch(
Iterable<? extends Long> containerIDs) throws IOException {
getScm().checkAdminAccess(null, true);

List<ContainerWithPipeline> cpList = new ArrayList<>();

StringBuilder strContainerIDs = new StringBuilder();
Expand All @@ -364,7 +360,6 @@ public List<ContainerWithPipeline> getContainerWithPipelineBatch(
}
}


AUDIT.logReadSuccess(buildAuditMessageForSuccess(
SCMAction.GET_CONTAINER_WITH_PIPELINE_BATCH,
Collections.singletonMap("containerIDs", strContainerIDs.toString())));
Expand All @@ -382,6 +377,7 @@ public List<ContainerWithPipeline> getExistContainerWithPipelinesInBatch(
cpList.add(cp);
} catch (IOException ex) {
//not found , just go ahead
LOG.error("Container with common pipeline not found: {}", ex);
}
}
return cpList;
Expand Down Expand Up @@ -595,7 +591,6 @@ public List<HddsProtos.Node> queryNode(
HddsProtos.NodeOperationalState opState, HddsProtos.NodeState state,
HddsProtos.QueryScope queryScope, String poolName, int clientVersion)
throws IOException {

if (queryScope == HddsProtos.QueryScope.POOL) {
throw new IllegalArgumentException("Not Supported yet");
}
Expand Down Expand Up @@ -656,6 +651,7 @@ public List<DatanodeAdminError> startMaintenanceNodes(List<String> nodes,

@Override
public void closeContainer(long containerID) throws IOException {
getScm().checkAdminAccess(getRemoteUser(), false);
final UserGroupInformation remoteUser = getRemoteUser();
final Map<String, String> auditMap = Maps.newHashMap();
auditMap.put("containerID", String.valueOf(containerID));
Expand Down Expand Up @@ -684,6 +680,7 @@ public void closeContainer(long containerID) throws IOException {
public Pipeline createReplicationPipeline(HddsProtos.ReplicationType type,
HddsProtos.ReplicationFactor factor, HddsProtos.NodePool nodePool)
throws IOException {
getScm().checkAdminAccess(getRemoteUser(), false);
Map<String, String> auditMap = Maps.newHashMap();
if (type != null) {
auditMap.put("replicationType", type.toString());
Expand Down Expand Up @@ -731,6 +728,7 @@ public void activatePipeline(HddsProtos.PipelineID pipelineID)
Map<String, String> auditMap = Maps.newHashMap();
auditMap.put("pipelineID", pipelineID.getId());
try {
getScm().checkAdminAccess(getRemoteUser(), false);
scm.getPipelineManager().activatePipeline(
PipelineID.getFromProtobuf(pipelineID));
AUDIT.logWriteSuccess(buildAuditMessageForSuccess(
Expand Down Expand Up @@ -865,6 +863,7 @@ public void transferLeadership(String newLeaderId)

public List<DeletedBlocksTransactionInfo> getFailedDeletedBlockTxn(int count,
long startTxId) throws IOException {
getScm().checkAdminAccess(getRemoteUser(), true);

@ChenSammi ChenSammi Sep 6, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This check can be removed too.

@devmadhuu devmadhuu Sep 6, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This check can be removed too.

Done.

List<DeletedBlocksTransactionInfo> result;
Map<String, String> auditMap = Maps.newHashMap();
auditMap.put("count", String.valueOf(count));
Expand Down Expand Up @@ -963,9 +962,7 @@ public boolean getReplicationManagerStatus() {
}

@Override
public ReplicationManagerReport getReplicationManagerReport()
throws IOException {
getScm().checkAdminAccess(getRemoteUser(), true);
public ReplicationManagerReport getReplicationManagerReport() {
AUDIT.logReadSuccess(buildAuditMessageForSuccess(
SCMAction.GET_REPLICATION_MANAGER_REPORT, null));
return scm.getReplicationManager().getContainerReport();
Expand Down Expand Up @@ -1328,6 +1325,7 @@ public DecommissionScmResponseProto decommissionScm(
DecommissionScmResponseProto.newBuilder();

try {
getScm().checkAdminAccess(getRemoteUser(), false);
decommissionScmResponseBuilder
.setSuccess(scm.removePeerFromHARing(scmId));
} catch (IOException ex) {
Expand Down
3 changes: 2 additions & 1 deletion hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ OZONE-SITE.XML_ozone.recon.address=recon:9891
OZONE-SITE.XML_ozone.security.enabled=true
OZONE-SITE.XML_ozone.acl.enabled=true
OZONE-SITE.XML_ozone.acl.authorizer.class=org.apache.hadoop.ozone.security.acl.OzoneNativeAuthorizer
OZONE-SITE.XML_ozone.administrators="testuser,recon"
OZONE-SITE.XML_ozone.administrators="testuser,recon,om"
OZONE-SITE.XML_ozone.s3.administrators="testuser,recon,om"
OZONE-SITE.XML_ozone.recon.administrators="testuser2"
OZONE-SITE.XML_ozone.s3.administrators="testuser,s3g"

Expand Down
3 changes: 3 additions & 0 deletions hadoop-ozone/dist/src/main/smoketest/admincli/container.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,3 +95,6 @@ Cannot close container without admin privilege

Cannot create container without admin privilege
Requires admin privilege ozone admin container create

Reset user
Run Keyword if '${SECURITY_ENABLED}' == 'true' Kinit test user testuser testuser.keytab
2 changes: 1 addition & 1 deletion hadoop-ozone/dist/src/main/smoketest/basic/links.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Verify Bucket ACL

Can follow link with read access
Execute kdestroy
Run Keyword Kinit test user testuser2 testuser2.keytab
Run Keyword Kinit test user testuser testuser.keytab

@ChenSammi ChenSammi Sep 6, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this still needed now?

@devmadhuu devmadhuu Sep 6, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes removed.

${result} = Execute And Ignore Error ozone sh key list ${target}/readable-link
Should Contain ${result} key-in-readable-bucket
${result} = Execute And Ignore Error ozone sh key list ${target}/readable-link2
Expand Down
2 changes: 2 additions & 0 deletions hadoop-ozone/dist/src/main/smoketest/basic/ozone-shell-lib.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,8 @@ Test native authorizer
Should contain ${result} PERMISSION_DENIED
${result} = Execute And Ignore Error ozone sh key list ${protocol}${server}/${volume}/bb1
Should contain ${result} PERMISSION_DENIED
Execute kdestroy
Run Keyword Kinit test user testuser2 testuser2.keytab

@ChenSammi ChenSammi Sep 6, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this still needed now?

@devmadhuu devmadhuu Sep 6, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed.

${result} = Execute And Ignore Error ozone sh volume addacl ${protocol}${server}/${volume} -a user:testuser2:xy
Should contain ${result} PERMISSION_DENIED User testuser2 doesn't have WRITE_ACL permission to access volume
Execute kdestroy
Expand Down