Skip to content

[pull] main from zaproxy:main #101

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 2 commits into from
Dec 12, 2025
Merged

[pull] main from zaproxy:main #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffe308d
Reduce classloading in Docker HTTP Sender scripts
thc202 Dec 11, 2025
a2cbb22
Merge pull request #9188 from thc202/docker/httpsender
psiinon Dec 12, 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
3 changes: 3 additions & 0 deletions docker/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Changelog
All notable changes to the docker containers will be documented in this file.

### 2025-12-11
- Update `Alert_on_HTTP_Response_Code_Errors.js` and `Alert_on_Unexpected_Content_Types.js` to reduce classloading (Issue 9187).

### 2025-11-21
- Updated `Alert_on_HTTP_Response_Code_Errors.js` to work with GraalVM JavaScript engine.

Expand Down
17 changes: 11 additions & 6 deletions docker/scripts/scripts/httpsender/Alert_on_HTTP_Response_Code_Errors.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,14 @@
// By default it will raise 'Info' level alerts for Client Errors (4xx) (apart from 404s) and 'Low' Level alerts for Server Errors (5xx)
// But it can be easily changed.

var Pattern = Java.type("java.util.regex.Pattern")
const Integer = Java.type("java.lang.Integer")
const Pattern = Java.type("java.util.regex.Pattern")

const Alert = Java.type("org.parosproxy.paros.core.scanner.Alert")
const ExtensionAlert = Java.type("org.zaproxy.zap.extension.alert.ExtensionAlert")
const HistoryReference = Java.type("org.parosproxy.paros.model.HistoryReference")

const extensionAlert = control.getExtensionLoader().getExtension(ExtensionAlert.NAME)

pluginid = 100000 // https://github.com/zaproxy/zaproxy/blob/main/docs/scanners.md

Expand All @@ -16,7 +23,6 @@ function responseReceived(msg, initiator, helper) {
return
}

var extensionAlert = control.getExtensionLoader().getExtension(org.zaproxy.zap.extension.alert.ExtensionAlert.NAME)
if (extensionAlert != null) {
var code = msg.getResponseHeader().getStatusCode()
if (code < 400 || code >= 600) {
Expand All @@ -30,10 +36,9 @@ function responseReceived(msg, initiator, helper) {
title = "A Server Error response code was returned by the server"
}
// CONFIDENCE_HIGH = 3 (we can be pretty sure we're right)
var alert = new org.parosproxy.paros.core.scanner.Alert(pluginid, risk, 3, title)
var alert = new Alert(pluginid, risk, 3, title)
var ref = msg.getHistoryRef()
if (ref != null && org.parosproxy.paros.model.HistoryReference.getTemporaryTypes().contains(
java.lang.Integer.valueOf(ref.getHistoryType()))) {
if (ref != null && HistoryReference.getTemporaryTypes().contains(Integer.valueOf(ref.getHistoryType()))) {
// Dont use temporary types as they will get deleted
ref = null
}
Expand Down Expand Up @@ -69,7 +74,7 @@ function responseReceived(msg, initiator, helper) {
type = 15 // User - fallback
break
}
ref = new org.parosproxy.paros.model.HistoryReference(model.getSession(), type, msg)
ref = new HistoryReference(model.getSession(), type, msg)
}
alert.setMessage(msg)
alert.setUri(msg.getRequestHeader().getURI().toString())
Expand Down
18 changes: 11 additions & 7 deletions docker/scripts/scripts/httpsender/Alert_on_Unexpected_Content_Types.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,16 @@
// By default it will raise 'Low' level alerts for content types that are not expected to be returned by APIs.
// But it can be easily changed.

var Pattern = Java.type("java.util.regex.Pattern")
const Integer = Java.type("java.lang.Integer")
const Pattern = Java.type("java.util.regex.Pattern")

var pluginid = 100001 // https://github.com/zaproxy/zaproxy/blob/main/docs/scanners.md
const Alert = Java.type("org.parosproxy.paros.core.scanner.Alert")
const ExtensionAlert = Java.type("org.zaproxy.zap.extension.alert.ExtensionAlert")
const HistoryReference = Java.type("org.parosproxy.paros.model.HistoryReference")

const extensionAlert = control.getExtensionLoader().getExtension(ExtensionAlert.NAME)

var extensionAlert = control.getExtensionLoader().getExtension(org.zaproxy.zap.extension.alert.ExtensionAlert.NAME)
var pluginid = 100001 // https://github.com/zaproxy/zaproxy/blob/main/docs/scanners.md

var expectedTypes = [
"application/octet-stream",
Expand Down Expand Up @@ -37,10 +42,9 @@ function responseReceived(msg, initiator, helper) {
var risk = 1 // Low
var title = "Unexpected Content-Type was returned"
// CONFIDENCE_HIGH = 3 (we can be pretty sure we're right)
var alert = new org.parosproxy.paros.core.scanner.Alert(pluginid, risk, 3, title)
var alert = new Alert(pluginid, risk, 3, title)
var ref = msg.getHistoryRef()
if (ref != null && org.parosproxy.paros.model.HistoryReference.getTemporaryTypes().contains(
java.lang.Integer.valueOf(ref.getHistoryType()))) {
if (ref != null && HistoryReference.getTemporaryTypes().contains(Integer.valueOf(ref.getHistoryType()))) {
// Dont use temporary types as they will get deleted
ref = null
}
Expand Down Expand Up @@ -76,7 +80,7 @@ function responseReceived(msg, initiator, helper) {
type = 15 // User - fallback
break
}
ref = new org.parosproxy.paros.model.HistoryReference(model.getSession(), type, msg)
ref = new HistoryReference(model.getSession(), type, msg)
}
alert.setMessage(msg)
alert.setUri(msg.getRequestHeader().getURI().toString())
Expand Down
Loading