Changeset aed3e6d for asadb/groups

Timestamp:

Dec 3, 2013, 12:31:49 AM (12 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, stable, stage

Children:

eab727a

Parents:

7dde669 (diff), d9624e8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Alex Dehnert <adehnert@…> (12/03/13 00:31:49)

git-committer:

Alex Dehnert <adehnert@…> (12/03/13 00:31:49)

Message:

Merge branch 'membership-confirmations'

• membership-confirmations: Link people lookup tool from membership update page People lookup: mention the data source People lookup: Support large numbers of people People lookup: make the UI more reasonable Basic people lookup support (ASA-#186) Reword membership definition text More thoroughly purge mention of membership lists Standarize on UK-style ndashes Remove the membership list Do my counting in the DB... Save some unnecessary queries with select_related Finish removing membership confirmation search box Include suspended groups in issues.csv (ASA-#195) Memberships: refactor issues.csv slightly Make issues.csv cycle-aware (ASA-#191) JSify the giant list of groups (ASA-#185) Show the group name on the update page List only adminned groups in anti-hazing select Add Group.admin_groups method (ASA-#181)

Location:

asadb/groups

Files:

• models.py (modified) (6 diffs)
• views.py (modified) (3 diffs)

asadb/groups/models.py

@@ +1 @@
+import collections
 import datetime
 import filecmp
@@ -14 +15 @@
 from django.db.models import Q
 from django.core.validators import RegexValidator
-from django.contrib.auth.models import User
+from django.contrib.auth.models import User, Permission
+from django.contrib.contenttypes.models import ContentType
 from django.template.defaultfilters import slugify
 
@@ -112 +114 @@
         current_officers = OfficeHolder.current_holders.filter(person=username)
         users_groups = Group.objects.filter(officeholder__in=current_officers).distinct()
+
+    @staticmethod
+    def admin_groups(username, codename='admin_group'):
+        holders = OfficeHolder.current_holders.filter_perm(codename=codename).filter(person=username)
+        users_groups = Group.objects.filter(officeholder__in=holders).distinct()
         return users_groups
 
@@ -395 +402 @@
 
     @classmethod
+    def getRolesGrantingPerm(cls, perm=None, model=Group, codename=None, ):
+        """Get all OfficerRole objects granting a permission
+
+        Either `perm` or `codename` must be supplied, but not both. If
+        `codename` is provided (and `perm` is None), then `perm` the
+        permission corresponding to `model` (default: `Group`) and `codename`
+        will be found and used."""
+
+        if perm is None:
+            ct = ContentType.objects.get_for_model(model)
+            print ct
+            print Permission.objects.filter(content_type=ct)
+            perm = Permission.objects.get(content_type=ct, codename=codename)
+
+        Q_user = Q(user_permissions=perm)
+        Q_group = Q(groups__permissions=perm)
+        users = User.objects.filter(Q_user|Q_group)
+        roles = cls.objects.filter(grant_user__in=users)
+        return roles
+
+    @classmethod
     def retrieve(cls, slug, ):
         return cls.objects.get(slug=slug)
+
 reversion.register(OfficerRole)
 
@@ -407 +436 @@
         )
 
+    def filter_perm(self, perm=None, model=Group, codename=None, ):
+        roles = OfficerRole.getRolesGrantingPerm(perm=perm, model=model, codename=codename)
+        return self.get_query_set().filter(role__in=roles)
+
 class OfficeHolder(models.Model):
     EXPIRE_OFFSET   = datetime.timedelta(seconds=1)
@@ -433 +466 @@
     def __repr__(self, ):
         return str(self)
+
 reversion.register(OfficeHolder)
 

asadb/groups/views.py

@@ -696 +696 @@
             from_email='asa-admin@mit.edu',
         )
-        # XXX: Handle this better
-        if officer_domain != 'mit.edu' or (create_group_list and group_domain != 'mit.edu'):
-            accounts_mail.to = ['asa-groups@mit.edu']
-            accounts_mail.cc = ['asa-db@mit.edu']
-            accounts_mail.subject = "ERROR: " + accounts_mail.subject
-            accounts_mail.body = "Bad domain on officer or group list\n\n" + accounts_mail.body
 
     else:
@@ -828 +822 @@
     return render_to_response('groups/create/startup.html', context, context_instance=RequestContext(request), )
 
+def review_group_check_warnings(group_startup, group, ):
+    warnings = []
+
+    if group.name.startswith("MIT "):
+        warnings.append('Group name starts with "MIT". Generally, we prefer "Foo, MIT" instead.')
+    if "mit" in group.athena_locker.lower():
+        warnings.append('Athena locker name contains "mit", which may be redundant with paths like "http://web.mit.edu/mitfoo" or "/mit/foo/".')
+
+    if group_startup.president_kerberos == group_startup.treasurer_kerberos:
+        warnings.append('President matches Treasurer.')
+    if "%s@mit.edu" % (group_startup.president_kerberos, ) in (group.officer_email, group.group_email):
+        warnings.append('President email matches officer and/or group email.')
+    if group.officer_email == group.group_email:
+        warnings.append('Officer email matches group email.')
+
+    if '@mit.edu' not in group.officer_email or '@mit.edu' not in group.group_email:
+        warnings.append('Officer and/or group email are non-MIT. Ensure that they are not requesting the addresses be created, and consider suggesting they use an MIT list instead.')
+
+    if '.' in group.athena_locker:
+        warnings.append('Athena locker contains a ".". This is not compatible with scripts.mit.edu\'s wildcard certificate, and may cause other problems.')
+    if '_' in group.athena_locker:
+        warnings.append('Athena locker contains a "_". If this locker name gets used in a URL (for example, locker.scripts.mit.edu), it will technically violate the hostname specification and may not work in some clients.')
+    if len(group.athena_locker) > 12:
+        warnings.append('Athena locker is more than twelve characters long. In general, twelve characters is the longest Athena locker an ASA-recognized group can get.')
+
+    return warnings
+
 @permission_required('groups.recognize_group')
 def recognize_normal_group(request, pk, ):
@@ -843 +864 @@
     if group_startup.stage != groups.models.GROUP_STARTUP_STAGE_SUBMITTED:
         return render_to_response('groups/create/err.not-applying.html', context, context_instance=RequestContext(request), )
+
+    context['warnings'] = review_group_check_warnings(group_startup, group)
 
     context['msg'] = ""