From 484883df559da7e844c7bfe2d4d4bcfe027e68a2 Mon Sep 17 00:00:00 2001
From: Bennet Schulz <mail@bennet-schulz.de>
Date: Mon, 2 Oct 2023 14:56:15 +0200
Subject: [PATCH 1/4] add trivy pr check

---
 .github/workflows/trivy-pr-check.yml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 .github/workflows/trivy-pr-check.yml

diff --git a/.github/workflows/trivy-pr-check.yml b/.github/workflows/trivy-pr-check.yml
new file mode 100644
index 000000000..ee22843be
--- /dev/null
+++ b/.github/workflows/trivy-pr-check.yml
@@ -0,0 +1,27 @@
+name: build
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Run Trivy vulnerability scanner in repo mode
+        uses: aquasecurity/trivy-action@master
+        with:
+          scan-type: 'fs'
+          ignore-unfixed: true
+          format: 'sarif'
+          output: 'trivy-results.sarif'
+          severity: 'CRITICAL'
+
+      - name: Upload Trivy scan results to GitHub Security tab
+        uses: github/codeql-action/upload-sarif@v2
+        with:
+          sarif_file: 'trivy-results.sarif'

From 2988fce34c330ee3d10ed2cb7b1bc6f138deaf00 Mon Sep 17 00:00:00 2001
From: Bennet Schulz <mail@bennet-schulz.de>
Date: Mon, 2 Oct 2023 15:00:09 +0200
Subject: [PATCH 2/4] add log4shell vulnerability

---
 pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pom.xml b/pom.xml
index 809e2db5e..04e617862 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,6 +67,12 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+      <version>2.0-beta2</version>
+    </dependency>
+
     <!-- Databases - Uses H2 by default -->
     <dependency>
       <groupId>com.h2database</groupId>

From a0af1cd62c37d1a584a9c7ee51876d2128c77acd Mon Sep 17 00:00:00 2001
From: Bennet Schulz <mail@bennet-schulz.de>
Date: Mon, 2 Oct 2023 15:00:36 +0200
Subject: [PATCH 3/4] Revert "add log4shell vulnerability"

This reverts commit 2988fce34c330ee3d10ed2cb7b1bc6f138deaf00.
---
 pom.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 04e617862..809e2db5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,12 +67,6 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-core</artifactId>
-      <version>2.0-beta2</version>
-    </dependency>
-
     <!-- Databases - Uses H2 by default -->
     <dependency>
       <groupId>com.h2database</groupId>

From 57a38fbf01c1b436a6ea21e9a01f4bc8d51144be Mon Sep 17 00:00:00 2001
From: Bennet Schulz <mail@bennet-schulz.de>
Date: Mon, 2 Oct 2023 15:01:17 +0200
Subject: [PATCH 4/4] add log4shell vulnerability

---
 pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pom.xml b/pom.xml
index 809e2db5e..04e617862 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,6 +67,12 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+      <version>2.0-beta2</version>
+    </dependency>
+
     <!-- Databases - Uses H2 by default -->
     <dependency>
       <groupId>com.h2database</groupId>