Merge branch 'hotfix/0.2.15'

account/models.py

@@ -34,6 +34,10 @@ class UserProfile(models.Model):
                                null=True,
                                blank=True,
                                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):
         return 'Profile: %s' % self.user.username

account/views.py

@@ -141,7 +141,7 @@ def gastropin(request):
 
 @login_required
 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')
 
     def calculate_clab_hash(pin):
@@ -236,7 +236,7 @@ def nrf24(request):
 @login_required
 def admin(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')
     users = admin_member.list_users()
     if request.method == 'POST':

cbmi/settings.py

@@ -132,15 +132,17 @@ AUTH_LDAP_CACHE_GROUPS = True
 AUTH_LDAP_GROUP_CACHE_TIMEOUT = 300
 AUTH_LDAP_MIRROR_GROUPS = True
 AUTH_LDAP_GROUP_SEARCH = LDAPSearch(
-    "dc=c-base,dc=org",
+    "ou=groups,dc=c-base,dc=org",
     ldap.SCOPE_SUBTREE,
     "(objectClass=groupOfNames)",
 )
 AUTH_LDAP_REQUIRE_GROUP = "cn=crew,ou=groups,dc=c-base,dc=org"
 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_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_clab_member": "cn=cey-c-lab,ou=groups,dc=c-base,dc=org",
 }
 
 AUTH_LDAP_USER_ATTR_MAP = {