fix: change size of dummy key to 2048

This fixes the CodeQL scan issue for using a weak key.
merge branch 'main' into ssh--auth-control
2026-04-22 15:26:58 -07:00 · 2024-02-15 12:12:34 -08:00 · 2024-02-15 12:09:21 -08:00 · 2024-02-13 17:57:23 -08:00 · 2024-02-13 17:54:30 -08:00 · 2024-02-13 16:30:07 -08:00
150 changed files with 8274 additions and 3629 deletions
@@ -1,35 +1,69 @@
 name: "Build Helper"
 on: workflow_dispatch
 env:
+    WAVETERM_VERSION: 0.6.1
    GO_VERSION: "1.21.5"
    NODE_VERSION: "21.5.0"
 jobs:
-    runbuild:
-        outputs:
-            WAVETERM_VERSION: ${{ steps.set-version.outputs.WAVETERM_VERSION }}
-        strategy:
-            matrix:
-                include:
-                    - platform: "darwin"
-                      arch: "x64"
-                      runner: "macos-latest"
-                      scripthaus: "build-package"
-                    - platform: "darwin"
-                      arch: "arm64"
-                      runner: "macos-latest-xlarge"
-                      scripthaus: "build-package"
-                    - platform: "linux"
-                      arch: "x64"
-                      runner: "ubuntu-latest"
-                      scripthaus: "build-package-linux"
-        runs-on: ${{ matrix.runner }}
+    runbuild-darwin-x64:
+        name: "Build MacOS x64"
+        runs-on: macos-latest
+        steps:
+            - uses: actions/checkout@v4
+            - uses: actions/setup-go@v4
+              with:
+                  go-version: ${{env.GO_VERSION}}
+                  cache-dependency-path: |
+                      wavesrv/go.sum
+                      waveshell/go.sum
+            - run: brew tap scripthaus-dev/scripthaus
+            - run: brew install scripthaus
+            - uses: actions/setup-node@v4
+              with:
+                  node-version: ${{env.NODE_VERSION}}
+                  cache: "yarn"
+            - run: yarn --frozen-lockfile
+            - run: scripthaus run build-package
+            - uses: actions/upload-artifact@v4
+              with:
+                  name: waveterm-build-darwin-x64
+                  path: out/make/zip/darwin/x64/*.zip
+                  retention-days: 2
+    runbuild-darwin-arm64:
+        name: "Build MacOS arm64"
+        runs-on: macos-latest-xlarge
+        steps:
+            - uses: actions/checkout@v4
+            - uses: actions/setup-go@v4
+              with:
+                  go-version: ${{env.GO_VERSION}}
+                  cache-dependency-path: |
+                      wavesrv/go.sum
+                      waveshell/go.sum
+            - run: brew tap scripthaus-dev/scripthaus
+            - run: brew install scripthaus
+            - uses: actions/setup-node@v4
+              with:
+                  node-version: ${{env.NODE_VERSION}}
+                  cache: "yarn"
+            - run: yarn --frozen-lockfile
+            - run: scripthaus run build-package
+            - uses: actions/upload-artifact@v4
+              with:
+                  name: waveterm-build-darwin-arm64
+                  path: out/make/zip/darwin/arm64/*.zip
+                  retention-days: 2
+    runbuild-linux:
+        name: "Build Linux x64"
+        runs-on: ubuntu-latest
+        needs: [runbuild-darwin-x64, runbuild-darwin-arm64]
        steps:
            - uses: actions/checkout@v4
            - uses: actions/checkout@v4
              with:
                  repository: scripthaus-dev/scripthaus
                  path: scripthaus
-            - uses: actions/setup-go@v5
+            - uses: actions/setup-go@v4
              with:
                  go-version: ${{env.GO_VERSION}}
                  cache-dependency-path: |
@@ -45,31 +79,22 @@ jobs:
              with:
                  node-version: ${{env.NODE_VERSION}}
                  cache: "yarn"
-            - id: set-version
-              run: |
-                  VERSION=$(node -e 'console.log(require("./version.js"))')
-                  echo "WAVETERM_VERSION=${VERSION}" >> "$GITHUB_OUTPUT"
            - run: yarn --frozen-lockfile
-            - run: ./scripthaus/scripthaus run ${{ matrix.scripthaus }}
-            - uses: actions/upload-artifact@v4
-              with:
-                  name: waveterm-build-${{ matrix.platform }}-${{ matrix.arch }}
-                  path: out/make/zip/${{ matrix.platform }}/${{ matrix.arch }}/*.zip
-                  retention-days: 2
-    upload:
-        name: "Upload Builds"
-        runs-on: ubuntu-latest
-        needs: [runbuild]
-        steps:
+            - run: ./scripthaus/scripthaus run build-package-linux
            - uses: actions/download-artifact@v4
              with:
                  merge-multiple: true
                  path: buildtemp
            - run: |
-                  echo "${{ needs.runbuild.outputs.WAVETERM_VERSION }}" > buildtemp/version.txt
+                  mv out/make/zip/linux/x64/Wave-linux-x64-$WAVETERM_VERSION.zip buildtemp/waveterm-linux-x64-v$WAVETERM_VERSION.zip
            - run: (cd buildtemp; zip ../waveterm-builds.zip *)
            - run: aws s3 cp waveterm-builds.zip s3://waveterm-github-artifacts/
              env:
                  AWS_ACCESS_KEY_ID: "${{ secrets.S3_USERID }}"
                  AWS_SECRET_ACCESS_KEY: "${{ secrets.S3_SECRETKEY }}"
                  AWS_DEFAULT_REGION: us-west-2
+            - uses: actions/upload-artifact@v4
+              with:
+                  name: waveterm-builds
+                  path: buildtemp
+                  retention-days: 2
@@ -12,69 +12,70 @@
 name: "CodeQL"

 on:
-    push:
-        branches: ["main"]
-    pull_request:
-        branches: ["main"]
-    schedule:
-        - cron: "36 5 * * 5"
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+  schedule:
+    - cron: '36 5 * * 5'

 jobs:
-    analyze:
-        name: Analyze
-        # Runner size impacts CodeQL analysis time. To learn more, please see:
-        #   - https://gh.io/recommended-hardware-resources-for-running-codeql
-        #   - https://gh.io/supported-runners-and-hardware-resources
-        #   - https://gh.io/using-larger-runners
-        # Consider using larger runners for possible analysis time improvements.
-        runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
-        timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
-        permissions:
-            actions: read
-            contents: read
-            security-events: write
+  analyze:
+    name: Analyze
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners
+    # Consider using larger runners for possible analysis time improvements.
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
+    permissions:
+      actions: read
+      contents: read
+      security-events: write

-        strategy:
-            fail-fast: false
-            matrix:
-                language: ["go", "javascript-typescript"]
-                # CodeQL supports [ 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' ]
-                # Use only 'java-kotlin' to analyze code written in Java, Kotlin or both
-                # Use only 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
-                # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'go', 'javascript-typescript' ]
+        # CodeQL supports [ 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' ]
+        # Use only 'java-kotlin' to analyze code written in Java, Kotlin or both
+        # Use only 'javascript-typescript' 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@v4
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3

-            # Initializes the CodeQL tools for scanning.
-            - name: Initialize CodeQL
-              uses: github/codeql-action/init@v3
-              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.
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      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.

-                  # For more 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
+        # For more 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, Java, or Swift).
-            # If this step fails, then you should remove it and run the build manually (see below)
-            - name: Autobuild
-              uses: github/codeql-action/autobuild@v3

-            # ℹ️ 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
+    # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v3

-            #   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.
+    # ℹ️ 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

-            # - run: |
-            #     echo "Run, Build Application using script"
-            #     ./location_of_script_within_repo/buildscript.sh
+    #   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.

-            - name: Perform CodeQL Analysis
-              uses: github/codeql-action/analyze@v3
-              with:
-                  category: "/language:${{matrix.language}}"
+    # - run: |
+    #     echo "Run, Build Application using script"
+    #     ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
+      with:
+        category: "/language:${{matrix.language}}"
@@ -1,8 +1,8 @@
 <p align="center">
  <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="./assets/waveterm-logo-horizontal-dark.png">
-    <source media="(prefers-color-scheme: light)" srcset="./assets/waveterm-logo-horizontal-light.png">
-    <img alt="Wave Terminal Logo" src="./assets/waveterm-logo-horizontal-light.png" width="240" height="80" style="max-width: 100%;">
+    <source media="(prefers-color-scheme: dark)" srcset="./assets/wave-logo_horizontal-coloronblack.svg">
+    <source media="(prefers-color-scheme: light)" srcset="./assets/wave-logo_horizontal-coloronwhite.svg">
+    <img alt="Wave Terminal Logo" src="./assets/wave-logo_horizontal-coloronwhite.svg" width="352" height="59" style="max-width: 100%;">
  </picture>
  <br/>
 </p>
@@ -179,11 +179,11 @@ THE SOFTWARE.

 -----

-## github.com/google/go-github/v59/github
+## github.com/google/go-github/v57/github

-* Name: github.com/google/go-github/v59/github
-* Version: v59.0.0
-* License: [BSD-3-Clause](https://github.com/google/go-github/blob/v59.0.0/LICENSE)
+* Name: github.com/google/go-github/v57/github
+* Version: v57.0.0
+* License: [BSD-3-Clause](https://github.com/google/go-github/blob/v57.0.0/LICENSE)

 ```txt
 Copyright (c) 2013 The go-github AUTHORS. All rights reserved.
@@ -1,3 +1,3 @@
-*/
+temp/
 *.zip
-*.dmg
+*.dmg
@@ -1,9 +1,9 @@
 const eu = require("@electron/universal");
 const path = require("path");

-const x64Path = path.resolve(__dirname, "temp", "x64", "Wave.app");
-const arm64Path = path.resolve(__dirname, "temp", "arm64", "Wave.app");
-const outPath = path.resolve(__dirname, "temp", "Wave.app");
+let x64Path = path.resolve(__dirname, "temp", "x64", "Wave.app")
+let arm64Path = path.resolve(__dirname, "temp", "arm64", "Wave.app")
+let outPath = path.resolve(__dirname, "temp", "Wave.app")

 console.log("building universal package");
 console.log("x64 path", x64Path);
@@ -1,19 +1,11 @@
 #!/bin/bash
-# This script is used to build the universal app for macOS

-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-rm -f *.zip *.dmg
-ZIP_DIR=$SCRIPT_DIR/zip
-rm -rf $ZIP_DIR
-mkdir $ZIP_DIR
-TEMP_DIR=$SCRIPT_DIR/temp
-rm -rf $TEMP_DIR
-mkdir $TEMP_DIR
-BUILDS_DIR=$SCRIPT_DIR/builds
-rm -rf $BUILDS_DIR
-
-# Download the builds zip
+# assumes we have Wave-darwin-x64-[version].zip and Wave-darwin-arm64-[version].zip in current directory
+VERSION=0.6.1
+rm -rf temp
+rm -rf builds
+mkdir temp
+mkdir temp/x64
 aws s3 cp s3://waveterm-github-artifacts/waveterm-builds.zip .
 BUILDS_ZIP=waveterm-builds.zip
 if ! [ -f $BUILDS_ZIP ]; then
@@ -21,66 +13,40 @@ if ! [ -f $BUILDS_ZIP ]; then
    exit 1;
 fi
 echo "unzipping $BUILDS_ZIP"
-unzip -q $BUILDS_ZIP -d $BUILDS_DIR
-rm $BUILDS_ZIP
-
-# Ensure we have exactly one of each build
-find_build() 
-{
-    local BUILD_DIR=$1
-    local BUILD_PATTERN=$2
-    local BUILD_PATH=$(find $BUILD_DIR -type f -iname "$BUILD_PATTERN")
-    local NUM_MATCHES=$(echo $BUILD_PATH | wc -l)
-    if [ "0" -eq "$NUM_MATCHES" ]; then
-        echo "no $BUILD_NAME found in $BUILD_DIR"
-        exit 1
-    elif [ "1" -lt "$NUM_MATCHES" ]; then
-        echo "multiple $BUILD_NAME found in $BUILD_DIR"
-        exit 1
-    fi
-    echo $BUILD_PATH
-}
-
-X64_ZIP=$(find_build $BUILDS_DIR "Wave-darwin-x64-*.zip")
-ARM64_ZIP=$(find_build $BUILDS_DIR "Wave-darwin-arm64-*.zip")
+unzip -q $BUILDS_ZIP -d builds
+X64_ZIP="builds/Wave-darwin-x64-$VERSION.zip"
+ARM64_ZIP="builds/Wave-darwin-arm64-$VERSION.zip"
+if ! [ -f $X64_ZIP ]; then
+    echo "no $X64_ZIP found";
+    exit 1;
+fi
+if ! [ -f $ARM64_ZIP ]; then
+    echo "no $ARM64_ZIP found"
+    exit 1;
+fi
 set -e
-
-echo "unzipping zip files"
-unzip -q $X64_ZIP -d $TEMP_DIR/x64
-unzip -q $ARM64_ZIP -d $TEMP_DIR/arm64
-rm $ARM64_ZIP $X64_ZIP
-
-# Create universal app and sign and notarize it
-TEMP_WAVE_DIR_ARM=$TEMP_DIR/x64/Wave.app
-TEMP_WAVE_DIR_X64=$TEMP_DIR/arm64/Wave.app
-TEMP_WAVE_DIR_UNIVERSAL=$TEMP_DIR/Wave.app
-lipo -create -output $TEMP_DIR/wavesrv $TEMP_WAVE_DIR_X64/Contents/Resources/app/bin/wavesrv $TEMP_WAVE_DIR_ARM/Contents/Resources/app/bin/wavesrv
-rm -rf $TEMP_WAVE_DIR_ARM/Contents/Resources/app
-mv $TEMP_WAVE_DIR_X64/Contents/Resources/app $TEMP_DIR
-cp $TEMP_DIR/wavesrv $TEMP_DIR/app/bin/wavesrv
-mkdir $TEMP_WAVE_DIR_ARM/Contents/Resources/app
-mkdir $TEMP_WAVE_DIR_X64/Contents/Resources/app
-node $SCRIPT_DIR/build-universal.js
-rm -rf $TEMP_WAVE_DIR_UNIVERSAL/Contents/Resources/app
-mv $TEMP_DIR/app $TEMP_WAVE_DIR_UNIVERSAL/Contents/Resources/app
-node $SCRIPT_DIR/osx-sign.js
-DEBUG=electron-notarize node $SCRIPT_DIR/osx-notarize.js
+echo "unzipping version v$VERSION zip files"
+ls -l "$X64_ZIP" "$ARM64_ZIP"
+unzip -q $X64_ZIP -d temp/x64
+mkdir temp/arm64
+unzip -q $ARM64_ZIP -d temp/arm64
+lipo -create -output temp/wavesrv temp/x64/Wave.app/Contents/Resources/app/bin/wavesrv temp/arm64/Wave.app/Contents/Resources/app/bin/wavesrv
+rm -rf temp/arm64/Wave.app/Contents/Resources/app
+mv temp/x64/Wave.app/Contents/Resources/app temp/
+cp temp/wavesrv temp/app/bin/wavesrv
+mkdir temp/x64/Wave.app/Contents/Resources/app
+mkdir temp/arm64/Wave.app/Contents/Resources/app
+node build-universal.js
+rm -rf temp/Wave.app/Contents/Resources/app
+mv temp/app temp/Wave.app/Contents/Resources/app
+node osx-sign.js
+DEBUG=electron-notarize node osx-notarize.js
 echo "universal app creation success (build/sign/notarize)"
-
-UVERSION=$(cat $BUILDS_DIR/version.txt)
-DMG_NAME="waveterm-macos-universal-${UVERSION}.dmg"
-ZIP_NAME="Wave-macos-universal-${UVERSION}.zip"
-
-echo "creating universal zip"
-ditto $TEMP_WAVE_DIR_UNIVERSAL $ZIP_DIR/Wave.app
-cd $ZIP_DIR
-zip -9yqr $ZIP_NAME Wave.app
-mv $ZIP_NAME $BUILDS_DIR/
-cd $SCRIPT_DIR
-
-# Expects create-dmg repo to be cloned in the same parent directory as the waveterm repo.
 echo "creating universal dmg"
-$SCRIPT_DIR/../../create-dmg/create-dmg \
+rm -f *.dmg
+DMG_VERSION=$(node -e 'console.log(require("../version.js"))')
+DMG_NAME="waveterm-macos-universal-${DMG_VERSION}.dmg"
+../../create-dmg/create-dmg \
  --volname "WaveTerm" \
  --window-pos 200 120 \
  --window-size 600 300 \
@@ -89,9 +55,8 @@ $SCRIPT_DIR/../../create-dmg/create-dmg \
  --hide-extension "Wave.app" \
  --app-drop-link 400 125 \
  $DMG_NAME \
-  "$TEMP_WAVE_DIR_UNIVERSAL"
+  "temp/Wave.app"
 echo "success, created $DMG_NAME"
-mv $DMG_NAME $BUILDS_DIR/
-spctl -a -vvv -t install $TEMP_WAVE_DIR_UNIVERSAL/
-
-rm -rf $TEMP_DIR $ZIP_DIR
+mv $DMG_NAME builds/
+rm builds/Wave-darwin-*.zip
+spctl -a -vvv -t install temp/Wave.app/
@@ -1,18 +1,14 @@
-const { notarize } = require("@electron/notarize");
-const path = require("path");
+const { notarize } = require('@electron/notarize');
+// DEBUG=electron-notarize

 console.log("running osx-notarize");
-const waveAppPath = path.resolve(__dirname, "temp", "Wave.app");
-
 notarize({
-    appPath: waveAppPath,
+    appPath: "temp/Wave.app",
    tool: "notarytool",
    keychainProfile: "notarytool-creds",
-})
-    .then(() => {
-        console.log("notarize success");
-    })
-    .catch((e) => {
-        console.log("notarize error", e);
-        process.exit(1);
-    });
+}).then(() => {
+    console.log("notarize success");
+}).catch((e) => {
+    console.log("notarize error", e);
+    process.exit(1);
+});
@@ -1,10 +1,10 @@
 const { signAsync } = require("@electron/osx-sign");
-const path = require("path");
+// DEBUG="electron-osx-sign*"

 console.log("running osx-sign");
-const waveAppPath = path.resolve(__dirname, "temp", "Wave.app");
+let waveAppPath = "temp/Wave.app";
 signAsync({
-    app: waveAppPath,
+    app: "temp/Wave.app",
    binaries: [
        waveAppPath + "/Contents/Resources/app/bin/wavesrv",
        waveAppPath + "/Contents/Resources/app/bin/mshell/mshell-v0.4-linux.amd64",
@@ -12,11 +12,9 @@ signAsync({
        waveAppPath + "/Contents/Resources/app/bin/mshell/mshell-v0.4-darwin.amd64",
        waveAppPath + "/Contents/Resources/app/bin/mshell/mshell-v0.4-darwin.arm64",
    ],
-})
-    .then(() => {
-        console.log("signing success");
-    })
-    .catch((e) => {
-        console.log("signing error", e);
-        process.exit(1);
-    });
+}).then(() => {
+    console.log("signing success");
+}).catch((e) => {
+    console.log("signing error", e);
+    process.exit(1);
+});
@@ -1,4 +1,3 @@
-github.com/aws/aws-sdk-go-v2/service/s3 v1.27.11 h1:3/gm/JTX9bX8CpzTgIlrtYpB3EVBDxyg/GY/QdcIEZw=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
 github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
@@ -2,7 +2,7 @@
    "name": "waveterm",
    "author": "Command Line Inc",
    "productName": "Wave",
-    "version": "v0.6.1",
+    "version": "0.6.1",
    "main": "dist/emain.js",
    "license": "Apache-2.0",
    "dependencies": {
@@ -72,7 +72,6 @@
        "copy-webpack-plugin": "^11.0.0",
        "css-loader": "^6.7.1",
        "electron": "28.1.3",
-        "electron-devtools-installer": "^3.2.0",
        "file-loader": "^6.2.0",
        "http-server": "^14.1.1",
        "less": "^4.1.2",
@@ -13,6 +13,7 @@
    </head>
    <body>
        <div id="measure"></div>
+        <div id="title-bar"></div>
        <div id="app"></div>
    </body>
 </html>
@@ -13,6 +13,7 @@
    </head>
    <body>
        <div id="measure"></div>
+        <div id="title-bar"></div>
        <div id="app"></div>
    </body>
 </html>
@@ -27,7 +27,7 @@ node_modules/.bin/electron-rebuild
 ```bash
 # @scripthaus command electron
 # @scripthaus cd :playbook
-WAVETERM_DEV=1 UPGRADE_EXTENSIONS=1 PCLOUD_ENDPOINT="https://ot2e112zx5.execute-api.us-west-2.amazonaws.com/dev" PCLOUD_WS_ENDPOINT="wss://5lfzlg5crl.execute-api.us-west-2.amazonaws.com/dev/" node_modules/.bin/electron dist-dev/emain.js
+WAVETERM_DEV=1 PCLOUD_ENDPOINT="https://ot2e112zx5.execute-api.us-west-2.amazonaws.com/dev" PCLOUD_WS_ENDPOINT="wss://5lfzlg5crl.execute-api.us-west-2.amazonaws.com/dev/" node_modules/.bin/electron dist-dev/emain.js
 ```

 ```bash
@@ -43,13 +43,12 @@ rm -rf dist/
 rm -rf bin/
 rm -rf build/
 node_modules/.bin/webpack --env prod
-WAVESRV_VERSION=$(node -e 'console.log(require("./version.js"))')
 GO_LDFLAGS="-s -w -X main.BuildTime=$(date +'%Y%m%d%H%M')"
 (cd waveshell; CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.4-darwin.amd64 main-waveshell.go)
 (cd waveshell; CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.4-darwin.arm64 main-waveshell.go)
 (cd waveshell; CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.4-linux.amd64 main-waveshell.go)
 (cd waveshell; CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.4-linux.arm64 main-waveshell.go)
-(cd wavesrv; CGO_ENABLED=1 go build -tags "osusergo,netgo,sqlite_omit_load_extension" -ldflags "-X main.BuildTime=$(date +'%Y%m%d%H%M') -X main.WaveVersion=$WAVESRV_VERSION" -o ../bin/wavesrv ./cmd)
+(cd wavesrv; CGO_ENABLED=1 go build -tags "osusergo,netgo,sqlite_omit_load_extension" -ldflags "-X main.BuildTime=$(date +'%Y%m%d%H%M')" -o ../bin/wavesrv ./cmd)
 node_modules/.bin/electron-forge make
 ```

@@ -60,14 +59,13 @@ rm -rf dist/
 rm -rf bin/
 rm -rf build/
 node_modules/.bin/webpack --env prod
-WAVESRV_VERSION=$(node -e 'console.log(require("./version.js"))')
 GO_LDFLAGS="-s -w -X main.BuildTime=$(date +'%Y%m%d%H%M')"
 (cd waveshell; CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.4-darwin.amd64 main-waveshell.go)
 (cd waveshell; CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.4-darwin.arm64 main-waveshell.go)
 (cd waveshell; CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.4-linux.amd64 main-waveshell.go)
 (cd waveshell; CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.4-linux.arm64 main-waveshell.go)
 # adds -extldflags=-static, *only* on linux (macos does not support fully static binaries) to avoid a glibc dependency
-(cd wavesrv; CGO_ENABLED=1 go build -tags "osusergo,netgo,sqlite_omit_load_extension" -ldflags "-linkmode 'external' -extldflags=-static $GO_LDFLAGS -X main.WaveVersion=$WAVESRV_VERSION" -o ../bin/wavesrv ./cmd)
+(cd wavesrv; CGO_ENABLED=1 go build -tags "osusergo,netgo,sqlite_omit_load_extension" -ldflags "-linkmode 'external' -extldflags=-static $GO_LDFLAGS" -o ../bin/wavesrv ./cmd)
 node_modules/.bin/electron-forge make
 ```

@@ -79,9 +77,8 @@ open out/Wave-darwin-x64/Wave.app

 ```bash
 # @scripthaus command build-wavesrv
-WAVESRV_VERSION=$(node -e 'console.log(require("./version.js"))')
 cd wavesrv
-CGO_ENABLED=1 go build -tags "osusergo,netgo,sqlite_omit_load_extension" -ldflags "-X main.BuildTime=$(date +'%Y%m%d%H%M') -X main.WaveVersion=$WAVESRV_VERSION" -o ../bin/wavesrv ./cmd
+CGO_ENABLED=1 go build -tags "osusergo,netgo,sqlite_omit_load_extension" -ldflags "-X main.BuildTime=$(date +'%Y%m%d%H%M')" -o ../bin/wavesrv ./cmd
 ```

 ```bash
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Sylvia Crowe	550e93e62a	fix: change size of dummy key to 2048 This fixes the CodeQL scan issue for using a weak key.	2024-02-15 12:12:34 -08:00
Sylvia Crowe	42963f4287	merge branch 'main' into ssh--auth-control	2024-02-15 12:09:21 -08:00
Sylvia Crowe	a356df3396	fix: allow 60 second timeouts for ssh inputs With the previous change, it is now possible to extend the timeout for manual inputs. 60 seconds should be a reasonable starting point.	2024-02-13 17:57:23 -08:00
Sylvia Crowe	0eab1e3973	merge branch 'main' into ssh--auth-control	2024-02-13 17:54:30 -08:00
Sylvia Crowe	5abff8075b	merge branch 'main' into 'ssh--auth-control' This was mostly straightforward, but it appears that a previous commit to main broke the user input modals by deleting a function. This adds that back in addition to the merge.	2024-02-13 16:30:07 -08:00
Sylvia Crowe	6bd60e8330	deactivate timer while connecting to new ssh The new ssh setup handles timers differently from the old one due to the possibility of asking for user input multiple times. This limited the user input to entirely be done within 15 seconds. This removes that restriction which will allow those timers to increase. It does not impact the legacy ssh systems or the local connections on the new system.	2024-02-13 14:10:07 -08:00
Sylvia Crowe	e62540bdbe	fix: fix auth ordering and identity files The last few commits introduced a few bugs that are fixed here. The first is that the auth ordering is parsed as a single string and not a list. This is fixed by manually splitting the string into a list. The second is that the copy of identity files was not long enough to copy the contents of the original. This is now updated to use the length of the original in its construction.	2024-02-10 00:55:58 -08:00
Sylvia Crowe	85156bd6c2	feat: add batch mode support BatchMode turns off user input to enter passwords for ssh. Because we save passwords, we can still attempt these methods but we disable the user interactive prompts in this case.	2024-02-09 23:44:53 -08:00
Sylvia Crowe	d4a64fa8c2	feat: allow attempting auth methods in any order While waveterm does not provide the control over which order to attempt yet, it is possible to provide that information in the ssh_config. This change allows that order to take precedence in a case where it is set.	2024-02-09 23:35:45 -08:00
Sylvia Crowe	618a08fe54	refactor: move logic for wave and config options The logic for making decisions between details made available from wave and details made available from ssh_config was spread out. This change condenses it into one function for gathering those details and one for picking between them. It also adds a few new keywords but the logic for those hasn't been implemented yet.	2024-02-09 22:44:55 -08:00
Sylvia Crowe	b788a5e4af	merge branch 'main' into ssh--auth-control This only has a few bug fixes.	2024-02-09 15:07:32 -08:00
Sylvia Crowe	2e76556cac	chore: remove old publicKey auth check With the new callback in place, we no longer need this, so it has been removed.	2024-02-09 13:30:07 -08:00
Sylvia Crowe	d66287fcc6	chore: remove unnecessary print in sshclient.go	2024-02-08 22:45:52 -08:00
Sylvia Crowe	f25892ba40	chore: remove unnecessary print in updatebus.go	2024-02-08 21:49:02 -08:00
Sylvia Crowe	37ff5f8c3e	feat: parse multiple identity files in ssh While this does not make it possible to discover multiple identity files in every case, it does make it possible to parse them individually and check for user input if it's required for each one.	2024-02-08 21:47:06 -08:00