Skip to content
Snippets Groups Projects
Commit 80b6cc31 authored by Christian Dresen's avatar Christian Dresen
Browse files

[WarpAuth] Adapted to new ldap config

parent 52bf8ec5
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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 = {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment