You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by vj...@apache.org on 2020/12/30 18:52:57 UTC
[hbase] branch master updated: HBASE-25441 : add security check for
some APIs in RSRpcServices (#2810)
This is an automated email from the ASF dual-hosted git repository.
vjasani pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/master by this push:
new 29a9a16 HBASE-25441 : add security check for some APIs in RSRpcServices (#2810)
29a9a16 is described below
commit 29a9a16de4199733d331746a7d1b4e6d670e55d9
Author: lujiefsi <lu...@foxmail.com>
AuthorDate: Thu Dec 31 02:52:26 2020 +0800
HBASE-25441 : add security check for some APIs in RSRpcServices (#2810)
Signed-off-by: stack <st...@apache.org>
Signed-off-by: Viraj Jasani <vj...@apache.org>
---
.../main/java/org/apache/hadoop/hbase/master/HMaster.java | 13 +++++++++++++
.../org/apache/hadoop/hbase/regionserver/RSRpcServices.java | 9 +++++++--
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index a61254f..a1e68bf 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -2785,6 +2785,19 @@ public class HMaster extends HRegionServer implements MasterServices {
}
/**
+ * Report whether this master is started
+ *
+ * This method is used for testing.
+ *
+ * @return true if master is ready to go, false if not.
+ */
+
+ @Override
+ public boolean isOnline() {
+ return serviceStarted;
+ }
+
+ /**
* Report whether this master is in maintenance mode.
*
* @return true if master is in maintenanceMode
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
index f84a6eb..78926d6 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
@@ -2345,6 +2345,7 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
@QosPriority(priority=HConstants.ADMIN_QOS)
public StopServerResponse stopServer(final RpcController controller,
final StopServerRequest request) throws ServiceException {
+ rpcPreCheck("stopServer");
requestCount.increment();
String reason = request.getReason();
regionServer.stop(reason);
@@ -2354,6 +2355,7 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
@Override
public UpdateFavoredNodesResponse updateFavoredNodes(RpcController controller,
UpdateFavoredNodesRequest request) throws ServiceException {
+ rpcPreCheck("updateFavoredNodes");
List<UpdateFavoredNodesRequest.RegionUpdateInfo> openInfoList = request.getUpdateInfoList();
UpdateFavoredNodesResponse.Builder respBuilder = UpdateFavoredNodesResponse.newBuilder();
for (UpdateFavoredNodesRequest.RegionUpdateInfo regionUpdateInfo : openInfoList) {
@@ -3774,6 +3776,7 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
RpcController controller, UpdateConfigurationRequest request)
throws ServiceException {
try {
+ requirePermission("updateConfiguration", Permission.Action.ADMIN);
this.regionServer.updateConfiguration();
} catch (Exception e) {
throw new ServiceException(e);
@@ -3806,7 +3809,8 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
@Override
public ClearRegionBlockCacheResponse clearRegionBlockCache(RpcController controller,
- ClearRegionBlockCacheRequest request) {
+ ClearRegionBlockCacheRequest request) throws ServiceException {
+ rpcPreCheck("clearRegionBlockCache");
ClearRegionBlockCacheResponse.Builder builder =
ClearRegionBlockCacheResponse.newBuilder();
CacheEvictionStatsBuilder stats = CacheEvictionStats.builder();
@@ -3933,7 +3937,8 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
@Override
@QosPriority(priority = HConstants.ADMIN_QOS)
public ClearSlowLogResponses clearSlowLogsResponses(final RpcController controller,
- final ClearSlowLogResponseRequest request) {
+ final ClearSlowLogResponseRequest request) throws ServiceException {
+ rpcPreCheck("clearSlowLogsResponses");
final NamedQueueRecorder namedQueueRecorder =
this.regionServer.getNamedQueueRecorder();
boolean slowLogsCleaned = Optional.ofNullable(namedQueueRecorder)