Merge remote-tracking branch 'origin/master' into master-3.0

# Conflicts: # angular.json # package.json # src/ReleaseNotes.txt # src/app/cartography/helpers/font-fixer.spec.ts # src/app/cartography/models/node.ts # src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.html # src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.ts # src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.ts # src/app/components/project-map/project-map-menu/project-map-menu.component.ts # src/app/components/project-map/project-map.component.html # src/app/components/project-map/project-map.component.ts # src/app/components/projects/projects.component.html # src/app/components/settings/settings.component.html # src/app/components/settings/settings.component.spec.ts # src/app/components/template/template-list-dialog/template-list-dialog.component.html # src/app/components/template/template.component.html # src/app/components/template/template.component.ts # src/app/services/link.service.ts # yarn.lock
2025-01-29 15:43:58 +00:00 · 2023-02-01 10:32:12 +08:00 · 2023-02-01 10:32:12 +08:00 · 7ac3a628a4
commit 7ac3a628a4
parent a08f8c5963 7e172e30ba
25 changed files with 208 additions and 55 deletions
--- a/.angular/cache/babel-webpack/d6a73bccc4e531ea9b921fbd7f814650.json
+++ b/.angular/cache/babel-webpack/d6a73bccc4e531ea9b921fbd7f814650.json
--- a/.github/workflows/add-new-issues-to-project.yml
+++ b/.github/workflows/add-new-issues-to-project.yml
@ -0,0 +1,16 @@
+name: Add new issues to GNS3 project
+
+on:
+  issues:
+    types:
+      - opened
+
+jobs:
+  add-to-project:
+    name: Add issue to project
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/add-to-project@v0.4.0
+        with:
+          project-url: https://github.com/orgs/GNS3/projects/3
+          github-token: ${{ secrets.ADD_NEW_ISSUES_TO_PROJECT }}
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@ -0,0 +1,76 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "master-3.0" ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "master-3.0" ]
+  schedule:
+    - cron: '38 18 * * 6'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript', 'python' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Use only 'java' to analyze code written in Java, Kotlin or both
+        # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    #   If the Autobuild fails above, remove it and uncomment the following three lines.
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #   echo "Run, Build Application using script"
+    #   ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"
--- a/.whitesource
+++ b/.whitesource
@ -2,7 +2,8 @@
  "scanSettings": {
    "configMode": "AUTO",
    "configExternalURL": "",
-    "projectToken" : ""
+    "projectToken" : "",
+    "baseBranches": ["master", "master-3.0"]
  },
  "checkRunSettings": {
    "vulnerableCheckRunConclusionLevel": "failure"
@ -10,4 +11,4 @@
  "issueSettings": {
    "minSeverityLevel": "LOW"
  }
-}
+}
--- a/SECURITY.md
+++ b/SECURITY.md
@ -0,0 +1,5 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+Please use GitHub's report a vulnerability feature. More information can be found in https://docs.github.com/en/code-security/security-advisories/guidance-on-reporting-and-writing/privately-reporting-a-security-vulnerability
--- a/angular.json
+++ b/angular.json
@ -228,4 +228,4 @@
    "cli": {
        "analytics": false
    }
-}
+}
--- a/karma.conf.js
+++ b/karma.conf.js
@ -25,7 +25,7 @@ module.exports = function (config) {
    colors: true,
    logLevel: config.LOG_INFO,
    autoWatch: true,
-    browsers: ['ChromeHeadless'],
+    browsers: ['Chrome'],
    singleRun: true
  });
 };
--- a/package.json
+++ b/package.json
@ -17,7 +17,7 @@
    "start": "ng serve",
    "startforelectron": "ng serve --configuration=electronDev",
    "build": "ng build",
-    "buildforproduction": "ng build --source-map=false --configuration=production --base-href /static/web-ui/",
+    "buildforproduction": "ng build --source-map=false --build-optimizer --configuration=production --base-href /static/web-ui/",
    "buildforelectron": "ng build --configuration=electronProd",
    "buildforgithub": "ng build --configuration=githubProd",
    "test": "ng test",
--- a/src/app/cartography/helpers/font-fixer.ts
+++ b/src/app/cartography/helpers/font-fixer.ts
@ -9,8 +9,8 @@ import { Font } from '../models/font';
 export class FontFixer {
  static DEFAULT_FONT = 'TypeWriter';
  static DEFAULT_SIZE = 10;
-  static REPLACE_BY_FONT = 'Noto Sans';
-  static REPLACE_BY_SIZE = 11;
+  static REPLACE_BY_FONT = 'Arial';
+  static REPLACE_BY_SIZE = 12;

  public fix(font: Font): Font {
    if (font.font_family === FontFixer.DEFAULT_FONT && font.font_size === FontFixer.DEFAULT_SIZE) {
--- a/src/app/cartography/widgets/drawings/text-drawing.spec.ts
+++ b/src/app/cartography/widgets/drawings/text-drawing.spec.ts
@ -42,7 +42,7 @@ describe('TextDrawingWidget', () => {
    const text_element = drew.nodes()[0];
    expect(text_element.innerHTML).toEqual('<tspan xml:space="preserve" x="0" dy="0em">THIS IS TEXT</tspan>');
    expect(text_element.getAttribute('fill')).toEqual('#000000');
-    expect(text_element.getAttribute('style')).toEqual('font-family: "Noto Sans"; font-size: 11pt; font-weight: bold');
+    expect(text_element.getAttribute('style')).toEqual('font-family: "Arial"; font-size: 12pt; font-weight: bold');
    expect(text_element.getAttribute('text-decoration')).toEqual('line-through');
  });

--- a/src/app/cartography/widgets/interface-status.ts
+++ b/src/app/cartography/widgets/interface-status.ts
@ -97,9 +97,9 @@ export class InterfaceStatusWidget implements Widget {
          .attr('y', (ls: LinkStatus) => ls.y - 10)
          .attr('rx', 8)
          .attr('ry', 8)
-          .style('fill', 'white')
+          .style('fill', '#c7ffdf')
          .attr('stroke', '#2ecc71')
-          .attr('stroke-width', 3);
+          .attr('stroke-width', 2);
        status_started.exit().remove();
        const status_started_label = link_group
          .selectAll<SVGTextElement, LinkStatus>('text.status_started_label')
@ -111,7 +111,7 @@ export class InterfaceStatusWidget implements Widget {
          .text((ls: LinkStatus) => ls.port)
          .attr('x', (ls: LinkStatus) => ls.x - 25)
          .attr('y', (ls: LinkStatus) => ls.y + 5)
-          .attr('fill', `black`);
+          .attr('fill', `#0e9647`);
        status_started_label.exit().remove();

        const status_stopped = link_group
@ -129,9 +129,9 @@ export class InterfaceStatusWidget implements Widget {
          .attr('y', (ls: LinkStatus) => ls.y - 10)
          .attr('rx', 8)
          .attr('ry', 8)
-          .style('fill', 'white')
+          .style('fill', '#ffe3e3')
          .attr('stroke', 'red')
-          .attr('stroke-width', 3);
+          .attr('stroke-width', 2);
        status_stopped.exit().remove();
        const status_stopped_label = link_group
          .selectAll<SVGTextElement, LinkStatus>('text.status_stopped_label')
@ -143,7 +143,7 @@ export class InterfaceStatusWidget implements Widget {
          .text((ls: LinkStatus) => ls.port)
          .attr('x', (ls: LinkStatus) => ls.x - 25)
          .attr('y', (ls: LinkStatus) => ls.y + 5)
-          .attr('fill', `black`);
+          .attr('fill', `red`);
        status_stopped_label.exit().remove();

        const status_suspended = link_group
@ -162,8 +162,8 @@ export class InterfaceStatusWidget implements Widget {
          .attr('rx', 8)
          .attr('ry', 8)
          .style('fill', 'white')
-          .attr('stroke', '#FFFF00')
-          .attr('stroke-width', 3);
+          .attr('stroke', '#fffbc3')
+          .attr('stroke-width', 2);
        status_suspended.exit().remove();
        const status_suspended_label = link_group
          .selectAll<SVGTextElement, LinkStatus>('text.status_suspended_label')
@ -175,7 +175,7 @@ export class InterfaceStatusWidget implements Widget {
          .text((ls: LinkStatus) => ls.port)
          .attr('x', (ls: LinkStatus) => ls.x - 25)
          .attr('y', (ls: LinkStatus) => ls.y + 5)
-          .attr('fill', `black`);
+          .attr('fill', `#6b5633`);
        status_suspended_label.exit().remove();
      } else {
        const status_started = link_group
--- a/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.html
+++ b/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.html
@ -106,7 +106,6 @@
                  placeholder="Please enter name"
                />
              </mat-form-field>
-              <!-- here removed the processbar and common processbar -->
            </div>
          </form>
        </mat-step>
--- a/src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.ts
+++ b/src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.ts
@ -29,7 +29,7 @@ export class ConsoleDeviceActionComponent implements OnInit {
    let consoleCommand = this.settingsService.getConsoleSettings()
      ? this.settingsService.getConsoleSettings()
      : this.nodeService.getDefaultCommand();
-    const startedNodes = this.nodes.filter((node) => node.status === 'started');
+    const startedNodes = this.nodes.filter((node) => node.status === 'started' && node.console_type !== 'none');

    if (startedNodes.length === 0) {
      this.toasterService.error('Device needs to be started in order to console to it.');
@ -37,7 +37,7 @@ export class ConsoleDeviceActionComponent implements OnInit {
    }

    for (var node of this.nodes) {
-      if (node.status !== 'started') {
+      if (node.status !== 'started' && node.console_type !== 'none') {
        continue;
      }

--- a/src/app/components/project-map/log-console/log-console.component.ts
+++ b/src/app/components/project-map/log-console/log-console.component.ts
@ -232,12 +232,12 @@ export class LogConsoleComponent implements OnInit, AfterViewInit, OnDestroy {
              location.assign(
                `gns3+vnc://${node.console_host}:${node.console}?name=${node.name}&project_id=${node.project_id}&node_id=${node.node_id}`
              );
-            } else if (node.console_type === 'spice') {
+            } else if (node.console_type.startsWith('spice')) {
              location.assign(
                `gns3+spice://${node.console_host}:${node.console}?name=${node.name}&project_id=${node.project_id}&node_id=${node.node_id}`
              );
            } else {
-              this.showCommand('Supported console types: telnet, vnc, spice.');
+              this.showCommand('Supported console types are: telnet, vnc, spice and spice+agent');
            }
          } else {
            this.showCommand(`This node must be started before a console can be opened.`);
--- a/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.html
+++ b/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.html
@ -110,7 +110,7 @@

            <h6>Additional directories</h6>
            <mat-form-field class="form-field">
-              <textarea matInput type="text" [(ngModel)]="node.properties.extra_volumes"></textarea>
+              <textarea matInput type="text" [(ngModel)]="additionalDirectories"></textarea>
            </mat-form-field>
          </mat-tab>

--- a/src/app/components/project-map/packet-capturing/start-capture/start-capture.component.ts
+++ b/src/app/components/project-map/packet-capturing/start-capture/start-capture.component.ts
@ -56,7 +56,7 @@ export class StartCaptureDialogComponent implements OnInit {
    const sourcePort = sourceNode.ports[this.link.nodes[0].port_number];
    const targetPort = targetNode.ports[this.link.nodes[1].port_number];
    this.inputForm.controls['fileName'].setValue(
-      `${sourceNode.name}_${sourcePort.name}_to_${targetNode.name}_${targetPort.name}`
+      `${sourceNode.name}_${sourcePort.name}_to_${targetNode.name}_${targetPort.name}`.replace(new RegExp('[^0-9A-Za-z_-]', 'g'), '')
    );
  }

--- a/src/app/components/project-map/project-map-menu/project-map-menu.component.ts
+++ b/src/app/components/project-map/project-map-menu/project-map-menu.component.ts
@ -207,7 +207,7 @@ export class ProjectMapMenuComponent implements OnInit, OnDestroy {
      });
    });
  }
-  
+
  public changeLockValue() {
    this.isLocked = !this.isLocked;
    this.mapSettingsService.changeMapLockValue(this.isLocked);
@ -269,7 +269,7 @@ export class ProjectMapMenuComponent implements OnInit, OnDestroy {
  }

  private createSvgFileForImage(image: string | ArrayBuffer, imageToUpload: HTMLImageElement) {
-    return `<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" height=\"${imageToUpload.height}\" 
+    return `<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" height=\"${imageToUpload.height}\"
                width=\"${imageToUpload.width}\">\n<image height=\"${imageToUpload.height}\" width=\"${imageToUpload.width}\" xlink:href=\"${image}\"/>\n</svg>`;
  }

--- a/src/app/components/project-map/project-map.component.html
+++ b/src/app/components/project-map/project-map.component.html
@ -91,7 +91,7 @@
        <mat-icon>work</mat-icon>
        <span>Projects</span>
      </button>
-      
+
      <button mat-menu-item routerLink="/controller/{{ controller.id }}/preferences">
        <mat-icon>settings_applications</mat-icon>
        <span>Template preferences</span>
--- a/src/app/components/project-map/project-map.component.scss
+++ b/src/app/components/project-map/project-map.component.scss
@ -73,6 +73,10 @@ g.node:hover {
    font-size: 28px !important;
  }

+  .map-settings-button mat-icon {
+    font-size: 22px !important;
+  }
+
  .selected {
    background: rgba(0, 151, 167, 0.1);

--- a/src/app/components/project-map/project-map.component.ts
+++ b/src/app/components/project-map/project-map.component.ts
@ -998,7 +998,7 @@ export class ProjectMapComponent implements OnInit, OnDestroy {
      this.exportPortableProjectDialog();
    }
  }
-  
+
  exportPortableProjectDialog() {
    const dialogRef = this.dialog.open(ExportPortableProjectComponent, {
      width: '700px',
--- a/src/app/components/projects/projects.component.html
+++ b/src/app/components/projects/projects.component.html
@ -77,17 +77,17 @@
              matTooltip="Export project"
              matTooltipClass="custom-tooltip"
              (click)="exportSelectProject(row)"
-              
+
            >
            <mat-icon aria-label="Export project">arrow_downward</mat-icon>

            </button>
-            
+
          </mat-cell>
        </ng-container>

        <ng-container matColumnDef="delete" >
-          <mat-header-cell *matHeaderCellDef  class="action"> 
+          <mat-header-cell *matHeaderCellDef  class="action">
            <button mat-button   matTooltip="Delete all projects"   matTooltipClass="custom-tooltip"*ngIf="(selection.hasValue() && isAllSelected())  || selection.selected.length > 1" (click)="deleteAllFiles()" aria-label="Example icon button with a delete icon">
             <mat-icon>delete</mat-icon>
            </button>
--- a/src/app/components/projects/projects.component.ts
+++ b/src/app/components/projects/projects.component.ts
@ -69,6 +69,12 @@ export class ProjectsComponent implements OnInit {
    this.projectService.projectListSubject.subscribe(() => this.refresh());
  }

+  goToSystemStatus() {
+    this.router
+      .navigate(['/server', this.server.id, 'systemstatus'])
+      .catch((error) => this.toasterService.error('Cannot navigate to the system status'));
+  }
+
  refresh() {
    this.projectService.list(this.controller).subscribe(
      (projects: Project[]) => {
--- a/src/app/components/template/template.component.scss
+++ b/src/app/components/template/template.component.scss
@ -1,6 +1,7 @@
 ::ng-deep .mat-menu-panel {
  max-width: 400px;
-  max-height: 500px;
+  max-height: 640px;
+  border-radius: 8px;
 }

 .menu {
@ -8,6 +9,26 @@
  overflow-y: scroll;
  scrollbar-color: darkgrey #263238;
  scrollbar-width: thin;
+  font-size: 12px;
+}
+
+.templateMenuHeader {
+   border-bottom: 1px solid rgba(255,255,255,0.05);
+}
+
+.templateFilterBar {
+   padding: 10px 2%;
+   background-color: rgba(0,0,0,0.2);
+   margin-bottom: 10px;
+}
+
+.templateFilterBar > .form-field {
+   font-size: 12px;
+}
+
+.templateFilterBar .searchIcon {
+   position: relative;
+   top: 5px;
 }

 ::-webkit-scrollbar {
@ -24,20 +45,22 @@
 }

 .form-field {
-  width: 90%;
-  margin-left: 5%;
-  margin-right: 5%;
+  width: 44%;
+  margin-left: 3%;
+  margin-right: 3%;
 }

 .image {
-  width: 65px;
-  height: 65px;
+  display: inline-block;
+  width: 55px;
+  height: 55px;
  filter: invert(0);
  --webkit-filter: invert(0) !important;
 }

 .templateList {
  width: 100%;
+  padding: 10px;
 }

 .templateRow {
@ -55,6 +78,23 @@
 }

 .templateIcon {
-  width: 80px !important;
-  padding: 10px;
+  width: 90px !important;
+  padding: 2px 5px;
+  text-align: center;
+  margin: 3px;
+}
+
+.templateIcon > .iconContainer {
+   display: inline-flex;
+   align-items: center;
+   justify-content: center;
+   width: 70px;
+   height: 70px;
+   margin-bottom: 10px;
+   border-radius: 50%;
+   cursor: move;
+}
+
+.templateIcon > .iconContainer:hover {
+   background-color: rgba(237, 246, 231, 0.08);
 }
--- a/src/app/components/template/template.component.ts
+++ b/src/app/components/template/template.component.ts
@ -57,7 +57,7 @@ export class TemplateComponent implements OnInit, OnDestroy {
    private symbolService: SymbolService,
    private domSanitizer: DomSanitizer,
    private themeService: ThemeService,
-    private overlayContainer: OverlayContainer, 
+    private overlayContainer: OverlayContainer,
  ) {
    this.overlay = overlayContainer.getContainerElement();
  }
--- a/src/app/services/nodeConsole.service.ts
+++ b/src/app/services/nodeConsole.service.ts
@ -79,13 +79,15 @@ export class NodeConsoleService {
    let nodesToStart = 'Please start the following nodes if you want to open consoles for them: ';
    let nodesToStartCounter = 0;
    nodes.forEach((n) => {
-      if (n.status === 'started') {
-        this.mapSettingsService.logConsoleSubject.next(true);
-        // this timeout is required due to xterm.js implementation
-        setTimeout(() => { this.openConsoleForNode(n); }, 500);
-      } else {
-        nodesToStartCounter++;
-        nodesToStart += n.name + ' '
+      if (n.console_type !== "none") {
+        if (n.status === 'started') {
+          this.mapSettingsService.logConsoleSubject.next(true);
+          // this timeout is required due to xterm.js implementation
+          setTimeout(() => { this.openConsoleForNode(n); }, 500);
+        } else {
+          nodesToStartCounter++;
+          nodesToStart += n.name + ' '
+        }
      }
    });
    if (nodesToStartCounter > 0) {
@ -94,16 +96,19 @@ export class NodeConsoleService {
  }

  openConsolesForAllNodesInNewTabs(nodes: Node[]) {
-    let nodesToStart = 'Please start the following nodes if you want to open consoles for them: ';
+    let nodesToStart = 'Please start the following nodes if you want to open consoles in tabs for them: ';
    let nodesToStartCounter = 0;
    nodes.forEach((n) => {
-      if (n.status === 'started') {
-        let url = this.router.url.split('/');
-        let urlString = `/static/web-ui/${url[1]}/${url[2]}/${url[3]}/${url[4]}/nodes/${n.node_id}`;
-        window.open(urlString);
-      } else {
-        nodesToStartCounter++;
-        nodesToStart += n.name + ' '
+      // opening a console in tab is only supported for telnet type
+      if (n.console_type === "telnet") {
+        if (n.status === 'started') {
+          let url = this.router.url.split('/');
+          let urlString = `/static/web-ui/${url[1]}/${url[2]}/${url[3]}/${url[4]}/nodes/${n.node_id}`;
+          window.open(urlString);
+        } else {
+          nodesToStartCounter++;
+          nodesToStart += n.name + ' '
+        }
      }
    });
    if (nodesToStartCounter > 0) {