Return-Path: X-Original-To: apmail-ranger-commits-archive@www.apache.org Delivered-To: apmail-ranger-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4DAABC7EE for ; Tue, 9 Dec 2014 23:44:03 +0000 (UTC) Received: (qmail 93508 invoked by uid 500); 9 Dec 2014 23:44:03 -0000 Delivered-To: apmail-ranger-commits-archive@ranger.apache.org Received: (qmail 93486 invoked by uid 500); 9 Dec 2014 23:44:03 -0000 Mailing-List: contact commits-help@ranger.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ranger.incubator.apache.org Delivered-To: mailing list commits@ranger.incubator.apache.org Received: (qmail 93477 invoked by uid 99); 9 Dec 2014 23:44:03 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Dec 2014 23:44:03 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 09 Dec 2014 23:44:01 +0000 Received: (qmail 91583 invoked by uid 99); 9 Dec 2014 23:42:26 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Dec 2014 23:42:26 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2B250A22146; Tue, 9 Dec 2014 23:42:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sneethir@apache.org To: commits@ranger.incubator.apache.org Date: Tue, 09 Dec 2014 23:42:27 -0000 Message-Id: <2abf261dfa5f422c82cd0d2c4783889d@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/7] incubator-ranger git commit: Argus-180-Ranger lookup for hadoop repository fails when wire encryption is on X-Virus-Checked: Checked by ClamAV on apache.org Argus-180-Ranger lookup for hadoop repository fails when wire encryption is on Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/57b8dbd4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/57b8dbd4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/57b8dbd4 Branch: refs/heads/ranger-0.4 Commit: 57b8dbd436ee8edc7f014aa4b516c25b1ed973b0 Parents: 80b3e1b Author: rmani Authored: Wed Nov 12 22:45:25 2014 -0800 Committer: sneethiraj Committed: Sun Dec 7 01:12:46 2014 -0500 ---------------------------------------------------------------------- .../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-ranger/blob/57b8dbd4/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("" + key.trim() + "" + val + "") ; } out.println("") ; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/57b8dbd4/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-ranger/blob/57b8dbd4/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