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

Improve test setup for triage process #1

Merged
merged 2 commits into from
Jan 14, 2025
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
2 changes: 1 addition & 1 deletion Containerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:trixie
FROM docker.io/library/debian:trixie

ENV PGHOST glvd
ENV PGPORT 5432
Expand Down
13 changes: 12 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Utility to add CVE context information to GLVD.

Data is maintained [here](https://github.com/gardenlinux/glvd-triage-data) in yaml files.

## usage:
## usage

Download the [glvd-triage.sh script](https://raw.githubusercontent.com/gardenlinux/glvd-triage-cli/refs/heads/main/glvd-triage.sh), for example like this:

Expand All @@ -13,3 +13,14 @@ mkdir -p ~/bin
wget --output-document ~/bin/glvd-triage https://raw.githubusercontent.com/gardenlinux/glvd-triage-cli/refs/heads/main/glvd-triage.sh
chmod +x ~/bin/glvd-triage
```

## tests

This repo contains tets as a [compose file](https://compose-spec.io).
This setup allows to quickly iterate based on defined data.

To run the tests:

* Setup podman compose to use the `docker-compose` binary
* Create a (gitignored) `github-pat.txt` file in this directory and put your own PAT there
* Run `test.sh`
29 changes: 23 additions & 6 deletions asserts-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,28 @@ chmod 0600 ~/.pgpass

# todo(fwilhe): better assertions, more stable and useful test data

psql -c "select * from public.cve_context where create_date > now() - interval '1 day';" glvd > /tmp/results.txt
if [ "pre" == "$1" ]; then
psql -c "select * from public.cve_context where create_date > now() - interval '1 day';" glvd > /tmp/results.txt
cat /tmp/results.txt
wc -l /tmp/results.txt
# Assert CVEs are not triaged
if grep -q -E 'CVE-2024-53142|CVE-2024-53141|CVE-2024-50106|CVE-2024-56201' /tmp/results.txt; then
echo fail
exit 1
else
echo "ok"
fi
fi

if grep -q -E 'CVE-2024-10979|CVE-2024-10977|CVE-2024-10978|CVE-2024-53051' /tmp/results.txt; then
echo "ok"
else
echo fail
exit 1
if [ "post" == "$1" ]; then
psql -c "select * from public.cve_context where create_date > now() - interval '1 day';" glvd > /tmp/results.txt
cat /tmp/results.txt
wc -l /tmp/results.txt
# Assert CVEs are triaged
if grep -q -E 'CVE-2024-53142|CVE-2024-53141|CVE-2024-50106|CVE-2024-56201' /tmp/results.txt; then
echo "ok"
else
echo fail
exit 1
fi
fi
2 changes: 1 addition & 1 deletion asserts.Containerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:trixie
FROM docker.io/library/debian:trixie

ENV PGHOST glvd
ENV PGPORT 5432
Expand Down
17 changes: 16 additions & 1 deletion compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,31 @@ services:
environment:
PGHOST: glvd-postgres

glvd-triage-assert-pre:
build:
dockerfile: ./asserts.Containerfile
networks:
- glvd-triage-IT
depends_on:
glvd-init:
condition: service_completed_successfully
restart: false
environment:
PGHOST: glvd-postgres
command: pre

glvd-triage:
build:
dockerfile: ./Containerfile
networks:
- glvd-triage-IT
depends_on:
glvd-init:
glvd-triage-assert-pre:
condition: service_completed_successfully
restart: false
environment:
PGHOST: glvd-postgres
GLVD_TRIAGE_FILE: 2025-01-10.yaml
secrets:
- github_pat

Expand All @@ -55,6 +69,7 @@ services:
restart: false
environment:
PGHOST: glvd-postgres
command: post

networks:
glvd-triage-IT: {}
Expand Down
1 change: 0 additions & 1 deletion entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ if [[ $PAT == "NOT_SET" ]]; then
fi
fi


git clone --depth=1 https://"$PAT"@github.com/gardenlinux/glvd-triage-data /data/

python3 /cli.py > /triage.sql
Expand Down
3 changes: 3 additions & 0 deletions test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash

podman compose up --build --force-recreate