[inlong] branch master updated: [INLONG-7946][Manager] Add user authentication when bind clusterTag (#7947)

[dockerzhang]

This is an automated email from the ASF dual-hosted git repository.

dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new 216b9b49d [INLONG-7946][Manager] Add user authentication when bind 
clusterTag (#7947)
216b9b49d is described below

commit 216b9b49d8a3d3b01455da2b92994d68878aecc8
Author: fuweng11 <76141879+fuwen...@users.noreply.github.com>
AuthorDate: Mon May 1 15:14:14 2023 +0800

    [INLONG-7946][Manager] Add user authentication when bind clusterTag (#7947)
---
 .../manager/service/cluster/InlongClusterServiceImpl.java  | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceImpl.java
 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceImpl.java
index c1b06627a..be32bed28 100644
--- 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceImpl.java
+++ 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceImpl.java
@@ -664,6 +664,8 @@ public class InlongClusterServiceImpl implements 
InlongClusterService {
         if (CollectionUtils.isNotEmpty(request.getBindClusters())) {
             request.getBindClusters().forEach(id -> {
                 InlongClusterEntity entity = clusterMapper.selectById(id);
+                userService.checkUser(entity.getInCharges(), operator,
+                        "Current user does not have permission to bind or 
unbind cluster tag");
                 Set<String> tagSet = 
Sets.newHashSet(entity.getClusterTags().split(InlongConstants.COMMA));
                 tagSet.add(clusterTag);
                 String updateTags = Joiner.on(",").join(tagSet);
@@ -681,6 +683,10 @@ public class InlongClusterServiceImpl implements 
InlongClusterService {
         if (CollectionUtils.isNotEmpty(request.getUnbindClusters())) {
             request.getUnbindClusters().forEach(id -> {
                 InlongClusterEntity entity = clusterMapper.selectById(id);
+                String errMsg = String.format(
+                        "Current user does not have permission to bind or 
unbind cluster tag for cluster by id=%s, name=%s",
+                        entity.getId(), entity.getName());
+                userService.checkUser(entity.getInCharges(), operator, errMsg);
                 this.removeClusterTag(entity, clusterTag, operator);
             });
         }
@@ -697,6 +703,10 @@ public class InlongClusterServiceImpl implements 
InlongClusterService {
         if (CollectionUtils.isNotEmpty(request.getBindClusters())) {
             request.getBindClusters().forEach(id -> {
                 InlongClusterEntity entity = clusterMapper.selectById(id);
+                String errMsg = String.format(
+                        "Current user does not have permission to bind or 
unbind cluster tag for cluster by id=%s, name=%s",
+                        entity.getId(), entity.getName());
+                userService.checkUser(entity.getInCharges(), opInfo.getName(), 
errMsg);
                 Set<String> tagSet = 
Sets.newHashSet(entity.getClusterTags().split(InlongConstants.COMMA));
                 tagSet.add(request.getClusterTag());
                 String updateTags = Joiner.on(",").join(tagSet);
@@ -713,6 +723,10 @@ public class InlongClusterServiceImpl implements 
InlongClusterService {
         if (CollectionUtils.isNotEmpty(request.getUnbindClusters())) {
             request.getUnbindClusters().forEach(id -> {
                 InlongClusterEntity entity = clusterMapper.selectById(id);
+                String errMsg = String.format(
+                        "Current user does not have permission to bind or 
unbind cluster tag for cluster by id=%s, name=%s",
+                        entity.getId(), entity.getName());
+                userService.checkUser(entity.getInCharges(), opInfo.getName(), 
errMsg);
                 Set<String> tagSet = 
Sets.newHashSet(entity.getClusterTags().split(InlongConstants.COMMA));
                 tagSet.remove(request.getClusterTag());
                 String updateTags = Joiner.on(",").join(tagSet);