...

mech_imap.py

@@ -9,7 +9,7 @@ from twisted.internet import protocol, ssl
 from twisted.mail import imap4
 
 from serpent.config import conf
-from serpent.imap.mailbox import IMAPMailbox
+from serpent.imap.mbox import ExtendedMaildir
 from serpent.misc import IMAP_HDELIM, IMAP_MBOX_REG, IMAP_ACC_CONN_NUM
 from shutil import rmtree, move
 
@@ -30,8 +30,14 @@ class IMAPUserAccount(object):
             if isinstance(m, unicode):
                 m = m.encode('imap4-utf-7')
             if m not in IMAP_MBOX_REG[self.dir].keys():
+<<<<<<< HEAD
+                if isinstance(m, unicode):
+                    m = m.encode('imap4-utf-7')
+                IMAP_MBOX_REG[self.dir][m] = ExtendedMaildir(os.path.join(self.dir, m))
+=======
                 IMAP_MBOX_REG[self.dir][m] = self.create(m)
                 IMAP_MBOX_REG[self.dir][m].setSpecial(conf.imap_auto_mbox[name])
+>>>>>>> refs/remotes/origin/sqlitedict
                 IMAP_MBOX_REG[self.dir][m]._start_monitor()
                 self.subscribe(m)
 
@@ -39,7 +45,7 @@ class IMAPUserAccount(object):
         if isinstance(path, unicode):
             path = path.encode('imap4-utf-7')
         fullPath = os.path.join(self.dir, path)
-        mbox = IMAPMailbox(fullPath)
+        mbox = ExtendedMaildir(fullPath)
         mbox._start_monitor()
         return mbox
 
@@ -121,8 +127,11 @@ class IMAPUserAccount(object):
             move(os.path.join(self.dir, old), os.path.join(self.dir, new))
             IMAP_MBOX_REG[self.dir][new] = IMAP_MBOX_REG[self.dir][old]
             IMAP_MBOX_REG[self.dir][new].path = os.path.join(self.dir, new)
+<<<<<<< HEAD
+=======
             IMAP_MBOX_REG[self.dir][new].open_flags()
             IMAP_MBOX_REG[self.dir][new]._start_monitor()
+>>>>>>> refs/remotes/origin/sqlitedict
             del IMAP_MBOX_REG[self.dir][old]
         return True
 

serpent/config.py

@@ -6,7 +6,7 @@ conf = Config()
 conf.VERSION = '0.1.0'
 conf.SRVNAME = 'Serpent'
 conf.srv_version = '%s %s' % (conf.SRVNAME, conf.VERSION)
-conf.imap_connection_timeout = 60 * 30
+conf.imap_connection_timeout = 120
 conf.local_domains = ['dom.lan']    # Список доменов, для которых будет приниматься почта
 conf.tls = True
 conf.tls_pem = u'./serpent.pem'

serpent/dataio.py

@@ -60,16 +60,19 @@ class SmtpFileStore(object):
 
 class MailDirStore(object):
     def __init__(self):
-        from serpent.imap import mailbox
-        self.mbox = mailbox
+        from serpent.imap import mbox
+        from mailbox import MaildirMessage
+        self.mbox = mbox
+        self.mbox.MaildirMessage = MaildirMessage
     def deliver(self, user, message):
         mdir = os.path.join(conf.app_dir, conf.maildir_user_path % user)
         if not os.path.exists(mdir):
             os.makedirs(mdir)
         inbox = os.path.join(mdir, 'INBOX')
-        mailbox = self.mbox.IMAPMailbox(inbox)
+        mailbox = self.mbox.ExtendedMaildir(inbox)
+        msg = self.mbox.MaildirMessage(message)
         try:
-            mailbox.addMessage(message, [IMAP_FLAGS['RECENT']])
+            mailbox.add(msg, [])
             return True
         except:
             raise

serpent/imap/mailbox.py

@@ -1,371 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from twisted.mail import maildir, imap4
-from twisted.mail.smtp import rfc822date
-from twisted.internet import inotify
-from twisted.python import filepath
-
-from zope.interface import implements
-from threading import Thread
-
-import random
-import email
-
-from StringIO import StringIO
-import os
-
-from serpent.config import conf
-from serpent import misc
-
-from sqlitedict import SqliteDict
-
-class LoopingTask(Thread):
-    def __init__(self, func, event, interval):
-        Thread.__init__(self)
-        self.func = func
-        self.interval = interval
-        self.stopped = event
-
-    def run(self):
-        while not self.stopped.wait(self.interval):
-            self.func()
-
-class SerpentAppendMessageTask(maildir._MaildirMailboxAppendMessageTask):
-    
-    def moveFileToNew(self):
-        while True:
-            newname = os.path.join(self.mbox.path, "new", maildir._generateMaildirName())
-            try:
-                self.osrename(self.tmpname, newname)
-                break
-            except OSError, (err, _):
-                import errno
-                # if the newname exists, retry with a new newname.
-                if err != errno.EEXIST:
-                    self.fail()
-                    newname = None
-                    break
-        if newname is not None:
-            self.mbox.lastadded = newname
-            self.defer.callback(None)
-            self.defer = None
-
-
-
-class ExtendedMaildir(maildir.MaildirMailbox):
-    def __iter__(self):
-        return iter(self.list)
-
-    def __getitem__(self, i):
-        return self.list[i]
-
-class IMAPMailbox(ExtendedMaildir):
-    implements(imap4.IMailbox, imap4.ICloseableMailbox)
-    
-    AppendFactory = SerpentAppendMessageTask
-
-    def __init__(self, path):
-        maildir.initializeMaildir(path)
-        self.listeners = []
-        self.path = path
-        self.open_flags()
-        self.lastadded = None
-        self.__check_flags_()
-    
-    def open_flags(self):
-        self.msg_info = SqliteDict(os.path.join(self.path, conf.imap_msg_info))
-        self.mbox_info = SqliteDict(os.path.join(self.path, conf.imap_mbox_info))
-
-    def _start_monitor(self):
-        self.notifier = inotify.INotify()
-        self.notifier.startReading()
-        self.notifier.watch(filepath.FilePath(os.path.join(self.path, 'new')),
-                   callbacks=[self._new_files])
-        self.notifier.watch(filepath.FilePath(os.path.join(self.path,'cur')),
-                   callbacks=[self._new_files])
-
-    def _stop_monitor(self):
-        self.notifier.stopReading()
-        self.notifier.loseConnection()
-
-    def _new_files(self, wo, path, code):
-        if code == inotify.IN_MOVED_TO or code == inotify.IN_DELETE:
-            for l in self.listeners:
-                l.newMessages(self.getMessageCount(), self.getRecentCount())
-
-    def __check_flags_(self):
-        if 'subscribed' not in self.mbox_info.keys(): self.mbox_info['subscribed'] = False
-        if 'flags' not in self.mbox_info.keys(): self.mbox_info['flags'] = []
-        if 'special' not in self.mbox_info.keys(): self.mbox_info['special'] = ''
-        if 'uidvalidity' not in self.mbox_info.keys(): self.mbox_info['uidvalidity'] = random.randint(0, 2**32)
-        if 'uidnext' not in self.mbox_info.keys(): self.mbox_info['uidnext'] = 1
-        #self.mbox_info.commit(blocking=False)    # XXX
-        l = [l for l in self.__msg_list_()]
-        for i in l:
-            fn = i.split('/')[-1]
-            if fn not in self.msg_info.keys():
-                val1 = {'uid': self.getUIDNext()}
-                if i.split('/')[-2] == 'new':
-                    val1['flags'] = []
-                else:
-                    val1['flags'] = [misc.IMAP_FLAGS['SEEN']]
-                self.msg_info[fn] = val1
-        #self.msg_info.commit(blocking=False)    # XXX
-
-    def subscribe(self):
-        self.mbox_info['subscribed'] = True
-        #self.mbox_info.commit(blocking=False)    # XXX
-
-    def unsubscribe(self):
-        self.mbox_info['subscribed'] = False
-        #self.mbox_info.commit(blocking=False)    # XXX
-    
-    def is_subscribed(self):
-        return self.mbox_info['subscribed']
-
-    def __count_flagged_msgs_(self, flag):
-        val1 = [0 for fn in self.msg_info.keys() if flag in self.msg_info[fn]['flags']]
-        return len(val1)
-    
-    def getHierarchicalDelimiter(self):
-        return misc.IMAP_HDELIM
-
-    def setSpecial(self, special):
-        self.mbox_info['special'] = special
-        #self.mbox_info.commit(blocking=False)    # XXX
-
-    def getFlags(self):
-        return sorted(misc.IMAP_FLAGS.values())
-    
-    def getMboxFlags(self):
-        f = list(self.mbox_info['flags'])
-        if self.mbox_info['special'] != '': f.append(self.mbox_info['special'])
-        return f
-    
-    def addFlag(self, flag):
-        self.mbox_info['flags'] = list(set(self.mbox_info['flags']).union([flag]))
-        #self.mbox_info.commit(blocking=False)    # XXX
-    
-    def removeFlag(self, flag):
-        self.mbox_info['flags'] = list(set(self.mbox_info['flags']).difference([flag]))
-        #self.mbox_info.commit(blocking=False)    # XXX
-    
-    def hasChildren(self):
-        flags = self.getFlags()
-        if misc.MBOX_FLAGS['HASCHILDREN'] not in flags:
-            self.addFlag(misc.MBOX_FLAGS['HASCHILDREN'])
-        if misc.MBOX_FLAGS['HASNOCHILDREN'] in flags:
-            self.removeFlag(misc.MBOX_FLAGS['HASNOCHILDREN'])
-    def hasNoChildren(self):
-        flags = self.getFlags()
-        if misc.MBOX_FLAGS['HASNOCHILDREN'] not in flags:
-            self.addFlag(misc.MBOX_FLAGS['HASNOCHILDREN'])
-        if misc.MBOX_FLAGS['HASCHILDREN'] in flags:
-            self.removeFlag(misc.MBOX_FLAGS['HASCHILDREN'])
-
-    def getMessageCount(self):
-        val1 = [0 for fn in self.msg_info.keys() if misc.IMAP_FLAGS['DELETED'] not in self.msg_info[fn]['flags']]
-        return len(val1)
-
-    def getRecentCount(self):
-        c = 0
-        for fn in self.msg_info.keys():
-            if misc.IMAP_FLAGS['RECENT'] in self.msg_info[fn]['flags']:
-                c += 1
-                info = self.msg_info[fn]
-                info['flags'] = set(info['flags']).difference(set([misc.IMAP_FLAGS['RECENT']]))
-                self.msg_info[fn] = info
-        #self.msg_info.commit(blocking=False)    # XXX
-        return c
-    
-    def getUnseenCount(self):
-        return self.getMessageCount() - self.__count_flagged_msgs_(misc.IMAP_FLAGS['SEEN'])
-
-    def isWriteable(self):
-        return True
-
-    def getUIDValidity(self):
-        return self.mbox_info['uidvalidity']
-    
-    def getUIDNext(self):
-        un = self.mbox_info['uidnext']
-        self.mbox_info['uidnext'] += 1
-        #self.mbox_info.commit(blocking=False)    # XXX
-        return un
-    
-    def getUID(self, num):
-        return num
-
-    def addMessage(self, message, flags = (), date = None):
-        return self.appendMessage(message).addCallback(self._cbAddMessage, flags)
-    
-    def _cbAddMessage(self, obj, flags):
-        path = self.lastadded
-        self.lastadded = None
-        fn = path.split('/')[-1]
-        self.msg_info[fn] = {'uid': self.getUIDNext(), 'flags': flags}
-        #self.msg_info.commit(blocking=False)    # XXX
-        if misc.IMAP_FLAGS['SEEN'] in flags and path.split('/')[-2] != 'cur':
-            new_path = os.path.join(self.path, 'cur', fn)
-            os.rename(path, new_path)
-
-    def __msg_list_(self):
-        a = []
-        for m in os.listdir(os.path.join(self.path, 'new')):
-            a.append(os.path.join(self.path, 'new', m))
-        for m in os.listdir(os.path.join(self.path, 'cur')):
-            a.append(os.path.join(self.path, 'cur', m))
-        return a
-
-    def _seqMessageSetToSeqDict(self, messageSet):
-        if not messageSet.last:
-            messageSet.last = self.getMessageCount()
-
-        seqMap = {}
-        msgs = self.__msg_list_()
-        for messageNum in messageSet:
-            if messageNum > 0 and messageNum <= self.getMessageCount():
-                seqMap[messageNum] = msgs[messageNum - 1]
-        return seqMap
-
-    def fetch(self, messages, uid):
-        return [[seq, MaildirMessage(seq,
-                                     file(filename, 'rb').read(),
-                                     self.msg_info[filename.split('/')[-1]]['flags'],
-                                     rfc822date())]
-                for seq, filename in self.__fetch_(messages, uid).iteritems()]
-    def __fetch_(self, messages, uid):
-        if uid:
-            messagesToFetch = {}
-            if not messages.last:
-                messages.last = self.mbox_info['uidnext']
-            fn_uid = dict((fn, self.msg_info[fn]['uid']) for fn in self.msg_info.keys())
-            for uid in messages:
-                if uid in fn_uid.values():
-                    for name, _id in fn_uid.iteritems():
-                        if uid == _id:
-                            if os.path.exists(os.path.join(self.path,'new', name)):
-                                messagesToFetch[uid] = os.path.join(self.path,'new', name)
-                            elif os.path.exists(os.path.join(self.path,'cur', name)):
-                                messagesToFetch[uid] = os.path.join(self.path,'cur', name)
-        else:
-            messagesToFetch = self._seqMessageSetToSeqDict(messages)
-        return messagesToFetch
-    def store(self, messages, flags, mode, uid):
-        d = {}
-        for _id, path in self.__fetch_(messages, uid).iteritems():
-            filename = path.split('/')[-1]
-            if mode < 0:
-                old_f = self.msg_info[filename]
-                old_f['flags'] = list(set(old_f['flags']).difference(set(flags)))
-                self.msg_info[filename] = old_f
-                if misc.IMAP_FLAGS['SEEN'] in flags and path.split('/')[-2] != 'new':
-                    new_path = os.path.join(self.path, 'new', filename)
-                    os.rename(path, new_path)
-            elif mode == 0:
-                old_f = self.msg_info[filename]
-                old_f['flags'] = flags
-                self.msg_info[filename] = old_f
-            elif mode > 0:
-                old_f = self.msg_info[filename]
-                old_f['flags'] = list(set(old_f['flags']).union(set(flags)))
-                self.msg_info[filename] = old_f
-                if misc.IMAP_FLAGS['SEEN'] in flags and path.split('/')[-2] != 'cur':
-                    new_path = os.path.join(self.path, 'cur', filename)
-                    os.rename(path, new_path)
-            d[_id] = self.msg_info[filename]['flags']
-        #self.msg_info.commit(blocking=False)    # XXX
-        return d
-    
-    def expunge(self):
-        uids = []
-        for path in self.__msg_list_():
-            fn = path.split('/')[-1]
-            if fn not in self.msg_info.keys():
-                continue
-            uid = self.msg_info[fn]['uid']
-            if misc.IMAP_FLAGS['DELETED'] in self.msg_info[fn]['flags']:
-                os.remove(path)
-                del self.msg_info[fn]
-                uids.append(uid)
-        #self.msg_info.commit(blocking=False)    # XXX
-        return uids
-    
-    def addListener(self, listener):
-        self.listeners.append(listener)
-        return True
-
-    def removeListener(self, listener):
-        self.listeners.remove(listener)
-        return True
-    
-    def requestStatus(self, names):
-        return imap4.statusRequestHelper(self, names)
-    
-    def destroy(self):
-        pass
-
-    def close(self):
-        print('!!! %s - %d !!!' % (self.path, len(self.listeners)))
-        if len(self.listeners) == 0:
-            self._stop_monitor() 
-            if conf.imap_expunge_on_close:
-                self.expunge()
-            self.msg_info.commit(blocking=False)
-            self.mbox_info.commit(blocking = False)
-            self.msg_info.close()
-            self.mbox_info.close()
-
-class MaildirMessagePart(object):
-    implements(imap4.IMessagePart)
-    
-    def __init__(self, message):
-        self.message = message
-        self.data = str(message)
-    
-    def getHeaders(self, negate, *names):
-        if not names:
-            names = self.message.keys()
-
-        headers = {}
-        if negate:
-            for header in self.message.keys():
-                if header.upper() not in names:
-                    headers[header.lower()] = self.message.get(header, '')
-        else:
-            for name in names:
-                headers[name.lower()] = self.message.get(name, '')
-
-        return headers
-
-    def getBodyFile(self):
-        return StringIO(self.message.get_payload())
-    
-    def getSize(self):
-        return len(self.data)
-    
-    def isMultipart(self):
-        return self.message.is_multipart()
-    
-    def getSubPart(self, part):
-        return MaildirMessagePart(self.message.get_payload(part))
-
-class MaildirMessage(MaildirMessagePart):
-    implements(imap4.IMessage)
-
-    def __init__(self, uid, message, flags, date):
-        MaildirMessagePart.__init__(self, message)
-        self.uid = uid
-        self.message = email.message_from_string(message)
-        self.flags = flags
-        self.date = date
-    
-
-    def getUID(self):
-        return self.uid
-
-    def getFlags(self):
-        return self.flags
-
-    def getInternalDate(self):
-        return self.date

serpent/imap/mbox.py

@@ -0,0 +1,37 @@
+from mailbox import Maildir
+import os
+
+class ExtendedMaildir(Maildir):
+    def set_flags(self, key, flags):
+        sflags = sorted(flags)
+        if sflags == self.get_flags(key): return True
+        subpath = self._lookup(key)
+        info = '2,' + ''.join(sflags)
+        oldpath = os.path.join(self._path, subpath)
+        newsubdir = os.path.split(subpath)[0]
+        newname = key + self.colon + info
+        if 'S' in sflags and newsubdir == 'new':
+            newsubdir = 'cur'
+        if 'S' not in sflags and newsubdir == 'cur':
+            newsubdir = 'new'
+        newpath = os.path.join(self._path, newsubdir, newname)
+        if hasattr(os, 'link'):
+            os.link(oldpath, newpath)
+            os.remove(oldpath)
+        else:
+            os.rename(oldpath, newpath)
+        self._toc[key] = os.path.join(newsubdir, newname)
+    def get_flags(self, key):
+        subpath = self._lookup(key)
+        _, name = os.path.split(subpath)
+        info = name.split(self.colon)[-1]
+        if info.startswith('2,'):
+            return info[2:]
+        else:
+            return ''
+    def add_flag(self, key, flag):
+        self.set_flags(key, ''.join(set(self.get_flags(key)) | set(flag)))
+    def remove_flag(self, key, flag):
+        if flag not in self.get_flags(key): return True
+        if self.get_flags(key):
+            self.set_flags(key, ''.join(set(self.get_flags(key)) - set(flag)))

serpent/misc.py

@@ -3,12 +3,12 @@ MSG_ACTIVE = 0
 MSG_FROZEN = 1
 
 IMAP_FLAGS = {
-    'SEEN':     '\\Seen',
-    'FLAGGED':  '\\Flagged',
-    'ANSWERED': '\\Answered',
-    'RECENT':   '\\Recent',
-    'DELETED':  '\\Deleted',
-    'DRAFT':    '\\Draft'    
+    'S':     '\\Seen',
+    'F':  '\\Flagged',
+    'P': '\\Passed',
+    'R': '\\Replied',
+    'T':  '\\Trashed',
+    'D':    '\\Draft'    
     }
 MBOX_FLAGS = {
     'NOINFERIORS': '\\Noinferiors',
@@ -19,5 +19,5 @@ MBOX_FLAGS = {
     'HASNOCHILDREN': '\\HasNoChildren'
     }
 IMAP_HDELIM = '.'
-IMAP_ACC_CONN_NUM = '...ConnectionUUID...'
+IMAP_ACC_CONN_NUM = '...ConnectionNumber...'
 IMAP_MBOX_REG = {}