Repository: incubator-ranger Updated Branches: refs/heads/master 79947f10a -> 59b49610a
RANGER-898: Change Ranger's default value for LDAP User / Group Sync Case Conversion properties to "none" Signed-off-by: Gautam Borad <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/59b49610 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/59b49610 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/59b49610 Branch: refs/heads/master Commit: 59b49610a8d4f46a71b665e811749c1e2385b366 Parents: 79947f1 Author: Mehul Parikh <[email protected]> Authored: Thu Feb 11 14:46:50 2016 +0530 Committer: Gautam Borad <[email protected]> Committed: Mon Apr 4 10:44:57 2016 +0530 ---------------------------------------------------------------------- .../ambari2.1-hdp2.3-ranger0.50/bin/import_ranger_to_ambari.py | 4 ++-- .../ldapconfigchecktool/ldapconfigcheck/conf/input.properties | 4 ++-- .../main/java/org/apache/ranger/ldapconfigcheck/LdapConfig.java | 5 +++-- .../apache/ranger/unixusersync/config/UserGroupSyncConfig.java | 4 ++-- ugsync/src/test/resources/ranger-ugsync-site.xml | 4 ++-- unixauthservice/conf.dist/ranger-ugsync-default.xml | 4 ++-- 6 files changed, 13 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/59b49610/migration-util/ambari2.1-hdp2.3-ranger0.50/bin/import_ranger_to_ambari.py ---------------------------------------------------------------------- diff --git a/migration-util/ambari2.1-hdp2.3-ranger0.50/bin/import_ranger_to_ambari.py b/migration-util/ambari2.1-hdp2.3-ranger0.50/bin/import_ranger_to_ambari.py index bc06a65..418171c 100755 --- a/migration-util/ambari2.1-hdp2.3-ranger0.50/bin/import_ranger_to_ambari.py +++ b/migration-util/ambari2.1-hdp2.3-ranger0.50/bin/import_ranger_to_ambari.py @@ -358,8 +358,8 @@ def add_advanced_ranger_configurations(add_admin_or_usersync, ranger_service_pro advanced_user_sync_properties['ranger.usersync.ldap.user.searchfilter'] = ranger_service_properties_from_file.get('ranger.usersync.ldap.user.searchfilter','empty') advanced_user_sync_properties['ranger.usersync.ldap.user.nameattribute'] = ranger_service_properties_from_file.get('ranger.usersync.ldap.user.nameattribute','cn') advanced_user_sync_properties['ranger.usersync.ldap.user.groupnameattribute'] = ranger_service_properties_from_file.get('ranger.usersync.ldap.user.groupnameattribute','memberof, ismemberof') - advanced_user_sync_properties['ranger.usersync.ldap.username.caseconversion'] = ranger_service_properties_from_file.get('ranger.usersync.ldap.username.caseconversion','lower') - advanced_user_sync_properties['ranger.usersync.ldap.groupname.caseconversion'] = ranger_service_properties_from_file.get('ranger.usersync.ldap.groupname.caseconversion','lower') + advanced_user_sync_properties['ranger.usersync.ldap.username.caseconversion'] = ranger_service_properties_from_file.get('ranger.usersync.ldap.username.caseconversion','none') + advanced_user_sync_properties['ranger.usersync.ldap.groupname.caseconversion'] = ranger_service_properties_from_file.get('ranger.usersync.ldap.groupname.caseconversion','none') advanced_user_sync_properties['ranger.usersync.logdir'] = ranger_service_properties_from_file.get('ranger.usersync.logdir','/var/log/ranger/usersync') advanced_user_sync_properties['ranger.usersync.group.searchenabled'] = ranger_service_properties_from_file.get('ranger.usersync.group.searchenabled','false') advanced_user_sync_properties['ranger.usersync.group.usermapsyncenabled'] = ranger_service_properties_from_file.get('ranger.usersync.group.usermapsyncenabled','false') http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/59b49610/ugsync/ldapconfigchecktool/ldapconfigcheck/conf/input.properties ---------------------------------------------------------------------- diff --git a/ugsync/ldapconfigchecktool/ldapconfigcheck/conf/input.properties b/ugsync/ldapconfigchecktool/ldapconfigcheck/conf/input.properties index dc6fc59..38e6f5a 100755 --- a/ugsync/ldapconfigchecktool/ldapconfigcheck/conf/input.properties +++ b/ugsync/ldapconfigchecktool/ldapconfigcheck/conf/input.properties @@ -44,8 +44,8 @@ ranger.usersync.group.searchfilter= ranger.usersync.ldap.authentication.mechanism=simple ranger.usersync.pagedresultsenabled=true ranger.usersync.pagedresultssize=500 -ranger.usersync.ldap.username.caseconversion=lower -ranger.usersync.ldap.groupname.caseconversion=lower +ranger.usersync.ldap.username.caseconversion=none +ranger.usersync.ldap.groupname.caseconversion=none ranger.usersync.ldap.user.searchscope=sub ranger.usersync.group.searchscope=sub http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/59b49610/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/LdapConfig.java ---------------------------------------------------------------------- diff --git a/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/LdapConfig.java b/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/LdapConfig.java index a548957..4f7b004 100644 --- a/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/LdapConfig.java +++ b/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/LdapConfig.java @@ -61,13 +61,14 @@ public class LdapConfig { private static final String LGSYNC_USER_GROUP_NAME_ATTRIBUTE = "ranger.usersync.ldap.user.groupnameattribute"; + public static final String UGSYNC_NONE_CASE_CONVERSION_VALUE = "none" ; public static final String UGSYNC_LOWER_CASE_CONVERSION_VALUE = "lower"; private static final String UGSYNC_USERNAME_CASE_CONVERSION_PARAM = "ranger.usersync.ldap.username.caseconversion"; - private static final String DEFAULT_UGSYNC_USERNAME_CASE_CONVERSION_VALUE = UGSYNC_LOWER_CASE_CONVERSION_VALUE; + private static final String DEFAULT_UGSYNC_USERNAME_CASE_CONVERSION_VALUE = UGSYNC_NONE_CASE_CONVERSION_VALUE; private static final String UGSYNC_GROUPNAME_CASE_CONVERSION_PARAM = "ranger.usersync.ldap.groupname.caseconversion"; - private static final String DEFAULT_UGSYNC_GROUPNAME_CASE_CONVERSION_VALUE = UGSYNC_LOWER_CASE_CONVERSION_VALUE; + private static final String DEFAULT_UGSYNC_GROUPNAME_CASE_CONVERSION_VALUE = UGSYNC_NONE_CASE_CONVERSION_VALUE; private static final String LGSYNC_PAGED_RESULTS_ENABLED = "ranger.usersync.pagedresultsenabled"; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/59b49610/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java ---------------------------------------------------------------------- diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java index 6cfb394..2297b65 100644 --- a/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java +++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java @@ -134,10 +134,10 @@ public class UserGroupSyncConfig { public static final String UGSYNC_UPPER_CASE_CONVERSION_VALUE = "upper" ; private static final String UGSYNC_USERNAME_CASE_CONVERSION_PARAM = "ranger.usersync.ldap.username.caseconversion" ; - private static final String DEFAULT_UGSYNC_USERNAME_CASE_CONVERSION_VALUE = UGSYNC_LOWER_CASE_CONVERSION_VALUE ; + private static final String DEFAULT_UGSYNC_USERNAME_CASE_CONVERSION_VALUE = UGSYNC_NONE_CASE_CONVERSION_VALUE; private static final String UGSYNC_GROUPNAME_CASE_CONVERSION_PARAM = "ranger.usersync.ldap.groupname.caseconversion" ; - private static final String DEFAULT_UGSYNC_GROUPNAME_CASE_CONVERSION_VALUE = UGSYNC_LOWER_CASE_CONVERSION_VALUE ; + private static final String DEFAULT_UGSYNC_GROUPNAME_CASE_CONVERSION_VALUE = UGSYNC_NONE_CASE_CONVERSION_VALUE; private static final String DEFAULT_USER_GROUP_TEXTFILE_DELIMITER = ","; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/59b49610/ugsync/src/test/resources/ranger-ugsync-site.xml ---------------------------------------------------------------------- diff --git a/ugsync/src/test/resources/ranger-ugsync-site.xml b/ugsync/src/test/resources/ranger-ugsync-site.xml index f1232de..1bd07d1 100644 --- a/ugsync/src/test/resources/ranger-ugsync-site.xml +++ b/ugsync/src/test/resources/ranger-ugsync-site.xml @@ -100,7 +100,7 @@ <property> <name>ranger.usersync.ldap.groupname.caseconversion</name> - <value>lower</value> + <value>none</value> </property> <property> @@ -150,7 +150,7 @@ <property> <name>ranger.usersync.ldap.username.caseconversion</name> - <value>lower</value> + <value>none</value> </property> <property> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/59b49610/unixauthservice/conf.dist/ranger-ugsync-default.xml ---------------------------------------------------------------------- diff --git a/unixauthservice/conf.dist/ranger-ugsync-default.xml b/unixauthservice/conf.dist/ranger-ugsync-default.xml index 4175986..5ed5b89 100644 --- a/unixauthservice/conf.dist/ranger-ugsync-default.xml +++ b/unixauthservice/conf.dist/ranger-ugsync-default.xml @@ -47,11 +47,11 @@ </property> <property> <name>ranger.usersync.ldap.username.caseconversion</name> - <value>lower</value> + <value>none</value> </property> <property> <name>ranger.usersync.ldap.groupname.caseconversion</name> - <value>lower</value> + <value>none</value> </property> <property> <name>ranger.usersync.logdir</name>
