Merge pull request #1302 from jumpserver/dev

v4.10.0

Author: baijiangjie

src/app/elements/asset-tree/asset-tree.component.html

@@ -20,7 +20,7 @@
         </span>
       </div>
       <span
-        [hidden]="!tree.open"
+        *ngIf="tree.open"
         class="tree-banner-icon-zone"
       >
         <a

src/app/elements/connect/connect-dialog/advanced-option/advanced-option.component.ts

@@ -99,6 +99,22 @@ export class ElementAdvancedOptionComponent implements OnChanges, OnInit {
           return !this.connectMethod || this.connectMethod.component !== 'tinker';
         }
       },
+      {
+        type: 'select',
+        field: 'virtualappConnectMethod',
+        options: [
+          { label: 'Web', value: 'web' },
+          ...(true ? [{ label: 'Client', value: 'client' }] : [])
+        ],
+        label: 'Virtualapp connect method',
+        value: this.setting.graphics.applet_connection_method,
+        hidden: () => {
+          if (!this._settingSvc.hasXPack()) {
+            return true;
+          }
+          return !this.connectMethod || this.connectMethod.component !== 'panda';
+        }
+      },
       {
         type: 'select',
         field: 'reusable',

src/app/elements/connect/connect-dialog/connect-dialog.component.html

@@ -39,6 +39,7 @@ <h3>{{ "Connect" | translate }} - {{ asset.name | truncatechars:30 }}</h3>
 
       <elements-connect-method
         (onDownloadRDPFile)="onConfirm(true)"
+        (onGuidePage)="onConfirm()"
         [(connectMethod)]="connectMethod"
         [account]="accountSelected"
         [connectOption]="connectOption"

src/app/elements/connect/connect-dialog/connect-method/connect-method.component.html

@@ -32,6 +32,12 @@
                  class="fa fa-arrow-circle-down question"
               ></i>
             </span>
+            <span matTooltip="{{'Client Guide'| translate}}">
+              <i (click)="ChangeToGuidePage(method)"
+                *ngIf="CanGuide(method)"
+                class="fa fa-book question"
+              ></i>
+            </span>
           </mat-radio-button>
         </mat-radio-group>
       </mat-tab>

src/app/elements/connect/connect-dialog/connect-method/connect-method.component.ts

@@ -10,6 +10,7 @@ import {AppService, I18nService, SettingService} from '@app/services';
 export class ElementConnectMethodComponent implements OnInit {
   @Output() connectMethodChange = new EventEmitter<ConnectMethod>();
   @Output() onDownloadRDPFile = new EventEmitter<ConnectMethod>();
+  @Output() onGuidePage = new EventEmitter<ConnectMethod>();
   @Input() manualAuthInfo: AuthInfo;
   @Input() connectOption: Object;
   @Input() account: Account;
@@ -26,6 +27,10 @@ export class ElementConnectMethodComponent implements OnInit {
     return this.connectOption && this.connectOption['appletConnectMethod'] === 'client';
   }
 
+  get isVirtualAppClientMethod() {
+    return this.connectOption && this.connectOption['virtualappConnectMethod'] === 'client';
+  }
+
   private _protocol: Protocol;
 
   get protocol() {
@@ -119,4 +124,19 @@ export class ElementConnectMethodComponent implements OnInit {
     this.connectMethod = method;
     this.onDownloadRDPFile.emit(this.connectMethod);
   }
+
+  CanGuide(method) {
+    if (method.type === 'virtual_app' && this.isVirtualAppClientMethod) {
+      return true;
+    }
+    return false;
+  }
+
+  ChangeToGuidePage(method) {
+    if (method.disabled) {
+      return;
+    }
+    this.connectMethod = method;
+    this.onGuidePage.emit(this.connectMethod);
+  }
 }

src/app/elements/connect/connect.component.ts

@@ -1,4 +1,4 @@
-import {Component, EventEmitter, OnDestroy, OnInit, Output} from '@angular/core';
+import {Component, EventEmitter, Input, OnDestroy, OnInit, Output} from '@angular/core';
 import 'rxjs/add/operator/toPromise';
 import {connectEvt} from '@app/globals';
 import {MatDialog} from '@angular/material';
@@ -25,6 +25,7 @@ import {ActivatedRoute} from '@angular/router';
 })
 export class ElementConnectComponent implements OnInit, OnDestroy {
   @Output() onNewView: EventEmitter<View> = new EventEmitter<View>();
+  @Input() direct: boolean = false;
   hasLoginTo = false;
 
   constructor(private _appSvc: AppService,
@@ -132,6 +133,11 @@ export class ElementConnectComponent implements OnInit, OnDestroy {
       return;
     }
 
+    if (this.direct) {
+      this._logger.debug('Direct connect');
+      return;
+    }
+
     this._logger.debug('Connect info: ', connectInfo);
 
     const connectMethod = connectInfo.connectMethod;
@@ -144,7 +150,7 @@ export class ElementConnectComponent implements OnInit, OnDestroy {
     }
 
     if (connToken.protocol === 'k8s') {
-      const url = `${window.location.protocol}//${window.location.host}/luna/k8s/${connToken.id}`;
+      const url = `${window.location.protocol}//${window.location.host}/luna/k8s/${connToken.id}?asset=${asset.id}`;
       window.open(url);
       return;
     }
@@ -210,6 +216,10 @@ export class ElementConnectComponent implements OnInit, OnDestroy {
       this._logger.debug('Not auto login');
       return false;
     }
+
+    if (this.direct) {
+      return true;
+    }
     // 验证账号是否有效
     const preAccount = preData.account;
     const account = accounts.find(item => {
@@ -250,10 +260,13 @@ export class ElementConnectComponent implements OnInit, OnDestroy {
     if (isValid) {
       return Promise.resolve(preConnectData);
     }
+
     if (this._i18n.getLangCode() === 'pt-br') {
       dialogWidth = '730px';
     }
+
     this._appSvc.connectDialogShown = true;
+
     const dialogRef = this._dialog.open(ElementConnectDialogComponent, {
       minHeight: '300px',
       height: 'auto',

src/app/elements/content/content-window/content-view/content-view.component.ts

@@ -25,6 +25,10 @@ export class ElementContentViewComponent implements OnInit {
     const {connectData} = view;
     switch (connectData.connectMethod.component) {
       case 'panda':
+        if (connectData.connectOption.virtualappConnectMethod === 'client') {
+          connector = 'nec'
+          break;
+        }
       case 'tinker':
         connector = 'lion';
         break;

src/app/elements/content/content-window/content-window.component.ts

@@ -1,6 +1,7 @@
 import {Component, ElementRef, Input, OnInit, DoCheck, ViewChild, IterableDiffers} from '@angular/core';
 import {View} from '@app/model';
 import {User} from '@app/globals';
+import {getWaterMarkContent} from '@app/utils/common';
 import {AppService, HttpService, SettingService, ViewService} from '@app/services';
 import {ActivatedRoute} from '@angular/router';
 
@@ -20,14 +21,15 @@ export class ElementContentWindowComponent implements OnInit, DoCheck {
               private _http: HttpService,
               public viewSrv: ViewService,
               private iterableDiffers: IterableDiffers,
-              private _route: ActivatedRoute
+              private _route: ActivatedRoute,
   ) {
     this.iterableDiffer = this.iterableDiffers.find([]).create();
   }
 
-  get subViews () {
+  get subViews() {
     return this.view.subViews;
   }
+
   async ngOnInit() {
     try {
       this.id = 'window-' + Math.random().toString(36).substr(2);
@@ -53,9 +55,14 @@ export class ElementContentWindowComponent implements OnInit, DoCheck {
   }
 
   createWaterMark() {
-    this._settingSvc.createWaterMarkIfNeed(
-      this.windowRef.nativeElement,
-      `${User.name}(${User.username})\n${this.view.asset.name}`
-    );
+    try {
+      const content = getWaterMarkContent(User, this.view.asset, this._settingSvc);
+      this._settingSvc.createWaterMarkIfNeed(
+        this.windowRef.nativeElement,
+        content
+      );
+    } catch (e) {
+      console.error('Error creating watermark:', e);
+    }
   }
 }

src/app/elements/content/content-window/nec/nec.component.ts

@@ -30,6 +30,8 @@ export class ElementConnectorNecComponent implements OnInit {
   token: ConnectionToken;
   showSetReusable: boolean;
   commands: Array<Command> = [];
+  isVirtualApp: boolean = false;
+  connectMethod: any;
 
   constructor(private _http: HttpService,
               private _i18n: I18nService,
@@ -42,12 +44,24 @@ export class ElementConnectorNecComponent implements OnInit {
   }
 
   async ngOnInit() {
-    const {asset, account, protocol, smartEndpoint, connectToken} = this.view;
+    const {asset, account, protocol, smartEndpoint, connectToken, connectMethod} = this.view;
     this.token = connectToken;
     this.asset = asset;
     this.account = account;
     this.protocol = protocol;
     this.endpoint = smartEndpoint;
+    this.connectMethod = connectMethod;
+
+    // 处理 panda nec connect method
+    switch (this.connectMethod['component']) {
+      case 'panda':
+        this.protocol = 'vnc';
+        this.isVirtualApp = true;
+        break;
+      default:
+        break;
+    }
+
 
     const oriHost = this.asset.address;
     this.name = `${this.asset.name}(${oriHost})`;
@@ -101,20 +115,23 @@ export class ElementConnectorNecComponent implements OnInit {
 
     this.commands = [
       {
-      title: this._i18n.instant('Connect command line') + ' (' + this._i18n.instant('Using token') + ')',
-      value: cliValue,
-      safeValue: cliSafe,
-      helpText:  this._i18n.instant('Password is token password on the table'),
-      callClient: false
-    },
-      {
+        title: this._i18n.instant('Connect command line') + ' (' + this._i18n.instant('Using token') + ')',
+        value: cliValue,
+        safeValue: cliSafe,
+        helpText: this._i18n.instant('Password is token password on the table'),
+        callClient: false
+      },
+    ];
+
+    if (!this.isVirtualApp) {
+      this.commands.push({
         title: this._i18n.instant('Connect command line') + ' (' + this._i18n.instant('Directly') + ')',
         value: cliDirect,
         safeValue: cliDirect,
         helpText: this._i18n.instant('Password is your password login to system'),
         callClient: false
-      }
-    ];
+      });
+    }
   }
 
   async reconnect() {

src/app/elements/iframe/iframe.component.ts

@@ -22,7 +22,6 @@ export class ElementIframeComponent implements OnInit, AfterViewInit, OnDestroy
   @Input() origin: string;
   @ViewChild('iFrame', {static: false}) iframeRef: ElementRef;
   @Output() onLoad: EventEmitter<Boolean> = new EventEmitter<Boolean>();
-  @Output() socketCloseEvent: EventEmitter<Boolean> = new EventEmitter<Boolean>();
   @Output() createFileConnectToken: EventEmitter<Boolean> = new EventEmitter<Boolean>();
   eventHandler: EventListenerOrEventListenerObject;
   private renewalTrigger = new Subject<void>();
@@ -47,6 +46,7 @@ export class ElementIframeComponent implements OnInit, AfterViewInit, OnDestroy
     private iframeCommunicationService: IframeCommunicationService
   ) {
   }
+
   ngOnInit() {
     this._logger.info(`IFrame URL: ${this.src}`);
 
@@ -68,7 +68,9 @@ export class ElementIframeComponent implements OnInit, AfterViewInit, OnDestroy
     this.eventHandler = function (e: any) {
       const msg = e.data;
 
-      if (msg.id !== this.id) { return; }
+      if (msg.id !== this.id) {
+        return;
+      }
 
       switch (msg.name) {
         case 'PING': {
@@ -88,11 +90,10 @@ export class ElementIframeComponent implements OnInit, AfterViewInit, OnDestroy
           if (this.view && this.view.connected) {
             this.view.connected = false;
           }
-          this.socketCloseEvent.emit(true);
           if (this.view && this.view.connectToken && this.view.connectToken.face_monitor_token) {
             this.faceService.removeMonitoringTab(this.view.id);
           }
-          this.iframeCommunicationService.sendMessage({ name: 'CLOSE' })
+          this.iframeCommunicationService.sendMessage({name: 'CLOSE'});
           break;
         case 'CONNECTED':
           this.view.connected = true;
@@ -144,7 +145,7 @@ export class ElementIframeComponent implements OnInit, AfterViewInit, OnDestroy
     // @ts-ignore
     this.ping = setInterval(() => {
       this._logger.info(`[Luna] Send PING to: ${this.id}`);
-      this.iframeWindow.postMessage({name: 'PING', id: this.id}, '*');
+      this.iframeWindow.postMessage({name: 'PING', id: this.id, protocol: this.view.protocol}, '*');
     }, 500);
 
     this.subscription = this.iframeCommunicationService.message$.subscribe((message) => {
@@ -169,7 +170,7 @@ export class ElementIframeComponent implements OnInit, AfterViewInit, OnDestroy
     if (event.data && typeof event.data === 'object') {
       this.termComp = event.data;
     }
-  }
+  };
 
   async reconnect() {
     const oldConnectToken = this.view.connectToken;
@@ -180,10 +181,10 @@ export class ElementIframeComponent implements OnInit, AfterViewInit, OnDestroy
     }
 
     // 更新当前 view 的 connectToken
-    this.src = 'about:blank';
     this.view.connectToken = newConnectToken;
 
     const url = this.src.replace(oldConnectToken.id, newConnectToken.id);
+    this.src = 'about:blank';
 
     setTimeout(() => {
       this.src = url;