Changeset 10523 for main/waeup.cas/trunk/waeup/cas/authenticators.py

Timestamp:

22 Aug 2013, 06:52:16 (11 years ago)

Author:

Henrik Bettermann

Message:

Handling school markers in Moodle is a nightmare. We should think about giving up the option of handling several schools with only one Moodle instance.

File:

• main/waeup.cas/trunk/waeup/cas/authenticators.py (modified) (3 diffs)

main/waeup.cas/trunk/waeup/cas/authenticators.py

@@ -159 +159 @@
         """
         for backend_name, backend in self.backends.items():
-            if not re.match(backend['marker'], username):
-                continue
-            # remove school marker
-            username = RE_SCHOOL_MARKER.sub('', username)
+            if backend['marker']:
+                if not re.match(backend['marker'], username):
+                    continue
+                # remove school marker
+                username = RE_SCHOOL_MARKER.sub('', username)
             proxy = xmlrpclib.ServerProxy(
                 backend['url'], allow_none=True)
@@ -204 +205 @@
         except xmlrpclib.Fault:
             faultstring = sys.exc_info()[1].faultString
+            if 'Email address already exists' in faultstring:
+                return (False,
+                    'Another Moodle user is using the same email address.'
+                    ' Email addresses can\'t be used twice in Moodle.')
             if not 'Username already exists' in faultstring:
                 return (False, faultstring)
@@ -229 +234 @@
         """
         for backend_name, backend in self.backends.items():
-            if not re.match(backend['marker'], username):
-                continue
-            # remove school marker
-            username = RE_SCHOOL_MARKER.sub('', username)
+            if backend['marker']:
+                if not re.match(backend['marker'], username):
+                    continue
+                # remove school marker
+                kofa_username = RE_SCHOOL_MARKER.sub('', username)
+            else:
+                kofa_username = username
             proxy = xmlrpclib.ServerProxy(
                 backend['url'], allow_none=True)
             moodle = xmlrpclib.ServerProxy(
                 backend['moodle_url'], allow_none=True)
-            principal = proxy.check_applicant_credentials(username, password)
+            principal = proxy.check_applicant_credentials(kofa_username, password)
             if principal is None:
-                principal = proxy.check_student_credentials(username, password)
+                principal = proxy.check_student_credentials(kofa_username, password)
             if principal is None:
                 return (False, 'Invalid username or password')
             if principal['type'] == 'student':
-                userdata = proxy.get_student_moodle_data(username)
+                userdata = proxy.get_student_moodle_data(kofa_username)
                 return self._create_user(username, userdata, moodle)
             if principal['type'] == 'applicant':
-                userdata = proxy.get_applicant_moodle_data(username)
+                userdata = proxy.get_applicant_moodle_data(kofa_username)
                 return self._create_user(username, userdata, moodle)
             return (False, 'User not eligible')