Skip to content

Commit b1d9267

Browse files
prabhuprabhu
authored
Update osquery version (#29)
* Update osquery version Signed-off-by: Prabhu Subramanian <[email protected]> --------- Signed-off-by: Prabhu Subramanian <[email protected]>
1 parent 85b628f commit b1d9267

20 files changed

+123
-144
lines changed

‎.github/workflows/native-builds.yml

+23-46
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,34 @@ jobs:
1515
strategy:
1616
fail-fast: true
1717
matrix:
18-
os: ['ubuntu-latest', 'macos-13', 'macos-15', 'windows-latest']
18+
os: ['ubuntu-24.04', 'ubuntu-24.04-arm', 'macos-13', 'macos-15']
1919
runs-on: ${{ matrix.os }}
2020
permissions:
2121
contents: write
2222
packages: write
2323
steps:
2424
- uses: actions/checkout@v4
25-
- uses: swift-actions/setup-swift@v2
26-
if: matrix.os == 'ubuntu-latest'
25+
- name: Setup swift
26+
if: matrix.os == 'ubuntu-24.04' || matrix.os == 'ubuntu-24.04-arm'
27+
run: |
28+
curl -O https://download.swift.org/swiftly/linux/swiftly-$(uname -m).tar.gz && \
29+
tar zxf swiftly-$(uname -m).tar.gz && \
30+
./swiftly init --quiet-shell-followup && \
31+
. ~/.local/share/swiftly/env.sh && \
32+
hash -r
33+
- name: Setup swift
34+
if: matrix.os == 'macos-15'
35+
run: |
36+
curl -O https://download.swift.org/swiftly/darwin/swiftly.pkg && \
37+
installer -pkg swiftly.pkg -target CurrentUserHomeDirectory && \
38+
~/.swiftly/bin/swiftly init --quiet-shell-followup && \
39+
. ~/.swiftly/env.sh && \
40+
hash -r
2741
- uses: oras-project/setup-oras@v1
2842
- run: oras version
2943
- name: Build
3044
run: |
31-
if [ "${{ matrix.os }}" == "ubuntu-latest" ]; then
32-
bash thirdparty/sourcekitten/build.sh
33-
bash packages/linux-arm64/build-linux-arm64.sh
34-
bash packages/linux-arm/build-linux-arm.sh
35-
bash packages/ppc64/build-ppc64.sh
36-
elif [ "${{ matrix.os }}" == "windows-latest" ]; then
37-
powershell ./packages/windows-amd64/build-windows-amd64.ps1
38-
powershell ./packages/windows-arm64/build-windows-arm64.ps1
39-
else
40-
bash thirdparty/sourcekitten/build.sh
41-
fi
45+
bash thirdparty/sourcekitten/build.sh
4246
ls -l thirdparty/sourcekitten/SourceKitten/.build/release
4347
echo $GITHUB_TOKEN | oras login ghcr.io -u $GITHUB_USERNAME --password-stdin
4448
env:
@@ -51,21 +55,15 @@ jobs:
5155
--artifact-type application/vnd.oras.config.v1+json \
5256
./sourcekitten:application/vnd.cyclonedx.plugins.layer.v1+tar \
5357
./sourcekitten.sha256:application/vnd.cyclonedx.plugins.layer.v1+tar
54-
if: matrix.os == 'ubuntu-latest'
58+
if: matrix.os == 'ubuntu-24.04'
5559
- name: Upload linux arm64
5660
run: |
57-
cd packages/linux-arm64/release/
61+
cd thirdparty/sourcekitten/SourceKitten/.build/release/
5862
oras push ghcr.io/cyclonedx/cdxgen-plugins-bin:linux-arm64 \
5963
--artifact-type application/vnd.oras.config.v1+json \
60-
./arm64-binary:application/vnd.cyclonedx.plugins.layer.v1+tar
61-
if: matrix.os == 'ubuntu-latest'
62-
- name: Upload linux arm
63-
run: |
64-
cd packages/linux-arm/release/
65-
oras push ghcr.io/cyclonedx/cdxgen-plugins-bin:linux-arm \
66-
--artifact-type application/vnd.oras.config.v1+json \
67-
./arm-binary:application/vnd.cyclonedx.plugins.layer.v1+tar
68-
if: matrix.os == 'ubuntu-latest'
64+
./sourcekitten:application/vnd.cyclonedx.plugins.layer.v1+tar \
65+
./sourcekitten.sha256:application/vnd.cyclonedx.plugins.layer.v1+tar
66+
if: matrix.os == 'ubuntu-24.04-arm'
6967
- name: Upload darwin amd64
7068
run: |
7169
cd thirdparty/sourcekitten/SourceKitten/.build/release/
@@ -82,24 +80,3 @@ jobs:
8280
./sourcekitten:application/vnd.cyclonedx.plugins.layer.v1+tar \
8381
./sourcekitten.sha256:application/vnd.cyclonedx.plugins.layer.v1+tar
8482
if: matrix.os == 'macos-15'
85-
- name: Upload windows amd64
86-
run: |
87-
cd packages/windows-amd64/release/
88-
oras push ghcr.io/cyclonedx/cdxgen-plugins-bin:windows-amd64 \
89-
--artifact-type application/vnd.oras.config.v1+json \
90-
./windows-binary:application/vnd.cyclonedx.plugins.layer.v1+tar
91-
if: matrix.os == 'windows-latest'
92-
- name: Upload windows arm64
93-
run: |
94-
cd packages/windows-arm64/release/
95-
oras push ghcr.io/cyclonedx/cdxgen-plugins-bin:windows-arm64 \
96-
--artifact-type application/vnd.oras.config.v1+json \
97-
./windows-arm64-binary:application/vnd.cyclonedx.plugins.layer.v1+tar
98-
if: matrix.os == 'windows-latest'
99-
- name: Upload ppc64
100-
run: |
101-
cd packages/ppc64/release/
102-
oras push ghcr.io/cyclonedx/cdxgen-plugins-bin:ppc64 \
103-
--artifact-type application/vnd.oras.config.v1+json \
104-
./ppc64-binary:application/vnd.cyclonedx.plugins.layer.v1+tar
105-
if: matrix.os == 'ubuntu-latest'

‎.github/workflows/release.yml

+9-6
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,6 @@ jobs:
1212
contents: read
1313
packages: write
1414
steps:
15-
- name: Upload Linux AMD64 Package
16-
uses: actions/upload-artifact@v3
17-
with:
18-
name: linux-amd64-package
19-
path: packages/linux-amd64/*.tgz
20-
2115
- uses: actions/checkout@v4
2216
- name: Use Node.js
2317
uses: actions/setup-node@v4
@@ -29,6 +23,8 @@ jobs:
2923
go-version: '^1.19.8'
3024
- uses: swift-actions/setup-swift@v2
3125
if: matrix.os == 'ubuntu-latest'
26+
with:
27+
swift-version: '6.0'
3228
- uses: oras-project/setup-oras@v1
3329
- run: oras version
3430
- name: Trim CI agent
@@ -56,6 +52,13 @@ jobs:
5652
npm publish --access=public --@cyclonedx:registry='https://registry.npmjs.org'
5753
popd
5854
55+
pushd packages/linux-amd64
56+
echo "cyclonedx:registry=https://npm.pkg.github.com" > ~/.npmrc
57+
npm publish --access=public --@cyclonedx:registry='https://npm.pkg.github.com'
58+
echo "cyclonedx:registry=https://registry.npmjs.org" > ~/.npmrc
59+
npm publish --access=public --@cyclonedx:registry='https://registry.npmjs.org'
60+
popd
61+
5962
pushd packages/linux-arm64
6063
echo "cyclonedx:registry=https://npm.pkg.github.com" > ~/.npmrc
6164
npm publish --access=public --@cyclonedx:registry='https://npm.pkg.github.com'

‎.github/workflows/test.yml

+5
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ jobs:
2626
python-version: '3.11'
2727
- uses: swift-actions/setup-swift@v2
2828
if: matrix.os == 'ubuntu-latest'
29+
with:
30+
swift-version: '6.0'
2931
- uses: oras-project/setup-oras@v1
3032
- run: oras version
3133
- name: Trim CI agent
@@ -45,6 +47,9 @@ jobs:
4547
pushd packages/windows-amd64
4648
npm publish --dry-run
4749
popd
50+
pushd packages/linux-amd64
51+
npm publish --dry-run
52+
popd
4853
pushd packages/linux-arm64
4954
npm publish --dry-run
5055
popd

‎build.ps1

+5-12
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ New-Item -ItemType Directory -Path plugins\trivy -Force
55
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
66
Expand-Archive -Path upx-4.2.4-win64.zip -DestinationPath . -Force
77

8-
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
9-
Expand-Archive -Path osquery-5.14.1.windows_x86_64.zip -DestinationPath . -Force
10-
copy "osquery-5.14.1.windows_x86_64\Program Files\osquery\osqueryi.exe" plugins\osquery\osqueryi-windows-amd64.exe
8+
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
9+
Expand-Archive -Path osquery-5.16.0.windows_x86_64.zip -DestinationPath . -Force
10+
copy "osquery-5.16.0.windows_x86_64\Program Files\osquery\osqueryi.exe" plugins\osquery\osqueryi-windows-amd64.exe
1111
upx-4.2.4-win64\upx.exe -9 --lzma plugins\osquery\osqueryi-windows-amd64.exe
1212
plugins\osquery\osqueryi-windows-amd64.exe --help
1313

@@ -20,14 +20,7 @@ copy build\* ..\..\plugins\trivy\
2020
Remove-Item build -Recurse -Force
2121
cd ..\..
2222

23-
Write-Host "Building Linux AMD64 package..."
24-
Set-Location -Path packages/linux-amd64
25-
Copy-Item -Path ../../plugins/* -Destination plugins/
26-
npm install
27-
npm pack
28-
Set-Location -Path ../../
29-
30-
Remove-Item osquery-5.14.1.windows_x86_64 -Recurse -Force
31-
Remove-Item osquery-5.14.1.windows_x86_64.zip -Recurse -Force
23+
Remove-Item osquery-5.16.0.windows_x86_64 -Recurse -Force
24+
Remove-Item osquery-5.16.0.windows_x86_64.zip -Recurse -Force
3225
Remove-Item upx-4.2.4-win64 -Recurse -Force
3326
Remove-Item upx-4.2.4-win64.zip -Recurse -Force

‎build.sh

+1-23
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,6 @@ rm -rf plugins/dosai
66
rm -rf plugins/sourcekitten
77
mkdir -p plugins/osquery plugins/dosai plugins/sourcekitten
88

9-
oras pull ghcr.io/cyclonedx/cdxgen-plugins-bin:linux-amd64 -o plugins/sourcekitten/
10-
sha256sum plugins/sourcekitten/sourcekitten > plugins/sourcekitten/sourcekitten.sha256
11-
12-
wget https://github.com/osquery/osquery/releases/download/5.14.1/osquery-5.14.1_1.linux_x86_64.tar.gz
13-
tar -xvf osquery-5.14.1_1.linux_x86_64.tar.gz
14-
cp opt/osquery/bin/osqueryd plugins/osquery/osqueryi-linux-amd64
15-
upx -9 --lzma plugins/osquery/osqueryi-linux-amd64
16-
sha256sum plugins/osquery/osqueryi-linux-amd64 > plugins/osquery/osqueryi-linux-amd64.sha256
17-
rm -rf etc usr var opt
18-
rm osquery-5.14.1_1.linux_x86_64.tar.gz
19-
20-
curl -L https://github.com/owasp-dep-scan/dosai/releases/latest/download/Dosai -o plugins/dosai/dosai-linux-amd64
21-
chmod +x plugins/dosai/dosai-linux-amd64
22-
sha256sum plugins/dosai/dosai-linux-amd64 > plugins/dosai/dosai-linux-amd64.sha256
23-
249
for plug in trivy
2510
do
2611
mkdir -p plugins/$plug
@@ -37,14 +22,7 @@ upx -9 --lzma ./plugins/trivy/trivy-cdxgen-linux-amd64
3722
./plugins/trivy/trivy-cdxgen-linux-amd64 -v
3823
./plugins/dosai/dosai-linux-amd64 --help
3924

40-
echo "Building Linux AMD64 package..."
41-
cd packages/linux-amd64
42-
cp ../../plugins/* plugins/
43-
npm install
44-
npm pack
45-
cd ../../
46-
47-
for flavours in windows-amd64 linux-arm64 linux-arm windows-arm64 darwin-arm64 darwin-amd64 ppc64
25+
for flavours in windows-amd64 linux-amd64 linux-arm64 linux-arm windows-arm64 darwin-arm64 darwin-amd64 ppc64
4826
do
4927
chmod +x packages/$flavours/build-$flavours.sh
5028
pushd packages/$flavours

‎package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cyclonedx/cdxgen-plugins-bin",
3-
"version": "1.6.9",
3+
"version": "1.6.10",
44
"description": "Binary plugins to supercharge @cyclonedx/cdxgen npm package",
55
"main": "index.js",
66
"repository": {

‎packages/darwin-amd64/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cyclonedx/cdxgen-plugins-bin-darwin-amd64",
3-
"version": "1.6.9",
3+
"version": "1.6.10",
44
"description": "Arm64 binary plugins to supercharge @cyclonedx/cdxgen npm package",
55
"main": "index.js",
66
"repository": {

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

+5-3
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ mkdir -p plugins/osquery plugins/dosai plugins/sourcekitten
88

99
oras pull ghcr.io/cyclonedx/cdxgen-plugins-bin:darwin-arm64 -o plugins/sourcekitten/
1010

11-
wget https://github.com/osquery/osquery/releases/download/5.14.1/osquery-5.14.1_1.macos_arm64.tar.gz
12-
tar -xvf osquery-5.14.1_1.macos_arm64.tar.gz
11+
wget https://github.com/osquery/osquery/releases/download/5.16.0/osquery-5.16.0_1.macos_arm64.tar.gz
12+
tar -xf osquery-5.16.0_1.macos_arm64.tar.gz
1313
cp -rf opt/osquery/lib/osquery.app plugins/osquery/osqueryi-darwin-arm64.app
1414
rm -rf etc usr var opt
15-
rm osquery-5.14.1_1.macos_arm64.tar.gz
15+
rm osquery-5.16.0_1.macos_arm64.tar.gz
1616

1717
curl -L https://github.com/owasp-dep-scan/dosai/releases/latest/download/Dosai-osx-arm64 -o plugins/dosai/dosai-darwin-arm64
1818
chmod +x plugins/dosai/dosai-darwin-arm64
@@ -23,3 +23,5 @@ do
2323
mkdir -p plugins/$plug
2424
mv ../../plugins/$plug/*darwin-arm64* plugins/$plug/
2525
done
26+
27+
rm -rf private

‎packages/darwin-arm64/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cyclonedx/cdxgen-plugins-bin-darwin-arm64",
3-
"version": "1.6.9",
3+
"version": "1.6.10",
44
"description": "Arm64 binary plugins to supercharge @cyclonedx/cdxgen npm package",
55
"main": "index.js",
66
"repository": {

‎packages/linux-amd64/build-linux-amd64.sh

100644100755
+16-12
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,32 @@
11
#!/usr/bin/env bash
22
set -e # Exit on error
33

4-
echo "Building Linux AMD64 package..."
5-
64
# Remove old plugin directories to ensure a clean build
7-
rm -rf plugins/trivy plugins/osquery plugins/dosai
8-
mkdir -p plugins/trivy plugins/osquery plugins/dosai
5+
rm -rf plugins/trivy plugins/osquery plugins/sourcekitten plugins/dosai
6+
mkdir -p plugins/trivy plugins/osquery plugins/sourcekitten plugins/dosai
7+
8+
oras pull ghcr.io/cyclonedx/cdxgen-plugins-bin:linux-amd64 -o plugins/sourcekitten/
9+
sha256sum plugins/sourcekitten/sourcekitten > plugins/sourcekitten/sourcekitten.sha256
10+
11+
wget https://github.com/osquery/osquery/releases/download/5.16.0/osquery-5.16.0_1.linux_x86_64.tar.gz
12+
tar -xf osquery-5.16.0_1.linux_x86_64.tar.gz
13+
cp opt/osquery/bin/osqueryd plugins/osquery/osqueryi-linux-amd64
14+
upx -9 --lzma plugins/osquery/osqueryi-linux-amd64
15+
sha256sum plugins/osquery/osqueryi-linux-amd64 > plugins/osquery/osqueryi-linux-amd64.sha256
16+
rm -rf etc usr var opt
17+
rm osquery-5.16.0_1.linux_x86_64.tar.gz
918

1019
# Download the Dosai binary
1120
curl -L https://github.com/owasp-dep-scan/dosai/releases/latest/download/Dosai-linux-amd64 -o plugins/dosai/dosai-linux-amd64
1221
chmod +x plugins/dosai/dosai-linux-amd64
1322
sha256sum plugins/dosai/dosai-linux-amd64 > plugins/dosai/dosai-linux-amd64.sha256
1423

15-
# Handle additional plugins: Trivy and Osquery
16-
for plug in trivy osquery; do
24+
for plug in trivy; do
1725
mkdir -p plugins/$plug
18-
# Check if the source plugin directory exists and is not empty
1926
if [ -d "../../plugins/$plug" ] && [ "$(ls -A ../../plugins/$plug/*linux-amd64* 2>/dev/null)" ]; then
20-
cp ../../plugins/$plug/*linux-amd64* plugins/$plug/
21-
upx -9 --lzma plugins/$plug/*linux-amd64* || true # Compress files if possible
27+
mv ../../plugins/$plug/*linux-amd64* plugins/$plug/
28+
upx -9 --lzma plugins/$plug/*linux-amd64* || true
2229
else
2330
echo "Warning: No files found for $plug in ../../plugins/$plug/"
2431
fi
2532
done
26-
27-
# Final output message
28-
echo "Linux AMD64 build completed successfully!"

‎packages/linux-amd64/package.json

+33-16
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,34 @@
11
{
2-
"name": "@cyclonedx/cdxgen-plugins-bin-linux-amd64",
3-
"version": "1.0.0",
4-
"description": "CycloneDX plugins binary for Linux AMD64",
5-
"main": "index.js",
6-
"scripts": {
7-
"build": "./build-linux-amd64.sh"
8-
},
9-
"keywords": [
10-
"CycloneDX",
11-
"plugins",
12-
"linux",
13-
"amd64"
14-
],
15-
"license": "MIT"
16-
}
17-
2+
"name": "@cyclonedx/cdxgen-plugins-bin-linux-amd64",
3+
"version": "1.6.10",
4+
"description": "linux amd64 binary plugins to supercharge @cyclonedx/cdxgen npm package",
5+
"main": "index.js",
6+
"repository": {
7+
"type": "git",
8+
"url": "git+https://github.com/cyclonedx/cdxgen-plugins-bin.git"
9+
},
10+
"keywords": [
11+
"cdxgen",
12+
"sbom",
13+
"bom",
14+
"plugins",
15+
"dependency",
16+
"appsec"
17+
],
18+
"author": "Prabhu Subramanian <[email protected]>",
19+
"license": "Apache-2.0",
20+
"bugs": {
21+
"url": "https://github.com/cyclonedx/cdxgen-plugins-bin/issues"
22+
},
23+
"homepage": "https://github.com/cyclonedx/cdxgen-plugins-bin#readme",
24+
"files": [
25+
"*.js",
26+
"plugins/"
27+
],
28+
"os": [
29+
"linux"
30+
],
31+
"cpu": [
32+
"x64"
33+
]
34+
}

‎packages/linux-arm/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"name": "@cyclonedx/cdxgen-plugins-bin-arm",
3-
"version": "1.6.9",
2+
"name": "@cyclonedx/cdxgen-plugins-bin-linux-arm",
3+
"version": "1.6.10",
44
"description": "Arm binary plugins to supercharge @cyclonedx/cdxgen npm package",
55
"main": "index.js",
66
"repository": {

0 commit comments

Comments
 (0)