You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by sn...@apache.org on 2015/05/31 17:03:51 UTC
[11/12] incubator-ranger git commit: RANGER-517 : Fix Unix
authentication
RANGER-517 : Fix Unix authentication
Signed-off-by: sneethiraj <sn...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/3250e5c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/3250e5c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/3250e5c2
Branch: refs/heads/ranger-0.5
Commit: 3250e5c22fb4d4f5048b62bb2d26fc8b706d5caa
Parents: a097b7f
Author: Gautam Borad <gb...@gmail.com>
Authored: Sun May 31 09:17:47 2015 +0530
Committer: sneethiraj <sn...@apache.org>
Committed: Sun May 31 00:27:34 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/ranger/common/PropertiesUtil.java | 3 +++
.../org/apache/ranger/common/XMLPropertiesUtil.java | 2 +-
.../handler/RangerAuthenticationProvider.java | 14 +++-----------
3 files changed, 7 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3250e5c2/security-admin/src/main/java/org/apache/ranger/common/PropertiesUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/PropertiesUtil.java b/security-admin/src/main/java/org/apache/ranger/common/PropertiesUtil.java
index a0bfff4..4044443 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/PropertiesUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/PropertiesUtil.java
@@ -222,4 +222,7 @@ public class PropertiesUtil extends PropertyPlaceholderConfigurer {
}
return Boolean.parseBoolean(value);
}
+ public static Map<String, String> getPropertiesMap() {
+ return propertiesMap;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3250e5c2/security-admin/src/main/java/org/apache/ranger/common/XMLPropertiesUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/XMLPropertiesUtil.java b/security-admin/src/main/java/org/apache/ranger/common/XMLPropertiesUtil.java
index a00664d..521fe2f 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/XMLPropertiesUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/XMLPropertiesUtil.java
@@ -84,7 +84,7 @@ public class XMLPropertiesUtil extends DefaultPropertiesPersister {
properties.put(propertyName, propertyValue);
}
- logger.info("ranger site properties loaded successfully.");
+ //logger.info("ranger site properties loaded successfully.");
}
} catch (Exception e) {
logger.error("Error loading : ", e);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3250e5c2/security-admin/src/main/java/org/apache/ranger/security/handler/RangerAuthenticationProvider.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/handler/RangerAuthenticationProvider.java b/security-admin/src/main/java/org/apache/ranger/security/handler/RangerAuthenticationProvider.java
index 3275a8e..ac522cc 100644
--- a/security-admin/src/main/java/org/apache/ranger/security/handler/RangerAuthenticationProvider.java
+++ b/security-admin/src/main/java/org/apache/ranger/security/handler/RangerAuthenticationProvider.java
@@ -19,7 +19,6 @@
package org.apache.ranger.security.handler;
-import java.security.Principal;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -288,27 +287,20 @@ public class RangerAuthenticationProvider implements AuthenticationProvider {
DefaultJaasAuthenticationProvider jaasAuthenticationProvider = new DefaultJaasAuthenticationProvider();
String loginModuleName = "org.apache.ranger.authentication.unix.jaas.RemoteUnixLoginModule";
LoginModuleControlFlag controlFlag = LoginModuleControlFlag.REQUIRED;
- Map<String, String> options = (Map<String, String>) new HashMap<String, String>();
- options.put("configFile", "ranger-admin-site.xml");
+ Map<String, String> options = PropertiesUtil.getPropertiesMap();
AppConfigurationEntry appConfigurationEntry = new AppConfigurationEntry(
loginModuleName, controlFlag, options);
AppConfigurationEntry[] appConfigurationEntries = new AppConfigurationEntry[] { appConfigurationEntry };
- Map<String, AppConfigurationEntry[]> appConfigurationEntriesOptions = (Map<String, AppConfigurationEntry[]>) new HashMap<String, AppConfigurationEntry[]>();
+ Map<String, AppConfigurationEntry[]> appConfigurationEntriesOptions = new HashMap<String, AppConfigurationEntry[]>();
appConfigurationEntriesOptions.put("SPRINGSECURITY",
appConfigurationEntries);
Configuration configuration = new InMemoryConfiguration(
appConfigurationEntriesOptions);
-
jaasAuthenticationProvider.setConfiguration(configuration);
-
RoleUserAuthorityGranter authorityGranter = new RoleUserAuthorityGranter();
-
- authorityGranter.grant((Principal) authentication.getPrincipal());
-
RoleUserAuthorityGranter[] authorityGranters = new RoleUserAuthorityGranter[] { authorityGranter };
-
jaasAuthenticationProvider.setAuthorityGranters(authorityGranters);
-
+ jaasAuthenticationProvider.afterPropertiesSet();
String userName = authentication.getName();
String userPassword = "";
if (authentication.getCredentials() != null) {