Skip to content

Sync fork with upstream master - #25

Open
fgibelin wants to merge 11 commits into
masterfrom
fgibelin-sync-upstream-commits
Open

fgibelin wants to merge 11 commits into
masterfrom
fgibelin-sync-upstream-commits

Conversation

@fgibelin

Copy link
Copy Markdown
Owner

Summary

  • Merge the latest OWASP-Benchmark/BenchmarkJava master into the fork, preserving fork-specific history.
  • Include upstream commits through 10dfcc54ad02.

Earlier sync PRs #23 and #24 do not include all current upstream commits.

TheAuditorTool and others added 11 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
Bumps [org.apache.maven.plugins:maven-help-plugin](https://github.com/apache/maven-help-plugin) from 3.5.2 to 3.6.0.
- [Release notes](https://github.com/apache/maven-help-plugin/releases)
- [Commits](apache/maven-help-plugin@maven-help-plugin-3.5.2...maven-help-plugin-3.6.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-help-plugin
  dependency-version: 3.6.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…t/maven/org.apache.maven.plugins-maven-help-plugin-3.6.0

Bump org.apache.maven.plugins:maven-help-plugin from 3.5.2 to 3.6.0
Bumps [org.apache.httpcomponents.core5:httpcore5](https://github.com/apache/httpcomponents-core) from 5.4.4 to 5.5.
- [Changelog](https://github.com/apache/httpcomponents-core/blob/master/RELEASE_NOTES.txt)
- [Commits](apache/httpcomponents-core@rel/v5.4.4...rel/v5.5)

---
updated-dependencies:
- dependency-name: org.apache.httpcomponents.core5:httpcore5
  dependency-version: '5.5'
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…t/maven/org.apache.httpcomponents.core5-httpcore5-5.5

Bump org.apache.httpcomponents.core5:httpcore5 from 5.4.4 to 5.5
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
@fgibelin
fgibelin requested a balanced review from Copilot November 20, 2026 08:03

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

3 open issues
What changed in this PR

Syncs the fork with upstream OWASP-Benchmark/BenchmarkJava through commit 10dfcc54ad02, bringing in upstream dependency updates and new tooling for handling ZAP scan outputs.

Changes:

  • Add a helper script to download ZAP XML reports into results/ with optional API key support.
  • Bump several dependency/plugin versions in pom.xml (HttpComponents Core, Jackson Databind, Maven Help Plugin, Tomcat).
File Description
scripts/​fetchZAPResults.sh New script to download and validate a ZAP XML report for later scorecard generation.
pom.xml Updates several library/plugin versions pulled in via upstream sync.

Review effort: Lite

# scripts/fetchZAPResults.sh http://zap:8090/OTHER/core/other/xmlreport/ my-zap-results.xml
# scripts/fetchZAPResults.sh http://zap:8090/OTHER/core/other/xmlreport/ "" my-secret-api-key

source scripts/requireCommand.sh
if [ -n "${2:-}" ]; then
filename="$2"
else
benchmark_version=$(scripts/getBenchmarkVersion.sh)
exit 1
fi

if ! head -2 "${output}" | grep -q "OWASPZAPReport"; then
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