Skip to content

HDDS-3819. OzoneManager#listVolumeByUser ignores userName parameter when ACL is enabled #1087

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
smengcl merged 3 commits into from
Jun 24, 2020
Merged

HDDS-3819. OzoneManager#listVolumeByUser ignores userName parameter when ACL is enabled #1087

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f8cf4a7
Create UGI with userName as input to checkAcls.
smengcl Jun 17, 2020
9265403
Fix the existing tests to detect the bug.
smengcl Jun 17, 2020
7f4c345
Add new test cases specifically for list other users' volumes.
smengcl Jun 23, 2020
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
10 changes: 5 additions & 5 deletions hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1583,11 +1583,11 @@ private void checkAcls(ResourceType resType, StoreType store,
*
* @return true if permission granted, false if permission denied.
*/
private boolean hasAcls(ResourceType resType, StoreType store,
ACLType acl, String vol, String bucket, String key) {
private boolean hasAcls(String userName, ResourceType resType,
StoreType store, ACLType acl, String vol, String bucket, String key) {
try {
return checkAcls(resType, store, acl, vol, bucket, key,
ProtobufRpcEngine.Server.getRemoteUser(),
UserGroupInformation.createRemoteUser(userName),
ProtobufRpcEngine.Server.getRemoteIp(),
ProtobufRpcEngine.Server.getRemoteIp().getHostName(),
false);
Expand Down Expand Up @@ -1849,8 +1849,8 @@ public List<OmVolumeArgs> listVolumeByUser(String userName, String prefix,
List<OmVolumeArgs> result = new ArrayList<>();
// Filter all volumes by LIST ACL
for (OmVolumeArgs volumeArgs : listAllVolumes) {
if (hasAcls(ResourceType.VOLUME, StoreType.OZONE, ACLType.LIST,
volumeArgs.getVolume(), null, null)) {
if (hasAcls(userName, ResourceType.VOLUME, StoreType.OZONE,
ACLType.LIST, volumeArgs.getVolume(), null, null)) {
result.add(volumeArgs);
}
}
Expand Down