Ticket #16376: python-managesieve-0.3-darkness.patch

managesieve.py

@@ -9 +9 @@
 Ulrich Eck <ueck@net-labs.de> April 2001
 """
 
-import binascii, re, socket, time, random, sys
+import binascii, re, socket, time, random, sys, base64
 
 __all__ = [ 'MANAGESIEVE', 'SIEVE_PORT', 'OK', 'NO', 'BYE', 'Debug']
 
-from imaplib import _log, _mesg
+# XXX darky -- these are now in an IMAP4 class, and I don't think we
+# should be using them.
+#from imaplib import _log, _mesg
+
+import logging
+log = logging.getLogger("managesieve")
+def _log(message):
+    log.debug(message)
+_mesg = _log
 
 Debug = 0
 CRLF = '\r\n'
@@ -135 +143 @@
 
 
     def _parse_capabilities(self, lines):
+        # XXX darky: seeing the STARTTLS cap makes managesieve barf
+        # because 'data' (in the below unpack) has nothing to unpack.
+        # Fix up lines for this.
+        for pair in lines:
+            if len(pair) == 1:
+                pair.append("")
+            assert len(pair) == 2
         for typ, data in lines:
             if __debug__:
                 if self.debug >= 3:
@@ -363 +378 @@
         """ Login to the Sieve server using mechanism LOGIN. """
         return self.authenticate('LOGIN', user, password)
 
+    def auth_plain(self, auth, user, password):
+        authenticationData = "%s\0%s\0%s" % (auth, user, password)
+        authenticationData = base64.encodestring(authenticationData)
+        authenticationData = authenticationData.replace("\n", "")
+        typ, data = self._command("AUTHENTICATE", sieve_name("PLAIN"),
+                                  '"%s"' % (authenticationData,))
+        if typ == 'OK':
+            self.state = 'AUTH'
+        return typ
 
     def logout(self):
         """Terminate connection to server."""