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

Backport 7532f9d to mitigate CVE-2024-52316 and updated version to 8.5.100-TT.4 #45

Merged
merged 2 commits into from
Nov 22, 2024
Merged

Backport 7532f9d to mitigate CVE-2024-52316 and updated version to 8.5.100-TT.4 #45

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
ea883e6
If the Jakarta Authentication fails with an exception, set a 500 status
markt-asf Sep 19, 2024
558d020
Backport 7532f9d to mitigate CVE-2024-52316 and updated version to 8.…
cesarhernandezgt Nov 20, 2024
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 @@ -33,7 +33,7 @@ version.major=8
version.minor=5
version.build=100
version.patch=0
version.suffix=-TT.3
version.suffix=-TT.4
version.dev=

# ----- Build tools -----
Expand Down
2 changes: 2 additions & 0 deletions java/org/apache/catalina/authenticator/AuthenticatorBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -806,6 +806,8 @@ private boolean authenticateJaspic(Request request, Response response, JaspicSta
authStatus = state.serverAuthContext.validateRequest(state.messageInfo, client, null);
} catch (AuthException e) {
log.debug(sm.getString("authenticator.loginFail"), e);
// Need to explicitly set the return code as the ServerAuthContext may not have done.
response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
return false;
}

Expand Down
5 changes: 5 additions & 0 deletions webapps/docs/changelog.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,11 @@
<code>NullPointerException</code>, if an attempt is made to use the
<code>AsyncContext</code> after it has been recycled. (markt)
</fix>
<fix>
If the Jakarta Authentication process fails with an Exception,
explicitly set the HTTP response status to 500 as the
<code>ServerAuthContext</code> may not have set it. (markt)
</fix>
</changelog>
</subsection>
<subsection name="Coyote">
Expand Down
Loading