[CalendarServer-changes] [7071] CalendarServer/trunk/calendarserver/platform/darwin/od

[source_changes at macosforge.org]

Revision: 7071
          http://trac.macosforge.org/projects/calendarserver/changeset/7071
Author:   sagen at apple.com
Date:     2011-02-23 11:19:34 -0800 (Wed, 23 Feb 2011)
Log Message:
-----------
Fix error handling for case where we try to auth a missing directory record.

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/platform/darwin/od/opendirectory.py
    CalendarServer/trunk/calendarserver/platform/darwin/od/test/test_opendirectory.py

Modified: CalendarServer/trunk/calendarserver/platform/darwin/od/opendirectory.py
===================================================================
--- CalendarServer/trunk/calendarserver/platform/darwin/od/opendirectory.py	2011-02-23 18:11:24 UTC (rev 7070)
+++ CalendarServer/trunk/calendarserver/platform/darwin/od/opendirectory.py	2011-02-23 19:19:34 UTC (rev 7071)
@@ -308,5 +308,4 @@
     """
     Exceptions from DirectoryServices errors.
     """
-    def __init__(self, error):
-        self.message = (str(error), error.code())
+    pass

Modified: CalendarServer/trunk/calendarserver/platform/darwin/od/test/test_opendirectory.py
===================================================================
--- CalendarServer/trunk/calendarserver/platform/darwin/od/test/test_opendirectory.py	2011-02-23 18:11:24 UTC (rev 7070)
+++ CalendarServer/trunk/calendarserver/platform/darwin/od/test/test_opendirectory.py	2011-02-23 19:19:34 UTC (rev 7071)
@@ -768,6 +768,38 @@
                 user, challenge, response, method)
             self.assertTrue(result)
 
+        def test_digestAuth_master_wrong_password(self):
+            directory = opendirectory.odInit("/Search")
+
+            user = "odtestamanda"
+            password = "wrong"
+            node = "/LDAPv3/127.0.0.1"
+            uri = "principals/users/odtestamanda"
+            method = "PROPFIND"
+
+            challenge, response = getChallengeResponse(user, password, node,
+                uri, method)
+
+            self.assertRaises(opendirectory.ODError,
+                opendirectory.authenticateUserDigest,
+                directory, node, user, challenge, response, method)
+
+        def test_digestAuth_master_missing_record(self):
+            directory = opendirectory.odInit("/Search")
+
+            user = "missingperson"
+            password = "wrong"
+            node = "/LDAPv3/127.0.0.1"
+            uri = "principals/users/odtestamanda"
+            method = "PROPFIND"
+
+            challenge, response = getChallengeResponse(user, password, node,
+                uri, method)
+
+            self.assertRaises(opendirectory.ODError,
+                opendirectory.authenticateUserDigest,
+                directory, node, user, challenge, response, method)
+
         def test_digestAuth_local(self):
             directory = opendirectory.odInit("/Search")
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110223/0431e495/attachment.html>