Update Django plugin with current upstream code

* commit '5ba5fe8d4f31b66af67137cc36f79597138b76b0':
  Scripts auth: don't activate on 127.0.0.1 either
  Use API function instead of UNUSABLE_PASSWORD
  Set a password of UNUSABLE_PASSWORD
  kinit when creating a MoiraList object
  Wrappers for safely calling commands in a new PAG
  Validate constitution_url (ASA-#76)
  Django MIT plugin: Don't crash on users with hidden emails (ASA Trac: #63)
  Function to create an MIT user with LDAP data

diff --combined django/mit/__init__.py
index 6b727108c8093c40e2c099ad3838adaa2a3fff53,4d093137dce4e5c278ff26d71b381159ffbc894c..4d093137dce4e5c278ff26d71b381159ffbc894c
--- 1/django/mit/__init__.py
--- 2/__init__.py
+++ b/django/mit/__init__.py
@@@ -1,15 -1,19 +1,19 @@@
+ import os
  import subprocess
+ import tempfile
  import ldap
  import ldap.filter
  
- from django.contrib.auth.middleware import RemoteUserMiddleware
  from django.contrib.auth.backends import RemoteUserBackend
+ from django.contrib.auth.middleware import RemoteUserMiddleware
  from django.contrib.auth.views import login
  from django.contrib.auth import REDIRECT_FIELD_NAME
  from django.http import HttpResponseRedirect
  from django.contrib import auth
  from django.core.exceptions import ObjectDoesNotExist
- import settings
+ from django.core.validators import URLValidator, ValidationError
+ 
+ from django.conf import settings
  
  def zephyr(msg, clas='message', instance='log', rcpt='nobody',):
      proc = subprocess.Popen(
@@@ -18,6 -22,53 +22,53 @@@
      )
      proc.communicate(msg)
  
+ def UrlOrAfsValidator(value):
+     if value.startswith('/mit/') or value.startswith('/afs/'):
+         return
+     else:
+         try:
+             URLValidator()(value)
+         except ValidationError:
+             raise ValidationError('Provide a valid URL or AFS path')
+ 
+ def pag_check_helper(fn, args, aklog=False, ccname=None, **kwargs):
+     if 'executable' in kwargs:
+         raise ValueError('"executable" not supported with pag_check_*')
+ 
+     env = None
+     if 'env' in kwargs:
+         env = kwargs['env']
+         del kwargs['env']
+     if ccname:
+         if env is not None:
+             env = dict(env)
+         else:
+             env = dict(os.environ)
+         env['KRB5CCNAME'] = ccname
+ 
+     pagsh_cmd = 'exec "$@"'
+     if aklog: pagsh_cmd = "aklog && " + pagsh_cmd
+     args = ['pagsh', '-c', pagsh_cmd, 'exec', ] + args
+ 
+     return fn(args, env=env, **kwargs)
+ 
+ def pag_check_call(args, **kwargs):
+     return pag_check_helper(subprocess.check_call, args, **kwargs)
+ def pag_check_output(args, **kwargs):
+     return pag_check_helper(subprocess.check_output, args, **kwargs)
+ 
+ def kinit(keytab=None, principal=None, autodelete=True, ):
+     if not keytab:
+         keytab = settings.KRB_KEYTAB
+     if not principal:
+         principal = settings.KRB_PRINCIPAL
+     assert keytab and principal
+     fd = tempfile.NamedTemporaryFile(mode='rb', prefix="krb5cc_djmit_", delete=autodelete, )
+     env = dict(KRB5CCNAME=fd.name)
+     kinit_cmd = ['kinit', '-k', '-t', keytab, principal, ]
+     subprocess.check_call(kinit_cmd, env=env)
+     return fd
+ 
  class ScriptsRemoteUserMiddleware(RemoteUserMiddleware):
      header = 'SSL_CLIENT_S_DN_Email'
  
@@@ -31,7 -82,7 +82,7 @@@ class ScriptsRemoteUserBackend(RemoteUs
              return username
      def configure_user(self, user, ):
          username = user.username
-         user.password = "ScriptsSSLAuth"
+         user.set_unusable_password()
          con = ldap.open('ldap-too.mit.edu')
          con.simple_bind_s("", "")
          dn = "dc=mit,dc=edu"
@@@ -41,7 -92,10 +92,10 @@@
          if len(result) == 1:
              user.first_name = result[0][1]['givenName'][0]
              user.last_name = result[0][1]['sn'][0]
-             user.email = result[0][1]['mail'][0]
+             try:
+                 user.email = result[0][1]['mail'][0]
+             except KeyError:
+                 user.email = username + '@mit.edu'
              try:
                  user.groups.add(auth.models.Group.objects.get(name='mit'))
              except ObjectDoesNotExist:
@@@ -55,9 -109,27 +109,27 @@@
          user.save()
          return user
  
+ def get_or_create_mit_user(username, ):
+     """
+     Given an MIT username, return a Django user object for them.
+     If necessary, create (and save) the Django user for them.
+     If the MIT user doesn't exist, raises ValueError.
+     """
+     user, created = auth.models.User.objects.get_or_create(username=username, )
+     if created:
+         backend = ScriptsRemoteUserBackend()
+         # Raises ValueError if the user doesn't exist
+         try:
+             return backend.configure_user(user), created
+         except ValueError:
+             user.delete()
+             raise
+     else:
+         return user, created
+ 
  def scripts_login(request, **kwargs):
      host = request.META['HTTP_HOST'].split(':')[0]
-     if host == 'localhost':
+     if host in ('localhost', '127.0.0.1'):
          return login(request, **kwargs)
      elif request.META['SERVER_PORT'] == '444':
          if request.user.is_authenticated():