Skip to content

[pull] main from zaproxy:main #98

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.

Sign up for GitHub

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

Merged
pull merged 3 commits into from
Dec 8, 2025
Merged

[pull] main from zaproxy:main #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
964757e
Reserve Scanner IDs for Foxhound Checks (#9173)
tmbrbr Dec 8, 2025
785d2b5
Update FlatLaf
thc202 Dec 8, 2025
8184bcb
Merge pull request #9180 from thc202/update-dep
kingthorin Dec 8, 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
6 changes: 3 additions & 3 deletions LEGALNOTICE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ and subject to their respective licenses.
| commons-logging-1.3.5.jar | Apache 2.0 |
| commons-text-1.14.0.jar | Apache 2.0 |
| ezmorph-1.0.6.jar | Apache 2.0 |
| flatlaf-3.6.2.jar | Apache 2.0 |
| flatlaf-swingx-3.6.2.jar | Apache 2.0 |
| flatlaf-3.7.jar | Apache 2.0 |
| flatlaf-swingx-3.7.jar | Apache 2.0 |
| harlib-1.1.3.jar | Apache 2.0 |
| hsqldb-2.7.4.jar | BSD |
| jackson-core-asl-1.9.13.jar | Apache 2.0 |
Expand All @@ -55,7 +55,7 @@ and subject to their respective licenses.
| jgrapht-core-0.9.2.jar | LGPL 2.1 |
| json-lib-2.4-jdk15.jar | MIT + "Good, Not Evil" |
| log4j-1.2-api-2.25.2.jar | Apache 2.0 |
| log4j-api-2.25.2".jar | Apache 2.0 |
| log4j-api-2.25.2.jar | Apache 2.0 |
| log4j-core-2.25.2.jar | Apache 2.0 |
| log4j-jul-2.25.2.jar | Apache 2.0 |
| rsyntaxtextarea-3.6.0.jar | BSD-3 clause |
Expand Down
4 changes: 4 additions & 0 deletions docs/scanners.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,10 @@ Scan rules:
40046 Server Side Request Forgery
40047 Text4Shell (CVE-2022-42889)
40048 React4Shell (CVE-2025-55182, CVE-2025-66478)
40100 Client-Side Data Flow (Foxhound)
40101 Client-Side Cross-Site Scripting (Foxhound)
40102 Stored Client-Side Cross-Site Scripting (Foxhound)
40103 Client-Side Cross-Site Request Forgery (Foxhound)

50000 Active Scan scripts
50001 Passive Scan scripts
Expand Down
4 changes: 2 additions & 2 deletions zap/zap.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ dependencies {
api("org.jgrapht:jgrapht-core:0.9.2")
api("org.swinglabs.swingx:swingx-all:1.6.5-1")

implementation("com.formdev:flatlaf:3.6.2")
implementation("com.formdev:flatlaf-swingx:3.6.2")
implementation("com.formdev:flatlaf:3.7")
implementation("com.formdev:flatlaf-swingx:3.7")

runtimeOnly("commons-logging:commons-logging:1.3.5")
runtimeOnly("xom:xom:1.3.9") {
Expand Down
Loading