ATLAS-4528: updated log4j2 version to 2.17.1; removed references to o…

…rg.apache.logging.NDC
apache · Jan 11, 2022 · be824ba · be824ba
1 parent f10c848
commit be824ba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -736,7 +736,7 @@
         <kafka.version>2.8.1</kafka.version>
         <keycloak.version>6.0.1</keycloak.version>
         <log4j.version>1.2.17</log4j.version>
-        <log4j2.version>2.15.0</log4j2.version>
+        <log4j2.version>2.17.1</log4j2.version>
         <lucene-solr.version>8.6.3</lucene-solr.version>
         <maven-site-plugin.version>3.7</maven-site-plugin.version>
         <MaxPermGen>512m</MaxPermGen>

diff --git a/webapp/src/main/java/org/apache/atlas/web/filters/AtlasAuthenticationFilter.java b/webapp/src/main/java/org/apache/atlas/web/filters/AtlasAuthenticationFilter.java
@@ -42,7 +42,6 @@
 import org.apache.hadoop.security.authentication.util.SignerSecretProvider;
 import org.apache.hadoop.security.authorize.AuthorizationException;
 import org.apache.hadoop.security.authorize.ProxyUsers;
-import org.apache.log4j.NDC;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.authentication.AbstractAuthenticationToken;
@@ -792,17 +791,11 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo
             if (httpRequest.getMethod().equals("OPTIONS")) {
                 optionsServlet.service(request, response);
             } else {
-                try {
-                    String requestUser = httpRequest.getRemoteUser();
+                String requestUser = httpRequest.getRemoteUser();
 
-                    NDC.push(requestUser + ":" + httpRequest.getMethod() + httpRequest.getRequestURI());
+                LOG.info("Request from authenticated user: {}, URL={}", requestUser, Servlets.getRequestURI(httpRequest));
 
-                    LOG.info("Request from authenticated user: {}, URL={}", requestUser, Servlets.getRequestURI(httpRequest));
-
-                    filterChain.doFilter(servletRequest, servletResponse);
-                } finally {
-                    NDC.pop();
-                }
+                filterChain.doFilter(servletRequest, servletResponse);
             }
         }
     }