You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ab...@apache.org on 2025/07/18 19:11:19 UTC

(ranger) branch ranger-2.7 updated (a6a1b50ac -> a26a3fe51)

This is an automated email from the ASF dual-hosted git repository.

abhi pushed a change to branch ranger-2.7
in repository https://gitbox.apache.org/repos/asf/ranger.git


    from a6a1b50ac RANGER-5258: added menu items for easier reference to source repo, jira, ci sites
     new 871ebc43b RANGER-5251: dedupTags() doesn’t remove duplicate tag IDs within a single resource’s resourceToTagIds list (#608)
     new a26a3fe51 RANGER-4993 : Ranger KMS - Missing HSTS Headers for 404 Not found requests port 9494 (#585)

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../org/apache/ranger/plugin/util/ServiceTags.java |   8 ++
 .../apache/ranger/plugin/util/TestServiceTags.java |  51 +++++++++
 kms/config/webserver/ranger-kms-site.xml           | 119 ++++++++++-----------
 .../hadoop/crypto/key/kms/server/HSTSFilter.java   |  60 +++++++++++
 .../hadoop/crypto/key/kms/server/KMSMDCFilter.java |   1 -
 kms/src/main/webapp/WEB-INF/web.xml                | 112 ++++++++++---------
 6 files changed, 239 insertions(+), 112 deletions(-)
 create mode 100644 kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/HSTSFilter.java


(ranger) 01/02: RANGER-5251: dedupTags() doesn’t remove duplicate tag IDs within a single resource’s resourceToTagIds list (#608)

Posted by ab...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

abhi pushed a commit to branch ranger-2.7
in repository https://gitbox.apache.org/repos/asf/ranger.git

commit 871ebc43b5c194089efb31ae877f407bba294a03
Author: Vyom Mani Tiwari <vy...@gmail.com>
AuthorDate: Wed Jul 16 20:59:18 2025 +0530

    RANGER-5251: dedupTags() doesn’t remove duplicate tag IDs within a single resource’s resourceToTagIds list (#608)
    
    (cherry picked from commit fb4f8d9ea395f72b3cfe2c7936aeb67ff4ee7c16)
---
 .../org/apache/ranger/plugin/util/ServiceTags.java |  8 ++++
 .../apache/ranger/plugin/util/TestServiceTags.java | 51 ++++++++++++++++++++++
 2 files changed, 59 insertions(+)

diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/ServiceTags.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/ServiceTags.java
index 12f026e32..c77b96711 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/ServiceTags.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/ServiceTags.java
@@ -21,12 +21,14 @@
 
 
 import java.util.Date;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
 import java.util.HashMap;
 import java.util.ArrayList;
+import java.util.Set;
 
 import org.apache.commons.lang3.tuple.MutablePair;
 import org.apache.ranger.authorization.utils.StringUtil;
@@ -283,6 +285,7 @@ public int dedupTags() {
 		final int finalTagsCount = tags.size();
 
 		for (Map.Entry<Long, List<Long>> resourceEntry : resourceToTagIds.entrySet()) {
+			Set<Long> uniqueTagIds = new HashSet<>(resourceEntry.getValue().size());
 			for (ListIterator<Long> listIter = resourceEntry.getValue().listIterator(); listIter.hasNext(); ) {
 				final Long tagId       = listIter.next();
 				Long       mappedTagId = null;
@@ -295,6 +298,11 @@ public int dedupTags() {
 					continue;
 				}
 
+				if (!uniqueTagIds.add(mappedTagId)) {
+					listIter.remove();
+					continue;
+				}
+
 				listIter.set(mappedTagId);
 
 				RangerTag tag = tags.get(mappedTagId);
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/util/TestServiceTags.java b/agents-common/src/test/java/org/apache/ranger/plugin/util/TestServiceTags.java
index d44309805..3866942bd 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/util/TestServiceTags.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/util/TestServiceTags.java
@@ -23,9 +23,12 @@
 import org.junit.Test;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -205,6 +208,54 @@ public void testDedupTags_HigherIdTagAfterLowerIdRemoval() {
         assertFalse(svcTags1.getTags().containsKey(newTagId));
     }
 
+    @Test
+    public void testDedupTags_DuplicateResourceToTagIds() {
+        RangerTag[] tags = {
+                new RangerTag("PII", Collections.singletonMap("type", "email")),
+                new RangerTag("PII", Collections.singletonMap("type", "email")),
+                new RangerTag("PCI", Collections.emptyMap()),
+                new RangerTag("PCI", Collections.emptyMap()),
+                new RangerTag("PII", Collections.singletonMap("type", "email"))
+        };
+        ServiceTags svcTags = createServiceTags(tags, RESOURCES);
+        assertEquals(5, svcTags.getTags().size());
+
+        int dedupCount = svcTags.dedupTags();
+        assertEquals(3, dedupCount);
+        assertEquals(2, svcTags.getTags().size());
+
+        ServiceTags svcTags1 = new ServiceTags(svcTags);
+        // Simulate resource1 deletion (like delete table_1)
+        svcTags1.getResourceToTagIds().remove(0L);
+        // Clear tags to simulate new sync
+        svcTags1.getTags().clear();
+
+        RangerTag tag1 = new RangerTag("PII", Collections.singletonMap("type", "email"));
+        RangerTag tag2 = new RangerTag("PII", Collections.singletonMap("type", "email"));
+        tag1.setId(200L);
+        tag2.setId(201L);
+        svcTags1.getTags().put(200L, tag1);
+        svcTags1.getTags().put(201L, tag2);
+
+        // Set resource mappings with duplicate tag IDs
+        svcTags1.getResourceToTagIds().put(0L, new ArrayList<>(Arrays.asList(200L, 200L, 201L)));
+        svcTags1.getResourceToTagIds().put(1L, new ArrayList<>(Arrays.asList(200L, 200L, 201L, 201L)));
+
+        dedupCount = svcTags1.dedupTags();
+        assertEquals(1, dedupCount);
+        assertEquals(1, svcTags1.getTags().size());
+
+        // Verify resource1 has no duplicate tag IDs
+        List<Long> resource1Tags = svcTags1.getResourceToTagIds().get(0L);
+        Set<Long> uniqueTags = new HashSet<>(resource1Tags);
+        assertEquals("Duplicate tag IDs should be removed from resource1", uniqueTags.size(), resource1Tags.size());
+
+        // Verify resource2 has no duplicate tag IDs
+        List<Long> resource2Tags = svcTags1.getResourceToTagIds().get(1L);
+        uniqueTags = new HashSet<>(resource2Tags);
+        assertEquals("Duplicate tag IDs should be removed from resource2", uniqueTags.size(), resource2Tags.size());
+    }
+
     private ServiceTags createServiceTags(RangerTag[] tags, RangerServiceResource[] resources) {
         ServiceTags ret = new ServiceTags();
 


(ranger) 02/02: RANGER-4993 : Ranger KMS - Missing HSTS Headers for 404 Not found requests port 9494 (#585)

Posted by ab...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

abhi pushed a commit to branch ranger-2.7
in repository https://gitbox.apache.org/repos/asf/ranger.git

commit a26a3fe51a1177f02a9daf6e5c207b3e9850a28d
Author: dhavalshah9131 <dh...@gmail.com>
AuthorDate: Fri Jul 18 16:02:20 2025 +0530

    RANGER-4993 : Ranger KMS - Missing HSTS Headers for 404 Not found requests port 9494 (#585)
    
    (cherry picked from commit 1bbcd7e0b4e2e1fb11b038ffe73cdb300511d192)
---
 kms/config/webserver/ranger-kms-site.xml           | 119 ++++++++++-----------
 .../hadoop/crypto/key/kms/server/HSTSFilter.java   |  60 +++++++++++
 .../hadoop/crypto/key/kms/server/KMSMDCFilter.java |   1 -
 kms/src/main/webapp/WEB-INF/web.xml                | 112 ++++++++++---------
 4 files changed, 180 insertions(+), 112 deletions(-)

diff --git a/kms/config/webserver/ranger-kms-site.xml b/kms/config/webserver/ranger-kms-site.xml
index 8b72cc2b7..13e7ee34b 100644
--- a/kms/config/webserver/ranger-kms-site.xml
+++ b/kms/config/webserver/ranger-kms-site.xml
@@ -12,67 +12,66 @@
   limitations under the License. See accompanying LICENSE file.
 -->
 
-
 <configuration>
-	<property>
-		<name>ranger.service.host</name>
-		<value>localhost</value>
-	</property>
+    <property>
+        <name>ranger.service.host</name>
+        <value>localhost</value>
+    </property>
+
+    <property>
+        <name>ranger.service.http.port</name>
+        <value>9292</value>
+    </property>
+
+    <property>
+        <name>ranger.service.shutdown.port</name>
+        <value>7085</value>
+    </property>
+
+    <property>
+        <name>ranger.contextName</name>
+        <value>/</value>
+    </property>
 
-	<property>
-		<name>ranger.service.http.port</name>
-		<value>9292</value>
-	</property>
-	
-	<property>
-		<name>ranger.service.shutdown.port</name>
-		<value>7085</value>
-	</property>
-	
-	<property>
-		<name>ranger.contextName</name>
-		<value>/kms</value>
-	</property>			
-	
-	<property>
-		<name>xa.webapp.dir</name>
-		<value>./webapp</value>
-	</property>	
-	<property>
-		<name>ranger.service.https.port</name>
-		<value>9393</value>
-	</property>
-	<property>
-		<name>ranger.service.https.attrib.ssl.enabled</name>
-		<value>false</value>
-	</property>
-	<property>
-		<name>ajp.enabled</name>
-		<value>false</value>
-	</property>
-	<property>
-		<name>ranger.service.https.attrib.client.auth</name>
-		<value>want</value>
-	</property>
-	<property>
-		<name>ranger.credential.provider.path</name>
-		<value>/etc/ranger/kms/rangerkms.jceks</value>
-	</property>
-	<property>
-		<name>ranger.service.https.attrib.keystore.file</name>
-		<value></value>
-	</property>
-	<property>
-		<name>ranger.service.https.attrib.keystore.keyalias</name>
-		<value>rangerkms</value>
-	</property>
-	<property>
-		<name>ranger.service.https.attrib.keystore.pass</name>
-		<value></value>
-	</property>
-	<property>
-		<name>ranger.service.https.attrib.keystore.credential.alias</name>
-		<value>keyStoreCredentialAlias</value>
-	</property>
+    <property>
+        <name>xa.webapp.dir</name>
+        <value>./webapp</value>
+    </property>
+    <property>
+        <name>ranger.service.https.port</name>
+        <value>9393</value>
+    </property>
+    <property>
+        <name>ranger.service.https.attrib.ssl.enabled</name>
+        <value>false</value>
+    </property>
+    <property>
+        <name>ajp.enabled</name>
+        <value>false</value>
+    </property>
+    <property>
+        <name>ranger.service.https.attrib.client.auth</name>
+        <value>want</value>
+    </property>
+    <property>
+        <name>ranger.credential.provider.path</name>
+        <value>/etc/ranger/kms/rangerkms.jceks</value>
+    </property>
+    <property>
+        <name>ranger.service.https.attrib.keystore.file</name>
+        <value></value>
+    </property>
+    <property>
+        <name>ranger.service.https.attrib.keystore.keyalias</name>
+        <value>rangerkms</value>
+    </property>
+    <property>
+        <name>ranger.service.https.attrib.keystore.pass</name>
+        <value></value>
+    </property>
+    <property>
+        <name>ranger.service.https.attrib.keystore.credential.alias</name>
+        <value>keyStoreCredentialAlias</value>
+    </property>
 
 </configuration>
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/HSTSFilter.java b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/HSTSFilter.java
new file mode 100644
index 000000000..506f4a3d2
--- /dev/null
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/HSTSFilter.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.hadoop.crypto.key.kms.server;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.Filter;
+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;
+
+import java.io.IOException;
+
+public class HSTSFilter implements Filter {
+    static final Logger LOG = LoggerFactory.getLogger(HSTSFilter.class);
+
+    @Override
+    public void init(FilterConfig filterConfig) throws ServletException {
+        // Initialization logic if needed
+    }
+
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+            throws IOException, ServletException {
+        LOG.debug("===> HSTSFilter:doFilter()");
+        String path = ((HttpServletRequest) request).getRequestURI();
+        LOG.debug("==> HSTSFilter:doFilter() path = " + path);
+        HttpServletResponse resp = (HttpServletResponse) response;
+        resp.setHeader("Strict-Transport-Security", "max-age=31536000; includeSubDomains; preload");
+        chain.doFilter(request, response);
+        LOG.debug("<=== HSTSFilter:doFilter()");
+    }
+
+    @Override
+    public void destroy() {
+        // Cleanup logic if needed
+    }
+}
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSMDCFilter.java b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSMDCFilter.java
index b975bd099..d62afb5b7 100644
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSMDCFilter.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSMDCFilter.java
@@ -75,7 +75,6 @@ public void doFilter(ServletRequest request, ServletResponse response,
 		try {
 			String path = ((HttpServletRequest) request).getRequestURI();
 			HttpServletResponse resp = (HttpServletResponse) response;
-			resp.setHeader("Strict-Transport-Security", "max-age=31536000; includeSubDomains; preload");
 
 			if (path.startsWith(RANGER_KMS_REST_API_PATH)) {
 				chain.doFilter(request, resp);
diff --git a/kms/src/main/webapp/WEB-INF/web.xml b/kms/src/main/webapp/WEB-INF/web.xml
index c3a35bc29..12b660ab6 100644
--- a/kms/src/main/webapp/WEB-INF/web.xml
+++ b/kms/src/main/webapp/WEB-INF/web.xml
@@ -18,56 +18,66 @@
 
 <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee">
 
-  <display-name>ranger-kms</display-name>
-  <absolute-ordering />
-
-  <listener>
-    <listener-class>org.apache.hadoop.crypto.key.kms.server.KMSWebApp</listener-class>
-  </listener>
-
-  <servlet>
-    <servlet-name>webservices-driver</servlet-name>
-    <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
-    <init-param>
-      <param-name>com.sun.jersey.config.property.packages</param-name>
-      <param-value>org.apache.hadoop.crypto.key.kms.server</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-  <servlet>
-    <servlet-name>jmx-servlet</servlet-name>
-    <servlet-class>org.apache.hadoop.crypto.key.kms.server.KMSJMXServlet</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>webservices-driver</servlet-name>
-    <url-pattern>/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>jmx-servlet</servlet-name>
-    <url-pattern>/jmx</url-pattern>
-  </servlet-mapping>
-
-  <filter>
-    <filter-name>authFilter</filter-name>
-    <filter-class>org.apache.hadoop.crypto.key.kms.server.KMSAuthenticationFilter</filter-class>
-  </filter>
-
-  <filter>
-    <filter-name>MDCFilter</filter-name>
-    <filter-class>org.apache.hadoop.crypto.key.kms.server.KMSMDCFilter</filter-class>
-  </filter>
-
-  <filter-mapping>
-    <filter-name>authFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-
-  <filter-mapping>
-    <filter-name>MDCFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
+    <display-name>ranger-kms</display-name>
+    <absolute-ordering />
+
+    <listener>
+        <listener-class>org.apache.hadoop.crypto.key.kms.server.KMSWebApp</listener-class>
+    </listener>
+
+    <servlet>
+        <servlet-name>webservices-driver</servlet-name>
+        <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
+        <init-param>
+            <param-name>com.sun.jersey.config.property.packages</param-name>
+            <param-value>org.apache.hadoop.crypto.key.kms.server</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>jmx-servlet</servlet-name>
+        <servlet-class>org.apache.hadoop.crypto.key.kms.server.KMSJMXServlet</servlet-class>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>webservices-driver</servlet-name>
+        <url-pattern>/kms/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>jmx-servlet</servlet-name>
+        <url-pattern>/jmx</url-pattern>
+    </servlet-mapping>
+
+    <filter>
+        <filter-name>HSTSFilter</filter-name>
+        <filter-class>org.apache.hadoop.crypto.key.kms.server.HSTSFilter</filter-class>
+    </filter>
+
+    <filter>
+        <filter-name>authFilter</filter-name>
+        <filter-class>org.apache.hadoop.crypto.key.kms.server.KMSAuthenticationFilter</filter-class>
+    </filter>
+
+    <filter>
+        <filter-name>MDCFilter</filter-name>
+        <filter-class>org.apache.hadoop.crypto.key.kms.server.KMSMDCFilter</filter-class>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>HSTSFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>authFilter</filter-name>
+        <url-pattern>/kms/*</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>MDCFilter</filter-name>
+        <url-pattern>/kms/*</url-pattern>
+    </filter-mapping>
 
 </web-app>