Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 08:25:44 +01:00
Code Issues Packages Projects Releases Activity

Fix typo

Browse Source
This commit is contained in:
René Pfeuffer
2018-10-25 10:47:44 +02:00
parent f041b4ecb6
commit a36768fbb3
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scm-webapp/src/main/java/sonia/scm/filter/MDCFilter.java
View File

@@ -34,7 +34,6 @@ package sonia.scm.filter;
//~--- non-JDK imports -------------------------------------------------------- //~--- non-JDK imports --------------------------------------------------------
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
import com.google.inject.Singleton;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import org.apache.shiro.subject.Subject; import org.apache.shiro.subject.Subject;
@@ -65,11 +64,11 @@ public class MDCFilter extends HttpFilter
/** Field description */ /** Field description */
@VisibleForTesting @VisibleForTesting
static final String MDC_CLIEN_HOST = "client_host"; static final String MDC_CLIENT_HOST = "client_host";
/** Field description */ /** Field description */
@VisibleForTesting @VisibleForTesting
static final String MDC_CLIEN_IP = "client_ip"; static final String MDC_CLIENT_IP = "client_ip";
/** url of the current request */ /** url of the current request */
@VisibleForTesting @VisibleForTesting
@@ -102,8 +101,8 @@ public class MDCFilter extends HttpFilter
throws IOException, ServletException throws IOException, ServletException
{ {
MDC.put(MDC_USERNAME, getUsername()); MDC.put(MDC_USERNAME, getUsername());
MDC.put(MDC_CLIEN_IP, request.getRemoteAddr()); MDC.put(MDC_CLIENT_IP, request.getRemoteAddr());
MDC.put(MDC_CLIEN_HOST, request.getRemoteHost()); MDC.put(MDC_CLIENT_HOST, request.getRemoteHost());
MDC.put(MDC_REQUEST_METHOD, request.getMethod()); MDC.put(MDC_REQUEST_METHOD, request.getMethod());
MDC.put(MDC_REQUEST_URI, request.getRequestURI()); MDC.put(MDC_REQUEST_URI, request.getRequestURI());
@@ -114,8 +113,8 @@ public class MDCFilter extends HttpFilter
finally finally
{ {
MDC.remove(MDC_USERNAME); MDC.remove(MDC_USERNAME);
MDC.remove(MDC_CLIEN_IP); MDC.remove(MDC_CLIENT_IP);
MDC.remove(MDC_CLIEN_HOST); MDC.remove(MDC_CLIENT_HOST);
MDC.remove(MDC_REQUEST_METHOD); MDC.remove(MDC_REQUEST_METHOD);
MDC.remove(MDC_REQUEST_URI); MDC.remove(MDC_REQUEST_URI);
} }

4
scm-webapp/src/test/java/sonia/scm/filter/MDCFilterTest.java
View File

@@ -98,8 +98,8 @@ public class MDCFilterTest extends AbstractTestBase {
assertNotNull(chain.ctx); assertNotNull(chain.ctx);
assertEquals("trillian", chain.ctx.get(MDCFilter.MDC_USERNAME)); assertEquals("trillian", chain.ctx.get(MDCFilter.MDC_USERNAME));
assertEquals("api/v1/repositories", chain.ctx.get(MDCFilter.MDC_REQUEST_URI)); assertEquals("api/v1/repositories", chain.ctx.get(MDCFilter.MDC_REQUEST_URI));
assertEquals("127.0.0.1", chain.ctx.get(MDCFilter.MDC_CLIEN_IP)); assertEquals("127.0.0.1", chain.ctx.get(MDCFilter.MDC_CLIENT_IP));
assertEquals("localhost", chain.ctx.get(MDCFilter.MDC_CLIEN_HOST)); assertEquals("localhost", chain.ctx.get(MDCFilter.MDC_CLIENT_HOST));
assertEquals("GET", chain.ctx.get(MDCFilter.MDC_REQUEST_METHOD)); assertEquals("GET", chain.ctx.get(MDCFilter.MDC_REQUEST_METHOD));
} }