NAS-133730 / 25.04 / Add VNC Password field to Instances (#11379)

src/app/interfaces/virtualization.interface.ts

@@ -39,6 +39,7 @@ export interface VirtualizationInstance {
   image: VirtualizationImage;
   vnc_enabled: boolean;
   vnc_port: number | null;
+  vnc_password: string | null;
 }
 
 export interface VirtualizationAlias {
@@ -66,6 +67,7 @@ export interface CreateVirtualizationInstance {
    * Value must be greater or equal to 5900 and lesser or equal to 65535
    */
   vnc_port?: number | null;
+  vnc_password?: string | null;
 }
 
 export interface UpdateVirtualizationInstance {
@@ -75,6 +77,7 @@ export interface UpdateVirtualizationInstance {
   memory?: number;
   enable_vnc?: boolean;
   vnc_port?: number | null;
+  vnc_password?: string | null;
 }
 
 export type VirtualizationDevice =

src/app/pages/virtualization/components/all-instances/instance-details/instance-general-info/instance-edit-form/instance-edit-form.component.html

@@ -28,20 +28,28 @@
     @if (isVm) {
       <ix-fieldset [title]="'VNC' | translate">
 
-        <ix-checkbox
-          formControlName="enable_vnc"
-          [label]="'Enable VNC' | translate"
-          [matTooltip]="isStopped ? '' : ('Instance must be stopped to update VNC.' | translate)"
-        ></ix-checkbox>
+        <div [matTooltip]="isStopped ? '' : ('Instance must be stopped to update VNC.' | translate)">
+          <ix-checkbox
+            formControlName="enable_vnc"
+            [label]="'Enable VNC' | translate"
+          ></ix-checkbox>
 
-        @if (form.value.enable_vnc) {
-          <ix-input
-            formControlName="vnc_port"
-            type="number"
-            [label]="'VNC Port' | translate"
-            [required]="true"
-          ></ix-input>
-        }
+          @if (form.getRawValue().enable_vnc) {
+            <ix-input
+              formControlName="vnc_port"
+              type="number"
+              [label]="'VNC Port' | translate"
+              [required]="true"
+            ></ix-input>
+
+            <ix-input
+              formControlName="vnc_password"
+              type="password"
+              [label]="'VNC Password' | translate"
+              [hint]="'VNC password is not cryptographically secure. You should not rely on it as a single authentication mechanism for your VMs.' | translate"
+            ></ix-input>
+          }
+        </div>
       </ix-fieldset>
     }
 

src/app/pages/virtualization/components/all-instances/instance-details/instance-general-info/instance-edit-form/instance-edit-form.component.spec.ts

@@ -36,6 +36,7 @@ describe('InstanceEditFormComponent', () => {
     vnc_enabled: true,
     vnc_port: 9001,
     status: VirtualizationStatus.Stopped,
+    vnc_password: null,
   } as VirtualizationInstance;
 
   const createComponent = createComponentFactory({
@@ -59,6 +60,7 @@ describe('InstanceEditFormComponent', () => {
                 environment: {},
                 enable_vnc: true,
                 vnc_port: 9000,
+                vnc_password: 'testing',
               },
             })),
           ),
@@ -85,6 +87,7 @@ describe('InstanceEditFormComponent', () => {
         'CPU Configuration': '1-3',
         'Memory Size': '2 GiB',
         'VNC Port': '9001',
+        'VNC Password': '',
       });
     });
 
@@ -94,6 +97,7 @@ describe('InstanceEditFormComponent', () => {
         'CPU Configuration': '2-5',
         'Memory Size': '1 GiB',
         'VNC Port': 9000,
+        'VNC Password': 'testing',
       });
 
       const saveButton = await loader.getHarness(MatButtonHarness.with({ text: 'Save' }));
@@ -106,6 +110,7 @@ describe('InstanceEditFormComponent', () => {
         environment: {},
         enable_vnc: true,
         vnc_port: 9000,
+        vnc_password: 'testing',
       }]);
       expect(spectator.inject(DialogService).jobDialog).toHaveBeenCalled();
       expect(spectator.inject(SnackbarService).success).toHaveBeenCalled();
@@ -118,6 +123,7 @@ describe('InstanceEditFormComponent', () => {
           environment: {},
           enable_vnc: true,
           vnc_port: 9000,
+          vnc_password: 'testing',
         },
         error: false,
       });

src/app/pages/virtualization/components/all-instances/instance-details/instance-general-info/instance-edit-form/instance-edit-form.component.ts

@@ -78,6 +78,7 @@ export class InstanceEditFormComponent {
     memory: [null as number | null],
     enable_vnc: [false],
     vnc_port: [defaultVncPort, [Validators.required, Validators.min(5900), Validators.max(65535)]],
+    vnc_password: [null as string],
     environmentVariables: new FormArray<InstanceEnvVariablesFormGroup>([]),
   });
 
@@ -104,6 +105,7 @@ export class InstanceEditFormComponent {
       memory: this.editingInstance.memory,
       enable_vnc: this.editingInstance.vnc_enabled,
       vnc_port: this.editingInstance.vnc_port,
+      vnc_password: this.editingInstance.vnc_password,
     });
 
     this.setVncControls();
@@ -115,6 +117,10 @@ export class InstanceEditFormComponent {
 
   protected onSubmit(): void {
     const payload = this.getSubmissionPayload();
+    if (!payload.enable_vnc) {
+      delete payload.vnc_port;
+      delete payload.vnc_password;
+    }
     const job$ = this.api.job('virt.instance.update', [this.editingInstance.id, payload]);
 
     this.dialogService.jobDialog(job$, {
@@ -156,6 +162,7 @@ export class InstanceEditFormComponent {
       memory: values.memory,
       enable_vnc: values.enable_vnc,
       vnc_port: values.enable_vnc ? values.vnc_port || defaultVncPort : null,
+      vnc_password: values.enable_vnc ? values.vnc_password : null,
     } as UpdateVirtualizationInstance;
   }
 
@@ -172,7 +179,6 @@ export class InstanceEditFormComponent {
   }
 
   private setVncControls(): void {
-    this.form.controls.vnc_port.disable();
     this.form.controls.enable_vnc.valueChanges.pipe(untilDestroyed(this)).subscribe((vncEnabled) => {
       if (vncEnabled) {
         this.form.controls.vnc_port.enable();
@@ -183,6 +189,8 @@ export class InstanceEditFormComponent {
 
     if (!this.isStopped) {
       this.form.controls.enable_vnc.disable();
+      this.form.controls.vnc_password.disable();
+      this.form.controls.vnc_port.disable();
     }
   }
 }

src/app/pages/virtualization/components/all-instances/instance-details/instance-general-info/instance-general-info.component.spec.ts

@@ -49,6 +49,7 @@ const instance = {
   aliases: {} as VirtualizationAlias,
   raw: null,
   vnc_enabled: true,
+  vnc_password: '123456',
   vnc_port: 9000,
 } as VirtualizationInstance;
 

src/app/pages/virtualization/components/instance-wizard/instance-wizard.component.html

@@ -320,6 +320,13 @@
             type="number"
             [label]="'VNC Port' | translate"
           ></ix-input>
+
+          <ix-input
+            formControlName="vnc_password"
+            type="password"
+            [label]="'VNC Password' | translate"
+            [hint]="'VNC password is not cryptographically secure. You should not rely on it as a single authentication mechanism for your VMs.' | translate"
+          ></ix-input>
         }
       </ix-form-section>
 

src/app/pages/virtualization/components/instance-wizard/instance-wizard.component.spec.ts

@@ -200,6 +200,7 @@ describe('InstanceWizardComponent', () => {
         environment: {},
         enable_vnc: false,
         vnc_port: null,
+        vnc_password: null,
       }]);
       expect(spectator.inject(DialogService).jobDialog).toHaveBeenCalled();
       expect(spectator.inject(SnackbarService).success).toHaveBeenCalled();
@@ -242,6 +243,7 @@ describe('InstanceWizardComponent', () => {
         memory: GiB,
         enable_vnc: false,
         vnc_port: null,
+        vnc_password: null,
         instance_type: 'CONTAINER',
         environment: {},
       }]);
@@ -303,8 +305,14 @@ describe('InstanceWizardComponent', () => {
       const gpuDeviceCheckbox = await loader.getHarness(MatCheckboxHarness.with({ label: 'NVIDIA GeForce GTX 1080' }));
       await gpuDeviceCheckbox.check();
 
-      await form.fillForm({ 'Enable VNC': true });
-      await form.fillForm({ 'VNC Port': 9000 });
+      await form.fillForm({
+        'Enable VNC': true,
+      });
+
+      await form.fillForm({
+        'VNC Port': 9000,
+        'VNC Password': 'testing',
+      });
 
       const createButton = await loader.getHarness(MatButtonHarness.with({ text: 'Create' }));
       await createButton.click();
@@ -334,6 +342,7 @@ describe('InstanceWizardComponent', () => {
         memory: GiB,
         enable_vnc: true,
         vnc_port: 9000,
+        vnc_password: 'testing',
       }]);
       expect(spectator.inject(DialogService).jobDialog).toHaveBeenCalled();
       expect(spectator.inject(SnackbarService).success).toHaveBeenCalled();
@@ -382,6 +391,7 @@ describe('InstanceWizardComponent', () => {
         source_type: null,
         memory: 1073741824,
         vnc_port: null,
+        vnc_password: null,
       }]);
       expect(spectator.inject(DialogService).jobDialog).toHaveBeenCalled();
       expect(spectator.inject(SnackbarService).success).toHaveBeenCalled();
@@ -421,6 +431,7 @@ describe('InstanceWizardComponent', () => {
         instance_type: 'CONTAINER',
         enable_vnc: false,
         vnc_port: null,
+        vnc_password: null,
       }]);
       expect(spectator.inject(DialogService).jobDialog).toHaveBeenCalled();
       expect(spectator.inject(SnackbarService).success).toHaveBeenCalled();

src/app/pages/virtualization/components/instance-wizard/instance-wizard.component.ts

@@ -152,6 +152,7 @@ export class InstanceWizardComponent {
     image: ['', [Validators.required, Validators.minLength(1), Validators.maxLength(200)]],
     enable_vnc: [false],
     vnc_port: [defaultVncPort, [Validators.min(5900), Validators.max(65535)]],
+    vnc_password: [null as string],
     cpu: ['', [cpuValidator()]],
     memory: [null as number],
     tpm: [false],
@@ -343,6 +344,7 @@ export class InstanceWizardComponent {
       instance_type: this.form.controls.instance_type.value,
       enable_vnc: this.isVm ? this.form.value.enable_vnc : false,
       vnc_port: this.isVm && this.form.value.enable_vnc ? this.form.value.vnc_port || defaultVncPort : null,
+      vnc_password: this.isVm && this.form.value.enable_vnc ? this.form.value.vnc_password : null,
       name: this.form.controls.name.value,
       cpu: this.form.controls.cpu.value,
       memory: this.form.controls.memory.value,

src/assets/i18n/af.json

@@ -5021,8 +5021,10 @@
   "VMware Sync": "",
   "VMware: Extent block size 512b, TPC enabled, no Xen compat mode, SSD speed": "",
   "VNC": "",
+  "VNC Password": "",
   "VNC Port": "",
   "VNC connection is currently insecure. Secure the connection in other ways.": "",
+  "VNC password is not cryptographically secure. You should not rely on it as a single authentication mechanism for your VMs.": "",
   "Validate Certificates": "",
   "Validate Connection": "",
   "Validate Remote Path": "",

src/assets/i18n/ar.json

@@ -5021,8 +5021,10 @@
   "VMware Sync": "",
   "VMware: Extent block size 512b, TPC enabled, no Xen compat mode, SSD speed": "",
   "VNC": "",
+  "VNC Password": "",
   "VNC Port": "",
   "VNC connection is currently insecure. Secure the connection in other ways.": "",
+  "VNC password is not cryptographically secure. You should not rely on it as a single authentication mechanism for your VMs.": "",
   "Validate Certificates": "",
   "Validate Connection": "",
   "Validate Remote Path": "",

src/assets/i18n/ast.json

@@ -5021,8 +5021,10 @@
   "VMware Sync": "",
   "VMware: Extent block size 512b, TPC enabled, no Xen compat mode, SSD speed": "",
   "VNC": "",
+  "VNC Password": "",
   "VNC Port": "",
   "VNC connection is currently insecure. Secure the connection in other ways.": "",
+  "VNC password is not cryptographically secure. You should not rely on it as a single authentication mechanism for your VMs.": "",
   "Validate Certificates": "",
   "Validate Connection": "",
   "Validate Remote Path": "",

src/assets/i18n/az.json

@@ -5021,8 +5021,10 @@
   "VMware Sync": "",
   "VMware: Extent block size 512b, TPC enabled, no Xen compat mode, SSD speed": "",
   "VNC": "",
+  "VNC Password": "",
   "VNC Port": "",
   "VNC connection is currently insecure. Secure the connection in other ways.": "",
+  "VNC password is not cryptographically secure. You should not rely on it as a single authentication mechanism for your VMs.": "",
   "Validate Certificates": "",
   "Validate Connection": "",
   "Validate Remote Path": "",

src/assets/i18n/be.json

@@ -5021,8 +5021,10 @@
   "VMware Sync": "",
   "VMware: Extent block size 512b, TPC enabled, no Xen compat mode, SSD speed": "",
   "VNC": "",
+  "VNC Password": "",
   "VNC Port": "",
   "VNC connection is currently insecure. Secure the connection in other ways.": "",
+  "VNC password is not cryptographically secure. You should not rely on it as a single authentication mechanism for your VMs.": "",
   "Validate Certificates": "",
   "Validate Connection": "",
   "Validate Remote Path": "",

src/assets/i18n/bg.json

@@ -5021,8 +5021,10 @@
   "VMware Sync": "",
   "VMware: Extent block size 512b, TPC enabled, no Xen compat mode, SSD speed": "",
   "VNC": "",
+  "VNC Password": "",
   "VNC Port": "",
   "VNC connection is currently insecure. Secure the connection in other ways.": "",
+  "VNC password is not cryptographically secure. You should not rely on it as a single authentication mechanism for your VMs.": "",
   "Validate Certificates": "",
   "Validate Connection": "",
   "Validate Remote Path": "",

src/assets/i18n/bn.json

@@ -5021,8 +5021,10 @@
   "VMware Sync": "",
   "VMware: Extent block size 512b, TPC enabled, no Xen compat mode, SSD speed": "",
   "VNC": "",
+  "VNC Password": "",
   "VNC Port": "",
   "VNC connection is currently insecure. Secure the connection in other ways.": "",
+  "VNC password is not cryptographically secure. You should not rely on it as a single authentication mechanism for your VMs.": "",
   "Validate Certificates": "",
   "Validate Connection": "",
   "Validate Remote Path": "",

src/assets/i18n/br.json

@@ -5021,8 +5021,10 @@
   "VMware Sync": "",
   "VMware: Extent block size 512b, TPC enabled, no Xen compat mode, SSD speed": "",
   "VNC": "",
+  "VNC Password": "",
   "VNC Port": "",
   "VNC connection is currently insecure. Secure the connection in other ways.": "",
+  "VNC password is not cryptographically secure. You should not rely on it as a single authentication mechanism for your VMs.": "",
   "Validate Certificates": "",
   "Validate Connection": "",
   "Validate Remote Path": "",

src/assets/i18n/bs.json

@@ -5021,8 +5021,10 @@
   "VMware Sync": "",
   "VMware: Extent block size 512b, TPC enabled, no Xen compat mode, SSD speed": "",
   "VNC": "",
+  "VNC Password": "",
   "VNC Port": "",
   "VNC connection is currently insecure. Secure the connection in other ways.": "",
+  "VNC password is not cryptographically secure. You should not rely on it as a single authentication mechanism for your VMs.": "",
   "Validate Certificates": "",
   "Validate Connection": "",
   "Validate Remote Path": "",

src/assets/i18n/ca.json

@@ -5021,8 +5021,10 @@
   "VMware Sync": "",
   "VMware: Extent block size 512b, TPC enabled, no Xen compat mode, SSD speed": "",
   "VNC": "",
+  "VNC Password": "",
   "VNC Port": "",
   "VNC connection is currently insecure. Secure the connection in other ways.": "",
+  "VNC password is not cryptographically secure. You should not rely on it as a single authentication mechanism for your VMs.": "",
   "Validate Certificates": "",
   "Validate Connection": "",
   "Validate Remote Path": "",

src/assets/i18n/cs.json

@@ -4271,8 +4271,10 @@
   "VMware Sync": "",
   "VMware: Extent block size 512b, TPC enabled, no Xen compat mode, SSD speed": "",
   "VNC": "",
+  "VNC Password": "",
   "VNC Port": "",
   "VNC connection is currently insecure. Secure the connection in other ways.": "",
+  "VNC password is not cryptographically secure. You should not rely on it as a single authentication mechanism for your VMs.": "",
   "Validate effective ACL": "",
   "Variant": "",
   "View logs": "",

src/assets/i18n/cy.json

@@ -5021,8 +5021,10 @@
   "VMware Sync": "",
   "VMware: Extent block size 512b, TPC enabled, no Xen compat mode, SSD speed": "",
   "VNC": "",
+  "VNC Password": "",
   "VNC Port": "",
   "VNC connection is currently insecure. Secure the connection in other ways.": "",
+  "VNC password is not cryptographically secure. You should not rely on it as a single authentication mechanism for your VMs.": "",
   "Validate Certificates": "",
   "Validate Connection": "",
   "Validate Remote Path": "",