From cb1d74bc3d3a208aa2c4358ee34fa16eee52f00a Mon Sep 17 00:00:00 2001
From: "Destiny.Lin" <destiny.lin@fanruan.com>
Date: Mon, 26 Aug 2024 14:49:12 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-130000=20fbp=E7=9A=84fr=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=90=AF=E5=8A=A8=E5=A4=B1=E8=B4=A5=EF=BC=8C=E4=BD=86?=
 =?UTF-8?q?=E6=98=AFfbp=E8=AE=BE=E8=AE=A1=E5=99=A8=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E8=BF=98=E6=98=AF=E6=88=90=E5=8A=9F=E7=9A=84?=
 =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E7=A1=AE=E5=AE=9A=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=99=A8=E9=A1=B5=E9=9D=A2=E5=8D=A1=E6=AD=BB=20&=20REPORT-1310?=
 =?UTF-8?q?68=20=E8=BF=9C=E7=A8=8B=E8=AE=BE=E8=AE=A1=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E4=B8=8D=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/env/HttpWorkspaceConnector.java | 32 +++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/env/HttpWorkspaceConnector.java b/designer-base/src/main/java/com/fr/design/env/HttpWorkspaceConnector.java
index 3687735601..1c069bbb0e 100644
--- a/designer-base/src/main/java/com/fr/design/env/HttpWorkspaceConnector.java
+++ b/designer-base/src/main/java/com/fr/design/env/HttpWorkspaceConnector.java
@@ -4,8 +4,10 @@ import com.fanruan.workplace.http.HttpConstants;
 import com.fanruan.workplace.http.HttpServiceMap;
 import com.fanruan.workplace.http.RepositoryManager;
 import com.fanruan.workplace.http.info.Stub;
+import com.fr.exception.RemoteDesignPermissionDeniedException;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
+import com.fr.workspace.engine.exception.RemoteDesignConnectionException;
 import com.fr.workspace.server.repository.authority.RemoteAuthorityRepository;
 import com.fr.workspace.server.repository.compatible.register.CompatibleRegister;
 import com.fr.workspace.server.repository.connect.FineWorkspaceHttpClient;
@@ -43,7 +45,18 @@ public class HttpWorkspaceConnector implements WorkspaceConnector {
         FineWorkspaceHttpClient client = FineWorkspaceHttpClient.create("Http-Client", connectionInfo);
         LoginResponseInfoBean bean;
         try {
-             bean = RemoteAuthorityRepository.getInstance().login(createLoginBean(connectionInfo));
+            bean = RemoteAuthorityRepository.getInstance().login(createLoginBean(connectionInfo));
+            WorkspaceConnection connection = new WorkspaceConnection(
+                    UUID.randomUUID().toString(),
+                    connectionInfo.getUserName(),
+                    HttpConstants.AUTHORIZATION_PREFIX + bean.getAccessToken(),
+                    InetAddress.getLocalHost().getHostAddress());
+            client.updateConnection(connection);
+            // 检查远程权限
+            if (!checkRemoteAuthority(connection)) {
+                // 无权限则抛出无权限的错
+                throw new RemoteDesignPermissionDeniedException();
+            }
         } finally {
             client.closePool();
         }
@@ -71,16 +84,31 @@ public class HttpWorkspaceConnector implements WorkspaceConnector {
                     HttpConstants.AUTHORIZATION_PREFIX + bean.getAccessToken(),
                     InetAddress.getLocalHost().getHostAddress());
             client.updateConnection(connection);
+            // 检查远程权限
+            if (!checkRemoteAuthority(connection)) {
+                // 无权限则抛出无权限的错
+                throw new RemoteDesignPermissionDeniedException();
+            }
             client.startHeartBeat();
         } catch (Exception e) {
             client.closePool();
-            throw e;
+            throw new RemoteDesignConnectionException(e, StringUtils.EMPTY);
         }
         CompatibleRegister.registerCompatibleEnv();
         RepositoryManager.getInstance().clearLastPool();
         return client;
     }
 
+    private boolean checkRemoteAuthority(WorkspaceConnection connection) {
+        try {
+            return RemoteAuthorityRepository.getInstance().isRoot(connection.getUserName()) || RemoteAuthorityRepository.getInstance().hasAuthority(connection.getUserName());
+        } catch (Exception e) {
+            // 如果这里出现异常，就认为fr服务没启动
+            throw new RemoteDesignConnectionException(e, StringUtils.EMPTY);
+        }
+
+    }
+
     private LoginRequestInfoBean createLoginBean(WorkspaceConnectionInfo connectionInfo) {
         LoginRequestInfoBean bean = new LoginRequestInfoBean();
         bean.setUsername(connectionInfo.getUserName());