Validate constitution_url (ASA-#76)

[Scripts/git/.git] / __init__.py

diff --git a/__init__.py b/__init__.py
index 725d660b713858074dd409407f40da558f02df7f..62ec848eea86c20692bfbdd13bf0bafa15b4a54d 100644 (file)
--- a/__init__.py
+++ b/__init__.py
@@ -9,6 +9,8 @@ from django.contrib.auth import REDIRECT_FIELD_NAME
 from django.http import HttpResponseRedirect
 from django.contrib import auth
 from django.core.exceptions import ObjectDoesNotExist
+from django.core.validators import URLValidator, ValidationError
+
 import settings
 
 def zephyr(msg, clas='message', instance='log', rcpt='nobody',):
@@ -18,6 +20,15 @@ def zephyr(msg, clas='message', instance='log', rcpt='nobody',):
     )
     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')
+
 class ScriptsRemoteUserMiddleware(RemoteUserMiddleware):
     header = 'SSL_CLIENT_S_DN_Email'
 
@@ -41,7 +52,10 @@ class ScriptsRemoteUserBackend(RemoteUserBackend):
         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: