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 2021/01/07 13:46:45 UTC
[hbase] branch branch-2.2 updated: HBASE-25441 : add security check
for some APIs in RSRpcServices (#2829) (#2810)
This is an automated email from the ASF dual-hosted git repository.
vjasani pushed a commit to branch branch-2.2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.2 by this push:
new 493f21d HBASE-25441 : add security check for some APIs in RSRpcServices (#2829) (#2810)
493f21d is described below
commit 493f21df6cb848e1eea54ded549b2bd5dfdd2c22
Author: lujiefsi <lu...@foxmail.com>
AuthorDate: Thu Dec 31 02:56:43 2020 +0800
HBASE-25441 : add security check for some APIs in RSRpcServices (#2829) (#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 | 6 +++++-
2 files changed, 18 insertions(+), 1 deletion(-)
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 95a2e5c..80d37be 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
@@ -2856,6 +2856,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 812c324..5e2ab9b 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
@@ -2355,6 +2355,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);
@@ -2364,6 +2365,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) {
@@ -3620,6 +3622,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);
@@ -3652,7 +3655,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();