Skip to content

Commit

Permalink
Merge branch 'apache:master' into robot
Browse files Browse the repository at this point in the history
  • Loading branch information
@kumaab
kumaab authored Dec 4, 2024
2 parents d175e0c + 651dcf2 commit e7c1c07
Show file tree
Hide file tree
Showing 233 changed files with 12,425 additions and 8,391 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/maven.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,9 @@ jobs:
cd dev-support/ranger-docker
./download-archives.sh hadoop hive hbase kafka knox ozone
- name: Clean up Docker space
run: docker system prune --all --force --volumes

- name: Build all ranger-service images
run: |
cd dev-support/ranger-docker
Expand Down
396 changes: 198 additions & 198 deletions agents-audit/pom.xml
View file

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions agents-audit/src/main/java/org/apache/ranger/audit/provider/MultiDestAuditProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,10 @@ public void setName(String name) {

public void addAuditProvider(AuditHandler provider) {
if (provider != null) {
LOG.info("MultiDestAuditProvider.addAuditProvider(providerType="
+ provider.getClass().getCanonicalName() + ")");
if(LOG.isDebugEnabled()) {
LOG.debug("MultiDestAuditProvider.addAuditProvider(providerType="
+ provider.getClass().getCanonicalName() + ")");
}

mProviders.add(provider);
if (provider instanceof BaseAuditHandler) {
Expand Down
195 changes: 97 additions & 98 deletions agents-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,32 +17,56 @@
-->
<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">
<modelVersion>4.0.0</modelVersion>
<artifactId>ranger-plugins-common</artifactId>
<name>Common library for Plugins</name>
<description>Plugins Common</description>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>8</source>
<target>8</target>
</configuration>
</plugin>
</plugins>
</build>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<parent>
<groupId>org.apache.ranger</groupId>
<artifactId>ranger</artifactId>
<version>3.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>ranger-plugins-common</artifactId>
<packaging>jar</packaging>
<name>Common library for Plugins</name>
<description>Plugins Common</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${fasterxml.jackson.databind.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-base</artifactId>
<version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${fasterxml.jackson.version}</version>
<exclusions>
<exclusion>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.kstruct</groupId>
<artifactId>gethostname4j</artifactId>
<version>${kstruct.gethostname4j.version}</version>
</dependency>
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
<version>${nimbus-jose-jwt.version}</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-bundle</artifactId>
Expand All @@ -60,130 +84,97 @@
<version>${commons.lang.version}</version>
</dependency>
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
<version>${nimbus-jose-jwt.version}</version>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<version>${jna.version}</version>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
<version>${jna-platform.version}</version>
</dependency>
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
<version>${jsonsmart.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
<version>${commons.configuration.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>${commons.text.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>${hadoop.version}</version>
<exclusions>
<exclusion>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<groupId>log4j</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>*</artifactId>
<artifactId>commons-compress</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>*</artifactId>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<artifactId>commons-text</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>${commons.text.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
<version>${commons.configuration.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${fasterxml.jackson.databind.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${fasterxml.jackson.version}</version>
<exclusions>
<exclusion>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<groupId>org.slf4j</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-base</artifactId>
<version>${fasterxml.jackson.version}</version>
</dependency>


<dependency>
<groupId>org.apache.ranger</groupId>
<artifactId>ranger-plugins-cred</artifactId>
<artifactId>ranger-plugin-classloader</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.ranger</groupId>
<artifactId>ranger-plugins-audit</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<version>${jna.version}</version>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
<version>${jna-platform.version}</version>
</dependency>
<dependency>
<groupId>com.kstruct</groupId>
<artifactId>gethostname4j</artifactId>
<version>${kstruct.gethostname4j.version}</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>

<dependency>
<groupId>org.apache.ranger</groupId>
<artifactId>ranger-plugin-classloader</artifactId>
<artifactId>ranger-plugins-cred</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${fasterxml.jackson.version}</version>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
</dependency>
<!-- To be added for JDK15 and above
<dependency>
Expand All @@ -210,15 +201,23 @@
<version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>8</source>
<target>8</target>
</configuration>
</plugin>
</plugins>
</build>
</project>
8 changes: 6 additions & 2 deletions ...mmon/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ public boolean addResourceIfReadable(String aResourceName) {

URL fUrl = getFileLocation(aResourceName);
if (fUrl != null) {
LOG.info("addResourceIfReadable(" + aResourceName + "): resource file is " + fUrl);
if(LOG.isDebugEnabled()) {
LOG.debug("addResourceIfReadable(" + aResourceName + "): resource file is " + fUrl);
}
try {
addResource(fUrl);
ret = true;
Expand All @@ -58,7 +60,9 @@ public boolean addResourceIfReadable(String aResourceName) {
}
}
} else {
LOG.error("addResourceIfReadable(" + aResourceName + "): couldn't find resource file location");
if(LOG.isDebugEnabled()) {
LOG.debug("addResourceIfReadable(" + aResourceName + "): couldn't find resource file location");
}
}

if(LOG.isDebugEnabled()) {
Expand Down
19 changes: 4 additions & 15 deletions agents-common/src/main/java/org/apache/ranger/authorization/utils/JsonUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,11 @@
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.ranger.plugin.model.AuditFilter;
import org.apache.ranger.plugin.model.RangerGds.RangerTagDataMaskInfo;
import org.apache.ranger.plugin.model.RangerGds.RangerGdsMaskInfo;
import org.apache.ranger.plugin.model.RangerPrincipal;
import org.apache.ranger.plugin.model.RangerTag;
import org.apache.ranger.plugin.model.RangerValidityRecurrence;
import org.apache.ranger.plugin.model.RangerValiditySchedule;
import org.apache.ranger.plugin.model.RangerPolicy.RangerPolicyItemDataMaskInfo;
import org.apache.ranger.plugin.model.RangerPolicy.RangerPolicyResource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -55,8 +54,7 @@ public class JsonUtils {
private static final TypeReference TYPE_LIST_AUDIT_FILTER = new TypeReference<List<AuditFilter>>() {};
private static final TypeReference TYPE_LIST_RANGER_VALIDITY_RECURRENCE = new TypeReference<List<RangerValidityRecurrence>>() {};
private static final TypeReference TYPE_LIST_RANGER_PRINCIPAL = new TypeReference<List<RangerPrincipal>>() {};
private static final TypeReference TYPE_LIST_RANGER_TAG_MASK_INFO = new TypeReference<List<RangerTagDataMaskInfo>>() {};
private static final TypeReference TYPE_MAP_RANGER_MASK_INFO = new TypeReference<Map<String, RangerPolicyItemDataMaskInfo>>() {};
private static final TypeReference TYPE_LIST_RANGER_GDS_MASK_INFO = new TypeReference<List<RangerGdsMaskInfo>>() {};
private static final TypeReference TYPE_MAP_RANGER_POLICY_RESOURCE = new TypeReference<Map<String, RangerPolicyResource>>() {};
private static final TypeReference TYPE_LIST_RANGER_TAG = new TypeReference<List<RangerTag>>() {};

Expand Down Expand Up @@ -263,24 +261,15 @@ public static List<RangerTag> jsonToRangerTagList(String jsonStr) {
}
}

public static Map<String, RangerPolicyItemDataMaskInfo> jsonToMapMaskInfo(String jsonStr) {
public static List<RangerGdsMaskInfo> jsonToListGdsMaskInfo(String jsonStr) {
try {
return (Map<String, RangerPolicyItemDataMaskInfo>) getMapper().readValue(jsonStr, TYPE_MAP_RANGER_MASK_INFO);
return (List<RangerGdsMaskInfo>) getMapper().readValue(jsonStr, TYPE_LIST_RANGER_GDS_MASK_INFO);
} catch (Exception e) {
LOG.error("Cannot get Map<String, RangerPolicyItemDataMaskInfo> from " + jsonStr, e);
return null;
}
}

public static List<RangerTagDataMaskInfo> jsonToListTagMaskInfo(String jsonStr) {
try {
return (List<RangerTagDataMaskInfo>) getMapper().readValue(jsonStr, TYPE_LIST_RANGER_TAG_MASK_INFO);
} catch (Exception e) {
LOG.error("Cannot get List<RangerTagDataMaskInfo> from " + jsonStr, e);
return null;
}
}

public static Map<String, RangerPolicyResource> jsonToMapPolicyResource(String jsonStr) {
try {
return (Map<String, RangerPolicyResource>) getMapper().readValue(jsonStr, TYPE_MAP_RANGER_POLICY_RESOURCE);
Expand Down
Loading

0 comments on commit e7c1c07

Please sign in to comment.