Skip to content
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

Prepare for release 7.0.68-TT.18 #13

Merged
merged 3 commits into from
Sep 6, 2023
Merged

Prepare for release 7.0.68-TT.18 #13

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
d33279d
Fix parameter counting logic
markt-asf Apr 11, 2023
17721f3
Prepare for release 7.0.68-TT.18
cesarhernandezgt Sep 6, 2023
0e9cd25
Avoid protocol relative redirects
markt-asf Aug 22, 2023
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 build.properties.default
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ version.major=7
version.minor=0
version.build=68
version.patch=0
version.suffix=-TT.17
version.suffix=-TT.18

# ----- Build control flags -----
# Note enabling validation uses Checkstyle which is LGPL licensed
Expand Down
7 changes: 6 additions & 1 deletion java/org/apache/catalina/authenticator/FormAuthenticator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,8 +665,13 @@ protected String savedRequestURL(Session session) {
sb.append('?');
sb.append(saved.getQueryString());
}
return (sb.toString());

// Avoid protocol relative redirects
while (sb.length() > 1 && sb.charAt(1) == '/') {
sb.deleteCharAt(0);
}

return (sb.toString());
}


Expand Down
4 changes: 2 additions & 2 deletions java/org/apache/tomcat/util/http/Parameters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,14 +218,14 @@ public void addParameter( String key, String value )
return;
}

parameterCount ++;
if (limit > -1 && parameterCount > limit) {
if (limit > -1 && parameterCount >= limit) {
// Processing this parameter will push us over the limit. ISE is
// what Request.parseParts() uses for requests that are too big
setParseFailedReason(FailReason.TOO_MANY_PARAMETERS);
throw new IllegalStateException(sm.getString(
"parameters.maxCountFail", Integer.valueOf(limit)));
}
parameterCount++;

ArrayList<String> values = paramHashValues.get(key);
if (values == null) {
Expand Down
3 changes: 3 additions & 0 deletions webapps/docs/changelog.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@
<code>RemoteIpFilter</code> determines that this request was submitted
via a secure channel. (lihan)
</fix>
<fix>
Avoid protocol relative redirects in FORM authentication. (markt)
</fix>
</changelog>
</subsection>
<subsection name="WebSocket">
Expand Down