This is an automated email from the ASF dual-hosted git repository.
mehul pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/master by this push:
new 9d8e527 RANGER-2458 : Cluster property name changes in Ranger Plugin
code
9d8e527 is described below
commit 9d8e5274f60b0104a0788a028b9ab91ba72e8d73
Author: Bhavik Patel <[email protected]>
AuthorDate: Wed Jun 12 17:15:12 2019 +0530
RANGER-2458 : Cluster property name changes in Ranger Plugin code
Signed-off-by: Mehul Parikh <[email protected]>
---
.../apache/ranger/admin/client/RangerAdminRESTClient.java | 5 ++++-
.../org/apache/ranger/plugin/service/RangerBasePlugin.java | 5 ++++-
.../ranger/admin/client/RangerAdminJersey2RESTClient.java | 6 +++++-
.../main/java/org/apache/ranger/biz/ServiceDBStore.java | 14 ++++++++++----
4 files changed, 23 insertions(+), 7 deletions(-)
diff --git
a/agents-common/src/main/java/org/apache/ranger/admin/client/RangerAdminRESTClient.java
b/agents-common/src/main/java/org/apache/ranger/admin/client/RangerAdminRESTClient.java
index 81bbdbd..23871f3 100644
---
a/agents-common/src/main/java/org/apache/ranger/admin/client/RangerAdminRESTClient.java
+++
b/agents-common/src/main/java/org/apache/ranger/admin/client/RangerAdminRESTClient.java
@@ -85,7 +85,10 @@ public class RangerAdminRESTClient implements
RangerAdminClient {
String url = "";
String tmpUrl =
RangerConfiguration.getInstance().get(propertyPrefix + ".policy.rest.url");
String sslConfigFileName =
RangerConfiguration.getInstance().get(propertyPrefix +
".policy.rest.ssl.config.file");
- clusterName =
RangerConfiguration.getInstance().get(propertyPrefix + ".ambari.cluster.name",
"");
+ clusterName =
RangerConfiguration.getInstance().get(propertyPrefix + ".access.cluster.name",
"");
+ if(StringUtil.isEmpty(clusterName)){
+ clusterName =
RangerConfiguration.getInstance().get(propertyPrefix + ".ambari.cluster.name",
"");
+ }
int restClientConnTimeOutMs =
RangerConfiguration.getInstance().getInt(propertyPrefix +
".policy.rest.client.connection.timeoutMs", 120 * 1000);
int restClientReadTimeOutMs =
RangerConfiguration.getInstance().getInt(propertyPrefix +
".policy.rest.client.read.timeoutMs", 30 * 1000);
supportsPolicyDeltas =
RangerConfiguration.getInstance().get(propertyPrefix +
".policy.rest.supports.policy.deltas", "false");
diff --git
a/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java
b/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java
index cff768f..ddf181c 100644
---
a/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java
+++
b/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java
@@ -192,7 +192,10 @@ public class RangerBasePlugin {
long pollingIntervalMs = configuration.getLong(propertyPrefix
+ ".policy.pollIntervalMs", 30 * 1000);
String cacheDir = configuration.get(propertyPrefix +
".policy.cache.dir");
serviceName = configuration.get(propertyPrefix +
".service.name");
- clusterName =
RangerConfiguration.getInstance().get(propertyPrefix + ".ambari.cluster.name",
"");
+ clusterName =
RangerConfiguration.getInstance().get(propertyPrefix + ".access.cluster.name",
"");
+ if(StringUtil.isEmpty(clusterName)){
+ clusterName =
RangerConfiguration.getInstance().get(propertyPrefix + ".ambari.cluster.name",
"");
+ }
useForwardedIPAddress = configuration.getBoolean(propertyPrefix
+ ".use.x-forwarded-for.ipaddress", false);
String trustedProxyAddressString =
configuration.get(propertyPrefix + ".trusted.proxy.ipaddresses");
trustedProxyAddresses =
StringUtils.split(trustedProxyAddressString,
RANGER_TRUSTED_PROXY_IPADDRESSES_SEPARATOR_CHAR);
diff --git
a/knox-agent/src/main/java/org/apache/ranger/admin/client/RangerAdminJersey2RESTClient.java
b/knox-agent/src/main/java/org/apache/ranger/admin/client/RangerAdminJersey2RESTClient.java
index e6ba110..ba44b96 100644
---
a/knox-agent/src/main/java/org/apache/ranger/admin/client/RangerAdminJersey2RESTClient.java
+++
b/knox-agent/src/main/java/org/apache/ranger/admin/client/RangerAdminJersey2RESTClient.java
@@ -40,6 +40,7 @@ import org.apache.hadoop.security.UserGroupInformation;
import org.apache.ranger.plugin.util.*;
import org.apache.ranger.audit.provider.MiscUtil;
import org.apache.ranger.authorization.hadoop.config.RangerConfiguration;
+import org.apache.ranger.authorization.utils.StringUtil;
import org.glassfish.jersey.client.ClientProperties;
import com.google.gson.Gson;
@@ -80,7 +81,10 @@ public class RangerAdminJersey2RESTClient implements
RangerAdminClient {
_sslConfigFileName =
_utils.getSsslConfigFileName(configPropertyPrefix);
_restClientConnTimeOutMs =
RangerConfiguration.getInstance().getInt(configPropertyPrefix +
".policy.rest.client.connection.timeoutMs", 120 * 1000);
_restClientReadTimeOutMs =
RangerConfiguration.getInstance().getInt(configPropertyPrefix +
".policy.rest.client.read.timeoutMs", 30 * 1000);
- _clusterName =
RangerConfiguration.getInstance().get(configPropertyPrefix +
".ambari.cluster.name", "");
+ _clusterName =
RangerConfiguration.getInstance().get(configPropertyPrefix +
".access.cluster.name", "");
+ if(StringUtil.isEmpty(_clusterName)){
+ _clusterName =
RangerConfiguration.getInstance().get(configPropertyPrefix +
".ambari.cluster.name", "");
+ }
_supportsPolicyDeltas =
RangerConfiguration.getInstance().get(configPropertyPrefix +
".policy.rest.supports.policy.deltas", "false");
if (!"true".equalsIgnoreCase(_supportsPolicyDeltas)) {
_supportsPolicyDeltas = "false";
diff --git
a/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
b/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
index 2933392..bf50df3 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
@@ -196,6 +196,7 @@ public class ServiceDBStore extends AbstractServiceStore {
private static final String RANGER_VERSION = "Ranger apache version";
private static final String TIMESTAMP = "Export time";
+ private static final String SERVICE_CHECK_USER = "service.check.user";
private static final String AMBARI_SERVICE_CHECK_USER =
"ambari.service.check.user";
private static final String SERVICE_ADMIN_USERS =
"service.admin.users";
@@ -3104,19 +3105,24 @@ public class ServiceDBStore extends
AbstractServiceStore {
List<String> getServiceCheckUsers(RangerService createdService) {
List<String> ret = new ArrayList<String>();
+ String userNames ="";
Map<String, String> serviceConfig = createdService.getConfigs();
- if (serviceConfig.containsKey(AMBARI_SERVICE_CHECK_USER)) {
- String userNames =
serviceConfig.get(AMBARI_SERVICE_CHECK_USER);
+ if (serviceConfig.containsKey(SERVICE_CHECK_USER)) {
+ userNames = serviceConfig.get(SERVICE_CHECK_USER);
+ } else if
(serviceConfig.containsKey(AMBARI_SERVICE_CHECK_USER)) {
+ userNames =
serviceConfig.get(AMBARI_SERVICE_CHECK_USER);
+ }
+
+ if (!StringUtils.isEmpty(userNames)) {
String[] userList = userNames.split(",");
for (String userName : userList) {
if (!StringUtils.isEmpty(userName)) {
- ret.add(userName.trim());
+ ret.add(userName.trim());
}
}
}
-
return ret;
}
