rust/ja4: Add capture files and expected output

FoxIO-LLC · Oct 8, 2023 · 3605371 · 3605371
1 parent 72ce15b
commit 3605371
Show file tree

Hide file tree

Showing 40 changed files with 2,937 additions and 30 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -28,6 +28,15 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: true
+      - name: Install tshark
+        # See https://launchpad.net/~wireshark-dev/+archive/ubuntu/stable
+        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
+          tshark --version
       - name: Install ${{ matrix.toolchain }}
         uses: dtolnay/rust-toolchain@master
         with:
@@ -50,6 +59,15 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: true
+      - name: Install tshark
+        # See https://launchpad.net/~wireshark-dev/+archive/ubuntu/stable
+        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
+          tshark --version
       - name: Install stable
         uses: dtolnay/rust-toolchain@stable
       - name: Install nightly for -Zminimal-versions
@@ -70,16 +88,39 @@ 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 wireshark
+        if: runner.os == 'Windows'
+        shell: powershell
+        run: |
+          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's location to the system PATH
+          $env:Path += ";$env:ProgramFiles\Wireshark"
+          [Environment]::SetEnvironmentVariable("Path", $env:Path, [System.EnvironmentVariableTarget]::Machine)
+
+          tshark --version
       - name: Install stable
         uses: dtolnay/rust-toolchain@stable
       - run: cargo generate-lockfile
         if: hashFiles('rust/Cargo.lock') == ''
-      - name: cargo test
+      - name: non-windows / cargo test
+        if: runner.os != 'Windows'
         run: cargo test --locked --all-features --all-targets --workspace
         working-directory: rust/
+      - name: windows / cargo test
+        if: runner.os == 'Windows'
+        shell: powershell
+        run: |
+          # Add tshark's location to the system PATH
+          $env:Path += ";$env:ProgramFiles\Wireshark"
+          [Environment]::SetEnvironmentVariable("Path", $env:Path, [System.EnvironmentVariableTarget]::Machine)
+
+          cargo test --locked --all-features --all-targets --workspace
+        working-directory: rust/
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,3 @@
-/target
+rust/target
 .DS_Store
 .vscode/
diff --git a/pcap/browsers-x509.pcapng b/pcap/browsers-x509.pcapng
diff --git a/pcap/chrome-cloudflare-quic-with-secrets.pcapng b/pcap/chrome-cloudflare-quic-with-secrets.pcapng
diff --git a/pcap/http1-with-cookies.pcapng b/pcap/http1-with-cookies.pcapng
diff --git a/pcap/http1.pcapng b/pcap/http1.pcapng
diff --git a/pcap/http2-with-cookies.pcapng b/pcap/http2-with-cookies.pcapng
diff --git a/pcap/ipv6.pcapng b/pcap/ipv6.pcapng
diff --git a/pcap/latest.pcapng b/pcap/latest.pcapng
diff --git a/pcap/quic-tls-handshake.pcapng b/pcap/quic-tls-handshake.pcapng
diff --git a/pcap/quic-with-several-tls-frames.pcapng b/pcap/quic-with-several-tls-frames.pcapng
diff --git a/pcap/ssh-scp-1050.pcap b/pcap/ssh-scp-1050.pcap
diff --git a/pcap/ssh.pcapng b/pcap/ssh.pcapng
diff --git a/pcap/ssh2.pcapng b/pcap/ssh2.pcapng
diff --git a/pcap/tls-handshake.pcapng b/pcap/tls-handshake.pcapng
diff --git a/pcap/tls-sni.pcapng b/pcap/tls-sni.pcapng
diff --git a/pcap/tls3.pcapng b/pcap/tls3.pcapng
diff --git a/rust/CHANGELOG.md b/rust/CHANGELOG.md
@@ -7,11 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.15.0] - 2023-10-08
+
+### Added
+
+- Add capture files and expected output.
+
 ## [0.14.0] - 2023-10-04
 
 ### Added
 
 - Add Rust sources of `ja4` and `ja4x` CLI tools.
 
-[unreleased]: https://github.com/FoxIO-LLC/ja4/compare/v0.14.0...HEAD
+[unreleased]: https://github.com/FoxIO-LLC/ja4/compare/v0.15.0...HEAD
+[0.15.0]: https://github.com/FoxIO-LLC/ja4/compare/v0.14.0...v0.15.0
 [0.14.0]: https://github.com/FoxIO-LLC/ja4/releases/tag/v0.14.0