Merge pull request #45 from cesarhernandezgt/8.5.x-TT.x-patch

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

build.properties.default

@@ -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 -----

java/org/apache/catalina/authenticator/AuthenticatorBase.java

@@ -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;
         }
 

webapps/docs/changelog.xml

@@ -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">