Skip to content

Commit e7c1c07

Browse files
kumaabkumaab
authored
Merge branch 'apache:master' into robot
2 parents d175e0c + 651dcf2 commit e7c1c07

File tree

233 files changed

+12425
-8391
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

233 files changed

+12425
-8391
lines changed

‎.github/workflows/maven.yml

+3
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,9 @@ jobs:
9696
cd dev-support/ranger-docker
9797
./download-archives.sh hadoop hive hbase kafka knox ozone
9898
99+
- name: Clean up Docker space
100+
run: docker system prune --all --force --volumes
101+
99102
- name: Build all ranger-service images
100103
run: |
101104
cd dev-support/ranger-docker

‎agents-audit/pom.xml

+198-198
Large diffs are not rendered by default.

‎agents-audit/src/main/java/org/apache/ranger/audit/provider/MultiDestAuditProvider.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,10 @@ public void setName(String name) {
8787

8888
public void addAuditProvider(AuditHandler provider) {
8989
if (provider != null) {
90-
LOG.info("MultiDestAuditProvider.addAuditProvider(providerType="
91-
+ provider.getClass().getCanonicalName() + ")");
90+
if(LOG.isDebugEnabled()) {
91+
LOG.debug("MultiDestAuditProvider.addAuditProvider(providerType="
92+
+ provider.getClass().getCanonicalName() + ")");
93+
}
9294

9395
mProviders.add(provider);
9496
if (provider instanceof BaseAuditHandler) {

‎agents-common/pom.xml

+97-98
Original file line numberDiff line numberDiff line change
@@ -17,32 +17,56 @@
1717
-->
1818
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1919
<modelVersion>4.0.0</modelVersion>
20-
<artifactId>ranger-plugins-common</artifactId>
21-
<name>Common library for Plugins</name>
22-
<description>Plugins Common</description>
23-
<build>
24-
<plugins>
25-
<plugin>
26-
<groupId>org.apache.maven.plugins</groupId>
27-
<artifactId>maven-compiler-plugin</artifactId>
28-
<configuration>
29-
<source>8</source>
30-
<target>8</target>
31-
</configuration>
32-
</plugin>
33-
</plugins>
34-
</build>
35-
<packaging>jar</packaging>
36-
<properties>
37-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
38-
</properties>
3920
<parent>
4021
<groupId>org.apache.ranger</groupId>
4122
<artifactId>ranger</artifactId>
4223
<version>3.0.0-SNAPSHOT</version>
4324
<relativePath>..</relativePath>
4425
</parent>
26+
<artifactId>ranger-plugins-common</artifactId>
27+
<packaging>jar</packaging>
28+
<name>Common library for Plugins</name>
29+
<description>Plugins Common</description>
30+
<properties>
31+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
32+
</properties>
4533
<dependencies>
34+
<dependency>
35+
<groupId>com.fasterxml.jackson.core</groupId>
36+
<artifactId>jackson-core</artifactId>
37+
<version>${fasterxml.jackson.version}</version>
38+
</dependency>
39+
<dependency>
40+
<groupId>com.fasterxml.jackson.core</groupId>
41+
<artifactId>jackson-databind</artifactId>
42+
<version>${fasterxml.jackson.databind.version}</version>
43+
</dependency>
44+
<dependency>
45+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
46+
<artifactId>jackson-jaxrs-base</artifactId>
47+
<version>${fasterxml.jackson.version}</version>
48+
</dependency>
49+
<dependency>
50+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
51+
<artifactId>jackson-jaxrs-json-provider</artifactId>
52+
<version>${fasterxml.jackson.version}</version>
53+
<exclusions>
54+
<exclusion>
55+
<groupId>jakarta.activation</groupId>
56+
<artifactId>jakarta.activation-api</artifactId>
57+
</exclusion>
58+
</exclusions>
59+
</dependency>
60+
<dependency>
61+
<groupId>com.kstruct</groupId>
62+
<artifactId>gethostname4j</artifactId>
63+
<version>${kstruct.gethostname4j.version}</version>
64+
</dependency>
65+
<dependency>
66+
<groupId>com.nimbusds</groupId>
67+
<artifactId>nimbus-jose-jwt</artifactId>
68+
<version>${nimbus-jose-jwt.version}</version>
69+
</dependency>
4670
<dependency>
4771
<groupId>com.sun.jersey</groupId>
4872
<artifactId>jersey-bundle</artifactId>
@@ -60,130 +84,97 @@
6084
<version>${commons.lang.version}</version>
6185
</dependency>
6286
<dependency>
63-
<groupId>com.nimbusds</groupId>
64-
<artifactId>nimbus-jose-jwt</artifactId>
65-
<version>${nimbus-jose-jwt.version}</version>
87+
<groupId>mysql</groupId>
88+
<artifactId>mysql-connector-java</artifactId>
89+
</dependency>
90+
<dependency>
91+
<groupId>net.java.dev.jna</groupId>
92+
<artifactId>jna</artifactId>
93+
<version>${jna.version}</version>
94+
</dependency>
95+
<dependency>
96+
<groupId>net.java.dev.jna</groupId>
97+
<artifactId>jna-platform</artifactId>
98+
<version>${jna-platform.version}</version>
6699
</dependency>
67100
<dependency>
68101
<groupId>net.minidev</groupId>
69102
<artifactId>json-smart</artifactId>
70103
<version>${jsonsmart.version}</version>
71104
</dependency>
105+
<dependency>
106+
<groupId>org.apache.commons</groupId>
107+
<artifactId>commons-configuration2</artifactId>
108+
<version>${commons.configuration.version}</version>
109+
</dependency>
110+
<dependency>
111+
<groupId>org.apache.commons</groupId>
112+
<artifactId>commons-text</artifactId>
113+
<version>${commons.text.version}</version>
114+
</dependency>
72115
<dependency>
73116
<groupId>org.apache.hadoop</groupId>
74117
<artifactId>hadoop-common</artifactId>
75118
<version>${hadoop.version}</version>
76119
<exclusions>
77120
<exclusion>
78-
<groupId>net.minidev</groupId>
79-
<artifactId>json-smart</artifactId>
121+
<groupId>io.netty</groupId>
122+
<artifactId>netty-handler</artifactId>
80123
</exclusion>
81124
<exclusion>
82-
<groupId>io.netty</groupId>
83-
<artifactId>netty-handler</artifactId>
125+
<groupId>io.netty</groupId>
126+
<artifactId>netty-transport-native-epoll</artifactId>
84127
</exclusion>
85128
<exclusion>
86-
<groupId>io.netty</groupId>
87-
<artifactId>netty-transport-native-epoll</artifactId>
129+
<groupId>log4j</groupId>
130+
<artifactId>*</artifactId>
88131
</exclusion>
89132
<exclusion>
90-
<groupId>org.apache.commons</groupId>
91-
<artifactId>commons-text</artifactId>
133+
<groupId>net.minidev</groupId>
134+
<artifactId>json-smart</artifactId>
92135
</exclusion>
93136
<exclusion>
94137
<groupId>org.apache.commons</groupId>
95-
<artifactId>commons-configuration2</artifactId>
96-
</exclusion>
97-
<exclusion>
98-
<groupId>log4j</groupId>
99-
<artifactId>*</artifactId>
138+
<artifactId>commons-compress</artifactId>
100139
</exclusion>
101140
<exclusion>
102-
<groupId>org.slf4j</groupId>
103-
<artifactId>*</artifactId>
141+
<groupId>org.apache.commons</groupId>
142+
<artifactId>commons-configuration2</artifactId>
104143
</exclusion>
105144
<exclusion>
106145
<groupId>org.apache.commons</groupId>
107-
<artifactId>commons-compress</artifactId>
146+
<artifactId>commons-text</artifactId>
108147
</exclusion>
109148
<exclusion>
110149
<groupId>org.apache.zookeeper</groupId>
111150
<artifactId>zookeeper</artifactId>
112151
</exclusion>
113-
</exclusions>
114-
</dependency>
115-
<dependency>
116-
<groupId>org.apache.commons</groupId>
117-
<artifactId>commons-text</artifactId>
118-
<version>${commons.text.version}</version>
119-
</dependency>
120-
<dependency>
121-
<groupId>org.apache.commons</groupId>
122-
<artifactId>commons-configuration2</artifactId>
123-
<version>${commons.configuration.version}</version>
124-
</dependency>
125-
<dependency>
126-
<groupId>com.fasterxml.jackson.core</groupId>
127-
<artifactId>jackson-databind</artifactId>
128-
<version>${fasterxml.jackson.databind.version}</version>
129-
</dependency>
130-
<dependency>
131-
<groupId>com.fasterxml.jackson.jaxrs</groupId>
132-
<artifactId>jackson-jaxrs-json-provider</artifactId>
133-
<version>${fasterxml.jackson.version}</version>
134-
<exclusions>
135152
<exclusion>
136-
<groupId>jakarta.activation</groupId>
137-
<artifactId>jakarta.activation-api</artifactId>
153+
<groupId>org.slf4j</groupId>
154+
<artifactId>*</artifactId>
138155
</exclusion>
139156
</exclusions>
140157
</dependency>
141-
<dependency>
142-
<groupId>com.fasterxml.jackson.jaxrs</groupId>
143-
<artifactId>jackson-jaxrs-base</artifactId>
144-
<version>${fasterxml.jackson.version}</version>
145-
</dependency>
146-
147-
148158
<dependency>
149159
<groupId>org.apache.ranger</groupId>
150-
<artifactId>ranger-plugins-cred</artifactId>
160+
<artifactId>ranger-plugin-classloader</artifactId>
151161
<version>${project.version}</version>
162+
<scope>compile</scope>
152163
</dependency>
153164
<dependency>
154165
<groupId>org.apache.ranger</groupId>
155166
<artifactId>ranger-plugins-audit</artifactId>
156167
<version>${project.version}</version>
157168
</dependency>
158-
<dependency>
159-
<groupId>net.java.dev.jna</groupId>
160-
<artifactId>jna</artifactId>
161-
<version>${jna.version}</version>
162-
</dependency>
163-
<dependency>
164-
<groupId>net.java.dev.jna</groupId>
165-
<artifactId>jna-platform</artifactId>
166-
<version>${jna-platform.version}</version>
167-
</dependency>
168-
<dependency>
169-
<groupId>com.kstruct</groupId>
170-
<artifactId>gethostname4j</artifactId>
171-
<version>${kstruct.gethostname4j.version}</version>
172-
</dependency>
173-
<dependency>
174-
<groupId>mysql</groupId>
175-
<artifactId>mysql-connector-java</artifactId>
176-
</dependency>
169+
177170
<dependency>
178171
<groupId>org.apache.ranger</groupId>
179-
<artifactId>ranger-plugin-classloader</artifactId>
172+
<artifactId>ranger-plugins-cred</artifactId>
180173
<version>${project.version}</version>
181-
<scope>compile</scope>
182174
</dependency>
183175
<dependency>
184-
<groupId>com.fasterxml.jackson.core</groupId>
185-
<artifactId>jackson-core</artifactId>
186-
<version>${fasterxml.jackson.version}</version>
176+
<groupId>org.mockito</groupId>
177+
<artifactId>mockito-core</artifactId>
187178
</dependency>
188179
<!-- To be added for JDK15 and above
189180
<dependency>
@@ -210,15 +201,23 @@
210201
<version>${junit.jupiter.version}</version>
211202
<scope>test</scope>
212203
</dependency>
213-
<dependency>
214-
<groupId>org.mockito</groupId>
215-
<artifactId>mockito-core</artifactId>
216-
</dependency>
217204
<dependency>
218205
<groupId>org.slf4j</groupId>
219206
<artifactId>log4j-over-slf4j</artifactId>
220207
<version>${slf4j.version}</version>
221208
<scope>test</scope>
222209
</dependency>
223210
</dependencies>
211+
<build>
212+
<plugins>
213+
<plugin>
214+
<groupId>org.apache.maven.plugins</groupId>
215+
<artifactId>maven-compiler-plugin</artifactId>
216+
<configuration>
217+
<source>8</source>
218+
<target>8</target>
219+
</configuration>
220+
</plugin>
221+
</plugins>
222+
</build>
224223
</project>

‎agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerConfiguration.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ public boolean addResourceIfReadable(String aResourceName) {
4747

4848
URL fUrl = getFileLocation(aResourceName);
4949
if (fUrl != null) {
50-
LOG.info("addResourceIfReadable(" + aResourceName + "): resource file is " + fUrl);
50+
if(LOG.isDebugEnabled()) {
51+
LOG.debug("addResourceIfReadable(" + aResourceName + "): resource file is " + fUrl);
52+
}
5153
try {
5254
addResource(fUrl);
5355
ret = true;
@@ -58,7 +60,9 @@ public boolean addResourceIfReadable(String aResourceName) {
5860
}
5961
}
6062
} else {
61-
LOG.error("addResourceIfReadable(" + aResourceName + "): couldn't find resource file location");
63+
if(LOG.isDebugEnabled()) {
64+
LOG.debug("addResourceIfReadable(" + aResourceName + "): couldn't find resource file location");
65+
}
6266
}
6367

6468
if(LOG.isDebugEnabled()) {

‎agents-common/src/main/java/org/apache/ranger/authorization/utils/JsonUtils.java

+4-15
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,11 @@
2626
import org.apache.commons.collections.MapUtils;
2727
import org.apache.commons.lang.StringUtils;
2828
import org.apache.ranger.plugin.model.AuditFilter;
29-
import org.apache.ranger.plugin.model.RangerGds.RangerTagDataMaskInfo;
29+
import org.apache.ranger.plugin.model.RangerGds.RangerGdsMaskInfo;
3030
import org.apache.ranger.plugin.model.RangerPrincipal;
3131
import org.apache.ranger.plugin.model.RangerTag;
3232
import org.apache.ranger.plugin.model.RangerValidityRecurrence;
3333
import org.apache.ranger.plugin.model.RangerValiditySchedule;
34-
import org.apache.ranger.plugin.model.RangerPolicy.RangerPolicyItemDataMaskInfo;
3534
import org.apache.ranger.plugin.model.RangerPolicy.RangerPolicyResource;
3635
import org.slf4j.Logger;
3736
import org.slf4j.LoggerFactory;
@@ -55,8 +54,7 @@ public class JsonUtils {
5554
private static final TypeReference TYPE_LIST_AUDIT_FILTER = new TypeReference<List<AuditFilter>>() {};
5655
private static final TypeReference TYPE_LIST_RANGER_VALIDITY_RECURRENCE = new TypeReference<List<RangerValidityRecurrence>>() {};
5756
private static final TypeReference TYPE_LIST_RANGER_PRINCIPAL = new TypeReference<List<RangerPrincipal>>() {};
58-
private static final TypeReference TYPE_LIST_RANGER_TAG_MASK_INFO = new TypeReference<List<RangerTagDataMaskInfo>>() {};
59-
private static final TypeReference TYPE_MAP_RANGER_MASK_INFO = new TypeReference<Map<String, RangerPolicyItemDataMaskInfo>>() {};
57+
private static final TypeReference TYPE_LIST_RANGER_GDS_MASK_INFO = new TypeReference<List<RangerGdsMaskInfo>>() {};
6058
private static final TypeReference TYPE_MAP_RANGER_POLICY_RESOURCE = new TypeReference<Map<String, RangerPolicyResource>>() {};
6159
private static final TypeReference TYPE_LIST_RANGER_TAG = new TypeReference<List<RangerTag>>() {};
6260

@@ -263,24 +261,15 @@ public static List<RangerTag> jsonToRangerTagList(String jsonStr) {
263261
}
264262
}
265263

266-
public static Map<String, RangerPolicyItemDataMaskInfo> jsonToMapMaskInfo(String jsonStr) {
264+
public static List<RangerGdsMaskInfo> jsonToListGdsMaskInfo(String jsonStr) {
267265
try {
268-
return (Map<String, RangerPolicyItemDataMaskInfo>) getMapper().readValue(jsonStr, TYPE_MAP_RANGER_MASK_INFO);
266+
return (List<RangerGdsMaskInfo>) getMapper().readValue(jsonStr, TYPE_LIST_RANGER_GDS_MASK_INFO);
269267
} catch (Exception e) {
270268
LOG.error("Cannot get Map<String, RangerPolicyItemDataMaskInfo> from " + jsonStr, e);
271269
return null;
272270
}
273271
}
274272

275-
public static List<RangerTagDataMaskInfo> jsonToListTagMaskInfo(String jsonStr) {
276-
try {
277-
return (List<RangerTagDataMaskInfo>) getMapper().readValue(jsonStr, TYPE_LIST_RANGER_TAG_MASK_INFO);
278-
} catch (Exception e) {
279-
LOG.error("Cannot get List<RangerTagDataMaskInfo> from " + jsonStr, e);
280-
return null;
281-
}
282-
}
283-
284273
public static Map<String, RangerPolicyResource> jsonToMapPolicyResource(String jsonStr) {
285274
try {
286275
return (Map<String, RangerPolicyResource>) getMapper().readValue(jsonStr, TYPE_MAP_RANGER_POLICY_RESOURCE);

0 commit comments

Comments
 (0)