Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
23adb48b90 | ||
|
|
5ac9c36546 | ||
|
|
c98032ebe8 | ||
|
|
d74db6bde5 | ||
|
|
ee94d3a6d3 |
No files matched your search
+46
-13
@@ -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
|
||||
|
||||
@@ -25,11 +25,19 @@ class IMAPUserAccount(object):
|
||||
else:
|
||||
IMAP_MBOX_REG[self.dir] = {}
|
||||
IMAP_MBOX_REG[self.dir][IMAP_ACC_CONN_NUM] = 0
|
||||
for m in conf.imap_auto_mbox:
|
||||
if m not in IMAP_MBOX_REG[self.dir].keys():
|
||||
for m in conf.imap_auto_mbox.keys():
|
||||
name = m
|
||||
if isinstance(m, unicode):
|
||||
m = m.encode('imap4-utf-7')
|
||||
IMAP_MBOX_REG[self.dir][m] = IMAPMailbox(os.path.join(self.dir, m))
|
||||
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)
|
||||
|
||||
@@ -37,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
|
||||
|
||||
@@ -54,7 +62,7 @@ class IMAPUserAccount(object):
|
||||
if path in os.listdir(self.dir):
|
||||
return self.create(path)
|
||||
else:
|
||||
raise imap4.NoSuchMailbox, path
|
||||
return None
|
||||
|
||||
def addMailbox(self, name, mbox = None):
|
||||
if mbox:
|
||||
@@ -71,18 +79,22 @@ class IMAPUserAccount(object):
|
||||
if subpath not in IMAP_MBOX_REG[self.dir].keys():
|
||||
try:
|
||||
IMAP_MBOX_REG[self.dir][subpath] = self._getMailbox(IMAP_HDELIM.join(paths[:accum]))
|
||||
IMAP_MBOX_REG[self.dir][subpath].subscribe()
|
||||
except imap4.MailboxCollision:
|
||||
pass
|
||||
IMAP_MBOX_REG[self.dir][subpath].hasChildren()
|
||||
IMAP_MBOX_REG[self.dir][pathspec] = self._getMailbox(pathspec)
|
||||
IMAP_MBOX_REG[self.dir][pathspec].hasNoChildren()
|
||||
IMAP_MBOX_REG[self.dir][pathspec].subscribe()
|
||||
return IMAP_MBOX_REG[self.dir][pathspec]
|
||||
|
||||
def delete(self, pathspec):
|
||||
if isinstance(pathspec, unicode):
|
||||
pathspec = pathspec.encode('imap4-utf-7')
|
||||
if pathspec in conf.imap_auto_mbox:
|
||||
if pathspec in conf.imap_auto_mbox.keys():
|
||||
raise imap4.MailboxException, pathspec
|
||||
if pathspec not in IMAP_MBOX_REG[self.dir].keys():
|
||||
raise imap4.MailboxException("No such mailbox")
|
||||
raise imap4.NoSuchMailbox, pathspec
|
||||
inferiors = self._inferiorNames(pathspec)
|
||||
if r'\Noselect' in IMAP_MBOX_REG[self.dir][pathspec].getFlags():
|
||||
# Check for hierarchically inferior mailboxes with this one
|
||||
@@ -98,7 +110,7 @@ class IMAPUserAccount(object):
|
||||
return True
|
||||
|
||||
def rename(self, oldname, newname):
|
||||
if oldname in conf.imap_auto_mbox:
|
||||
if oldname in conf.imap_auto_mbox.keys():
|
||||
raise imap4.MailboxException, oldname
|
||||
if isinstance(oldname, unicode):
|
||||
oldname = oldname.encode('imap4-utf-7')
|
||||
@@ -111,11 +123,15 @@ class IMAPUserAccount(object):
|
||||
if new in IMAP_MBOX_REG[self.dir].keys():
|
||||
raise imap4.MailboxCollision, new
|
||||
for (old, new) in inferiors:
|
||||
IMAP_MBOX_REG[self.dir][old]._stop_monitor()
|
||||
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)
|
||||
IMAP_MBOX_REG[self.dir][new].path_msg_info = os.path.join(self.dir, conf.imap_msg_info)
|
||||
IMAP_MBOX_REG[self.dir][new].path_mbox_info = os.path.join(self.dir, conf.imap_mbox_info)
|
||||
<<<<<<< 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
|
||||
|
||||
@@ -124,19 +140,27 @@ class IMAPUserAccount(object):
|
||||
name = name.encode('imap4-utf-7')
|
||||
if name in IMAP_MBOX_REG[self.dir].keys():
|
||||
IMAP_MBOX_REG[self.dir][name].subscribe()
|
||||
return True
|
||||
#raise imap4.NoSuchMailbox, name
|
||||
|
||||
def unsubscribe(self, name):
|
||||
if name in conf.imap_auto_mbox:
|
||||
raise imap4.MailboxException, name
|
||||
if name in conf.imap_auto_mbox.keys():
|
||||
return False
|
||||
# raise imap4.MailboxException, name
|
||||
if isinstance(name, unicode):
|
||||
name = name.encode('imap4-utf-7')
|
||||
if name in IMAP_MBOX_REG[self.dir].keys():
|
||||
IMAP_MBOX_REG[self.dir][name].unsubscribe()
|
||||
return True
|
||||
#raise imap4.NoSuchMailbox, name
|
||||
|
||||
def isSubscribed(self, name):
|
||||
if isinstance(name, unicode):
|
||||
name = name.encode('imap4-utf-7')
|
||||
if name in IMAP_MBOX_REG[self.dir].keys():
|
||||
return IMAP_MBOX_REG[self.dir][name].is_subscribed()
|
||||
else:
|
||||
raise imap4.NoSuchMailbox, name
|
||||
|
||||
def _inferiorNames(self, name):
|
||||
name_l = name.split(IMAP_HDELIM)
|
||||
@@ -283,6 +307,14 @@ class IMAPServerProtocol(imap4.IMAP4Server):
|
||||
self.sendPositiveResponse(tag, 'STATUS complete')
|
||||
def __ebStatus(self, failure, tag, box):
|
||||
self.sendBadResponse(tag, 'STATUS %s failed: %s' % (box, str(failure.value)))
|
||||
def _cbListWork(self, mailboxes, tag, sub, cmdName):
|
||||
for (name, box) in mailboxes:
|
||||
if not sub or self.account.isSubscribed(name):
|
||||
flags = box.getMboxFlags()
|
||||
delim = box.getHierarchicalDelimiter()
|
||||
resp = (imap4.DontQuoteMe(cmdName), map(imap4.DontQuoteMe, flags), delim, name.encode('imap4-utf-7'))
|
||||
self.sendUntaggedResponse(imap4.collapseNestedLists(resp))
|
||||
self.sendPositiveResponse(tag, '%s completed' % (cmdName,))
|
||||
|
||||
################################################################################
|
||||
|
||||
@@ -297,6 +329,7 @@ class SerpentIMAPFactory(protocol.Factory):
|
||||
cert = ssl.PrivateCertificate.loadPEM(tls_data)
|
||||
contextFactory = cert.options()
|
||||
p = IMAPServerProtocol(contextFactory = contextFactory)
|
||||
p.setTimeout(conf.imap_connection_timeout)
|
||||
if conf.tls:
|
||||
p.canStartTLS = True
|
||||
p.IDENT = '%s ready' % conf.SRVNAME
|
||||
|
||||
+12
-3
@@ -6,9 +6,10 @@ conf = Config()
|
||||
conf.VERSION = '0.1.0'
|
||||
conf.SRVNAME = 'Serpent'
|
||||
conf.srv_version = '%s %s' % (conf.SRVNAME, conf.VERSION)
|
||||
conf.imap_connection_timeout = 120
|
||||
conf.local_domains = ['dom.lan'] # Список доменов, для которых будет приниматься почта
|
||||
conf.tls = True
|
||||
conf.tls_pem = './serpent.pem'
|
||||
conf.tls_pem = u'./serpent.pem'
|
||||
conf.smtp_open_relay = False # Разрешить ли пересылку откуда угодно куда угодно
|
||||
conf.smtp_email_delim = '@'
|
||||
conf.smtp_header = '''from [{sender_ip}] (helo={sender_host})
|
||||
@@ -28,9 +29,17 @@ conf.smtp_email_tls_required = True
|
||||
|
||||
conf.imap_SENT = 'Sent'
|
||||
conf.imap_TRASH = 'Trash'
|
||||
conf.imap_subscribed = '.subscribed'
|
||||
conf.imap_JUNK = 'Junk'
|
||||
conf.imap_ARCHIVE = 'Archive'
|
||||
conf.imap_DRAFTS = 'Drafts'
|
||||
conf.imap_msg_info = 'msg_info.db'
|
||||
conf.imap_mbox_info = 'mbox_info.db'
|
||||
conf.imap_auto_mbox = ['INBOX', 'Sent', 'Trash']
|
||||
conf.imap_auto_mbox = {'INBOX': '\\INBOX',
|
||||
conf.imap_SENT: '\\Sent',
|
||||
conf.imap_TRASH: '\\Trash',
|
||||
conf.imap_JUNK: '\\Junk',
|
||||
conf.imap_ARCHIVE: '\\Archive',
|
||||
conf.imap_DRAFTS: '\\Drafts'
|
||||
}
|
||||
conf.imap_expunge_on_close = True
|
||||
conf.imap_check_new_interval = 10.0 # Период проверки новых сообщений в ящике
|
||||
+7
-4
@@ -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
|
||||
|
||||
@@ -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)))
|
||||
+14
-6
@@ -3,12 +3,20 @@ 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',
|
||||
'NOSELECT': '\\Noselect',
|
||||
'MARKED': '\\Marked',
|
||||
'UNMARKED': '\\Unmarked',
|
||||
'HASCHILDREN': '\\HasChildren',
|
||||
'HASNOCHILDREN': '\\HasNoChildren'
|
||||
}
|
||||
IMAP_HDELIM = '.'
|
||||
IMAP_ACC_CONN_NUM = '...ConnectionNumber...'
|
||||
|
||||
Reference in new issue
Block a user