Merge pull request #806 from jumpserver/dev

v3.2.0 rc1
jumpserver · Apr 13, 2023 · 9a206e1 · 9a206e1
2 parents 9836a39 + 942581a
commit 9a206e1
Show file tree

Hide file tree

Showing 9 changed files with 69 additions and 13 deletions.
diff --git a/src/app/elements/asset-tree/asset-tree.component.ts b/src/app/elements/asset-tree/asset-tree.component.ts
@@ -391,7 +391,7 @@ export class ElementAssetTreeComponent implements OnInit {
 
   onMenuConnectNewTab() {
     const node = this.rightClickSelectNode;
-    connectOnNewPage(node, false);
+    connectOnNewPage(node, 'auto');
   }
 
   onMenuFavorite() {

diff --git a/src/app/elements/connect/connect-dialog/connect-dialog.component.ts b/src/app/elements/connect/connect-dialog/connect-dialog.component.ts
@@ -38,13 +38,18 @@ export class ElementConnectDialogComponent implements OnInit {
     this.accounts = this.data.accounts;
     this.asset = this.data.asset;
     this.preConnectData = this.data.preConnectData;
-    this.protocols = this.asset.protocols || [];
+    this.protocols = this.getProtocols();
     if (this.protocols.length === 0) {
-      this.protocols = [{name: 'ssh', port: 22}];
+      this.protocols = [{name: 'ssh', port: 22, public: true, setting: {sftp_enabled: true}}];
     }
     this.setDefaults();
   }
 
+  getProtocols() {
+    const protocols = this.asset.protocols.filter((item) => item.public);
+    return protocols || [];
+  }
+
   setDefaults() {
     if (this.preConnectData) {
       this.protocol = this.protocols.find(p => p.name === this.preConnectData.protocol.name);

diff --git a/src/app/elements/connect/connect-dialog/connect-method/connect-method.component.html b/src/app/elements/connect/connect-dialog/connect-method/connect-method.component.html
@@ -27,7 +27,7 @@
             {{ method.label }}
 
             <span matTooltip="{{'Click to download rdp file'| translate}}">
-              <i *ngIf="(method.component === 'razor'|| method.component == 'tinker') && !isWebConnectMethod"
+              <i *ngIf="canDownloadRDPFile(method)"
                  (click)="downloadRDPFile(method)"
                  class="fa fa-question-circle-o question"
               ></i>

diff --git a/src/app/elements/connect/connect-dialog/connect-method/connect-method.component.ts b/src/app/elements/connect/connect-dialog/connect-method/connect-method.component.ts
@@ -29,7 +29,7 @@ export class ElementConnectMethodComponent implements OnInit {
   @Output() onDownloadRDPFile = new EventEmitter<ConnectMethod>();
   public connectMethods = [];
   public connectMethodTypes = [];
-  public isWebConnectMethod = false;
+  public isAppletClientMethod = false;
 
 
   constructor(private _i18n: I18nService,
@@ -39,7 +39,7 @@ export class ElementConnectMethodComponent implements OnInit {
 
   ngOnInit() {
     this._settingSvc.appletConnectMethod$.subscribe((state) => {
-      this.isWebConnectMethod = state === 'web';
+      this.isAppletClientMethod = state === 'client';
     });
     this.setConnectMethods();
   }
@@ -61,6 +61,9 @@ export class ElementConnectMethodComponent implements OnInit {
     if (this.protocol.name === 'oracle') {
       this.oracleFilterConnectMethods();
     }
+    if (this.protocol.name === 'ssh') {
+      this.sshFilterConnectMethods();
+    }
     this.groupConnectMethods();
     if (!this.connectMethod || !this.connectMethod.value) {
       this.connectMethod = this.connectMethods[0];
@@ -72,6 +75,12 @@ export class ElementConnectMethodComponent implements OnInit {
     this.connectMethod = this.connectMethods[0];
   }
 
+  sshFilterConnectMethods() {
+    if (!this.protocol.setting.sftp_enabled) {
+      this.connectMethods = this.connectMethods.filter((item) => (item.value !== 'web_sftp'));
+    }
+  }
+
   groupConnectMethods() {
     const connectMethodTypes = [
       {value: 'web', label: 'Web', fa: 'fa-globe', methods: []},
@@ -86,6 +95,19 @@ export class ElementConnectMethodComponent implements OnInit {
     // return connectMethodTypes;
   }
 
+  canDownloadRDPFile(method): Boolean {
+    if (!this._settingSvc.hasXPack()) {
+      return false;
+    }
+    if (method.component === 'razor') {
+      return true;
+    }
+    if (method.type === 'applet' && this.isAppletClientMethod) {
+      return true;
+    }
+    return false;
+  }
+
   downloadRDPFile(method) {
     if (method.disabled) {
       return;

diff --git a/src/app/elements/connect/connect.component.ts b/src/app/elements/connect/connect.component.ts
@@ -96,7 +96,11 @@ export class ElementConnectComponent implements OnInit, OnDestroy {
         connectInfo.account = account;
         connectInfo.protocol = {
           'name': type,
-          'port': undefined
+          'port': undefined,
+          'public': true,
+          'setting': {
+            sftp_enabled: true
+          }
         };
         connectInfo.manualAuthInfo = {
           alias: account.alias,

diff --git a/src/app/model.ts b/src/app/model.ts
@@ -389,6 +389,10 @@ export class ConnectionToken {
 export class Protocol  {
   name: string;
   port: number;
+  public: boolean;
+  setting: {
+    sftp_enabled: boolean
+  };
 }
 
 export class Endpoint {

diff --git a/src/app/services/setting.ts b/src/app/services/setting.ts
@@ -24,6 +24,7 @@ export class SettingService {
     if (settingData && typeof settingData === 'object') {
       this.setting = settingData;
       this.setIsLoadTreeAsync();
+      this.setAppletConnectMethod();
     } else {
       this.setting = new Setting();
     }

diff --git a/src/app/utils/common.ts b/src/app/utils/common.ts
@@ -250,14 +250,30 @@ export function launchLocalApp(url, fail) {
 /**
  * 打开新页卡
  * @param {Object} node
- * @param {Boolean} newWindow
+ * @param {String} newWindowMode
  */
-export function connectOnNewPage(node: TreeNode, newWindow?: boolean) {
+export function connectOnNewPage(node: TreeNode, newWindowMode?: string) {
   const url = `/luna/connect?login_to=${node.id}&type=${node.meta.type}`;
-  if (newWindow) {
-    const height = window.innerHeight;
-    const width = window.innerWidth;
-    const params = `toolbar=yes,scrollbars=yes,resizable=yes,top=300,left=300,width=${width},height=${height}`;
+  let params = 'toolbar=yes,scrollbars=yes,resizable=yes';
+  if (newWindowMode === 'auto') {
+    let count: number;
+    let top = 50;
+    count = parseInt(window.sessionStorage.getItem('newWindowCount'), 10);
+    if (isNaN(count)) {
+      count = 0;
+    }
+    let left = 100 + count * 100;
+    if (left + screen.width / 3 > screen.width) {
+      // 支持两排足以
+      top = screen.height / 3;
+      count = 1;
+      left = 100;
+    }
+    params = params + `,top=${top},left=${left},width=${screen.width / 3},height=${screen.height / 3}`;
+    window.sessionStorage.setItem('newWindowCount', `${count + 1}`);
+    window.open(url, '_blank', params);
+  } else if (newWindowMode === 'new') {
+    params = params + `,top=50,left=100,width=${window.innerWidth},height=${window.innerHeight}`;
     window.open(url, '_blank', params);
   } else {
     window.open(url, '_blank');

diff --git a/src/styles.css b/src/styles.css
@@ -90,6 +90,10 @@ body ::-webkit-scrollbar {
   height:8px;
 }
 
+body ::-webkit-scrollbar-corner {
+  background: transparent;
+}
+
 body ::-webkit-scrollbar-thumb {
   background-color: #494141;
   border-radius: 6px;