Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7318e52b94 | ||
|
|
f2a43a948a | ||
|
|
de41f90943 | ||
|
|
f36515f233 | ||
|
|
7423d4941d | ||
|
|
44182ddd45 | ||
|
|
9956b94649 |
No files matched your search
@@ -6,7 +6,7 @@ from twisted.python import failure
|
||||
from twisted.internet import reactor, defer
|
||||
from twisted.internet.task import LoopingCall
|
||||
|
||||
from zope.interface import implements
|
||||
from zope.interface import implementer
|
||||
|
||||
from mech_smtp import SerpentSMTPFactory, smtp_portal
|
||||
from mech_imap import SerpentIMAPFactory, imap_portal
|
||||
@@ -14,10 +14,10 @@ from serpent.usrpwd import dbs
|
||||
from serpent.queue import squeue
|
||||
from serpent.config import conf
|
||||
|
||||
@implementer(ICredentialsChecker)
|
||||
class CredChecker(object):
|
||||
'''Класс проверки данных авторизации.
|
||||
Параметром в конструктор передаётся список (list()) объектов баз пользователей.'''
|
||||
implements(ICredentialsChecker)
|
||||
credentialInterfaces = (credentials.IUsernamePassword,
|
||||
credentials.IUsernameHashedPassword)
|
||||
|
||||
|
||||
+30
-32
@@ -2,20 +2,19 @@
|
||||
|
||||
import os
|
||||
|
||||
from zope.interface import implements
|
||||
from zope.interface import implementer
|
||||
|
||||
from twisted.cred import portal
|
||||
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.mailbox import ExtendedMaildir
|
||||
from serpent.misc import IMAP_HDELIM, IMAP_MBOX_REG, IMAP_ACC_CONN_NUM
|
||||
from shutil import rmtree, move
|
||||
|
||||
@implementer(imap4.IAccount)
|
||||
class IMAPUserAccount(object):
|
||||
implements(imap4.IAccount)
|
||||
|
||||
def __init__(self, mdir):
|
||||
if not os.path.exists(mdir):
|
||||
os.makedirs(mdir)
|
||||
@@ -27,17 +26,17 @@ class IMAPUserAccount(object):
|
||||
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():
|
||||
if isinstance(m, unicode):
|
||||
if isinstance(m, str):
|
||||
m = m.encode('imap4-utf-7')
|
||||
IMAP_MBOX_REG[self.dir][m] = IMAPMailbox(os.path.join(self.dir, m))
|
||||
IMAP_MBOX_REG[self.dir][m] = ExtendedMaildir(os.path.join(self.dir, m))
|
||||
IMAP_MBOX_REG[self.dir][m]._start_monitor()
|
||||
self.subscribe(m)
|
||||
|
||||
def _getMailbox(self, path):
|
||||
if isinstance(path, unicode):
|
||||
if isinstance(path, str):
|
||||
path = path.encode('imap4-utf-7')
|
||||
fullPath = os.path.join(self.dir, path)
|
||||
mbox = IMAPMailbox(fullPath)
|
||||
mbox = ExtendedMaildir(fullPath)
|
||||
mbox._start_monitor()
|
||||
return mbox
|
||||
|
||||
@@ -46,7 +45,7 @@ class IMAPUserAccount(object):
|
||||
yield box.decode('imap4-utf-7'), self.create(box)
|
||||
|
||||
def select(self, path, rw=False):
|
||||
if isinstance(path, unicode):
|
||||
if isinstance(path, str):
|
||||
path = path.encode('imap4-utf-7')
|
||||
if path in IMAP_MBOX_REG[self.dir].keys():
|
||||
return IMAP_MBOX_REG[self.dir][path]
|
||||
@@ -54,7 +53,7 @@ class IMAPUserAccount(object):
|
||||
if path in os.listdir(self.dir):
|
||||
return self.create(path)
|
||||
else:
|
||||
raise imap4.NoSuchMailbox, path
|
||||
raise imap4.NoSuchMailbox(path)
|
||||
|
||||
def addMailbox(self, name, mbox = None):
|
||||
if mbox:
|
||||
@@ -62,7 +61,7 @@ class IMAPUserAccount(object):
|
||||
return self.create(name)
|
||||
|
||||
def create(self, pathspec):
|
||||
if isinstance(pathspec, unicode):
|
||||
if isinstance(pathspec, str):
|
||||
pathspec = pathspec.encode('imap4-utf-7')
|
||||
if pathspec not in IMAP_MBOX_REG[self.dir].keys():
|
||||
paths = filter(None, pathspec.split(IMAP_HDELIM))
|
||||
@@ -77,10 +76,10 @@ class IMAPUserAccount(object):
|
||||
return IMAP_MBOX_REG[self.dir][pathspec]
|
||||
|
||||
def delete(self, pathspec):
|
||||
if isinstance(pathspec, unicode):
|
||||
if isinstance(pathspec, str):
|
||||
pathspec = pathspec.encode('imap4-utf-7')
|
||||
if pathspec in conf.imap_auto_mbox:
|
||||
raise imap4.MailboxException, pathspec
|
||||
raise imap4.MailboxException(pathspec)
|
||||
if pathspec not in IMAP_MBOX_REG[self.dir].keys():
|
||||
raise imap4.MailboxException("No such mailbox")
|
||||
inferiors = self._inferiorNames(pathspec)
|
||||
@@ -89,7 +88,7 @@ class IMAPUserAccount(object):
|
||||
# as part of their root.
|
||||
for inferior in inferiors:
|
||||
if inferior != pathspec:
|
||||
raise imap4.MailboxException, "Hierarchically inferior mailboxes exist and \\Noselect is set"
|
||||
raise imap4.MailboxException("Hierarchically inferior mailboxes exist and \\Noselect is set")
|
||||
for inferior in inferiors:
|
||||
mdir = IMAP_MBOX_REG[self.dir][inferior].path
|
||||
IMAP_MBOX_REG[self.dir][inferior].destroy()
|
||||
@@ -99,17 +98,17 @@ class IMAPUserAccount(object):
|
||||
|
||||
def rename(self, oldname, newname):
|
||||
if oldname in conf.imap_auto_mbox:
|
||||
raise imap4.MailboxException, oldname
|
||||
if isinstance(oldname, unicode):
|
||||
raise imap4.MailboxException(oldname)
|
||||
if isinstance(oldname, str):
|
||||
oldname = oldname.encode('imap4-utf-7')
|
||||
if isinstance(newname, unicode):
|
||||
if isinstance(newname, str):
|
||||
newname = newname.encode('imap4-utf-7')
|
||||
if oldname not in IMAP_MBOX_REG[self.dir].keys():
|
||||
raise imap4.NoSuchMailbox, oldname
|
||||
raise imap4.NoSuchMailbox(oldname)
|
||||
inferiors = [(o, o.replace(oldname, newname, 1)) for o in self._inferiorNames(oldname)]
|
||||
for (old, new) in inferiors:
|
||||
if new in IMAP_MBOX_REG[self.dir].keys():
|
||||
raise imap4.MailboxCollision, new
|
||||
raise imap4.MailboxCollision(new)
|
||||
for (old, new) in inferiors:
|
||||
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]
|
||||
@@ -120,21 +119,21 @@ class IMAPUserAccount(object):
|
||||
return True
|
||||
|
||||
def subscribe(self, name):
|
||||
if isinstance(name, unicode):
|
||||
if isinstance(name, str):
|
||||
name = name.encode('imap4-utf-7')
|
||||
if name in IMAP_MBOX_REG[self.dir].keys():
|
||||
IMAP_MBOX_REG[self.dir][name].subscribe()
|
||||
|
||||
def unsubscribe(self, name):
|
||||
if name in conf.imap_auto_mbox:
|
||||
raise imap4.MailboxException, name
|
||||
if isinstance(name, unicode):
|
||||
raise imap4.MailboxException(name)
|
||||
if isinstance(name, str):
|
||||
name = name.encode('imap4-utf-7')
|
||||
if name in IMAP_MBOX_REG[self.dir].keys():
|
||||
IMAP_MBOX_REG[self.dir][name].unsubscribe()
|
||||
|
||||
def isSubscribed(self, name):
|
||||
if isinstance(name, unicode):
|
||||
if isinstance(name, str):
|
||||
name = name.encode('imap4-utf-7')
|
||||
return IMAP_MBOX_REG[self.dir][name].is_subscribed()
|
||||
|
||||
@@ -146,9 +145,8 @@ class IMAPUserAccount(object):
|
||||
inferiors.append(infname)
|
||||
return inferiors
|
||||
|
||||
@implementer(portal.IRealm)
|
||||
class SerpentIMAPRealm(object):
|
||||
implements(portal.IRealm)
|
||||
|
||||
def requestAvatar(self, avatarId, mind, *interfaces):
|
||||
if imap4.IAccount not in interfaces:
|
||||
raise NotImplementedError(
|
||||
@@ -161,16 +159,16 @@ class SerpentIMAPRealm(object):
|
||||
|
||||
class IMAPServerProtocol(imap4.IMAP4Server):
|
||||
def lineReceived(self, line):
|
||||
if isinstance(line, unicode):
|
||||
if isinstance(line, str):
|
||||
line = line.encode('utf-8')
|
||||
print "CLIENT:", line
|
||||
print("CLIENT:", line)
|
||||
imap4.IMAP4Server.lineReceived(self, line)
|
||||
|
||||
def sendLine(self, line):
|
||||
imap4.IMAP4Server.sendLine(self, line)
|
||||
if isinstance(line, unicode):
|
||||
if isinstance(line, str):
|
||||
line = line.encode('utf-8')
|
||||
print "SERVER:", line
|
||||
print("SERVER:", line)
|
||||
|
||||
def connectionLost(self, reason):
|
||||
self.setTimeout(None)
|
||||
@@ -186,7 +184,7 @@ class IMAPServerProtocol(imap4.IMAP4Server):
|
||||
self.account = None
|
||||
|
||||
def _parseMbox(self, name):
|
||||
if isinstance(name, unicode):
|
||||
if isinstance(name, str):
|
||||
return name
|
||||
try:
|
||||
return name.decode('imap4-utf-7')
|
||||
@@ -277,7 +275,7 @@ class IMAPServerProtocol(imap4.IMAP4Server):
|
||||
|
||||
def __cbStatus(self, status, tag, box):
|
||||
line = ' '.join(['%s %s' % x for x in status.iteritems()])
|
||||
if isinstance(box, unicode):
|
||||
if isinstance(box, str):
|
||||
box = box.encode('imap4-utf-7')
|
||||
self.sendUntaggedResponse('STATUS %s (%s)' % (box, line))
|
||||
self.sendPositiveResponse(tag, 'STATUS complete')
|
||||
@@ -293,7 +291,7 @@ class SerpentIMAPFactory(protocol.Factory):
|
||||
def buildProtocol(self, addr):
|
||||
contextFactory = None
|
||||
if conf.tls:
|
||||
tls_data = file(conf.tls_pem, 'rb').read()
|
||||
tls_data = open(conf.tls_pem, 'rb').read()
|
||||
cert = ssl.PrivateCertificate.loadPEM(tls_data)
|
||||
contextFactory = cert.options()
|
||||
p = IMAPServerProtocol(contextFactory = contextFactory)
|
||||
|
||||
+6
-11
@@ -5,8 +5,8 @@ from serpent import rules
|
||||
from serpent.queue import squeue
|
||||
|
||||
|
||||
from email.Header import Header
|
||||
from zope.interface import implements
|
||||
from email.header import Header
|
||||
from zope.interface import implementer
|
||||
|
||||
from twisted.internet import defer, ssl
|
||||
from twisted.mail import smtp
|
||||
@@ -16,10 +16,8 @@ from twisted.cred.portal import IRealm, Portal
|
||||
|
||||
|
||||
|
||||
|
||||
@implementer(smtp.IMessageDelivery)
|
||||
class SmtpMessageDelivery:
|
||||
implements(smtp.IMessageDelivery)
|
||||
|
||||
def __init__(self, avatarId = None):
|
||||
self.avatarId = avatarId
|
||||
|
||||
@@ -59,9 +57,8 @@ class SmtpMessageDelivery:
|
||||
}
|
||||
return lambda: SmtpMessage(msg)
|
||||
|
||||
@implementer(smtp.IMessage)
|
||||
class SmtpMessage:
|
||||
implements(smtp.IMessage)
|
||||
|
||||
def __init__(self, msg):
|
||||
self.lines = []
|
||||
self.size = 0
|
||||
@@ -113,7 +110,7 @@ class SerpentSMTPFactory(smtp.SMTPFactory):
|
||||
def buildProtocol(self, addr):
|
||||
contextFactory = None
|
||||
if conf.tls:
|
||||
tls_data = file(conf.tls_pem, 'rb').read()
|
||||
tls_data = open(conf.tls_pem, 'rb').read()
|
||||
cert = ssl.PrivateCertificate.loadPEM(tls_data)
|
||||
contextFactory = cert.options()
|
||||
p = smtp.SMTPFactory.buildProtocol(self, addr)
|
||||
@@ -126,10 +123,8 @@ class SerpentSMTPFactory(smtp.SMTPFactory):
|
||||
return p
|
||||
|
||||
|
||||
|
||||
@implementer(IRealm)
|
||||
class SmtpRealm:
|
||||
implements(IRealm)
|
||||
|
||||
def requestAvatar(self, avatarId, mind, *interfaces):
|
||||
if smtp.IMessageDelivery in interfaces:
|
||||
return smtp.IMessageDelivery, SmtpMessageDelivery(avatarId), lambda: None
|
||||
|
||||
+4
-4
@@ -4,7 +4,6 @@ import os
|
||||
import pickle
|
||||
from glob import iglob
|
||||
from serpent.config import conf
|
||||
from serpent.misc import IMAP_FLAGS
|
||||
|
||||
class SmtpFileStore(object):
|
||||
def __init__(self, dpath):
|
||||
@@ -60,16 +59,17 @@ class SmtpFileStore(object):
|
||||
|
||||
class MailDirStore(object):
|
||||
def __init__(self):
|
||||
from serpent.imap import mailbox
|
||||
import mailbox
|
||||
self.mbox = mailbox
|
||||
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.Maildir(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)))
|
||||
+6
-6
@@ -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'
|
||||
}
|
||||
IMAP_HDELIM = '.'
|
||||
IMAP_ACC_CONN_NUM = '...ConnectionNumber...'
|
||||
|
||||
+1
-1
@@ -51,7 +51,7 @@ class SmtpQueue(object):
|
||||
for _, mx in mail_servers:
|
||||
s = SMTP(local_hostname = conf.smtp_hostname)
|
||||
try:
|
||||
ret_code, banner = s.connect(mx, 25)
|
||||
ret_code, _ = s.connect(mx, 25)
|
||||
except:
|
||||
s.quit()
|
||||
continue
|
||||
|
||||
Reference in new issue
Block a user