Skip to content

[pull] main from zaproxy:main #114

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
Jan 9, 2026
Merged

[pull] main from zaproxy:main #114

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
7038ca7
For multipart form-data use the non-normalized boundary when extracting
kingthorin Jan 7, 2026
59b6864
Merge pull request #9214 from kingthorin/issue-9208-multipart
psiinon Jan 9, 2026
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
2 changes: 1 addition & 1 deletion zap/src/main/java/org/parosproxy/paros/core/scanner/VariantMultipartFormParameters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public void setMessage(HttpMessage msg) {
}

try {
parseImpl(msg, contentType);
parseImpl(msg, msg.getRequestHeader().getHeader(HttpHeader.CONTENT_TYPE));
} catch (Exception e) {
LOGGER.error("An error occurred while parsing multipart content:", e);
}
Expand Down
48 changes: 48 additions & 0 deletions ...c/test/java/org/parosproxy/paros/core/scanner/VariantMultipartFormParametersUnitTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import org.parosproxy.paros.network.HttpHeader;
import org.parosproxy.paros.network.HttpMalformedHeaderException;
import org.parosproxy.paros.network.HttpMessage;
import org.parosproxy.paros.network.HttpRequestHeader;
import org.zaproxy.zap.core.scanner.InputVector.PayloadFormat;
import org.zaproxy.zap.core.scanner.InputVectorBuilder;

Expand Down Expand Up @@ -312,6 +313,53 @@ void shouldExtractParametersFromAllPartsEvenIfSomeAreEmpty() {
is(equalTo(NameValuePair.TYPE_MULTIPART_DATA_FILE_PARAM)));
}

@Test
void shouldExtractParametersWhenBoundyHasMixedCapitalization()
throws HttpMalformedHeaderException {
// Given
VariantMultipartFormParameters variant = new VariantMultipartFormParameters();
HttpRequestHeader reqHdr =
new HttpRequestHeader(
"""
POST https://127.0.0.1:8000/login HTTP/1.1
host: 127.0.0.1:8000
User-Agent: curl/8.7.1
Accept: */*
Content-Length: 282
Content-Type: multipart/form-data; boundary=------------------------o4XsAqQ54LPupcrI0dfahp
""");
String body =
"""
--------------------------o4XsAqQ54LPupcrI0dfahp\r
Content-Disposition: form-data; name="email"\r
\r
test@example.com\r
--------------------------o4XsAqQ54LPupcrI0dfahp\r
Content-Disposition: form-data; name="password"\r
\r
testpass123\r
--------------------------o4XsAqQ54LPupcrI0dfahp--\r
\r
""";
HttpMessage message = new HttpMessage(reqHdr);
message.setRequestBody(body);
// When
variant.setMessage(message);
// Then
assertThat(variant.getParamList().get(0).getPosition(), is(equalTo(1)));
assertThat(variant.getParamList().get(0).getName(), is(equalTo("email")));
assertThat(variant.getParamList().get(0).getValue(), is(equalTo("test@example.com")));
assertThat(
variant.getParamList().get(0).getType(),
is(equalTo(NameValuePair.TYPE_MULTIPART_DATA_PARAM)));
assertThat(variant.getParamList().get(1).getPosition(), is(equalTo(2)));
assertThat(variant.getParamList().get(1).getName(), is(equalTo("password")));
assertThat(variant.getParamList().get(1).getValue(), is(equalTo("testpass123")));
assertThat(
variant.getParamList().get(1).getType(),
is(equalTo(NameValuePair.TYPE_MULTIPART_DATA_PARAM)));
}

@Test
void shouldInjectParamValueModificationInGeneralParam() {
// Given
Expand Down
Loading