Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
5634fac
Add firewall-tester-action to run on every commit
bitterpanda63 Oct 30, 2025
6148e34
Set working-directory to firewall-java for build process
bitterpanda63 Oct 30, 2025
dc5839b
Update move of newly built module to zen-demo-java
bitterpanda63 Oct 30, 2025
b238925
call it zen_by_aikido_copy, so it is not ignored by the .dockerignore
bitterpanda63 Oct 30, 2025
9a37c57
Add RUN before command
bitterpanda63 Oct 30, 2025
24b55d2
Update: zen_by_aikido_copy is also ignored (facepalm)
bitterpanda63 Oct 30, 2025
ed32ff2
sleep 30 seconds before running tests
bitterpanda63 Oct 30, 2025
2e95fb0
Merge branch 'main' into add-zen-qa
bitterpanda63 Nov 3, 2025
c80f5f8
Update .github/workflows/Dockerfile.qa
bitterpanda63 Nov 3, 2025
2c1e80a
Merge branch 'remove-leading-slashes-path' into add-zen-qa
bitterpanda63 Nov 3, 2025
869ef3a
Merge branch 'main' into add-zen-qa
bitterpanda63 Nov 25, 2025
b3c131b
Update: openjdk:17-slim is deprecated
bitterpanda63 Nov 25, 2025
a07106a
Use JDK 17 for qa (match with builder)
bitterpanda63 Nov 25, 2025
692d66e
Port from content-disposition project the parse function
bitterpanda63 Nov 25, 2025
c793232
Revert "Port from content-disposition project the parse function"
bitterpanda63 Nov 25, 2025
c17af2a
Merge branch 'report-user-for-attack-wave' into add-zen-qa
bitterpanda63 Nov 25, 2025
1cd8095
Merge branch 'report-query-params-with-attack' into add-zen-qa
bitterpanda63 Nov 25, 2025
663c1d4
update e2e: test request
bitterpanda63 Nov 25, 2025
4bd5fe9
Also test for Spring
bitterpanda63 Nov 25, 2025
e70df7e
Merge branch 'report-query-params-with-attack' into add-zen-qa
bitterpanda63 Nov 25, 2025
3623db6
skip 2 failing tests for now
bitterpanda63 Nov 25, 2025
199b875
Merge branch 'main' into add-zen-qa
bitterpanda63 Nov 26, 2025
8e7cb40
Merge branch 'ssrf-respect-forced-protection-off' into add-zen-qa
bitterpanda63 Nov 26, 2025
bdd3fe4
Also skip test_stored_ssrf for now
bitterpanda63 Nov 26, 2025
5044183
Update qa-tests.yml
bitterpanda63 Nov 26, 2025
7a0c824
Update qa-tests.yml
bitterpanda63 Nov 26, 2025
33d924f
Merge branch 'main' into add-zen-qa
bitterpanda63 Nov 26, 2025
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
39 changes: 39 additions & 0 deletions .github/workflows/Dockerfile.qa
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Build stage
FROM gradle:7.6.1-jdk17 AS builder

# Install make
RUN apt-get update && apt-get install -y make

# Set working directory
WORKDIR /app

# Copy your source code, including Makefile
COPY . .

# Run make download
# --- modified part ---
RUN mkdir zen_by_aikido
RUN mv zen_dist zen_by_aikido/zen
# --- end modified part ---
RUN make build

# Runtime stage
FROM eclipse-temurin:17

# Install make and postgresql-client
RUN apt-get update && \
apt-get install -y make postgresql-client && \
rm -rf /var/lib/apt/lists/*

# Set working directory
WORKDIR /app

# Copy the built application and SQL file from builder stage
COPY --from=builder /app .
COPY database.sql /app/database.sql

# Create startup script
COPY start.sh /app/start.sh
RUN chmod 755 /app/start.sh

ENTRYPOINT ["/app/start.sh"]
52 changes: 52 additions & 0 deletions .github/workflows/qa-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: 🧪 QA Tests
permissions:
contents: read
on:
push: {}
workflow_call: {}

jobs:
qa-tests:
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- name: Checkout firewall-java
uses: actions/checkout@v5
with:
path: firewall-java

- name: Checkout zen-demo-java
uses: actions/checkout@v5
with:
repository: Aikido-demo-apps/zen-demo-java
path: zen-demo-java
ref: qa-test
submodules: true

- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: '21'
distribution: 'temurin'

- name: Build with Gradle
working-directory: ./firewall-java
run: |
chmod +x gradlew
make binaries
make build

# Move the build jars to demo app
mv dist ../zen-demo-java/zen_dist

- name: Replace Dockerfile with QA version
run: |
cp firewall-java/.github/workflows/Dockerfile.qa zen-demo-java/Dockerfile

- name: Run Firewall QA Tests
uses: AikidoSec/[email protected]
with:
dockerfile_path: ./zen-demo-java/Dockerfile
app_port: 8080
sleep_before_test: 30
skip_tests: test_ssrf,test_stored_ssrf,test_demo_apps_generic_tests
Loading