Support ForwardingHttpRequest

Author: making

src/main/java/am/ik/spring/logbook/ServletAwareAccessLoggerSink.java

@@ -1,13 +1,17 @@
 package am.ik.spring.logbook;
 
 import jakarta.servlet.http.HttpServletRequest;
+import org.zalando.logbook.ForwardingHttpRequest;
 import org.zalando.logbook.HttpRequest;
 
 public class ServletAwareAccessLoggerSink extends AccessLoggerSink {
 
 	@Override
 	protected String getUsername(HttpRequest request) {
-		if (request instanceof HttpServletRequest httpServletRequest) {
+		if (request instanceof ForwardingHttpRequest forwardingHttpRequest) {
+			return getUsername(forwardingHttpRequest.delegate());
+		}
+		else if (request instanceof HttpServletRequest httpServletRequest) {
 			return httpServletRequest.getRemoteUser();
 		}
 		return null;

src/test/java/org/zalando/logbook/servlet/ServletAwareAccessLoggerSinkTest.java

@@ -10,6 +10,7 @@
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.zalando.logbook.Correlation;
+import org.zalando.logbook.ForwardingHttpRequest;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -49,6 +50,18 @@ void shouldUsernameContainedIfRemoteUserIsNotNull(CapturedOutput capturedOutput)
 		assertThat(capturedOutput.toString()).contains("username=\"[email protected]\"");
 	}
 
+	@Test
+	void shouldUsernameContainedIfRemoteUserIsNotNullForForwardingRequest(CapturedOutput capturedOutput)
+			throws Exception {
+		ServletAwareAccessLoggerSink sink = new ServletAwareAccessLoggerSink();
+		MockHttpServletRequest mockRequest = new MockHttpServletRequest();
+		mockRequest.setRemoteUser("[email protected]");
+		RemoteRequest request = new RemoteRequest(mockRequest, FormRequestMode.OFF);
+		LocalResponse response = new LocalResponse(new MockHttpServletResponse(), "2.0");
+		sink.write(correlation, (ForwardingHttpRequest) () -> request, response);
+		assertThat(capturedOutput.toString()).contains("username=\"[email protected]\"");
+	}
+
 	@Test
 	void shouldNotUsernameContainedIfRemoteUserIsNull(CapturedOutput capturedOutput) throws Exception {
 		ServletAwareAccessLoggerSink sink = new ServletAwareAccessLoggerSink();
@@ -59,4 +72,15 @@ void shouldNotUsernameContainedIfRemoteUserIsNull(CapturedOutput capturedOutput)
 		assertThat(capturedOutput.toString()).doesNotContain("username=");
 	}
 
+	@Test
+	void shouldNotUsernameContainedIfRemoteUserIsNullForFowardingRequest(CapturedOutput capturedOutput)
+			throws Exception {
+		ServletAwareAccessLoggerSink sink = new ServletAwareAccessLoggerSink();
+		MockHttpServletRequest mockRequest = new MockHttpServletRequest();
+		RemoteRequest request = new RemoteRequest(mockRequest, FormRequestMode.OFF);
+		LocalResponse response = new LocalResponse(new MockHttpServletResponse(), "2.0");
+		sink.write(correlation, (ForwardingHttpRequest) () -> request, response);
+		assertThat(capturedOutput.toString()).doesNotContain("username=");
+	}
+
 }