You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by rm...@apache.org on 2014/11/13 07:56:17 UTC
[1/2] incubator-argus git commit: Argus-180-Ranger lookup for hadoop
repository fails when wire encryption is on
Repository: incubator-argus
Updated Branches:
refs/heads/master 02f4df19a -> 17bcc918f
Argus-180-Ranger lookup for hadoop repository fails when wire encryption
is on
Project: http://git-wip-us.apache.org/repos/asf/incubator-argus/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-argus/commit/5ea50f29
Tree: http://git-wip-us.apache.org/repos/asf/incubator-argus/tree/5ea50f29
Diff: http://git-wip-us.apache.org/repos/asf/incubator-argus/diff/5ea50f29
Branch: refs/heads/master
Commit: 5ea50f29495ebd43773fff8aa37cc4d4e541756a
Parents: b9da138
Author: rmani <rm...@hortonworks.com>
Authored: Wed Nov 12 22:45:25 2014 -0800
Committer: rmani <rm...@hortonworks.com>
Committed: Wed Nov 12 22:45:25 2014 -0800
----------------------------------------------------------------------
.../java/com/xasecure/hadoop/client/config/HadoopClassLoader.java | 3 +++
.../com/xasecure/hadoop/client/config/HadoopConfigHolder.java | 1 +
security-admin/src/main/resources/resourcenamemap.properties | 1 +
3 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/5ea50f29/lookup-client/src/main/java/com/xasecure/hadoop/client/config/HadoopClassLoader.java
----------------------------------------------------------------------
diff --git a/lookup-client/src/main/java/com/xasecure/hadoop/client/config/HadoopClassLoader.java b/lookup-client/src/main/java/com/xasecure/hadoop/client/config/HadoopClassLoader.java
index 7142bfa..214ff4d 100644
--- a/lookup-client/src/main/java/com/xasecure/hadoop/client/config/HadoopClassLoader.java
+++ b/lookup-client/src/main/java/com/xasecure/hadoop/client/config/HadoopClassLoader.java
@@ -84,6 +84,9 @@ public class HadoopClassLoader extends ClassLoader {
for(Object keyobj : prop.keySet()) {
String key = (String)keyobj;
String val = prop.getProperty(key) ;
+ if (HadoopConfigHolder.HADOOP_RPC_PROTECTION.equals(key) && (val == null || val.trim().isEmpty())) {
+ continue;
+ }
out.println("<property><name>" + key.trim() + "</name><value>" + val + "</value></property>") ;
}
out.println("</configuration>") ;
http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/5ea50f29/lookup-client/src/main/java/com/xasecure/hadoop/client/config/HadoopConfigHolder.java
----------------------------------------------------------------------
diff --git a/lookup-client/src/main/java/com/xasecure/hadoop/client/config/HadoopConfigHolder.java b/lookup-client/src/main/java/com/xasecure/hadoop/client/config/HadoopConfigHolder.java
index 6702954..b1bd62b 100644
--- a/lookup-client/src/main/java/com/xasecure/hadoop/client/config/HadoopConfigHolder.java
+++ b/lookup-client/src/main/java/com/xasecure/hadoop/client/config/HadoopConfigHolder.java
@@ -41,6 +41,7 @@ public class HadoopConfigHolder {
public static final String XASECURE_LOGIN_PASSWORD = "password" ;
public static final String HADOOP_SECURITY_AUTHENTICATION = "hadoop.security.authentication";
public static final String HADOOP_SECURITY_AUTHENTICATION_METHOD = "kerberos";
+ public static final String HADOOP_RPC_PROTECTION = "hadoop.rpc.protection";
private static boolean initialized = false ;
http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/5ea50f29/security-admin/src/main/resources/resourcenamemap.properties
----------------------------------------------------------------------
diff --git a/security-admin/src/main/resources/resourcenamemap.properties b/security-admin/src/main/resources/resourcenamemap.properties
index e87a663..d9b4d71 100644
--- a/security-admin/src/main/resources/resourcenamemap.properties
+++ b/security-admin/src/main/resources/resourcenamemap.properties
@@ -17,6 +17,7 @@ fs.default.name=core-site.xml
hadoop.security.authentication=core-site.xml
hadoop.security.authorization=core-site.xml
hadoop.security.auth_to_local=core-site.xml
+hadoop.rpc.protection=core-site.xml
dfs.datanode.kerberos.principal=hdfs-site.xml
dfs.namenode.kerberos.principal=hdfs-site.xml
dfs.secondary.namenode.kerberos.principal=hdfs-site.xml
[2/2] incubator-argus git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-argus
Posted by rm...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-argus
Project: http://git-wip-us.apache.org/repos/asf/incubator-argus/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-argus/commit/17bcc918
Tree: http://git-wip-us.apache.org/repos/asf/incubator-argus/tree/17bcc918
Diff: http://git-wip-us.apache.org/repos/asf/incubator-argus/diff/17bcc918
Branch: refs/heads/master
Commit: 17bcc918f9741306af8c00312656a723fec5b905
Parents: 5ea50f2 02f4df1
Author: rmani <rm...@hortonworks.com>
Authored: Wed Nov 12 22:55:45 2014 -0800
Committer: rmani <rm...@hortonworks.com>
Committed: Wed Nov 12 22:55:45 2014 -0800
----------------------------------------------------------------------
.../src/main/java/com/xasecure/server/tomcat/EmbededServer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------