diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/DefaultScanLabelGenerator.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/DefaultScanLabelGenerator.java index f47d669..e463da1 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/DefaultScanLabelGenerator.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/DefaultScanLabelGenerator.java @@ -59,8 +59,14 @@ public class DefaultScanLabelGenerator implements ScanLabelGenerator { if (authorizations != null) { List labels = authorizations.getLabels(); String userName = user.getName(); + LOG.debug("Have " + userName + " " + user.getShortName()); List auths = this.labelsManager.getAuths(userName); - return dropLabelsNotInUserAuths(labels, auths, userName); + List passedLabels = dropLabelsNotInUserAuths(labels, auths, userName); + if (passedLabels.isEmpty()) { + userName = user.getShortName(); + auths = this.labelsManager.getAuths(userName); + return dropLabelsNotInUserAuths(labels, auths, userName); + } } return null; }