From 555bf7789453df73e32ea1c4be6034cf305a5dfc Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Thu, 15 Oct 2020 10:42:04 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-38872=20=E8=AE=BE=E8=AE=A1=E5=99=A8https?=
 =?UTF-8?q?=E8=AF=81=E4=B9=A6=E5=AF=86=E7=A0=81=E6=98=8E=E6=96=87=E5=AD=98?=
 =?UTF-8?q?=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/DesignerEnvManager.java  | 17 ++++-------------
 .../src/main/java/com/fr/env/RemoteEnvPane.java | 16 +++++++++++-----
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java
index 6f1c94eee..c6488d330 100644
--- a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java
+++ b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java
@@ -418,21 +418,10 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         this.isHttps = isHttps;
     }
 
-
-    public String getCertificatePath() {
-        return certificatePath;
-    }
-
-
     public void setCertificatePath(String certificatePath) {
         this.certificatePath = certificatePath;
     }
 
-
-    public String getCertificatePass() {
-        return certificatePass;
-    }
-
     public void setCertificatePass(String certificatePass) {
         this.certificatePass = certificatePass;
     }
@@ -2015,11 +2004,13 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
 
     private void writeHttpsParas(XMLPrintWriter writer) {
         writer.startTAG(CAS_PARAS);
+        // 这边的密钥path和password没有用处了 当前已经全部储存在对应的WorkspaceConnectionInfo中
+        // 把历史遗留保存的全部置为空 防止显示明文密钥 后面删除 todo
         if (StringUtils.isNotBlank(certificatePath)) {
-            writer.attr(CAS_CERTIFICATE_PATH, certificatePath);
+            writer.attr(CAS_CERTIFICATE_PATH, StringUtils.EMPTY);
         }
         if (StringUtils.isNotBlank(certificatePass)) {
-            writer.attr(CAS_CERTIFICATE_PASSWORD, certificatePass);
+            writer.attr(CAS_CERTIFICATE_PASSWORD, StringUtils.EMPTY);
         }
         if (isHttps) {
             writer.attr("enable", true);
diff --git a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java
index 4fe69e6a9..b76e06912 100644
--- a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java
+++ b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java
@@ -143,6 +143,12 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
      * https 证书路径输入框
      */
     private JPanel httpsCertFileInputPanel;
+
+    /**
+     * 当前远程工作目录是否为新创建的
+     */
+    private boolean newCreate;
+
     /**
      * 主机名，web应用，Servlet，端口监听器
      */
@@ -327,7 +333,7 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
             this.certPathInput.setText(certPath);
             this.certSecretKeyInput.setText(certSecretKey);
             this.rememberPwdCheckbox.setSelected(rememberPwd);
-
+            this.newCreate = ob.isNewCreated();
         } else {
             this.remoteWorkspaceURL = RemoteWorkspaceURL.createDefaultURL();
             this.usernameInput.setText(StringUtils.EMPTY);
@@ -335,6 +341,7 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
             this.certPathInput.setText(StringUtils.EMPTY);
             this.certSecretKeyInput.setText(StringUtils.EMPTY);
             this.rememberPwdCheckbox.setSelected(true);
+            this.newCreate = true;
         }
 
         fillRemoteEnvURLField();
@@ -366,7 +373,9 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
                 new String(this.certSecretKeyInput.getPassword()),
                 rememberPwd);
 
-        return RemoteDesignerWorkspaceInfo.create(connection);
+        RemoteDesignerWorkspaceInfo info = RemoteDesignerWorkspaceInfo.create(connection);
+        info.setNewCreated(newCreate);
+        return info;
     }
 
     @Override
@@ -567,9 +576,6 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
 
             @Override
             protected TestConnectionResult doInBackground() throws Exception {
-
-                DesignerEnvManager.getEnvManager().setCertificatePath(connection.getCertPath());
-                DesignerEnvManager.getEnvManager().setCertificatePass(connection.getCertSecretKey());
                 try {
                     return TestConnectionResult.parse(WorkContext.getConnector().testConnection(connection), connection);
                 } catch (WorkspaceAuthException ignored) {