From f47f9a07909060cbbe7643bc429b9e62681e75d8 Mon Sep 17 00:00:00 2001 From: Ashish Singhi Date: Fri, 21 Nov 2014 17:50:48 +0530 Subject: [PATCH] HBASE-12552 listSnapshots should list only owned snapshots for a non-super user --- .../coprocessor/BaseMasterAndRegionObserver.java | 10 +++++++++ .../hbase/coprocessor/BaseMasterObserver.java | 10 +++++++++ .../hadoop/hbase/coprocessor/MasterObserver.java | 20 +++++++++++++++++ .../hadoop/hbase/master/MasterCoprocessorHost.java | 20 +++++++++++++++++ .../hbase/master/snapshot/SnapshotManager.java | 26 +++++++++++++++++----- .../hbase/security/access/AccessController.java | 10 +++++++++ .../hbase/coprocessor/TestMasterObserver.java | 25 +++++++++++++++++++++ 7 files changed, 116 insertions(+), 5 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterAndRegionObserver.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterAndRegionObserver.java index a6b9d84..51d1304 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterAndRegionObserver.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterAndRegionObserver.java @@ -373,6 +373,16 @@ public abstract class BaseMasterAndRegionObserver extends BaseRegionObserver } @Override + public void preListSnapshot(final ObserverContext ctx, + final SnapshotDescription snapshot) throws IOException { + } + + @Override + public void postListSnapshot(final ObserverContext ctx, + final SnapshotDescription snapshot) throws IOException { + } + + @Override public void preCloneSnapshot(final ObserverContext ctx, final SnapshotDescription snapshot, final HTableDescriptor hTableDescriptor) throws IOException { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterObserver.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterObserver.java index b09341d..dd92428 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterObserver.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterObserver.java @@ -366,6 +366,16 @@ public class BaseMasterObserver implements MasterObserver { } @Override + public void preListSnapshot(final ObserverContext ctx, + final SnapshotDescription snapshot) throws IOException { + } + + @Override + public void postListSnapshot(final ObserverContext ctx, + final SnapshotDescription snapshot) throws IOException { + } + + @Override public void preCloneSnapshot(final ObserverContext ctx, final SnapshotDescription snapshot, final HTableDescriptor hTableDescriptor) throws IOException { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java index e975d0f..4a57b2a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java @@ -598,6 +598,26 @@ public interface MasterObserver extends Coprocessor { throws IOException; /** + * Called before listSnapshots request has been processed. + * It can't bypass the default action, e.g., ctx.bypass() won't have effect. + * @param ctx the environment to interact with the framework and master + * @param snapshot the SnapshotDescriptor of the snapshot to list + * @throws IOException + */ + void preListSnapshot(final ObserverContext ctx, + final SnapshotDescription snapshot) throws IOException; + + /** + * Called after listSnapshots request has been processed. + * It can't bypass the default action, e.g., ctx.bypass() won't have effect. + * @param ctx the environment to interact with the framework and master + * @param snapshot the SnapshotDescriptor of the snapshot to list + * @throws IOException + */ + void postListSnapshot(final ObserverContext ctx, + final SnapshotDescription snapshot) throws IOException; + + /** * Called before a snapshot is cloned. * Called as part of restoreSnapshot RPC call. * It can't bypass the default action, e.g., ctx.bypass() won't have effect. diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterCoprocessorHost.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterCoprocessorHost.java index 28aab61..1bc5f60 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterCoprocessorHost.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterCoprocessorHost.java @@ -717,6 +717,26 @@ public class MasterCoprocessorHost }); } + public void preListSnapshot(final SnapshotDescription snapshot) throws IOException { + execOperation(coprocessors.isEmpty() ? null : new CoprocessorOperation() { + @Override + public void call(MasterObserver oserver, ObserverContext ctx) + throws IOException { + oserver.preListSnapshot(ctx, snapshot); + } + }); + } + + public void postListSnapshot(final SnapshotDescription snapshot) throws IOException { + execOperation(coprocessors.isEmpty() ? null : new CoprocessorOperation() { + @Override + public void call(MasterObserver oserver, ObserverContext ctx) + throws IOException { + oserver.postListSnapshot(ctx, snapshot); + } + }); + } + public void preCloneSnapshot(final SnapshotDescription snapshot, final HTableDescriptor hTableDescriptor) throws IOException { execOperation(coprocessors.isEmpty() ? null : new CoprocessorOperation() { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java index 5099cc5..65c7670 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java @@ -31,19 +31,19 @@ import java.util.concurrent.ThreadPoolExecutor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.Stoppable; import org.apache.hadoop.hbase.MetaTableAccessor; +import org.apache.hadoop.hbase.Stoppable; +import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.client.TableState; import org.apache.hadoop.hbase.errorhandling.ForeignException; import org.apache.hadoop.hbase.executor.ExecutorService; @@ -65,7 +65,7 @@ import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Type; -import org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos; +import org.apache.hadoop.hbase.security.AccessDeniedException; import org.apache.hadoop.hbase.security.User; import org.apache.hadoop.hbase.snapshot.ClientSnapshotDescriptionUtils; import org.apache.hadoop.hbase.snapshot.HBaseSnapshotException; @@ -214,6 +214,7 @@ public class SnapshotManager extends MasterProcedureManager implements Stoppable // ignore all the snapshots in progress FileStatus[] snapshots = fs.listStatus(snapshotDir, new SnapshotDescriptionUtils.CompletedSnaphotDirectoriesFilter(fs)); + MasterCoprocessorHost cpHost = master.getMasterCoprocessorHost(); // loop through all the completed snapshots for (FileStatus snapshot : snapshots) { Path info = new Path(snapshot.getPath(), SnapshotDescriptionUtils.SNAPSHOTINFO_FILE); @@ -226,7 +227,22 @@ public class SnapshotManager extends MasterProcedureManager implements Stoppable try { in = fs.open(info); SnapshotDescription desc = SnapshotDescription.parseFrom(in); + if (cpHost != null) { + try { + cpHost.preListSnapshot(desc); + } catch (AccessDeniedException e) { + LOG.warn("Current user does not have access to " + desc.getName() + " snapshot. " + + "Either you should be owner of this snapshot or admin user."); + // Skip this and try for next snapshot + continue; + } + } snapshotDescs.add(desc); + + // call coproc post hook + if (cpHost != null) { + cpHost.postListSnapshot(desc); + } } catch (IOException e) { LOG.warn("Found a corrupted snapshot " + snapshot.getPath(), e); } finally { 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 e665887..0af660d 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 @@ -1104,6 +1104,16 @@ public class AccessController extends BaseMasterAndRegionObserver } @Override + public void preListSnapshot(ObserverContext ctx, + final SnapshotDescription snapshot) throws IOException { + if (SnapshotDescriptionUtils.isSnapshotOwner(snapshot, getActiveUser())) { + // list it, if user is the owner of snapshot + } else { + requirePermission("listSnapshot", Action.ADMIN); + } + } + + @Override public void preCloneSnapshot(final ObserverContext ctx, final SnapshotDescription snapshot, final HTableDescriptor hTableDescriptor) throws IOException { diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java index 0e54782..d60ab33 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java @@ -122,6 +122,8 @@ public class TestMasterObserver { private boolean stopCalled; private boolean preSnapshotCalled; private boolean postSnapshotCalled; + private boolean preListSnapshotCalled; + private boolean postListSnapshotCalled; private boolean preCloneSnapshotCalled; private boolean postCloneSnapshotCalled; private boolean preRestoreSnapshotCalled; @@ -192,6 +194,8 @@ public class TestMasterObserver { postBalanceSwitchCalled = false; preSnapshotCalled = false; postSnapshotCalled = false; + preListSnapshotCalled = false; + postListSnapshotCalled = false; preCloneSnapshotCalled = false; postCloneSnapshotCalled = false; preRestoreSnapshotCalled = false; @@ -706,6 +710,22 @@ public class TestMasterObserver { } @Override + public void preListSnapshot(final ObserverContext ctx, + final SnapshotDescription snapshot) throws IOException { + preListSnapshotCalled = true; + } + + @Override + public void postListSnapshot(final ObserverContext ctx, + final SnapshotDescription snapshot) throws IOException { + postListSnapshotCalled = true; + } + + public boolean wasListSnapshotCalled() { + return preListSnapshotCalled && postListSnapshotCalled; + } + + @Override public void preCloneSnapshot(final ObserverContext ctx, final SnapshotDescription snapshot, final HTableDescriptor hTableDescriptor) throws IOException { @@ -1305,6 +1325,11 @@ public class TestMasterObserver { assertTrue("Coprocessor should have been called on snapshot", cp.wasSnapshotCalled()); + //Test list operation + admin.listSnapshots(); + assertTrue("Coprocessor should have been called on snapshot list", + cp.wasListSnapshotCalled()); + // Test clone operation admin.cloneSnapshot(TEST_SNAPSHOT, TEST_CLONE); assertTrue("Coprocessor should have been called on snapshot clone", -- 1.9.2.msysgit.0