Skip to content

RANGER-5466 Avoid hardcoded delta sync and unnecessary LDAP filter when delta sync is disabled #827

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kimsehwan96 wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −3
Open

RANGER-5466 Avoid hardcoded delta sync and unnecessary LDAP filter when delta sync is disabled #827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapUserGroupBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,11 @@ private long getUsers(boolean computeDeletes) throws Throwable {
deltaSyncUserTimeStamp = dateFormat.format(new Date(0));
}

extendedUserSearchFilter = "(objectclass=" + userObjectClass + ")(|(uSNChanged>=" + deltaSyncUserTime + ")(modifyTimestamp>=" + deltaSyncUserTimeStamp + "Z))";
if (config.isDeltaSyncEnabled()) {
extendedUserSearchFilter = "(objectclass=" + userObjectClass + ")(|(uSNChanged>=" + deltaSyncUserTime + ")(modifyTimestamp>=" + deltaSyncUserTimeStamp + "Z))";
} else {
extendedUserSearchFilter = "(objectclass=" + userObjectClass + ")";
}

if (userSearchFilter != null && !userSearchFilter.trim().isEmpty()) {
String customFilter = userSearchFilter.trim();
Expand Down Expand Up @@ -737,7 +741,11 @@ private long getGroups(boolean computeDeletes) throws Throwable {
deltaSyncGroupTimeStamp = dateFormat.format(new Date(0));
}

extendedAllGroupsSearchFilter = "(&" + extendedGroupSearchFilter + "(|(uSNChanged>=" + deltaSyncGroupTime + ")(modifyTimestamp>=" + deltaSyncGroupTimeStamp + "Z)))";
if (config.isDeltaSyncEnabled()) {
extendedAllGroupsSearchFilter = "(&" + extendedGroupSearchFilter + "(|(uSNChanged>=" + deltaSyncGroupTime + ")(modifyTimestamp>=" + deltaSyncGroupTimeStamp + "Z)))";
} else {
extendedAllGroupsSearchFilter = "(&" + extendedGroupSearchFilter + ")";
}

LOG.info("extendedAllGroupsSearchFilter = {}", extendedAllGroupsSearchFilter);

Expand Down
3 changes: 2 additions & 1 deletion unixauthservice/scripts/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,8 @@ def convertInstallPropsToXML(props):
# if (key.startswith("ranger.usersync.ldap") or key.startswith("ranger.usersync.group") or key.startswith("ranger.usersync.paged")):
# del ret[key]
elif (syncSource == SYNC_SOURCE_LDAP):
ret['ranger.usersync.ldap.deltasync'] = "true"
if ('ranger.usersync.ldap.deltasync' not in ret or len(str(ret['ranger.usersync.ldap.deltasync'])) == 0):
ret['ranger.usersync.ldap.deltasync'] = "true"
ldapPass = ret[SYNC_LDAP_BIND_PASSWORD_KEY]
password_validation(ldapPass, SYNC_LDAP_BIND_PASSWORD_KEY)
ret['ranger.usersync.source.impl.class'] = 'org.apache.ranger.ldapusersync.process.LdapUserGroupBuilder'
Expand Down