Changeset 10506 for main/waeup.cas/trunk/waeup/cas

Timestamp:

17 Aug 2013, 11:55:00 (11 years ago)

Author:

uli

Message:

Also ask for applicant credentials when querying Kofa servers.

Location:

main/waeup.cas/trunk/waeup/cas

Files:

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

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

@@ -164 +164 @@
             proxy = xmlrpclib.ServerProxy(
                 backend['url'], allow_none=True)
-            valid = proxy.check_credentials(username, password)
+            valid = proxy.check_applicant_credentials(username, password)
+            if valid is None:
+                valid = proxy.check_student_credentials(username, password)
             if valid is not None:
                 return (True, '')

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

@@ -134 +134 @@
         kw.update(allow_none=True)
         SimpleXMLRPCServer.__init__(self, *args, **kw)
-        self.register_function(self._check_credentials, 'check_credentials')
+        self.register_function(
+            self._check_credentials, 'check_applicant_credentials')
+        self.register_function(
+            self._check_credentials, 'check_student_credentials')
 
     def _check_credentials(self, username, password):
@@ -173 +176 @@
         # make sure the local fake kofa works
         proxy = xmlrpclib.ServerProxy("http://localhost:6666", allow_none=True)
-        result = proxy.check_credentials('bird', 'bebop')
+        result = proxy.check_student_credentials('bird', 'bebop')
+        assert result == {
+            'description': 'Mr. Charles Parker',
+            'email': 'bird@gods.net',
+            'id': 'bird'}
+        result = proxy.check_applicant_credentials('bird', 'bebop')
         assert result == {
             'description': 'Mr. Charles Parker',