Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions agents-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,6 @@
<artifactId>jsr305</artifactId>
<version>${jsr305.version}</version>
</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>
Expand All @@ -87,16 +82,6 @@
<artifactId>jsr311-api</artifactId>
<version>${jsr311-api.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>net.minidev</groupId>
<artifactId>json-smart</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

package org.apache.ranger.plugin.util;

import com.kstruct.gethostname4j.Hostname;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -73,7 +72,7 @@ public class RangerRESTUtils {
private static final Logger LOG = LoggerFactory.getLogger(RangerRESTUtils.class);
private static final int MAX_PLUGIN_ID_LEN = 255;

public static String hostname;
public static final String hostname = getHostname();

public String getPluginId(String serviceName, String appId) {
String hostName;
Expand Down Expand Up @@ -143,12 +142,32 @@ public String getAppIdFromPluginId(String pluginId) {
return ret;
}

static {
private static String getHostname() {
String hostname = null;

try {
hostname = Hostname.getHostname();
} catch (Exception e) {
LOG.error("ERROR: Unable to find hostname for the agent ", e);
hostname = "unknownHost";
hostname = System.getenv("HOSTNAME");
} catch (SecurityException excp) {
LOG.error("Error in getting environment HOSTNAME", excp);
}

if (StringUtils.isBlank(hostname)) {
try {
hostname = System.getenv("COMPUTERNAME");
} catch (SecurityException excp) {
LOG.error("Error in getting environment COMPUTERNAME", excp);
}

if (StringUtils.isBlank(hostname)) {
try {
hostname = InetAddress.getLocalHost().getHostName();
} catch (Exception e) {
LOG.error("ERROR: Unable to find hostname for the agent ", e);
hostname = "unknownHost";
}
}
}

return hostname.trim();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,6 @@ public void test01_getAuthzEvents_nullsAndAuditFlag() {

@Test
public void test02_getAuthzEvents_populatesFieldsAndDefaults() {
RangerRESTUtils.hostname = "my-host";

RangerServiceDef svcDef = new RangerServiceDef();
svcDef.setId(5L);
List<RangerResourceDef> resourceDefs = new ArrayList<>();
Expand Down Expand Up @@ -170,7 +168,7 @@ public void test02_getAuthzEvents_populatesFieldsAndDefaults() {
Assertions.assertEquals("clusterA", event.getClusterName());
Assertions.assertEquals("zone-1", event.getZoneName());
Assertions.assertEquals(Long.valueOf(7L), event.getPolicyVersion());
Assertions.assertEquals("my-host", event.getAgentHostname());
Assertions.assertEquals(new RangerRESTUtils().getAgentHostname(), event.getAgentHostname());
Assertions.assertNotNull(event.getEventId());
Assertions.assertEquals(event.getEventId(), result.getAuditLogId());
Assertions.assertEquals("RangerAudit", event.getLogType());
Expand Down
3 changes: 0 additions & 3 deletions distro/src/main/assembly/admin-web.xml
Original file line number Diff line number Diff line change
Expand Up @@ -255,9 +255,6 @@
<include>org.codehaus.woodstox:stax2-api:jar:${codehaus.woodstox.stax2api.version}</include>
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
<include>net.java.dev.jna:jna:jar:${jna.version}</include>
<include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
<include>org.apache.ranger:credentialbuilder</include>
<include>org.elasticsearch.client:elasticsearch-rest-client</include>
<include>org.elasticsearch.client:elasticsearch-rest-high-level-client</include>
Expand Down
3 changes: 0 additions & 3 deletions distro/src/main/assembly/hbase-agent.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,6 @@
<include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
<include>org.noggit:noggit:jar:${noggit.version}</include>
<include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
<include>net.java.dev.jna:jna:jar:${jna.version}</include>
<include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
<include>org.elasticsearch:elasticsearch</include>
<include>org.elasticsearch:elasticsearch-core</include>
<include>org.elasticsearch:elasticsearch-x-content</include>
Expand Down
3 changes: 0 additions & 3 deletions distro/src/main/assembly/hdfs-agent.xml
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,6 @@
<include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
<include>org.noggit:noggit:jar:${noggit.version}</include>
<include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
<include>net.java.dev.jna:jna:jar:${jna.version}</include>
<include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
<include>org.elasticsearch:elasticsearch</include>
<include>org.elasticsearch:elasticsearch-core</include>
<include>org.elasticsearch:elasticsearch-x-content</include>
Expand Down
3 changes: 0 additions & 3 deletions distro/src/main/assembly/hive-agent.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,6 @@
<include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
<include>org.noggit:noggit:jar:${noggit.version}</include>
<include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
<include>net.java.dev.jna:jna:jar:${jna.version}</include>
<include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
<include>org.elasticsearch:elasticsearch</include>
<include>org.elasticsearch:elasticsearch-core</include>
<include>org.elasticsearch:elasticsearch-x-content</include>
Expand Down
6 changes: 0 additions & 6 deletions distro/src/main/assembly/kms.xml
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,6 @@
<include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
<include>org.apache.ranger:ranger-common-utils</include>
<include>org.apache.ranger:ugsync-util</include>
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
<include>net.java.dev.jna:jna:jar:${jna.version}</include>
<include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
<include>org.apache.ranger:credentialbuilder</include>
<include>org.apache.commons:commons-collections4:jar:${commons.collections4.version}</include>
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
Expand Down Expand Up @@ -311,9 +308,6 @@
<include>org.noggit:noggit:jar:${noggit.version}</include>
<include>org.apache.zookeeper:zookeeper:jar:${zookeeper.version}</include>
<include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
<include>net.java.dev.jna:jna:jar:${jna.version}</include>
<include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
<include>org.elasticsearch:elasticsearch</include>
<include>org.elasticsearch:elasticsearch-core</include>
<include>org.elasticsearch:elasticsearch-x-content</include>
Expand Down
3 changes: 0 additions & 3 deletions distro/src/main/assembly/knox-agent.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,6 @@
<include>com.fasterxml.jackson.core:jackson-core:jar:${fasterxml.jackson.version}</include>
<include>com.fasterxml.jackson.core:jackson-databind:jar:${fasterxml.jackson.version}</include>
<include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
<include>net.java.dev.jna:jna:jar:${jna.version}</include>
<include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
<include>org.elasticsearch:elasticsearch</include>
<include>org.elasticsearch:elasticsearch-core</include>
<include>org.elasticsearch:elasticsearch-x-content</include>
Expand Down
5 changes: 0 additions & 5 deletions distro/src/main/assembly/pdp.xml
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,6 @@
<include>org.apache.zookeeper:zookeeper:jar:${zookeeper.version}</include>
<include>org.noggit:noggit</include>

<!-- Native libs (hostname lookup) -->
<include>com.kstruct:gethostname4j</include>
<include>net.java.dev.jna:jna</include>
<include>net.java.dev.jna:jna-platform</include>

<!-- Logging -->
<include>org.slf4j:slf4j-api:jar:${slf4j.version}</include>
<include>ch.qos.logback:logback-classic:jar:${logback.version}</include>
Expand Down
3 changes: 0 additions & 3 deletions distro/src/main/assembly/plugin-atlas.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,6 @@
<include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
<include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
<include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
<include>net.java.dev.jna:jna:jar:${jna.version}</include>
<include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
<include>com.fasterxml.woodstox:woodstox-core:jar:${fasterxml.woodstox.version}</include>
<include>org.codehaus.woodstox:stax2-api:jar:${codehaus.woodstox.stax2api.version}</include>
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
Expand Down
3 changes: 0 additions & 3 deletions distro/src/main/assembly/plugin-elasticsearch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,6 @@
<include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:${fasterxml.jackson.version}</include>
<include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
<include>commons-codec:commons-codec</include>
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
<include>net.java.dev.jna:jna:jar:${jna.version}</include>
<include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
<include>org.elasticsearch:elasticsearch</include>
<include>org.elasticsearch:elasticsearch-core</include>
<include>org.elasticsearch:elasticsearch-x-content</include>
Expand Down
3 changes: 0 additions & 3 deletions distro/src/main/assembly/plugin-kafka.xml
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,6 @@
<include>commons-codec:commons-codec</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>com.fasterxml.woodstox:woodstox-core</include>
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
<include>net.java.dev.jna:jna:jar:${jna.version}</include>
<include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
<include>org.elasticsearch:elasticsearch</include>
<include>org.elasticsearch:elasticsearch-core</include>
<include>org.elasticsearch:elasticsearch-x-content</include>
Expand Down
3 changes: 0 additions & 3 deletions distro/src/main/assembly/plugin-kms.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,6 @@
<include>org.noggit:noggit:jar:${noggit.version}</include>
<include>org.apache.zookeeper:zookeeper:jar:${zookeeper.version}</include>
<include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
<include>net.java.dev.jna:jna:jar:${jna.version}</include>
<include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
<include>org.apache.hive:hive-storage-api:jar:${hive.storage-api.version}</include>
<include>org.apache.orc:orc-core:jar:${orc.version}</include>
<include>org.apache.orc:orc-shims:jar:${orc.version}</include>
Expand Down
3 changes: 0 additions & 3 deletions distro/src/main/assembly/plugin-kylin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,6 @@
<include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
<include>org.noggit:noggit:jar:${noggit.version}</include>
<include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
<include>net.java.dev.jna:jna:jar:${jna.version}</include>
<include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
<include>org.elasticsearch:elasticsearch</include>
<include>org.elasticsearch:elasticsearch-core</include>
<include>org.elasticsearch:elasticsearch-x-content</include>
Expand Down
6 changes: 0 additions & 6 deletions distro/src/main/assembly/plugin-ozone.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
<unpack>false</unpack>
<includes>
<include>com.fasterxml.woodstox:woodstox-core:jar:${fasterxml.woodstox.version}</include>
<include>com.kstruct:gethostname4j</include>
<include>com.sun.jersey:jersey-client:jar:${jersey-bundle.version}</include>
<include>com.sun.jersey:jersey-core:jar:${jersey-bundle.version}</include>
<include>javax.ws.rs:jsr311-api:jar:${jsr311-api.version}</include>
Expand All @@ -59,8 +58,6 @@
<include>commons-configuration:commons-configuration:jar:${commons.configuration1.version}</include>
<include>commons-io:commons-io:jar:${commons.io.version}</include>
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
<include>net.java.dev.jna:jna</include>
<include>net.java.dev.jna:jna-platform</include>
<include>org.apache.commons:commons-collections4:jar:${commons.collections4.version}</include>
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
Expand Down Expand Up @@ -117,9 +114,6 @@
<include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar:${fasterxml.jackson.version}</include>
<include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:${fasterxml.jackson.version}</include>
<include>com.sun.xml.bind:jaxb-impl</include>
<include>com.kstruct:gethostname4j</include>
<include>net.java.dev.jna:jna</include>
<include>net.java.dev.jna:jna-platform</include>
<include>org.elasticsearch:elasticsearch</include>
<include>org.elasticsearch:elasticsearch-core</include>
<include>org.elasticsearch:elasticsearch-x-content</include>
Expand Down
3 changes: 0 additions & 3 deletions distro/src/main/assembly/plugin-presto.xml
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,6 @@
<include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar:${fasterxml.jackson.version}</include>
<include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:${fasterxml.jackson.version}</include>
<include>org.apache.zookeeper:zookeeper:jar:${zookeeper.version}</include>
<include>net.java.dev.jna:jna</include>
<include>net.java.dev.jna:jna-platform</include>
<include>com.kstruct:gethostname4j</include>
<include>org.elasticsearch:elasticsearch</include>
<include>org.elasticsearch:elasticsearch-core</include>
<include>org.elasticsearch:elasticsearch-x-content</include>
Expand Down
3 changes: 0 additions & 3 deletions distro/src/main/assembly/plugin-solr.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,6 @@
<include>com.fasterxml.jackson.core:jackson-databind:jar:${fasterxml.jackson.version}</include>
<include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar:${fasterxml.jackson.version}</include>
<include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:${fasterxml.jackson.version}</include>
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
<include>net.java.dev.jna:jna:jar:${jna.version}</include>
<include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
<include>org.elasticsearch:elasticsearch</include>
<include>org.elasticsearch:elasticsearch-core</include>
<include>org.elasticsearch:elasticsearch-x-content</include>
Expand Down
3 changes: 0 additions & 3 deletions distro/src/main/assembly/plugin-sqoop.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,6 @@
<include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
<include>org.noggit:noggit:jar:${noggit.version}</include>
<include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
<include>net.java.dev.jna:jna:jar:${jna.version}</include>
<include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
<include>org.elasticsearch:elasticsearch</include>
<include>org.elasticsearch:elasticsearch-core</include>
<include>org.elasticsearch:elasticsearch-x-content</include>
Expand Down
3 changes: 0 additions & 3 deletions distro/src/main/assembly/plugin-trino.xml
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,6 @@
<include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar:${fasterxml.jackson.version}</include>
<include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:${fasterxml.jackson.version}</include>
<include>org.apache.zookeeper:zookeeper:jar:${zookeeper.version}</include>
<include>net.java.dev.jna:jna</include>
<include>net.java.dev.jna:jna-platform</include>
<include>com.kstruct:gethostname4j</include>
<include>org.elasticsearch:elasticsearch</include>
<include>org.elasticsearch:elasticsearch-core</include>
<include>org.elasticsearch:elasticsearch-x-content</include>
Expand Down
3 changes: 0 additions & 3 deletions distro/src/main/assembly/plugin-yarn.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,6 @@
<include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
<include>org.noggit:noggit:jar:${noggit.version}</include>
<include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
<include>net.java.dev.jna:jna:jar:${jna.version}</include>
<include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
<include>org.elasticsearch:elasticsearch</include>
<include>org.elasticsearch:elasticsearch-core</include>
<include>org.elasticsearch:elasticsearch-x-content</include>
Expand Down
Loading