Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-12745 Visibility Labels: support visibility labels for user groups. (Addendum2 for BC between 0.98 and branch-1) (Anoop Sam John)

This commit is contained in:
Enis Soztutar 2015-01-26 15:58:35 -08:00
parent 5cee77a1f1
commit a84233ae35
1 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityController.java
View File

@ -827,11 +827,21 @@ public class VisibilityController extends BaseMasterAndRegionObserver implements
+ "' is not authorized to perform this action."); + "' is not authorized to perform this action.");
} }
if (AccessControlLists.isGroupPrincipal(Bytes.toString(user))) { if (AccessControlLists.isGroupPrincipal(Bytes.toString(user))) {
// For backward compatibility. Previous custom visibilityLabelService
// implementation may not have getGroupAuths
try {
this.visibilityLabelService.getClass().getDeclaredMethod("getGroupAuths",
new Class[] { String[].class, Boolean.TYPE });
} catch (SecurityException e) {
throw new AccessDeniedException("Failed to obtain getGroupAuths implementation");
} catch (NoSuchMethodException e) {
throw new AccessDeniedException(
"Get group auth is not supported in this implementation");
}
String group = AccessControlLists.getGroupName(Bytes.toString(user)); String group = AccessControlLists.getGroupName(Bytes.toString(user));
labels = this.visibilityLabelService.getGroupAuths(new String[]{group}, false); labels = this.visibilityLabelService.getGroupAuths(new String[] { group }, false);
} } else {
else { labels = this.visibilityLabelService.getAuths(user, false);
labels = this.visibilityLabelService.getUserAuths(user, false);
} }
} catch (IOException e) { } catch (IOException e) {
ResponseConverter.setControllerException(controller, e); ResponseConverter.setControllerException(controller, e);
@ -926,7 +936,20 @@ public class VisibilityController extends BaseMasterAndRegionObserver implements
if (user == null) { if (user == null) {
throw new IOException("Unable to retrieve calling user"); throw new IOException("Unable to retrieve calling user");
} }
if (!(this.visibilityLabelService.havingSystemAuth(user))) { boolean havingSystemAuth = false;
try {
this.visibilityLabelService.getClass().getDeclaredMethod("havingSystemAuth",
new Class[] { User.class });
havingSystemAuth = this.visibilityLabelService.havingSystemAuth(user);
} catch (SecurityException e) {
// Just consider this as AccessDeniedException
} catch (NoSuchMethodException e) {
// VLS not having havingSystemAuth(User) method. Go with deprecated havingSystemAuth(byte[])
// method invoke
havingSystemAuth = this.visibilityLabelService.havingSystemAuth(Bytes.toBytes(user
.getShortName()));
}
if (!havingSystemAuth) {
throw new AccessDeniedException("User '" + user.getShortName() throw new AccessDeniedException("User '" + user.getShortName()
+ "' is not authorized to perform this action."); + "' is not authorized to perform this action.");
} }