Use request parameter value for tree path.

Signed-off-by: kiy0taka <kiy0taka333@gmail.com>
zaproxy · kiy0taka · Apr 8, 2022 · Apr 8, 2022 · Apr 19, 2022 · Apr 21, 2022
commit 122cfdb7716b318facd0592ca437e45121a1ea73
diff --git a/zap/src/main/java/org/zaproxy/zap/model/StandardParameterParser.java b/zap/src/main/java/org/zaproxy/zap/model/StandardParameterParser.java
@@ -24,6 +24,7 @@
 import java.security.InvalidParameterException;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -399,9 +400,9 @@ public List<String> getTreePath(HttpMessage msg) throws URIException {
        // Add any structural params (form params) in key order
        List<NameValuePair> formParams = this.parseParameters(msg.getRequestBody().toString());
        formParams.stream()
-                .map(NameValuePair::getName)
-                .filter(structuralParameters::contains)
-                .sorted()
+                .filter(nameValuePair -> structuralParameters.contains(nameValuePair.getName()))
+                .sorted(Comparator.comparing(NameValuePair::getName))
+                .map(NameValuePair::getValue)
                .forEach(list::add);
        return list;
    }