Issue #6973 - Setup Request/Response objects for success with Request…

…Log (#7183) * Issue #6973 - Setup Request/Response objects for success with RequestLog + Prevents reading of Request body parameters + Still allows raw Request.getInputStream() and Request.getReader() usage + Restores committed response status code. + Does not rest committed response headers. + Adding testcase for post-commit response header issue. (currently disabled) + Remove Request.onRequestLog() + Move requestlog calling from HttpChannel to Request.onCompleted + address scenario where HttpChannel is null Signed-off-by: Joakim Erdfelt <[email protected]>
jetty · Dec 29, 2021 · 3c02a03 · 3c02a03
1 parent 95804b8
commit 3c02a03
Show file tree

Hide file tree

Showing 4 changed files with 422 additions and 3 deletions.
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
@@ -873,9 +873,6 @@ public void onCompleted()
         if (LOG.isDebugEnabled())
             LOG.debug("onCompleted for {} written={}", getRequest().getRequestURI(), getBytesWritten());
 
-        if (_requestLog != null)
-            _requestLog.log(_request, _response);
-
         long idleTO = _configuration.getIdleTimeout();
         if (idleTO >= 0 && getIdleTimeout() != _oldIdleTimeout)
             setIdleTimeout(_oldIdleTimeout);

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
@@ -1420,6 +1420,29 @@ public String changeSessionId()
      */
     public void onCompleted()
     {
+        HttpChannel httpChannel = getHttpChannel();
+        // httpChannel can be null in some scenarios
+        // it's not possible to use requestlog in those scenarios anyway.
+        if (httpChannel != null)
+        {
+            RequestLog requestLog = httpChannel.getRequestLog();
+            if (requestLog != null)
+            {
+                // Don't allow pulling more parameters
+                _contentParamsExtracted = true;
+
+                // Reset the status code to what was committed
+                MetaData.Response committedResponse = getResponse().getCommittedMetaData();
+                if (committedResponse != null)
+                {
+                    getResponse().setStatus(committedResponse.getStatus());
+                    // TODO: Reset the response headers to what they were when committed
+                }
+
+                requestLog.log(this, getResponse());
+            }
+        }
+
         if (_sessions != null)
         {
             for (Session s:_sessions)