Skip to content

Commit b8eb7b4

Browse files
mneethirajmneethiraj
authored
RANGER-5549: replace use of com.kstruct.gethostname4j library (#911)
1 parent fd5ec7a commit b8eb7b4

29 files changed

Lines changed: 26 additions & 126 deletions

‎agents-common/pom.xml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,6 @@
6262
<artifactId>jsr305</artifactId>
6363
<version>${jsr305.version}</version>
6464
</dependency>
65-
<dependency>
66-
<groupId>com.kstruct</groupId>
67-
<artifactId>gethostname4j</artifactId>
68-
<version>${kstruct.gethostname4j.version}</version>
69-
</dependency>
7065
<dependency>
7166
<groupId>com.nimbusds</groupId>
7267
<artifactId>nimbus-jose-jwt</artifactId>
@@ -87,16 +82,6 @@
8782
<artifactId>jsr311-api</artifactId>
8883
<version>${jsr311-api.version}</version>
8984
</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>
99-
</dependency>
10085
<dependency>
10186
<groupId>net.minidev</groupId>
10287
<artifactId>json-smart</artifactId>

‎agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTUtils.java‎

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
package org.apache.ranger.plugin.util;
2121

22-
import com.kstruct.gethostname4j.Hostname;
2322
import org.apache.commons.lang3.StringUtils;
2423
import org.slf4j.Logger;
2524
import org.slf4j.LoggerFactory;
@@ -73,7 +72,7 @@ public class RangerRESTUtils {
7372
private static final Logger LOG = LoggerFactory.getLogger(RangerRESTUtils.class);
7473
private static final int MAX_PLUGIN_ID_LEN = 255;
7574

76-
public static String hostname;
75+
public static final String hostname = getHostname();
7776

7877
public String getPluginId(String serviceName, String appId) {
7978
String hostName;
@@ -143,12 +142,31 @@ public String getAppIdFromPluginId(String pluginId) {
143142
return ret;
144143
}
145144

146-
static {
145+
private static String getHostname() {
146+
String hostname = null;
147+
147148
try {
148-
hostname = Hostname.getHostname();
149-
} catch (Exception e) {
150-
LOG.error("ERROR: Unable to find hostname for the agent ", e);
151-
hostname = "unknownHost";
149+
hostname = System.getenv("HOSTNAME");
150+
} catch (SecurityException excp) {
151+
LOG.error("Error in getting environment HOSTNAME", excp);
152152
}
153+
154+
if (StringUtils.isBlank(hostname)) {
155+
try {
156+
hostname = System.getenv("COMPUTERNAME");
157+
} catch (SecurityException excp) {
158+
LOG.error("Error in getting environment COMPUTERNAME", excp);
159+
}
160+
161+
if (StringUtils.isBlank(hostname)) {
162+
try {
163+
hostname = InetAddress.getLocalHost().getHostName();
164+
} catch (Exception e) {
165+
LOG.error("ERROR: unable to find hostname", e);
166+
}
167+
}
168+
}
169+
170+
return StringUtils.isBlank(hostname) ? "unknownHost" : hostname.trim();
153171
}
154172
}

‎agents-common/src/test/java/org/apache/ranger/plugin/audit/TestRangerDefaultAuditHandler.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,6 @@ public void test01_getAuthzEvents_nullsAndAuditFlag() {
8383

8484
@Test
8585
public void test02_getAuthzEvents_populatesFieldsAndDefaults() {
86-
RangerRESTUtils.hostname = "my-host";
87-
8886
RangerServiceDef svcDef = new RangerServiceDef();
8987
svcDef.setId(5L);
9088
List<RangerResourceDef> resourceDefs = new ArrayList<>();
@@ -170,7 +168,7 @@ public void test02_getAuthzEvents_populatesFieldsAndDefaults() {
170168
Assertions.assertEquals("clusterA", event.getClusterName());
171169
Assertions.assertEquals("zone-1", event.getZoneName());
172170
Assertions.assertEquals(Long.valueOf(7L), event.getPolicyVersion());
173-
Assertions.assertEquals("my-host", event.getAgentHostname());
171+
Assertions.assertEquals(new RangerRESTUtils().getAgentHostname(), event.getAgentHostname());
174172
Assertions.assertNotNull(event.getEventId());
175173
Assertions.assertEquals(event.getEventId(), result.getAuditLogId());
176174
Assertions.assertEquals("RangerAudit", event.getLogType());

‎distro/src/main/assembly/admin-web.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,9 +255,6 @@
255255
<include>org.codehaus.woodstox:stax2-api:jar:${codehaus.woodstox.stax2api.version}</include>
256256
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
257257
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
258-
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
259-
<include>net.java.dev.jna:jna:jar:${jna.version}</include>
260-
<include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
261258
<include>org.apache.ranger:credentialbuilder</include>
262259
<include>org.elasticsearch.client:elasticsearch-rest-client</include>
263260
<include>org.elasticsearch.client:elasticsearch-rest-high-level-client</include>

‎distro/src/main/assembly/hbase-agent.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,6 @@
7070
<include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
7171
<include>org.noggit:noggit:jar:${noggit.version}</include>
7272
<include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
73-
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
74-
<include>net.java.dev.jna:jna:jar:${jna.version}</include>
75-
<include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
7673
<include>org.elasticsearch:elasticsearch</include>
7774
<include>org.elasticsearch:elasticsearch-core</include>
7875
<include>org.elasticsearch:elasticsearch-x-content</include>

‎distro/src/main/assembly/hdfs-agent.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,6 @@
9797
<include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
9898
<include>org.noggit:noggit:jar:${noggit.version}</include>
9999
<include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
100-
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
101-
<include>net.java.dev.jna:jna:jar:${jna.version}</include>
102-
<include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
103100
<include>org.elasticsearch:elasticsearch</include>
104101
<include>org.elasticsearch:elasticsearch-core</include>
105102
<include>org.elasticsearch:elasticsearch-x-content</include>

‎distro/src/main/assembly/hive-agent.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,6 @@
6666
<include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
6767
<include>org.noggit:noggit:jar:${noggit.version}</include>
6868
<include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
69-
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
70-
<include>net.java.dev.jna:jna:jar:${jna.version}</include>
71-
<include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
7269
<include>org.elasticsearch:elasticsearch</include>
7370
<include>org.elasticsearch:elasticsearch-core</include>
7471
<include>org.elasticsearch:elasticsearch-x-content</include>

‎distro/src/main/assembly/kms.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -217,9 +217,6 @@
217217
<include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
218218
<include>org.apache.ranger:ranger-common-utils</include>
219219
<include>org.apache.ranger:ugsync-util</include>
220-
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
221-
<include>net.java.dev.jna:jna:jar:${jna.version}</include>
222-
<include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
223220
<include>org.apache.ranger:credentialbuilder</include>
224221
<include>org.apache.commons:commons-collections4:jar:${commons.collections4.version}</include>
225222
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
@@ -311,9 +308,6 @@
311308
<include>org.noggit:noggit:jar:${noggit.version}</include>
312309
<include>org.apache.zookeeper:zookeeper:jar:${zookeeper.version}</include>
313310
<include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
314-
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
315-
<include>net.java.dev.jna:jna:jar:${jna.version}</include>
316-
<include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
317311
<include>org.elasticsearch:elasticsearch</include>
318312
<include>org.elasticsearch:elasticsearch-core</include>
319313
<include>org.elasticsearch:elasticsearch-x-content</include>

‎distro/src/main/assembly/knox-agent.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,6 @@
7575
<include>com.fasterxml.jackson.core:jackson-core:jar:${fasterxml.jackson.version}</include>
7676
<include>com.fasterxml.jackson.core:jackson-databind:jar:${fasterxml.jackson.version}</include>
7777
<include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
78-
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
79-
<include>net.java.dev.jna:jna:jar:${jna.version}</include>
80-
<include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
8178
<include>org.elasticsearch:elasticsearch</include>
8279
<include>org.elasticsearch:elasticsearch-core</include>
8380
<include>org.elasticsearch:elasticsearch-x-content</include>

‎distro/src/main/assembly/pdp.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,6 @@
126126
<include>org.apache.zookeeper:zookeeper:jar:${zookeeper.version}</include>
127127
<include>org.noggit:noggit</include>
128128

129-
<!-- Native libs (hostname lookup) -->
130-
<include>com.kstruct:gethostname4j</include>
131-
<include>net.java.dev.jna:jna</include>
132-
<include>net.java.dev.jna:jna-platform</include>
133-
134129
<!-- Logging -->
135130
<include>org.slf4j:slf4j-api:jar:${slf4j.version}</include>
136131
<include>ch.qos.logback:logback-classic:jar:${logback.version}</include>

0 commit comments

Comments
 (0)