Skip to content

HDDS-10371. NPE in OzoneAclUtils.isOwner #6676

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
kerneltime merged 1 commit into from
May 14, 2024
Merged

HDDS-10371. NPE in OzoneAclUtils.isOwner #6676

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
12 changes: 2 additions & 10 deletions hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneAclUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,6 @@ public static void checkAllAcls(OmMetadataReader omMetadataReader,
String bucketOwner, UserGroupInformation user, InetAddress remoteAddress,
String hostName) throws IOException {

boolean isVolOwner = isOwner(user, volOwner);

switch (resType) {
//For Volume level access we only need to check {OWNER} equal
// to Volume Owner.
Expand All @@ -100,7 +98,7 @@ public static void checkAllAcls(OmMetadataReader omMetadataReader,
// volume owner if current ugi user is volume owner else we need check
//{OWNER} equals bucket owner for bucket/key/prefix.
case PREFIX:
if (isVolOwner) {
if (isOwner(user, volOwner)) {
omMetadataReader.checkAcls(resType, storeType,
aclType, vol, bucket, key,
user, remoteAddress, hostName, true,
Expand Down Expand Up @@ -184,12 +182,6 @@ public static IAccessAuthorizer.ACLType getParentNativeAcl(

private static boolean isOwner(UserGroupInformation callerUgi,
String ownerName) {
if (ownerName == null) {
return false;
}
if (callerUgi.getShortUserName().equals(ownerName)) {
return true;
}
return false;
return ownerName != null && ownerName.equals(callerUgi.getShortUserName());
}
}