From 7d8613b6bb0856d6c652632ecfc9839d640f6619 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 28 Jun 2016 12:06:28 +0200 Subject: [PATCH] added request method to mdc filter --- scm-webapp/src/main/java/sonia/scm/filter/MDCFilter.java | 6 ++++++ .../src/test/java/sonia/scm/filter/MDCFilterTest.java | 2 ++ 2 files changed, 8 insertions(+) diff --git a/scm-webapp/src/main/java/sonia/scm/filter/MDCFilter.java b/scm-webapp/src/main/java/sonia/scm/filter/MDCFilter.java index 5c14269ffb..f16e7ca548 100644 --- a/scm-webapp/src/main/java/sonia/scm/filter/MDCFilter.java +++ b/scm-webapp/src/main/java/sonia/scm/filter/MDCFilter.java @@ -72,6 +72,10 @@ public class MDCFilter extends HttpFilter /** url of the current request */ @VisibleForTesting static final String MDC_REQUEST_URI = "request_uri"; + + /** request method */ + @VisibleForTesting + static final String MDC_REQUEST_METHOD = "request_method"; /** Field description */ @VisibleForTesting @@ -98,6 +102,7 @@ public class MDCFilter extends HttpFilter MDC.put(MDC_USERNAME, getUsername()); MDC.put(MDC_CLIEN_IP, request.getRemoteAddr()); MDC.put(MDC_CLIEN_HOST, request.getRemoteHost()); + MDC.put(MDC_REQUEST_METHOD, request.getMethod()); MDC.put(MDC_REQUEST_URI, request.getRequestURI()); try @@ -109,6 +114,7 @@ public class MDCFilter extends HttpFilter MDC.remove(MDC_USERNAME); MDC.remove(MDC_CLIEN_IP); MDC.remove(MDC_CLIEN_HOST); + MDC.remove(MDC_REQUEST_METHOD); MDC.remove(MDC_REQUEST_URI); } } diff --git a/scm-webapp/src/test/java/sonia/scm/filter/MDCFilterTest.java b/scm-webapp/src/test/java/sonia/scm/filter/MDCFilterTest.java index b5e1753c52..010c9bc1cf 100644 --- a/scm-webapp/src/test/java/sonia/scm/filter/MDCFilterTest.java +++ b/scm-webapp/src/test/java/sonia/scm/filter/MDCFilterTest.java @@ -87,6 +87,7 @@ public class MDCFilterTest extends AbstractTestBase { when(request.getRequestURI()).thenReturn("api/v1/repositories"); when(request.getRemoteAddr()).thenReturn("127.0.0.1"); when(request.getRemoteHost()).thenReturn("localhost"); + when(request.getMethod()).thenReturn("GET"); MDCCapturingFilterChain chain = new MDCCapturingFilterChain(); filter.doFilter(request, response, chain); @@ -96,6 +97,7 @@ public class MDCFilterTest extends AbstractTestBase { assertEquals("api/v1/repositories", chain.ctx.get(MDCFilter.MDC_REQUEST_URI)); assertEquals("127.0.0.1", chain.ctx.get(MDCFilter.MDC_CLIEN_IP)); assertEquals("localhost", chain.ctx.get(MDCFilter.MDC_CLIEN_HOST)); + assertEquals("GET", chain.ctx.get(MDCFilter.MDC_REQUEST_METHOD)); } /**