|
|
@ -67,7 +67,8 @@ class LDAPUserManager(FilebasedUserManager, |
|
|
|
|
|
|
|
|
|
|
|
def findLDAPUser(self, userid): |
|
|
|
def findLDAPUser(self, userid): |
|
|
|
ldap_search_base = settings().get(["accessControl", "ldap_search_base"]) |
|
|
|
ldap_search_base = settings().get(["accessControl", "ldap_search_base"]) |
|
|
|
groups = settings().get(["accessControl", "groups"]) |
|
|
|
#groups = settings().get(["accessControl", "groups"]) |
|
|
|
|
|
|
|
groups = "blah" |
|
|
|
userid = self.escapeLDAP(userid) |
|
|
|
userid = self.escapeLDAP(userid) |
|
|
|
|
|
|
|
|
|
|
|
if ldap_search_base is None: |
|
|
|
if ldap_search_base is None: |
|
|
@ -96,6 +97,8 @@ class LDAPUserManager(FilebasedUserManager, |
|
|
|
else: |
|
|
|
else: |
|
|
|
group_filter = "(cn=%s)" % groups |
|
|
|
group_filter = "(cn=%s)" % groups |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
group_filter = "cn=octoprint,ou=Groups,ou=People,dc=edinburghhacklab,dc=com" |
|
|
|
|
|
|
|
|
|
|
|
query = "(&(objectClass=posixGroup)%s(memberUid=%s))" % (group_filter, userid) |
|
|
|
query = "(&(objectClass=posixGroup)%s(memberUid=%s))" % (group_filter, userid) |
|
|
|
self._logger.error("LDAP-AUTH QUERY:" + query) |
|
|
|
self._logger.error("LDAP-AUTH QUERY:" + query) |
|
|
|
group_result = connection.search_s(ldap_search_base, ldap.SCOPE_SUBTREE, query) |
|
|
|
group_result = connection.search_s(ldap_search_base, ldap.SCOPE_SUBTREE, query) |
|
|
|