smile/cbmi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'hotfix/0.2.15'

Browse source
This commit is contained in:
baccenfutter 2013-11-24 21:42:19 +01:00
commit 91c2c5140b
3 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
account/models.py
View file

@ -34,6 +34,10 @@ class UserProfile(models.Model):
null=True, null=True,
blank=True, blank=True,
default=None) default=None)
is_member = models.BooleanField(default=False, editable=False)
is_ldap_admin = models.BooleanField(default=False, editable=False)
is_circle_member = models.BooleanField(default=False, editable=False)
is_clab_member = models.BooleanField(default=False, editable=False)
def __unicode__(self): def __unicode__(self):
return 'Profile: %s' % self.user.username return 'Profile: %s' % self.user.username

4
account/views.py
View file

@ -141,7 +141,7 @@ def gastropin(request):
@login_required @login_required
def clabpin(request): def clabpin(request):
if request.user.groups.filter(name='cey-c-lab').count() == 0: if not request.user.profile.is_clab_member:
return render(request, 'access_denied.html') return render(request, 'access_denied.html')
def calculate_clab_hash(pin): def calculate_clab_hash(pin):
@ -236,7 +236,7 @@ def nrf24(request):
@login_required @login_required
def admin(request): def admin(request):
admin_member = retrieve_member(request) admin_member = retrieve_member(request)
if request.user.groups.filter(name='ldap_admins').count() == 0: if not request.user.profile.is_ldap_admin:
return render(request, 'access_denied.html') return render(request, 'access_denied.html')
users = admin_member.list_users() users = admin_member.list_users()
if request.method == 'POST': if request.method == 'POST':

6
cbmi/settings.py
View file

@ -132,15 +132,17 @@ AUTH_LDAP_CACHE_GROUPS = True
AUTH_LDAP_GROUP_CACHE_TIMEOUT = 300 AUTH_LDAP_GROUP_CACHE_TIMEOUT = 300
AUTH_LDAP_MIRROR_GROUPS = True AUTH_LDAP_MIRROR_GROUPS = True
AUTH_LDAP_GROUP_SEARCH = LDAPSearch( AUTH_LDAP_GROUP_SEARCH = LDAPSearch(
"dc=c-base,dc=org", "ou=groups,dc=c-base,dc=org",
ldap.SCOPE_SUBTREE, ldap.SCOPE_SUBTREE,
"(objectClass=groupOfNames)", "(objectClass=groupOfNames)",
) )
AUTH_LDAP_REQUIRE_GROUP = "cn=crew,ou=groups,dc=c-base,dc=org" AUTH_LDAP_REQUIRE_GROUP = "cn=crew,ou=groups,dc=c-base,dc=org"
AUTH_LDAP_GROUP_TYPE = GroupOfNamesType(name_attr="cn") AUTH_LDAP_GROUP_TYPE = GroupOfNamesType(name_attr="cn")
AUTH_LDAP_USER_FLAGS_BY_GROUP = { AUTH_LDAP_PROFILE_FLAGS_BY_GROUP = {
"is_member": "cn=crew,ou=groups,dc=c-base,dc=org", "is_member": "cn=crew,ou=groups,dc=c-base,dc=org",
"is_ldap_admin": "cn=ldap_admins,ou=groups,dc=c-base,dc=org",
"is_circle_member": "cn=circle,ou=groups,dc=c-base,dc=org", "is_circle_member": "cn=circle,ou=groups,dc=c-base,dc=org",
"is_clab_member": "cn=cey-c-lab,ou=groups,dc=c-base,dc=org",
} }
AUTH_LDAP_USER_ATTR_MAP = { AUTH_LDAP_USER_ATTR_MAP = {