From 80b6cc31bc0078a1ef69faaf222ecf9e97b54905 Mon Sep 17 00:00:00 2001
From: Christian Dresen <c.dresen@fh-muenster.de>
Date: Sat, 24 Sep 2016 02:34:17 +0200
Subject: [PATCH] [WarpAuth] Adapted to new ldap config
---
www/web/warpauth/models.py | 5 +++--
www/web/warpzone/settings.py | 6 +++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/www/web/warpauth/models.py b/www/web/warpauth/models.py
index 1d4244a..f24ff00 100644
--- a/www/web/warpauth/models.py
+++ b/www/web/warpauth/models.py
@@ -38,6 +38,7 @@ class LdapUser(ldapdb.models.Model):
uidNumber = CharField(db_column='uidNumber', max_length=200)
gidNumber = CharField(db_column='gidNumber', max_length=200)
homeDirectory = CharField(db_column='homeDirectory', max_length=200)
+
def __str__(self):
return self.uid
@@ -53,11 +54,11 @@ class LdapUserForm(ModelForm):
class LdapGroup(ldapdb.models.Model):
base_dn = "ou=groups,dc=warpzone,dc=ms"
- object_classes = ['posixGroup']
+ object_classes = ['groupOfUniqueNames']
gid = IntegerField(db_column='gidNumber', unique=True)
name = CharField(db_column='cn', max_length=200, primary_key=True)
- members = ListField(db_column='memberUid')
+ members = ListField(db_column='uniqueMember')
def __str__(self):
return self.name
diff --git a/www/web/warpzone/settings.py b/www/web/warpzone/settings.py
index 0f4fb0c..f22beb6 100644
--- a/www/web/warpzone/settings.py
+++ b/www/web/warpzone/settings.py
@@ -2,7 +2,7 @@ import os
import ldap
import logging
import configparser
-from django_auth_ldap.config import LDAPSearch, GroupOfNamesType, PosixGroupType
+from django_auth_ldap.config import LDAPSearch, GroupOfUniqueNamesType, GroupOfNamesType, PosixGroupType
from django.core.urlresolvers import reverse_lazy
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -169,10 +169,10 @@ AUTH_LDAP_PROFILE_ATTR_MAP = {"home_directory": "homeDirectory"}
AUTH_LDAP_GROUP_SEARCH = LDAPSearch(LDAP_GROUP_SEARCH_PATH,
- ldap.SCOPE_SUBTREE, "(objectClass=posixGroup)"
+ ldap.SCOPE_SUBTREE, "(objectClass=groupOfUniqueNames)"
)
-AUTH_LDAP_GROUP_TYPE = PosixGroupType()
+AUTH_LDAP_GROUP_TYPE = GroupOfUniqueNamesType()
AUTH_LDAP_USER_FLAGS_BY_GROUP = {
--
GitLab