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

HBASE-11435 Visibility labelled cells fail to getting replicated. (Anoop)

This commit is contained in:
anoopsjohn 2014-07-01 18:34:22 +05:30
parent 0e8e41d0ef
commit ba044f010e
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -154,6 +154,8 @@ public class VisibilityController extends BaseRegionObserver implements MasterOb
private Map<InternalScanner,String> scannerOwners = private Map<InternalScanner,String> scannerOwners =
new MapMaker().weakKeys().makeMap(); new MapMaker().weakKeys().makeMap();
List<String> superUsers;
static { static {
ByteArrayOutputStream baos = new ByteArrayOutputStream(); ByteArrayOutputStream baos = new ByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(baos); DataOutputStream dos = new DataOutputStream(baos);
@ -202,6 +204,7 @@ public class VisibilityController extends BaseRegionObserver implements MasterOb
// ScanLabelGenerator to be instantiated only with Region Observer. // ScanLabelGenerator to be instantiated only with Region Observer.
scanLabelGenerators = VisibilityUtils.getScanLabelGenerators(this.conf); scanLabelGenerators = VisibilityUtils.getScanLabelGenerators(this.conf);
} }
this.superUsers = getSystemAndSuperUsers();
} }
@Override @Override
@ -652,8 +655,7 @@ public class VisibilityController extends BaseRegionObserver implements MasterOb
Put p = new Put(Bytes.toBytes(SYSTEM_LABEL_ORDINAL)); Put p = new Put(Bytes.toBytes(SYSTEM_LABEL_ORDINAL));
p.addImmutable(LABELS_TABLE_FAMILY, LABEL_QUALIFIER, Bytes.toBytes(SYSTEM_LABEL)); p.addImmutable(LABELS_TABLE_FAMILY, LABEL_QUALIFIER, Bytes.toBytes(SYSTEM_LABEL));
// Set auth for "system" label for all super users. // Set auth for "system" label for all super users.
List<String> superUsers = getSystemAndSuperUsers(); for (String superUser : this.superUsers) {
for (String superUser : superUsers) {
p.addImmutable( p.addImmutable(
LABELS_TABLE_FAMILY, Bytes.toBytes(superUser), DUMMY_VALUE, LABELS_TABLE_TAGS); LABELS_TABLE_FAMILY, Bytes.toBytes(superUser), DUMMY_VALUE, LABELS_TABLE_TAGS);
} }
@ -832,6 +834,12 @@ public class VisibilityController extends BaseRegionObserver implements MasterOb
// Checks whether cell contains any tag with type as VISIBILITY_TAG_TYPE. // Checks whether cell contains any tag with type as VISIBILITY_TAG_TYPE.
// This tag type is reserved and should not be explicitly set by user. // This tag type is reserved and should not be explicitly set by user.
private boolean checkForReservedVisibilityTagPresence(Cell cell) throws IOException { private boolean checkForReservedVisibilityTagPresence(Cell cell) throws IOException {
// Bypass this check when the operation is done by a system/super user.
// This is done because, while Replication, the Cells coming to the peer cluster with reserved
// typed tags and this is fine and should get added to the peer cluster table
if (isSystemOrSuperUser()) {
return true;
}
if (cell.getTagsLength() > 0) { if (cell.getTagsLength() > 0) {
Iterator<Tag> tagsItr = CellUtil.tagsIterator(cell.getTagsArray(), cell.getTagsOffset(), Iterator<Tag> tagsItr = CellUtil.tagsIterator(cell.getTagsArray(), cell.getTagsOffset(),
cell.getTagsLength()); cell.getTagsLength());
@ -1091,9 +1099,8 @@ public class VisibilityController extends BaseRegionObserver implements MasterOb
} }
private boolean isSystemOrSuperUser() throws IOException { private boolean isSystemOrSuperUser() throws IOException {
List<String> superUsers = getSystemAndSuperUsers();
User activeUser = getActiveUser(); User activeUser = getActiveUser();
return superUsers.contains(activeUser.getShortName()); return this.superUsers.contains(activeUser.getShortName());
} }
@Override @Override