From 7f6bfd90cd5745337f31538ec4cc63476b003982 Mon Sep 17 00:00:00 2001 From: Cameron Sharp Date: Mon, 11 Nov 2019 22:09:08 +0000 Subject: [PATCH] override groups --- octoprint_auth_ldap/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/octoprint_auth_ldap/__init__.py b/octoprint_auth_ldap/__init__.py index 3f434df..0333905 100644 --- a/octoprint_auth_ldap/__init__.py +++ b/octoprint_auth_ldap/__init__.py @@ -67,7 +67,8 @@ class LDAPUserManager(FilebasedUserManager, def findLDAPUser(self, userid): 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) if ldap_search_base is None: @@ -96,6 +97,8 @@ class LDAPUserManager(FilebasedUserManager, else: 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) self._logger.error("LDAP-AUTH QUERY:" + query) group_result = connection.search_s(ldap_search_base, ldap.SCOPE_SUBTREE, query)