Changeset 10522 for main/waeup.cas/trunk

Timestamp:

21 Aug 2013, 21:08:11 (11 years ago)

Author:

Henrik Bettermann

Message:

Be more verbose if credentials checking fails.

Location:

main/waeup.cas/trunk/waeup/cas

Files:

• authenticators.py (modified) (2 diffs)
• tests/test_authenticators.py (modified) (2 diffs)

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

@@ -193 +193 @@
             # Usernames in Moodle must not contain uppercase
             # letters even if extendedusernamechars is set True.
+            # Usernames in Moodle are case insensitive.
+            # In other words, Moodle changes usernames from
+            # uppercase to lowercase when you login.
             result = moodle.core_user_create_users([
                 {'username':username.lower(),
@@ -237 +240 @@
             if principal is None:
                 principal = proxy.check_student_credentials(username, password)
-            if principal is not None:
-                if principal['type'] == 'student':
-                    userdata = proxy.get_student_moodle_data(username)
-                    return self._create_user(username, userdata, moodle)
-                if principal['type'] == 'applicant':
-                    userdata = proxy.get_applicant_moodle_data(username)
-                    return self._create_user(username, userdata, moodle)
-        return (False, 'Invalid username or password or user not eligible.')
+            if principal is None:
+                return (False, 'Invalid username or password')
+            if principal['type'] == 'student':
+                userdata = proxy.get_student_moodle_data(username)
+                return self._create_user(username, userdata, moodle)
+            if principal['type'] == 'applicant':
+                userdata = proxy.get_applicant_moodle_data(username)
+                return self._create_user(username, userdata, moodle)
+            return (False, 'User not eligible')
+        return (False, 'Invalid username or password')
+

main/waeup.cas/trunk/waeup/cas/tests/test_authenticators.py

@@ -190 +190 @@
         if username == 'fault5' and password == 'biz':
             return {'type': 'applicant'}
+        if username == 'fault6' and password == 'biz':
+            return {'type': 'boss'}
         return None
 
@@ -351 +353 @@
         assert result1a == (True, '')
         result2s = auth.check_credentials('SCHOOL1-foo', 'bar')
-        assert result2s == (
-            False, 'Invalid username or password or user not eligible.')
+        assert result2s == (False, 'Invalid username or password')
         result3s = auth.check_credentials('SCHOOL2-bar', 'baz')
-        assert result3s == (
-            False, 'Invalid username or password or user not eligible.')
+        assert result3s == (False, 'Invalid username or password')
+        result8 = auth.check_credentials('SCHOOL1-fault6', 'biz')
+        assert result8 == (False, 'User not eligible')
 
         # exceptions are raised in the follwoing cases