Skip to content

HBASE-26994 MasterFileSystem create directory without permission check #4391

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
merged 2 commits into from
May 8, 2022
Merged

HBASE-26994 MasterFileSystem create directory without permission check #4391

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe7bfff
fix permission bugs
skysiders May 1, 2022
93ea963
Resolving conflicts
skysiders May 1, 2022
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
23 changes: 11 additions & 12 deletions hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,16 +331,15 @@ private void checkSubDir(final Path p, final String dirPermsConfName) throws IOE
throw new IOException("HBase directory '" + p + "' creation failure.");
}
}
} else {
if (isSecurityEnabled && !dirPerms.equals(fs.getFileStatus(p).getPermission())) {
// check whether the permission match
LOG.warn("Found HBase directory permissions NOT matching expected permissions for "
+ p.toString() + " permissions=" + fs.getFileStatus(p).getPermission() + ", expecting "
+ dirPerms + ". Automatically setting the permissions. "
+ "You can change the permissions by setting \"" + dirPermsConfName
+ "\" in hbase-site.xml " + "and restarting the master");
fs.setPermission(p, dirPerms);
}
}
if (isSecurityEnabled && !dirPerms.equals(fs.getFileStatus(p).getPermission())) {
// check whether the permission match
LOG.warn("Found HBase directory permissions NOT matching expected permissions for "
+ p.toString() + " permissions=" + fs.getFileStatus(p).getPermission() + ", expecting "
+ dirPerms + ". Automatically setting the permissions. "
+ "You can change the permissions by setting \"" + dirPermsConfName
+ "\" in hbase-site.xml " + "and restarting the master");
fs.setPermission(p, dirPerms);
}
}

Expand All @@ -355,9 +354,9 @@ private void checkStagingDir() throws IOException {
if (!this.fs.mkdirs(p, HiddenDirPerms)) {
throw new IOException("Failed to create staging directory " + p.toString());
}
} else {
this.fs.setPermission(p, HiddenDirPerms);
}
this.fs.setPermission(p, HiddenDirPerms);

} catch (IOException e) {
LOG.error("Failed to create or set permission on staging directory " + p.toString());
throw new IOException(
Expand Down