Update osquery version (#29)

* Update osquery version

Signed-off-by: Prabhu Subramanian <[email protected]>

---------

Signed-off-by: Prabhu Subramanian <[email protected]>

Author: prabhu

.github/workflows/native-builds.yml

@@ -15,30 +15,34 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: ['ubuntu-latest', 'macos-13', 'macos-15', 'windows-latest']
+        os: ['ubuntu-24.04', 'ubuntu-24.04-arm', 'macos-13', 'macos-15']
     runs-on: ${{ matrix.os }}
     permissions:
       contents: write
       packages: write
     steps:
     - uses: actions/checkout@v4
-    - uses: swift-actions/setup-swift@v2
-      if: matrix.os == 'ubuntu-latest'
+    - name: Setup swift
+      if: matrix.os == 'ubuntu-24.04' || matrix.os == 'ubuntu-24.04-arm'
+      run: |
+        curl -O https://download.swift.org/swiftly/linux/swiftly-$(uname -m).tar.gz && \
+        tar zxf swiftly-$(uname -m).tar.gz && \
+        ./swiftly init --quiet-shell-followup && \
+        . ~/.local/share/swiftly/env.sh && \
+        hash -r
+    - name: Setup swift
+      if: matrix.os == 'macos-15'
+      run: |
+        curl -O https://download.swift.org/swiftly/darwin/swiftly.pkg && \
+        installer -pkg swiftly.pkg -target CurrentUserHomeDirectory && \
+        ~/.swiftly/bin/swiftly init --quiet-shell-followup && \
+        . ~/.swiftly/env.sh && \
+        hash -r
     - uses: oras-project/setup-oras@v1
     - run: oras version
     - name: Build
       run: |
-        if [ "${{ matrix.os }}" == "ubuntu-latest" ]; then
-          bash thirdparty/sourcekitten/build.sh
-          bash packages/linux-arm64/build-linux-arm64.sh
-          bash packages/linux-arm/build-linux-arm.sh
-          bash packages/ppc64/build-ppc64.sh
-        elif [ "${{ matrix.os }}" == "windows-latest" ]; then
-          powershell ./packages/windows-amd64/build-windows-amd64.ps1
-          powershell ./packages/windows-arm64/build-windows-arm64.ps1
-        else
-          bash thirdparty/sourcekitten/build.sh
-        fi
+        bash thirdparty/sourcekitten/build.sh
         ls -l thirdparty/sourcekitten/SourceKitten/.build/release
         echo $GITHUB_TOKEN | oras login ghcr.io -u $GITHUB_USERNAME --password-stdin
       env:
@@ -51,21 +55,15 @@ jobs:
           --artifact-type application/vnd.oras.config.v1+json \
           ./sourcekitten:application/vnd.cyclonedx.plugins.layer.v1+tar \
           ./sourcekitten.sha256:application/vnd.cyclonedx.plugins.layer.v1+tar
-      if: matrix.os == 'ubuntu-latest'
+      if: matrix.os == 'ubuntu-24.04'
     - name: Upload linux arm64
       run: |
-        cd packages/linux-arm64/release/
+        cd thirdparty/sourcekitten/SourceKitten/.build/release/
         oras push ghcr.io/cyclonedx/cdxgen-plugins-bin:linux-arm64 \
           --artifact-type application/vnd.oras.config.v1+json \
-          ./arm64-binary:application/vnd.cyclonedx.plugins.layer.v1+tar
-      if: matrix.os == 'ubuntu-latest'
-    - name: Upload linux arm
-      run: |
-        cd packages/linux-arm/release/
-        oras push ghcr.io/cyclonedx/cdxgen-plugins-bin:linux-arm \
-          --artifact-type application/vnd.oras.config.v1+json \
-          ./arm-binary:application/vnd.cyclonedx.plugins.layer.v1+tar
-      if: matrix.os == 'ubuntu-latest'
+          ./sourcekitten:application/vnd.cyclonedx.plugins.layer.v1+tar \
+          ./sourcekitten.sha256:application/vnd.cyclonedx.plugins.layer.v1+tar
+      if: matrix.os == 'ubuntu-24.04-arm'
     - name: Upload darwin amd64
       run: |
         cd thirdparty/sourcekitten/SourceKitten/.build/release/
@@ -82,24 +80,3 @@ jobs:
           ./sourcekitten:application/vnd.cyclonedx.plugins.layer.v1+tar \
           ./sourcekitten.sha256:application/vnd.cyclonedx.plugins.layer.v1+tar
       if: matrix.os == 'macos-15'
-    - name: Upload windows amd64
-      run: |
-        cd packages/windows-amd64/release/
-        oras push ghcr.io/cyclonedx/cdxgen-plugins-bin:windows-amd64 \
-          --artifact-type application/vnd.oras.config.v1+json \
-          ./windows-binary:application/vnd.cyclonedx.plugins.layer.v1+tar
-      if: matrix.os == 'windows-latest'
-    - name: Upload windows arm64
-      run: |
-        cd packages/windows-arm64/release/
-        oras push ghcr.io/cyclonedx/cdxgen-plugins-bin:windows-arm64 \
-          --artifact-type application/vnd.oras.config.v1+json \
-          ./windows-arm64-binary:application/vnd.cyclonedx.plugins.layer.v1+tar
-      if: matrix.os == 'windows-latest'
-    - name: Upload ppc64
-      run: |
-        cd packages/ppc64/release/
-        oras push ghcr.io/cyclonedx/cdxgen-plugins-bin:ppc64 \
-          --artifact-type application/vnd.oras.config.v1+json \
-          ./ppc64-binary:application/vnd.cyclonedx.plugins.layer.v1+tar
-      if: matrix.os == 'ubuntu-latest'

.github/workflows/release.yml

@@ -12,12 +12,6 @@ jobs:
       contents: read
       packages: write
     steps:
-    - name: Upload Linux AMD64 Package
-      uses: actions/upload-artifact@v3
-      with:
-        name: linux-amd64-package
-        path: packages/linux-amd64/*.tgz
-    
     - uses: actions/checkout@v4
     - name: Use Node.js
       uses: actions/setup-node@v4
@@ -29,6 +23,8 @@ jobs:
         go-version: '^1.19.8'
     - uses: swift-actions/setup-swift@v2
       if: matrix.os == 'ubuntu-latest'
+      with:
+        swift-version: '6.0'
     - uses: oras-project/setup-oras@v1
     - run: oras version
     - name: Trim CI agent
@@ -56,6 +52,13 @@ jobs:
         npm publish --access=public --@cyclonedx:registry='https://registry.npmjs.org'
         popd
 
+        pushd packages/linux-amd64
+        echo "cyclonedx:registry=https://npm.pkg.github.com" > ~/.npmrc
+        npm publish --access=public --@cyclonedx:registry='https://npm.pkg.github.com'
+        echo "cyclonedx:registry=https://registry.npmjs.org" > ~/.npmrc
+        npm publish --access=public --@cyclonedx:registry='https://registry.npmjs.org'
+        popd
+
         pushd packages/linux-arm64
         echo "cyclonedx:registry=https://npm.pkg.github.com" > ~/.npmrc
         npm publish --access=public --@cyclonedx:registry='https://npm.pkg.github.com'

.github/workflows/test.yml

@@ -26,6 +26,8 @@ jobs:
         python-version: '3.11'
     - uses: swift-actions/setup-swift@v2
       if: matrix.os == 'ubuntu-latest'
+      with:
+        swift-version: '6.0'
     - uses: oras-project/setup-oras@v1
     - run: oras version
     - name: Trim CI agent
@@ -45,6 +47,9 @@ jobs:
         pushd packages/windows-amd64
         npm publish --dry-run
         popd
+        pushd packages/linux-amd64
+        npm publish --dry-run
+        popd
         pushd packages/linux-arm64
         npm publish --dry-run
         popd

build.ps1

@@ -5,9 +5,9 @@ New-Item -ItemType Directory -Path plugins\trivy -Force
 Invoke-WebRequest -Uri https://github.com/upx/upx/releases/download/v4.2.4/upx-4.2.4-win64.zip -UseBasicParsing -OutFile upx-4.2.4-win64.zip
 Expand-Archive -Path upx-4.2.4-win64.zip -DestinationPath . -Force
 
-Invoke-WebRequest -Uri https://github.com/osquery/osquery/releases/download/5.14.1/osquery-5.14.1.windows_x86_64.zip -UseBasicParsing -OutFile osquery-5.14.1.windows_x86_64.zip
-Expand-Archive -Path osquery-5.14.1.windows_x86_64.zip -DestinationPath . -Force
-copy "osquery-5.14.1.windows_x86_64\Program Files\osquery\osqueryi.exe" plugins\osquery\osqueryi-windows-amd64.exe
+Invoke-WebRequest -Uri https://github.com/osquery/osquery/releases/download/5.16.0/osquery-5.16.0.windows_x86_64.zip -UseBasicParsing -OutFile osquery-5.16.0.windows_x86_64.zip
+Expand-Archive -Path osquery-5.16.0.windows_x86_64.zip -DestinationPath . -Force
+copy "osquery-5.16.0.windows_x86_64\Program Files\osquery\osqueryi.exe" plugins\osquery\osqueryi-windows-amd64.exe
 upx-4.2.4-win64\upx.exe -9 --lzma plugins\osquery\osqueryi-windows-amd64.exe
 plugins\osquery\osqueryi-windows-amd64.exe --help
 
@@ -20,14 +20,7 @@ copy build\* ..\..\plugins\trivy\
 Remove-Item build -Recurse -Force
 cd ..\..
 
-Write-Host "Building Linux AMD64 package..."
-Set-Location -Path packages/linux-amd64
-Copy-Item -Path ../../plugins/* -Destination plugins/
-npm install
-npm pack
-Set-Location -Path ../../
-
-Remove-Item osquery-5.14.1.windows_x86_64 -Recurse -Force
-Remove-Item osquery-5.14.1.windows_x86_64.zip -Recurse -Force
+Remove-Item osquery-5.16.0.windows_x86_64 -Recurse -Force
+Remove-Item osquery-5.16.0.windows_x86_64.zip -Recurse -Force
 Remove-Item upx-4.2.4-win64 -Recurse -Force
 Remove-Item upx-4.2.4-win64.zip -Recurse -Force

build.sh

@@ -6,21 +6,6 @@ rm -rf plugins/dosai
 rm -rf plugins/sourcekitten
 mkdir -p plugins/osquery plugins/dosai plugins/sourcekitten
 
-oras pull ghcr.io/cyclonedx/cdxgen-plugins-bin:linux-amd64 -o plugins/sourcekitten/
-sha256sum plugins/sourcekitten/sourcekitten > plugins/sourcekitten/sourcekitten.sha256
-
-wget https://github.com/osquery/osquery/releases/download/5.14.1/osquery-5.14.1_1.linux_x86_64.tar.gz
-tar -xvf osquery-5.14.1_1.linux_x86_64.tar.gz
-cp opt/osquery/bin/osqueryd plugins/osquery/osqueryi-linux-amd64
-upx -9 --lzma plugins/osquery/osqueryi-linux-amd64
-sha256sum plugins/osquery/osqueryi-linux-amd64 > plugins/osquery/osqueryi-linux-amd64.sha256
-rm -rf etc usr var opt
-rm osquery-5.14.1_1.linux_x86_64.tar.gz
-
-curl -L https://github.com/owasp-dep-scan/dosai/releases/latest/download/Dosai -o plugins/dosai/dosai-linux-amd64
-chmod +x plugins/dosai/dosai-linux-amd64
-sha256sum plugins/dosai/dosai-linux-amd64 > plugins/dosai/dosai-linux-amd64.sha256
-
 for plug in trivy
 do
     mkdir -p plugins/$plug
@@ -37,14 +22,7 @@ upx -9 --lzma ./plugins/trivy/trivy-cdxgen-linux-amd64
 ./plugins/trivy/trivy-cdxgen-linux-amd64 -v
 ./plugins/dosai/dosai-linux-amd64 --help
 
-echo "Building Linux AMD64 package..."
-cd packages/linux-amd64
-cp ../../plugins/* plugins/
-npm install
-npm pack
-cd ../../
-
-for flavours in windows-amd64 linux-arm64 linux-arm windows-arm64 darwin-arm64 darwin-amd64 ppc64
+for flavours in windows-amd64 linux-amd64 linux-arm64 linux-arm windows-arm64 darwin-arm64 darwin-amd64 ppc64
 do
     chmod +x packages/$flavours/build-$flavours.sh
     pushd packages/$flavours

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@cyclonedx/cdxgen-plugins-bin",
-  "version": "1.6.9",
+  "version": "1.6.10",
   "description": "Binary plugins to supercharge @cyclonedx/cdxgen npm package",
   "main": "index.js",
   "repository": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cyclonedx/cdxgen-plugins-bin-darwin-amd64",
-  "version": "1.6.9",
+  "version": "1.6.10",
   "description": "Arm64 binary plugins to supercharge @cyclonedx/cdxgen npm package",
   "main": "index.js",
   "repository": {

packages/darwin-amd64/package.json

@@ -8,11 +8,11 @@ mkdir -p plugins/osquery plugins/dosai plugins/sourcekitten
 
 oras pull ghcr.io/cyclonedx/cdxgen-plugins-bin:darwin-arm64 -o plugins/sourcekitten/
 
-wget https://github.com/osquery/osquery/releases/download/5.14.1/osquery-5.14.1_1.macos_arm64.tar.gz
-tar -xvf osquery-5.14.1_1.macos_arm64.tar.gz
+wget https://github.com/osquery/osquery/releases/download/5.16.0/osquery-5.16.0_1.macos_arm64.tar.gz
+tar -xf osquery-5.16.0_1.macos_arm64.tar.gz
 cp -rf opt/osquery/lib/osquery.app plugins/osquery/osqueryi-darwin-arm64.app
 rm -rf etc usr var opt
-rm osquery-5.14.1_1.macos_arm64.tar.gz
+rm osquery-5.16.0_1.macos_arm64.tar.gz
 
 curl -L https://github.com/owasp-dep-scan/dosai/releases/latest/download/Dosai-osx-arm64 -o plugins/dosai/dosai-darwin-arm64
 chmod +x plugins/dosai/dosai-darwin-arm64
@@ -23,3 +23,5 @@ do
     mkdir -p plugins/$plug
     mv ../../plugins/$plug/*darwin-arm64* plugins/$plug/
 done
+
+rm -rf private

packages/darwin-arm64/build-darwin-arm64.sh

@@ -1,6 +1,6 @@
 {
   "name": "@cyclonedx/cdxgen-plugins-bin-darwin-arm64",
-  "version": "1.6.9",
+  "version": "1.6.10",
   "description": "Arm64 binary plugins to supercharge @cyclonedx/cdxgen npm package",
   "main": "index.js",
   "repository": {