Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating all 3 plugins #20

Merged
merged 2 commits into from
Jul 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ jobs:
${{ runner.os }}-go-
- name: Release
run: |
wget https://github.com/upx/upx/releases/download/v4.2.2/upx-4.2.2-amd64_linux.tar.xz
tar -xvf upx-4.2.2-amd64_linux.tar.xz
chmod +x upx-4.2.2-amd64_linux/upx
sudo cp upx-4.2.2-amd64_linux/upx /usr/local/bin/
wget https://github.com/upx/upx/releases/download/v4.2.4/upx-4.2.4-amd64_linux.tar.xz
tar -xvf upx-4.2.4-amd64_linux.tar.xz
chmod +x upx-4.2.4-amd64_linux/upx
sudo cp upx-4.2.4-amd64_linux/upx /usr/local/bin/
npm config set //npm.pkg.github.com/:_authToken=$GITHUB_TOKEN
npm config set //registry.npmjs.org/:_authToken=$NPMJS_AUTH_TOKEN
bash build.sh
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,16 @@ jobs:
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-go-
- name: Trim CI agent
run: |
chmod +x contrib/free_disk_space.sh
./contrib/free_disk_space.sh
- name: Build
run: |
wget https://github.com/upx/upx/releases/download/v4.2.2/upx-4.2.2-amd64_linux.tar.xz
tar -xvf upx-4.2.2-amd64_linux.tar.xz
chmod +x upx-4.2.2-amd64_linux/upx
sudo cp upx-4.2.2-amd64_linux/upx /usr/local/bin/
wget https://github.com/upx/upx/releases/download/v4.2.4/upx-4.2.4-amd64_linux.tar.xz
tar -xvf upx-4.2.4-amd64_linux.tar.xz
chmod +x upx-4.2.4-amd64_linux/upx
sudo cp upx-4.2.4-amd64_linux/upx /usr/local/bin/
bash build.sh
pip3 install blint
blint -i plugins -o /tmp/reports
Expand Down
22 changes: 11 additions & 11 deletions build.ps1
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
New-Item -ItemType Directory -Path plugins\osquery -Force
New-Item -ItemType Directory -Path plugins\dosai -Force

Invoke-WebRequest -Uri https://github.com/upx/upx/releases/download/v4.2.2/upx-4.2.2-win64.zip -UseBasicParsing -OutFile upx-4.2.2-win64.zip
Expand-Archive -Path upx-4.2.2-win64.zip -DestinationPath . -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.11.0/osquery-5.11.0.windows_x86_64.zip -UseBasicParsing -OutFile osquery-5.11.0.windows_x86_64.zip
Expand-Archive -Path osquery-5.11.0.windows_x86_64.zip -DestinationPath . -Force
copy "osquery-5.11.0.windows_x86_64\Program Files\osquery\osqueryi.exe" plugins\osquery\osqueryi-windows-amd64.exe
upx-4.2.2-win64\upx.exe -9 --lzma plugins\osquery\osqueryi-windows-amd64.exe
Invoke-WebRequest -Uri https://github.com/osquery/osquery/releases/download/5.12.2/osquery-5.12.2.windows_x86_64.zip -UseBasicParsing -OutFile osquery-5.12.2.windows_x86_64.zip
Expand-Archive -Path osquery-5.12.2.windows_x86_64.zip -DestinationPath . -Force
copy "osquery-5.12.2.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

Invoke-WebRequest -Uri https://github.com/owasp-dep-scan/dosai/releases/latest/download/Dosai.exe -UseBasicParsing -OutFile plugins/dosai/dosai-windows-amd64.exe
Expand All @@ -19,12 +19,12 @@ set GOARCH=amd64
New-Item -ItemType Directory -Path plugins\trivy -Force
cd thirdparty\trivy
go build -ldflags "-H=windowsgui -s -w" -o build\trivy-windows-amd64.exe
..\..\upx-4.2.2-win64\upx.exe -9 --lzma build\trivy-windows-amd64.exe
..\..\upx-4.2.4-win64\upx.exe -9 --lzma build\trivy-windows-amd64.exe
copy build\* ..\..\plugins\trivy\
Remove-Item build -Recurse -Force
cd ..\..

Remove-Item osquery-5.11.0.windows_x86_64 -Recurse -Force
Remove-Item osquery-5.11.0.windows_x86_64.zip -Recurse -Force
Remove-Item upx-4.2.2-win64 -Recurse -Force
Remove-Item upx-4.2.2-win64.zip -Recurse -Force
Remove-Item osquery-5.12.2.windows_x86_64 -Recurse -Force
Remove-Item osquery-5.12.2.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
6 changes: 3 additions & 3 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ rm -rf plugins/osquery
rm -rf plugins/dosai
mkdir -p plugins/osquery plugins/dosai

wget https://github.com/osquery/osquery/releases/download/5.11.0/osquery-5.11.0_1.linux_x86_64.tar.gz
tar -xvf osquery-5.11.0_1.linux_x86_64.tar.gz
wget https://github.com/osquery/osquery/releases/download/5.12.2/osquery-5.12.2_1.linux_x86_64.tar.gz
tar -xvf osquery-5.12.2_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.11.0_1.linux_x86_64.tar.gz
rm osquery-5.12.2_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
Expand Down
53 changes: 53 additions & 0 deletions contrib/free_disk_space.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
#!/usr/bin/env bash
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.


#
# The Azure provided machines typically have the following disk allocation:
# Total space: 85GB
# Allocated: 67 GB
# Free: 17 GB
# This script frees up 28 GB of disk space by deleting unneeded packages and
# large directories.
# The Flink end to end tests download and generate more than 17 GB of files,
# causing unpredictable behavior and build failures.
#
echo "=============================================================================="
echo "Freeing up disk space on CI system"
echo "=============================================================================="

echo "Listing 100 largest packages"
dpkg-query -Wf '${Installed-Size}\t${Package}\n' | sort -n | tail -n 100
df -h
echo "Removing large packages"
sudo apt-get remove -y '^dotnet-.*'
sudo apt-get remove -y '^llvm-.*'
sudo apt-get remove -y 'php.*'
sudo apt-get remove -y '^mongodb-.*'
sudo apt-get remove -y '^mysql-.*'
sudo apt-get remove -y azure-cli google-cloud-sdk hhvm google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri
sudo apt-get autoremove -y
sudo apt-get clean
df -h
echo "Removing large directories"

sudo rm -rf /usr/share/dotnet/
sudo rm -rf /usr/local/graalvm/
sudo rm -rf /usr/local/.ghcup/
sudo rm -rf /usr/local/share/powershell
sudo rm -rf /usr/local/share/chromium
sudo rm -rf /usr/local/lib/android
df -h
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cyclonedx/cdxgen-plugins-bin",
"version": "1.6.0",
"version": "1.6.1",
"description": "Binary plugins to supercharge @cyclonedx/cdxgen npm package",
"main": "index.js",
"repository": {
Expand Down
6 changes: 3 additions & 3 deletions packages/darwin-amd64/build-darwin-amd64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ rm -rf plugins/osquery
rm -rf plugins/dosai
mkdir -p plugins/osquery plugins/dosai

wget https://github.com/osquery/osquery/releases/download/5.11.0/osquery-5.11.0_1.macos_x86_64.tar.gz
tar -xvf osquery-5.11.0_1.macos_x86_64.tar.gz
wget https://github.com/osquery/osquery/releases/download/5.12.2/osquery-5.12.2_1.macos_x86_64.tar.gz
tar -xvf osquery-5.12.2_1.macos_x86_64.tar.gz
cp -rf opt/osquery/lib/osquery.app plugins/osquery/osqueryi-darwin-amd64.app
rm -rf etc usr var opt
rm osquery-5.11.0_1.macos_x86_64.tar.gz
rm osquery-5.12.2_1.macos_x86_64.tar.gz

curl -L https://github.com/owasp-dep-scan/dosai/releases/latest/download/Dosai-osx-x64 -o plugins/dosai/dosai-darwin-amd64
chmod +x plugins/dosai/dosai-darwin-amd64
Expand Down
6 changes: 3 additions & 3 deletions packages/linux-arm64/build-linux-arm64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ rm -rf plugins/osquery
rm -rf plugins/dosai
mkdir -p plugins/osquery plugins/dosai

wget https://github.com/osquery/osquery/releases/download/5.11.0/osquery-5.11.0_1.linux_aarch64.tar.gz
tar -xvf osquery-5.11.0_1.linux_aarch64.tar.gz
wget https://github.com/osquery/osquery/releases/download/5.12.2/osquery-5.12.2_1.linux_aarch64.tar.gz
tar -xvf osquery-5.12.2_1.linux_aarch64.tar.gz
cp opt/osquery/bin/osqueryd plugins/osquery/osqueryi-linux-arm64
upx -9 --lzma plugins/osquery/osqueryi-linux-arm64
sha256sum plugins/osquery/osqueryi-linux-arm64 > plugins/osquery/osqueryi-linux-arm64.sha256
rm -rf etc usr var opt
rm osquery-5.11.0_1.linux_aarch64.tar.gz
rm osquery-5.12.2_1.linux_aarch64.tar.gz

curl -L https://github.com/owasp-dep-scan/dosai/releases/latest/download/Dosai-linux-arm64 -o plugins/dosai/dosai-linux-arm64
chmod +x plugins/dosai/dosai-linux-arm64
Expand Down
10 changes: 5 additions & 5 deletions packages/windows-amd64/build-windows-amd64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ rm -rf plugins/osquery
rm -rf plugins/dosai
mkdir -p plugins/osquery plugins/dosai

wget https://github.com/osquery/osquery/releases/download/5.11.0/osquery-5.11.0.windows_x86_64.zip
unzip osquery-5.11.0.windows_x86_64.zip
cp "osquery-5.11.0.windows_x86_64/Program Files/osquery/osqueryi.exe" plugins/osquery/osqueryi-windows-amd64.exe
wget https://github.com/osquery/osquery/releases/download/5.12.2/osquery-5.12.2.windows_x86_64.zip
unzip osquery-5.12.2.windows_x86_64.zip
cp "osquery-5.12.2.windows_x86_64/Program Files/osquery/osqueryi.exe" plugins/osquery/osqueryi-windows-amd64.exe
upx -9 --lzma plugins/osquery/osqueryi-windows-amd64.exe
sha256sum plugins/osquery/osqueryi-windows-amd64.exe > plugins/osquery/osqueryi-windows-amd64.exe.sha256
rm -rf osquery-5.11.0.windows_x86_64
rm osquery-5.11.0.windows_x86_64.zip
rm -rf osquery-5.12.2.windows_x86_64
rm osquery-5.12.2.windows_x86_64.zip

curl -L https://github.com/owasp-dep-scan/dosai/releases/latest/download/Dosai.exe -o plugins/dosai/dosai-windows-amd64.exe
sha256sum plugins/dosai/dosai-windows-amd64.exe > plugins/dosai/dosai-windows-amd64.exe.sha256
Expand Down
10 changes: 5 additions & 5 deletions packages/windows-arm64/build-windows-arm64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ rm -rf plugins/osquery
rm -rf plugins/dosai
mkdir -p plugins/osquery plugins/dosai

wget https://github.com/osquery/osquery/releases/download/5.11.0/osquery-5.11.0.windows_arm64.zip
unzip osquery-5.11.0.windows_arm64.zip
cp "osquery-5.11.0.windows_arm64/Program Files/osquery/osqueryi.exe" plugins/osquery/osqueryi-windows-arm64.exe
wget https://github.com/osquery/osquery/releases/download/5.12.2/osquery-5.12.2.windows_arm64.zip
unzip osquery-5.12.2.windows_arm64.zip
cp "osquery-5.12.2.windows_arm64/Program Files/osquery/osqueryi.exe" plugins/osquery/osqueryi-windows-arm64.exe
sha256sum plugins/osquery/osqueryi-windows-arm64.exe > plugins/osquery/osqueryi-windows-arm64.exe.sha256
rm -rf osquery-5.11.0.windows_arm64
rm osquery-5.11.0.windows_arm64.zip
rm -rf osquery-5.12.2.windows_arm64
rm osquery-5.12.2.windows_arm64.zip

curl -L https://github.com/owasp-dep-scan/dosai/releases/latest/download/Dosai-windows-arm64.exe -o plugins/dosai/dosai-windows-arm64.exe
sha256sum plugins/dosai/dosai-windows-arm64.exe > plugins/dosai/dosai-windows-arm64.exe.sha256
Expand Down
Loading