From b77961e19398a111adc184d980a849dacf778c62 Mon Sep 17 00:00:00 2001 From: Ashish Singhi Date: Mon, 27 Oct 2014 20:43:22 +0530 Subject: [PATCH] HBASE-12348 Add family name in audit log for addColumn, deleteColumn and modifyColumn operations --- .../apache/hadoop/hbase/security/access/AccessController.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java index 400e20a..d86a684 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java @@ -982,19 +982,20 @@ public class AccessController extends BaseMasterAndRegionObserver @Override public void preAddColumn(ObserverContext c, TableName tableName, HColumnDescriptor column) throws IOException { - requirePermission("addColumn", tableName, null, null, Action.ADMIN, Action.CREATE); + requirePermission("addColumn", tableName, column.getName(), null, Action.ADMIN, Action.CREATE); } @Override public void preModifyColumn(ObserverContext c, TableName tableName, HColumnDescriptor descriptor) throws IOException { - requirePermission("modifyColumn", tableName, null, null, Action.ADMIN, Action.CREATE); + requirePermission("modifyColumn", tableName, descriptor.getName(), null, Action.ADMIN, + Action.CREATE); } @Override public void preDeleteColumn(ObserverContext c, TableName tableName, byte[] col) throws IOException { - requirePermission("deleteColumn", tableName, null, null, Action.ADMIN, Action.CREATE); + requirePermission("deleteColumn", tableName, col, null, Action.ADMIN, Action.CREATE); } @Override @@ -2269,7 +2270,7 @@ public class AccessController extends BaseMasterAndRegionObserver final String namespace, final Quotas quotas) throws IOException { requirePermission("setNamespaceQuota", Action.ADMIN); } - + @Override public ReplicationEndpoint postCreateReplicationEndPoint( ObserverContext ctx, ReplicationEndpoint endpoint) { -- 1.9.2.msysgit.0