Skip to content

[pull] main from zaproxy:main #82

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
Nov 11, 2025
Merged

[pull] main from zaproxy:main #82

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2dc23d
Use parameter representation consistently
thc202 Nov 11, 2025
05e69c0
Merge pull request #9130 from thc202/tree-params
psiinon Nov 11, 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
60 changes: 25 additions & 35 deletions zap/src/main/java/org/zaproxy/zap/model/SessionStructure.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ private static String getNodeName(

try {
HttpMessage msg = getMsg(uri, method, postData, contentType);
String params = getParams(session, msg);
String params = getParamsString(session, msg);
if (!params.isEmpty()) {
nodeUrl += " " + params;
}
Expand All @@ -225,7 +225,7 @@ private static String getNodeName(
String nodeUrl = pathsToUrl(host, paths, size);

if (msg != null) {
String params = getParams(session, msg);
String params = getParamsString(session, msg);
if (!params.isEmpty()) {
nodeUrl = nodeUrl + " " + params;
}
Expand All @@ -248,7 +248,7 @@ public static String getNodeName(Model model, HttpMessage msg) throws URIExcepti
List<String> paths = getTreePath(model, uri);
String host = getHostName(uri);
String nodeUrl = pathsToUrl(host, paths, paths.size());
String params = getParams(session, msg);
String params = getParamsString(session, msg);
if (!params.isEmpty()) {
nodeUrl += " " + params;
}
Expand All @@ -268,19 +268,23 @@ public static String getLeafName(Model model, String nodeName, HttpMessage msg)
}
}

return getLeafName(nodeName, msg, getParameters(model.getSession(), msg));
}

private static List<org.parosproxy.paros.core.scanner.NameValuePair> getParameters(
Session session, HttpMessage msg) {
List<org.parosproxy.paros.core.scanner.NameValuePair> params =
convertNVP(
model.getSession().getParameters(msg, Type.url),
session.getParameters(msg, Type.url),
org.parosproxy.paros.core.scanner.NameValuePair.TYPE_QUERY_STRING);

if (msg.getRequestBody().length() > 0) {
params.addAll(
convertNVP(
model.getSession().getParameters(msg, Type.form),
session.getParameters(msg, Type.form),
org.parosproxy.paros.core.scanner.NameValuePair.TYPE_POST_DATA));
}

return getLeafName(nodeName, msg, params);
return params;
}

/**
Expand Down Expand Up @@ -313,21 +317,27 @@ public static String getLeafName(
sb.append(method);
sb.append(":");
sb.append(nodeName);
sb.append(getParamsString(params, message));

return sb.toString();
}

private static String getParamsString(Session session, HttpMessage message) {
return getParamsString(getParameters(session, message), message);
}

private static String getParamsString(
List<org.parosproxy.paros.core.scanner.NameValuePair> params, HttpMessage message) {
List<NameValuePair> postParams =
convertParosNVP(
params, org.parosproxy.paros.core.scanner.NameValuePair.TYPE_POST_DATA);

sb.append(
getQueryParamString(
return getQueryParamString(
convertParosNVP(
params,
org.parosproxy.paros.core.scanner.NameValuePair.TYPE_QUERY_STRING),
!postParams.isEmpty()));

sb.append(getPostParamString(message, getQueryParamString(postParams, false)));

return sb.toString();
!postParams.isEmpty())
+ getPostParamString(message, getQueryParamString(postParams, false));
}

private static List<org.parosproxy.paros.core.scanner.NameValuePair> convertNVP(
Expand Down Expand Up @@ -492,7 +502,7 @@ private static RecordStructure addStructure(

if (msg != null) {
url = msg.getRequestHeader().getURI().toString();
String params = getParams(session, msg);
String params = getParamsString(session, msg);
if (!params.isEmpty()) {
nodeName = nodeName + " " + params;
}
Expand Down Expand Up @@ -633,26 +643,6 @@ public static StructuralNode getRootNode(Model model) {
return null;
}

private static String getParams(Session session, HttpMessage msg) throws URIException {
String contentType = msg.getRequestHeader().getHeader(HttpHeader.CONTENT_TYPE);
String reqBody = msg.getRequestBody().toString();
boolean hasReqBody = contentType != null && !reqBody.isEmpty();

String leafParams =
getQueryParamString(
session.getUrlParameters(msg.getRequestHeader().getURI()), hasReqBody);
if (!hasReqBody) {
return leafParams;
}

return leafParams
+ getPostParamString(
msg,
getQueryParamString(
session.getFormParameters(msg.getRequestHeader().getURI(), reqBody),
false));
}

private static String getPostParamString(HttpMessage msg, String fallback) {
String contentType = msg.getRequestHeader().getHeader(HttpHeader.CONTENT_TYPE);
String reqBody = msg.getRequestBody().toString();
Expand Down
Loading