XXX-WIP

FoxIO-LLC · Oct 8, 2023 · 396bc5e · 396bc5e
1 parent 25d2bf4
commit 396bc5e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -19,6 +19,7 @@ concurrency:
 
 jobs:
   required:
+    if: false  # XXX-DELETEME
     name: ubuntu / ${{ matrix.toolchain }}
     runs-on: ubuntu-latest
     strategy:
@@ -28,7 +29,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - name: Install the latest stable `tshark`
+      - name: Install tshark
         # See https://launchpad.net/~wireshark-dev/+archive/ubuntu/stable
         run: |
           sudo apt update
@@ -53,13 +54,14 @@ jobs:
         working-directory: rust/
 
   minimal:
+    if: false  # XXX-DELETEME
     name: ubuntu / stable / minimal-versions
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - name: Install the latest stable `tshark`
+      - name: Install tshark
         # See https://launchpad.net/~wireshark-dev/+archive/ubuntu/stable
         run: |
           sudo apt update
@@ -88,20 +90,24 @@ jobs:
           # NOTE: Don't use GitHub-hosted macOS runners in a non-public repository --
           # they consume CI/CD minutes like crazy; see
           # https://docs.github.com/en/billing/managing-billing-for-github-actions/about-billing-for-github-actions#minute-multipliers
-          - windows-latest
           #- macos-latest
+          - windows-latest
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - name: Install the latest stable `tshark`
-        # See https://launchpad.net/~wireshark-dev/+archive/ubuntu/stable
+      - name: Install wireshark
+        if: runner.os == 'Windows'
+        shell: powershell
         run: |
-          sudo apt update
-          sudo apt -y install software-properties-common  # provides `add-apt-repository`
-          sudo add-apt-repository --yes ppa:wireshark-dev/stable
-          sudo apt update
-          sudo apt -y install tshark
+          Invoke-WebRequest -Uri "https://www.wireshark.org/download/win64/Wireshark-win64-4.0.10.exe" -OutFile "WiresharkInstaller.exe"
+          Start-Process -Wait -FilePath ".\WiresharkInstaller.exe" -ArgumentList "/S"
+
+          # Add `tshark` to the system PATH
+          $env:Path += ";$env:ProgramFiles\Wireshark"
+          [Environment]::SetEnvironmentVariable("Path", $env:Path, [System.EnvironmentVariableTarget]::Machine)
+
+          # Verify installation
           tshark --version
       - name: Install stable
         uses: dtolnay/rust-toolchain@stable

diff --git a/rust/ja4/src/tls.rs b/rust/ja4/src/tls.rs
@@ -575,7 +575,7 @@ fn tls_extensions_server(tls: &Proto) -> Vec<u16> {
     assert_eq!(tls.name(), "tls");
 
     tls.fields("tls.handshake.extension.type").filter_map(|md| {
-        md.value().parse().map_err(|e| {
+        md.value().parse::<u16>().map_err(|e| {
             tracing::debug!(packet = %tls.packet_num, value = md.value(), showname = md.display(), error = %e, "Invalid TLS extension");
         }).ok()
     })