diff --git a/agents-audit/dest-solr/pom.xml b/agents-audit/dest-solr/pom.xml index b9e562ca065..067b69298c2 100644 --- a/agents-audit/dest-solr/pom.xml +++ b/agents-audit/dest-solr/pom.xml @@ -114,6 +114,12 @@ org.eclipse.jetty jetty-client ${jetty-client.version} + + + * + * + + org.slf4j diff --git a/agents-common/pom.xml b/agents-common/pom.xml index 52cce7e2ce6..78b9026d972 100644 --- a/agents-common/pom.xml +++ b/agents-common/pom.xml @@ -55,6 +55,10 @@ jakarta.activation jakarta.activation-api + + org.eclipse.jetty + * + @@ -105,6 +109,10 @@ com.sun.jersey.contribs * + + org.eclipse.jetty + * + @@ -120,6 +128,10 @@ com.sun.jersey.contribs * + + org.eclipse.jetty + * + @@ -161,6 +173,10 @@ org.apache.logging.log4j * + + org.eclipse.jetty + * + org.slf4j * diff --git a/agents-cred/pom.xml b/agents-cred/pom.xml index 753a00989d5..7e7c00be1eb 100644 --- a/agents-cred/pom.xml +++ b/agents-cred/pom.xml @@ -60,16 +60,34 @@ org.apache.hadoop hadoop-auth ${hadoop.version} + + + org.eclipse.jetty + * + + org.apache.hadoop hadoop-client-api ${hadoop.version} + + + org.eclipse.jetty + * + + org.apache.hadoop hadoop-client-runtime ${hadoop.version} + + + org.eclipse.jetty + * + + org.slf4j diff --git a/audit-server/audit-dispatcher/dispatcher-common/pom.xml b/audit-server/audit-dispatcher/dispatcher-common/pom.xml index 3b717af732e..1092a639186 100644 --- a/audit-server/audit-dispatcher/dispatcher-common/pom.xml +++ b/audit-server/audit-dispatcher/dispatcher-common/pom.xml @@ -71,6 +71,10 @@ log4j * + + org.eclipse.jetty + * + org.slf4j * diff --git a/audit-server/audit-dispatcher/dispatcher-hdfs/pom.xml b/audit-server/audit-dispatcher/dispatcher-hdfs/pom.xml index f1a07a79aa7..7aaa7118f5d 100644 --- a/audit-server/audit-dispatcher/dispatcher-hdfs/pom.xml +++ b/audit-server/audit-dispatcher/dispatcher-hdfs/pom.xml @@ -97,6 +97,10 @@ org.apache.hadoop hadoop-client-api + + org.eclipse.jetty + * + @@ -126,6 +130,10 @@ org.apache.hadoop hadoop-client-api + + org.eclipse.jetty + * + org.slf4j * diff --git a/audit-server/audit-ingestor/pom.xml b/audit-server/audit-ingestor/pom.xml index bcb6d0233ef..9f89eaa8f24 100644 --- a/audit-server/audit-ingestor/pom.xml +++ b/audit-server/audit-ingestor/pom.xml @@ -163,6 +163,10 @@ org.codehaus.jackson * + + org.eclipse.jetty + * + org.slf4j * diff --git a/audit-server/pom.xml b/audit-server/pom.xml index 22d246b2d08..2a3d5e8a95b 100644 --- a/audit-server/pom.xml +++ b/audit-server/pom.xml @@ -115,12 +115,24 @@ org.apache.hadoop hadoop-azure ${hadoop.version} + + + org.eclipse.jetty + * + + org.apache.hadoop hadoop-common ${hadoop.version} + + + org.eclipse.jetty + * + + org.apache.hadoop diff --git a/credentialbuilder/pom.xml b/credentialbuilder/pom.xml index c0257fb747d..be0d98fe4a5 100644 --- a/credentialbuilder/pom.xml +++ b/credentialbuilder/pom.xml @@ -105,6 +105,10 @@ org.apache.zookeeper zookeeper + + org.eclipse.jetty + * + org.slf4j * diff --git a/hbase-agent/pom.xml b/hbase-agent/pom.xml index b4af771536a..92bcada4a89 100644 --- a/hbase-agent/pom.xml +++ b/hbase-agent/pom.xml @@ -43,6 +43,10 @@ ch.qos.logback * + + org.eclipse.jetty + * + @@ -72,6 +76,10 @@ jakarta.activation jakarta.activation-api + + org.eclipse.jetty + * + @@ -131,6 +139,10 @@ com.fasterxml.jackson.module * + + org.eclipse.jetty + * + @@ -151,6 +163,10 @@ com.fasterxml.jackson.module * + + org.eclipse.jetty + * + @@ -166,6 +182,10 @@ org.apache.hadoop * + + org.eclipse.jetty + * + org.slf4j * @@ -201,6 +221,10 @@ org.apache.zookeeper zookeeper + + org.eclipse.jetty + * + org.glassfish javax.el @@ -235,6 +259,10 @@ org.apache.hadoop * + + org.eclipse.jetty + * + @@ -569,12 +597,7 @@ ${hbase.jetty.version} test - - org.eclipse.jetty - jetty-server - ${hbase.jetty.version} - test - + org.eclipse.jetty jetty-util diff --git a/hdfs-agent/pom.xml b/hdfs-agent/pom.xml index 7b86beb37b7..7fea884c39b 100644 --- a/hdfs-agent/pom.xml +++ b/hdfs-agent/pom.xml @@ -127,6 +127,10 @@ org.apache.zookeeper zookeeper + + org.eclipse.jetty + * + org.slf4j * @@ -172,6 +176,10 @@ log4j * + + org.eclipse.jetty + * + org.slf4j * @@ -207,6 +215,10 @@ javax.ws.rs jsr311-api + + org.eclipse.jetty + * + diff --git a/hive-agent/pom.xml b/hive-agent/pom.xml index 3bf1b0deb00..f60cf5342c1 100644 --- a/hive-agent/pom.xml +++ b/hive-agent/pom.xml @@ -119,6 +119,10 @@ org.apache.zookeeper zookeeper + + org.eclipse.jetty + * + org.slf4j * @@ -162,6 +166,10 @@ org.apache.zookeeper zookeeper + + org.eclipse.jetty + * + org.slf4j * @@ -193,6 +201,10 @@ org.apache.zookeeper zookeeper + + org.eclipse.jetty + * + org.glassfish javax.el @@ -232,6 +244,10 @@ org.apache.zookeeper zookeeper + + org.eclipse.jetty + * + @@ -267,6 +283,10 @@ org.apache.zookeeper zookeeper + + org.eclipse.jetty + * + org.glassfish javax.el @@ -302,6 +322,10 @@ javax.ws.rs jsr311-api + + org.eclipse.jetty + * + diff --git a/kms/pom.xml b/kms/pom.xml index f49d33984c1..100e91eb815 100644 --- a/kms/pom.xml +++ b/kms/pom.xml @@ -50,6 +50,10 @@ com.fasterxml.jackson.dataformat jackson-dataformat-cbor + + org.eclipse.jetty + * + software.amazon.ion ion-java @@ -96,6 +100,10 @@ jakarta.activation jakarta.activation-api + + org.eclipse.jetty + * + @@ -143,6 +151,10 @@ log4jdbc ${googlecode.log4jdbc.version} + + org.eclipse.jetty + * + org.slf4j * @@ -166,6 +178,10 @@ org.apache.commons commons-lang3 + + org.eclipse.jetty + * + @@ -181,6 +197,10 @@ org.apache.commons commons-lang3 + + org.eclipse.jetty + * + @@ -197,6 +217,10 @@ org.apache.commons commons-lang3 + + org.eclipse.jetty + * + @@ -213,6 +237,10 @@ org.apache.commons commons-lang3 + + org.eclipse.jetty + * + @@ -324,6 +352,10 @@ junit junit + + org.eclipse.jetty + * + @@ -393,6 +425,10 @@ net.minidev json-smart + + org.eclipse.jetty + * + org.slf4j * @@ -457,6 +493,10 @@ org.apache.commons commons-text + + org.eclipse.jetty + * + org.slf4j * @@ -497,6 +537,10 @@ log4j * + + org.eclipse.jetty + * + @@ -536,6 +580,10 @@ net.minidev json-smart + + org.eclipse.jetty + * + @@ -569,6 +617,10 @@ log4j * + + org.eclipse.jetty + * + org.slf4j * diff --git a/knox-agent/pom.xml b/knox-agent/pom.xml index 4b7a3cd7dc8..7de45bf7db9 100644 --- a/knox-agent/pom.xml +++ b/knox-agent/pom.xml @@ -110,6 +110,10 @@ org.apache.zookeeper zookeeper + + org.eclipse.jetty + * + org.slf4j * @@ -146,6 +150,10 @@ javax.ws.rs jsr311-api + + org.eclipse.jetty + * + + + org.apache.tomcat.embed + tomcat-embed-core + ${tomcat.embed.version} + org.junit.jupiter @@ -73,6 +79,13 @@ org.mockito mockito-core + ${mockito.version} + test + + + org.mockito + mockito-junit-jupiter + ${mockito.version} test diff --git a/ranger-ozone-plugin-shim/pom.xml b/ranger-ozone-plugin-shim/pom.xml index 66587bc1814..5000d2ad331 100644 --- a/ranger-ozone-plugin-shim/pom.xml +++ b/ranger-ozone-plugin-shim/pom.xml @@ -40,6 +40,10 @@ io.netty netty-all + + org.eclipse.jetty + * + org.yaml snakeyaml diff --git a/ranger-solr-plugin-shim/pom.xml b/ranger-solr-plugin-shim/pom.xml index 14c11efec82..fa2fcb7001f 100644 --- a/ranger-solr-plugin-shim/pom.xml +++ b/ranger-solr-plugin-shim/pom.xml @@ -98,6 +98,14 @@ org.apache.zookeeper zookeeper-jute + + org.eclipse.jetty + * + + + org.eclipse.jetty.http2 + * + org.slf4j * diff --git a/ranger-storm-plugin-shim/pom.xml b/ranger-storm-plugin-shim/pom.xml index 16e70f331ac..4ac8512c19f 100644 --- a/ranger-storm-plugin-shim/pom.xml +++ b/ranger-storm-plugin-shim/pom.xml @@ -50,6 +50,10 @@ org.apache.logging.log4j * + + org.eclipse.jetty + * + org.slf4j * diff --git a/ranger-yarn-plugin-shim/pom.xml b/ranger-yarn-plugin-shim/pom.xml index f61e9105dad..ae5909714ad 100644 --- a/ranger-yarn-plugin-shim/pom.xml +++ b/ranger-yarn-plugin-shim/pom.xml @@ -49,6 +49,10 @@ log4j * + + org.eclipse.jetty + * + org.slf4j * diff --git a/security-admin/pom.xml b/security-admin/pom.xml index 491baf80fcb..f92bf8f9f40 100644 --- a/security-admin/pom.xml +++ b/security-admin/pom.xml @@ -80,6 +80,10 @@ jakarta.activation jakarta.activation-api + + org.eclipse.jetty + * + @@ -97,6 +101,10 @@ log4jdbc ${googlecode.log4jdbc.version} + + org.eclipse.jetty + * + org.slf4j * @@ -112,6 +120,10 @@ com.google.guava guava + + org.eclipse.jetty + * + @@ -130,6 +142,10 @@ HikariCP ${HikariCP.version} + + org.eclipse.jetty + * + org.slf4j * @@ -313,6 +329,10 @@ org.apache.commons commons-text + + org.eclipse.jetty + * + org.mortbay.jetty * @@ -398,6 +418,10 @@ org.apache.commons commons-compress + + org.eclipse.jetty + * + org.slf4j * @@ -463,6 +487,10 @@ org.apache.logging.log4j log4j-api + + org.eclipse.jetty + * + org.slf4j * @@ -482,6 +510,10 @@ org.apache.logging.log4j log4j-api + + org.eclipse.jetty + * + org.slf4j * @@ -522,6 +554,10 @@ javax.ws.rs jsr311-api + + org.eclipse.jetty + * + @@ -538,6 +574,10 @@ com.sun.xml.bind * + + org.eclipse.jetty + * + @@ -586,6 +626,14 @@ org.apache.zookeeper zookeeper-jute + + org.eclipse.jetty + * + + + org.eclipse.jetty.http2 + * + org.slf4j * @@ -601,6 +649,10 @@ org.apache.tomcat.embed tomcat-embed-core + + org.eclipse.jetty + * + org.slf4j * @@ -612,6 +664,10 @@ velocity-engine-core ${velocity.version} + + org.eclipse.jetty + * + org.slf4j * @@ -639,6 +695,10 @@ log4j * + + org.eclipse.jetty + * + org.slf4j * @@ -650,6 +710,18 @@ jettison ${jettison.version} + + + org.eclipse.jetty + jetty-client + ${jetty-client.version} + + + org.eclipse.jetty + * + + + org.eclipse.persistence eclipselink @@ -735,6 +807,10 @@ spring-core ${springframework.version} + + org.eclipse.jetty + * + org.springframework spring-jcl @@ -776,6 +852,10 @@ spring-ldap-core ${spring-ldap-core.version} + + org.eclipse.jetty + * + org.slf4j * diff --git a/security-admin/src/test/java/org/apache/ranger/security/handler/TestPermission.java b/security-admin/src/test/java/org/apache/ranger/security/handler/TestPermission.java index c88a72682ca..c8d7d3f2872 100644 --- a/security-admin/src/test/java/org/apache/ranger/security/handler/TestPermission.java +++ b/security-admin/src/test/java/org/apache/ranger/security/handler/TestPermission.java @@ -25,6 +25,8 @@ import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; /** * @generated by Cursor @@ -49,12 +51,8 @@ public void getPermission_returnsNullForUnknown() { @Test public void getPermission_acceptsNonStringInputs() { - Object in = new Object() { - @Override - public String toString() { - return "READ"; - } - }; + Object in = mock(Object.class); + when(in.toString()).thenReturn("READ"); assertEquals(Permission.PermissionType.READ, Permission.getPermission(in)); } diff --git a/security-admin/src/test/java/org/apache/ranger/security/web/filter/TestRangerHeaderPreAuthFilter.java b/security-admin/src/test/java/org/apache/ranger/security/web/filter/TestRangerHeaderPreAuthFilter.java index c721c30f063..8bd9df73b80 100644 --- a/security-admin/src/test/java/org/apache/ranger/security/web/filter/TestRangerHeaderPreAuthFilter.java +++ b/security-admin/src/test/java/org/apache/ranger/security/web/filter/TestRangerHeaderPreAuthFilter.java @@ -33,8 +33,6 @@ import org.springframework.security.core.context.SecurityContextHolder; import javax.servlet.FilterChain; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -130,22 +128,19 @@ public void testDoFilter_enabled_withUsername_setsAuthenticationFromRangerDbRole when(request.getHeader("x-awc-username")).thenReturn("joeuser"); - FilterChain chain = new FilterChain() { - @Override - public void doFilter(ServletRequest req, ServletResponse res) { - org.springframework.security.core.Authentication auth = SecurityContextHolder.getContext().getAuthentication(); - - assertNotNull(auth); - assertTrue(auth instanceof RangerAuthenticationToken); - RangerAuthenticationToken rangerAuth = (RangerAuthenticationToken) auth; - assertEquals(XXAuthSession.AUTH_TYPE_TRUSTED_PROXY, rangerAuth.getAuthType()); - assertEquals("joeuser", auth.getName()); - - Collection authorities = auth.getAuthorities(); - assertEquals(2, authorities.size()); - assertTrue(authorities.stream().anyMatch(a -> "ROLE_SYS_ADMIN".equals(a.toString()))); - assertTrue(authorities.stream().anyMatch(a -> "ROLE_USER".equals(a.toString()))); - } + FilterChain chain = (req, res) -> { + org.springframework.security.core.Authentication auth = SecurityContextHolder.getContext().getAuthentication(); + + assertNotNull(auth); + assertTrue(auth instanceof RangerAuthenticationToken); + RangerAuthenticationToken rangerAuth = (RangerAuthenticationToken) auth; + assertEquals(XXAuthSession.AUTH_TYPE_TRUSTED_PROXY, rangerAuth.getAuthType()); + assertEquals("joeuser", auth.getName()); + + Collection authorities = auth.getAuthorities(); + assertEquals(2, authorities.size()); + assertTrue(authorities.stream().anyMatch(a -> "ROLE_SYS_ADMIN".equals(a.toString()))); + assertTrue(authorities.stream().anyMatch(a -> "ROLE_USER".equals(a.toString()))); }; filter.doFilter(request, response, chain); diff --git a/security-admin/src/test/java/org/apache/ranger/security/web/filter/TestRangerKrbFilter.java b/security-admin/src/test/java/org/apache/ranger/security/web/filter/TestRangerKrbFilter.java index 43a0ab27c2e..f147eb5dd0a 100644 --- a/security-admin/src/test/java/org/apache/ranger/security/web/filter/TestRangerKrbFilter.java +++ b/security-admin/src/test/java/org/apache/ranger/security/web/filter/TestRangerKrbFilter.java @@ -180,22 +180,8 @@ public void testProtectedDoFilterDelegates() throws Exception { @Test public void testIsCustomSignerSecretProvider() throws Exception { RangerKrbFilter filter = new RangerKrbFilter(); - // Custom provider (anonymous) should be detected as custom - SignerSecretProvider custom = new SignerSecretProvider() { - @Override - public void init(Properties config, ServletContext servletContext, long tokenValidity) { - } - - @Override - public byte[] getCurrentSecret() { - return new byte[0]; - } - - @Override - public byte[][] getAllSecrets() { - return new byte[0][]; - } - }; + // Custom provider (mock) should be detected as custom + SignerSecretProvider custom = mock(SignerSecretProvider.class); setField(filter, "secretProvider", custom); assertTrue((Boolean) invoke(filter, "isCustomSignerSecretProvider")); } diff --git a/security-admin/src/test/java/org/apache/ranger/security/web/filter/TestRangerMDCFilter.java b/security-admin/src/test/java/org/apache/ranger/security/web/filter/TestRangerMDCFilter.java index 16156c6e6e9..0ef68218b90 100644 --- a/security-admin/src/test/java/org/apache/ranger/security/web/filter/TestRangerMDCFilter.java +++ b/security-admin/src/test/java/org/apache/ranger/security/web/filter/TestRangerMDCFilter.java @@ -30,7 +30,6 @@ import javax.servlet.FilterChain; import javax.servlet.FilterConfig; import javax.servlet.ServletException; -import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -88,12 +87,7 @@ public void testInitAndDoFilter_enabled_setsAndClearsMDC() throws Exception { ServletResponse response = mock(ServletResponse.class); - FilterChain chain = new FilterChain() { - @Override - public void doFilter(ServletRequest req, ServletResponse res) throws IOException, ServletException { - assertEquals("abc-123", MDC.get("RID")); - } - }; + FilterChain chain = (req, res) -> assertEquals("abc-123", MDC.get("RID")); filter.doFilter(request, response, chain); @@ -110,13 +104,7 @@ public void testDoFilter_disabled_bypasses() throws Exception { HttpServletRequest request = mock(HttpServletRequest.class); ServletResponse response = mock(ServletResponse.class); - FilterChain chain = new FilterChain() { - @Override - public void doFilter(ServletRequest req, ServletResponse res) { - // MDC should not be set - assertNull(MDC.get(RangerMDCFilter.DEFAULT_MDC_KEY)); - } - }; + FilterChain chain = (req, res) -> assertNull(MDC.get(RangerMDCFilter.DEFAULT_MDC_KEY)); filter.doFilter(request, response, chain); } diff --git a/security-admin/src/test/java/org/apache/ranger/security/web/filter/TestRangerSecurityContextFormationFilter.java b/security-admin/src/test/java/org/apache/ranger/security/web/filter/TestRangerSecurityContextFormationFilter.java index ff9f059bc4f..fc59cab53d7 100644 --- a/security-admin/src/test/java/org/apache/ranger/security/web/filter/TestRangerSecurityContextFormationFilter.java +++ b/security-admin/src/test/java/org/apache/ranger/security/web/filter/TestRangerSecurityContextFormationFilter.java @@ -124,14 +124,11 @@ public void testDoFilter_setsCreatePrincipalsIfAbsentFlag() throws Exception { when(req.getParameter("createPrincipalsIfAbsent")).thenReturn("true"); - FilterChain chain = new FilterChain() { - @Override - public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) { - Boolean flag = RangerContextHolder.getOpContext() != null - ? RangerContextHolder.getOpContext().getCreatePrincipalsIfAbsent() - : null; - assertEquals(Boolean.TRUE, flag); - } + FilterChain chain = (servletRequest, servletResponse) -> { + Boolean flag = RangerContextHolder.getOpContext() != null + ? RangerContextHolder.getOpContext().getCreatePrincipalsIfAbsent() + : null; + assertEquals(Boolean.TRUE, flag); }; filter.doFilter(req, res, chain); @@ -222,16 +219,13 @@ public void testDoFilter_authenticated_createsSecurityContextAndUserSession() th Mockito.when(sessionMgr.processSuccessLogin(Mockito.anyInt(), Mockito.anyString(), Mockito.any(HttpServletRequest.class))) .thenReturn(userSession); - FilterChain chain = new FilterChain() { - @Override - public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) { - RangerSecurityContext ctx = RangerContextHolder.getSecurityContext(); + FilterChain chain = (servletRequest, servletResponse) -> { + RangerSecurityContext ctx = RangerContextHolder.getSecurityContext(); - assertNotNull(ctx); - assertNotNull(ctx.getRequestContext()); - assertEquals("awc-request-1", ctx.getRequestContext().getServerRequestId()); - assertSame(userSession, ctx.getUserSession()); - } + assertNotNull(ctx); + assertNotNull(ctx.getRequestContext()); + assertEquals("awc-request-1", ctx.getRequestContext().getServerRequestId()); + assertSame(userSession, ctx.getUserSession()); }; filter.doFilter(req, res, chain); diff --git a/storm-agent/pom.xml b/storm-agent/pom.xml index 7e526e20751..327549c5b8f 100644 --- a/storm-agent/pom.xml +++ b/storm-agent/pom.xml @@ -50,6 +50,10 @@ jakarta.activation jakarta.activation-api + + org.eclipse.jetty + * + @@ -100,6 +104,10 @@ com.fasterxml.jackson.module * + + org.eclipse.jetty + * + @@ -120,6 +128,10 @@ com.fasterxml.jackson.module * + + org.eclipse.jetty + * + @@ -132,6 +144,11 @@ credentialbuilder ${project.version} + + org.eclipse.jetty + * + + org.slf4j * @@ -147,6 +164,10 @@ org.apache.hadoop hadoop-common + + org.eclipse.jetty + * + org.slf4j * @@ -162,6 +183,10 @@ org.apache.logging.log4j * + + org.eclipse.jetty + * + org.slf4j * diff --git a/tagsync/pom.xml b/tagsync/pom.xml index 30d5eea5b5a..11662bf21d9 100644 --- a/tagsync/pom.xml +++ b/tagsync/pom.xml @@ -176,6 +176,10 @@ log4j * + + org.eclipse.jetty + * + org.slf4j * @@ -199,6 +203,10 @@ log4j * + + org.eclipse.jetty + * + org.slf4j * @@ -230,6 +238,10 @@ org.apache.logging.log4j * + + org.eclipse.jetty + * + org.slf4j * @@ -269,6 +281,10 @@ org.apache.logging.log4j * + + org.eclipse.jetty + * + org.slf4j * @@ -308,6 +324,10 @@ org.apache.logging.log4j * + + org.eclipse.jetty + * + org.slf4j * @@ -323,6 +343,10 @@ org.apache.commons commons-lang3 + + org.eclipse.jetty + * + @@ -354,6 +378,10 @@ log4j * + + org.eclipse.jetty + * + @@ -385,6 +413,10 @@ javax.servlet javax.servlet-api + + org.eclipse.jetty + * + org.graalvm.sdk graal-sdk @@ -413,6 +445,10 @@ log4j * + + org.eclipse.jetty + * + org.slf4j * @@ -452,6 +488,11 @@ jersey-spring5 ${jersey-client.version} + + org.eclipse.jetty + * + + org.springframework *