Skip to content

Sync fork with upstream master - #23

Open
fgibelin wants to merge 6 commits into
masterfrom
fgibelin-sync-upstream-101
Open

fgibelin wants to merge 6 commits into
masterfrom
fgibelin-sync-upstream-101

Conversation

@fgibelin

Copy link
Copy Markdown
Owner

Summary

  • Merge the latest OWASP-Benchmark/BenchmarkJava master commits into the fork, preserving fork-specific history.
  • Include the upstream Jackson databind update and ZAP results download script.

Upstream head: a452b3aafd232245d0753e54eb243d6651f8ef96.

TheAuditorTool and others added 6 commits April 13, 2026 15:55
Adds a shell script that downloads a ZAP XML report from a remote ZAP
instance via its REST API and saves it to the results/ directory. This
enables scorecard generation when ZAP and Benchmark run in separate
Docker containers without a shared filesystem.

Closes #21
- Add mkdir -p results/ before curl writes to it (fixes failure on fresh clone)
- Pass API key via X-ZAP-API-Key header instead of URL query param (keeps
  key out of process list and shell history)
- Redirect all error/usage output to stderr
- Validate getBenchmarkVersion.sh output is non-empty before building filename
Bumps [com.fasterxml.jackson.core:jackson-databind](https://github.com/FasterXML/jackson-databind) from 2.22.4 to 2.23.0.
- [Commits](FasterXML/jackson-databind@jackson-databind-2.22.4...jackson-databind-2.23.0)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson.core:jackson-databind
  dependency-version: 2.23.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…t/maven/com.fasterxml.jackson.core-jackson-databind-2.23.0

Bump com.fasterxml.jackson.core:jackson-databind from 2.22.4 to 2.23.0
…-zap-results-from-url-21

Add fetchZAPResults.sh script to download ZAP reports from a URL
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
@fgibelin
fgibelin requested a balanced review from Copilot November 13, 2026 09:04

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Warning

Copilot couldn't run its full agentic review because it didn't start before the timeout. Make sure your repository has a runner available, or add a copilot-code-review.yml file specifying one with the runs-on attribute. See the docs for more details.

Copilot review overview

6 open issues
What changed in this PR

Syncs the fork with upstream OWASP-Benchmark/BenchmarkJava master, including the upstream Jackson databind bump and adding a helper script to download ZAP XML results for scorecard generation.

Changes:

  • Added scripts/fetchZAPResults.sh to download and validate a ZAP XML report into results/.
  • Updated jackson-databind dependency version in pom.xml to match upstream.
File Description
scripts/​fetchZAPResults.sh New utility script to fetch ZAP XML reports and save them under results/.
pom.xml Bumps com.fasterxml.jackson.core:jackson-databind version per upstream sync.

Review effort: Lite

mkdir -p results/
output="results/${filename}"

curl_args=(-sS -o "${output}" -w '%{http_code}' --connect-timeout 10 --max-time 120)
Comment on lines +60 to +66
http_code=$(curl "${curl_args[@]}" "${zap_url}")

if [ "${http_code}" -ne 200 ]; then
echo "ERROR: Download failed with HTTP status ${http_code}" >&2
rm -f "${output}"
exit 1
fi
Comment on lines +13 to +15
source scripts/requireCommand.sh

requireCommand curl
if [ -n "${2:-}" ]; then
filename="$2"
else
benchmark_version=$(scripts/getBenchmarkVersion.sh)
Comment on lines +55 to +57
if [ -n "${api_key}" ]; then
curl_args+=(-H "X-ZAP-API-Key: ${api_key}")
fi
@@ -0,0 +1,77 @@
#!/usr/bin/env bash

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants