2007-07-04 19:53:48 +02:00
|
|
|
# imaplib utilities
|
2010-12-16 13:43:47 +01:00
|
|
|
# Copyright (C) 2002-2007 John Goerzen <jgoerzen@complete.org>
|
|
|
|
# 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>
|
2007-07-04 19:36:33 +02:00
|
|
|
# This program is free software; you can redistribute it and/or modify
|
|
|
|
# it under the terms of the GNU General Public License as published by
|
|
|
|
# the Free Software Foundation; either version 2 of the License, or
|
|
|
|
# (at your option) any later version.
|
|
|
|
#
|
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
# GNU General Public License for more details.
|
|
|
|
#
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
|
|
# along with this program; if not, write to the Free Software
|
|
|
|
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
|
|
|
2011-04-13 10:52:18 +02:00
|
|
|
import os
|
|
|
|
import fcntl
|
2011-03-11 22:13:21 +01:00
|
|
|
import re
|
|
|
|
import socket
|
|
|
|
import time
|
|
|
|
import subprocess
|
2011-01-05 17:00:55 +01:00
|
|
|
from offlineimap.ui import getglobalui
|
Update to match semantics of new imaplib2
The biggest change here is that imapobj.untagged_responses is no
longer a dictionary, but a list. To access it, I use the semi-private
_get_untagged_response method.
* offlineimap/folder/IMAP.py (IMAPFolder.quickchanged,
IMAPFolder.cachemessagelist): imaplib2 now explicitly removes its
EXISTS response on select(), so instead we use the return values from
select() to get the number of messages.
* offlineimap/imapserver.py (UsefulIMAPMixIn.select): imaplib2 now
stores untagged_responses for different mailboxes, which confuses us
because it seems like our mailboxes are "still" in read-only mode when
we just re-opened them. Additionally, we have to return the value
from imaplib2's select() so that the above thing works.
* offlineimap/imapserver.py (UsefulIMAPMixIn._mesg): imaplib2 now
calls _mesg with the name of a thread, so we display this
information in debug output. This requires a corresponding change to
imaplibutil.new_mesg.
* offlineimap/imaplibutil.py: We override IMAP4_SSL.open, whose
default arguments have changed, so update the default arguments. We
also subclass imaplib.IMAP4 in a few different places, which now
relies on having a read_fd file descriptor to poll on.
Signed-off-by: Ethan Glasser-Camp <ethan@betacantrips.com>
Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
2011-03-10 21:36:20 +01:00
|
|
|
import threading
|
2011-03-08 16:05:16 +01:00
|
|
|
from offlineimap.imaplib2 import *
|
2007-07-04 19:36:33 +02:00
|
|
|
|
2007-07-04 20:17:27 +02:00
|
|
|
# Import the symbols we need that aren't exported by default
|
2011-03-08 16:05:16 +01:00
|
|
|
from offlineimap.imaplib2 import IMAP4_PORT, IMAP4_SSL_PORT, InternalDate, Mon2num
|
2007-07-04 20:17:27 +02:00
|
|
|
|
2009-08-24 20:11:22 +02:00
|
|
|
try:
|
2009-07-02 03:49:20 +02:00
|
|
|
import ssl
|
2009-08-24 20:11:22 +02:00
|
|
|
except ImportError:
|
2010-12-16 13:43:47 +01:00
|
|
|
#fails on python <2.6
|
|
|
|
pass
|
2007-07-04 20:17:27 +02:00
|
|
|
|
2011-03-22 15:51:43 +01:00
|
|
|
class UsefulIMAPMixIn:
|
|
|
|
def getstate(self):
|
|
|
|
return self.state
|
|
|
|
def getselectedfolder(self):
|
|
|
|
if self.getstate() == 'SELECTED':
|
|
|
|
return self.selectedfolder
|
|
|
|
return None
|
|
|
|
|
|
|
|
def select(self, mailbox='INBOX', readonly=None, force = 0):
|
|
|
|
if (not force) and self.getselectedfolder() == mailbox \
|
|
|
|
and self.is_readonly == readonly:
|
|
|
|
# No change; return.
|
|
|
|
return
|
|
|
|
# Wipe out all old responses, to maintain semantics with old imaplib2
|
|
|
|
del self.untagged_responses[:]
|
|
|
|
result = self.__class__.__bases__[1].select(self, mailbox, readonly)
|
|
|
|
if result[0] != 'OK':
|
|
|
|
raise ValueError, "Error from select: %s" % str(result)
|
|
|
|
if self.getstate() == 'SELECTED':
|
|
|
|
self.selectedfolder = mailbox
|
|
|
|
else:
|
|
|
|
self.selectedfolder = None
|
|
|
|
return result
|
|
|
|
|
|
|
|
def _mesg(self, s, tn=None, secs=None):
|
|
|
|
new_mesg(self, s, tn, secs)
|
|
|
|
|
2011-03-22 15:51:44 +01:00
|
|
|
class IMAP4_Tunnel(UsefulIMAPMixIn, IMAP4):
|
2007-07-04 19:36:33 +02:00
|
|
|
"""IMAP4 client class over a tunnel
|
|
|
|
|
|
|
|
Instantiate with: IMAP4_Tunnel(tunnelcmd)
|
|
|
|
|
|
|
|
tunnelcmd -- shell command to generate the tunnel.
|
|
|
|
The result will be in PREAUTH stage."""
|
|
|
|
|
2011-04-13 10:52:18 +02:00
|
|
|
def __init__(self, tunnelcmd, **kwargs):
|
|
|
|
IMAP4.__init__(self, tunnelcmd, **kwargs)
|
2007-07-04 19:36:33 +02:00
|
|
|
|
|
|
|
def open(self, host, port):
|
|
|
|
"""The tunnelcmd comes in on host!"""
|
2011-04-13 10:52:18 +02:00
|
|
|
self.host = host
|
2007-07-04 19:36:33 +02:00
|
|
|
self.process = subprocess.Popen(host, shell=True, close_fds=True,
|
|
|
|
stdin=subprocess.PIPE, stdout=subprocess.PIPE)
|
|
|
|
(self.outfd, self.infd) = (self.process.stdin, self.process.stdout)
|
Update to match semantics of new imaplib2
The biggest change here is that imapobj.untagged_responses is no
longer a dictionary, but a list. To access it, I use the semi-private
_get_untagged_response method.
* offlineimap/folder/IMAP.py (IMAPFolder.quickchanged,
IMAPFolder.cachemessagelist): imaplib2 now explicitly removes its
EXISTS response on select(), so instead we use the return values from
select() to get the number of messages.
* offlineimap/imapserver.py (UsefulIMAPMixIn.select): imaplib2 now
stores untagged_responses for different mailboxes, which confuses us
because it seems like our mailboxes are "still" in read-only mode when
we just re-opened them. Additionally, we have to return the value
from imaplib2's select() so that the above thing works.
* offlineimap/imapserver.py (UsefulIMAPMixIn._mesg): imaplib2 now
calls _mesg with the name of a thread, so we display this
information in debug output. This requires a corresponding change to
imaplibutil.new_mesg.
* offlineimap/imaplibutil.py: We override IMAP4_SSL.open, whose
default arguments have changed, so update the default arguments. We
also subclass imaplib.IMAP4 in a few different places, which now
relies on having a read_fd file descriptor to poll on.
Signed-off-by: Ethan Glasser-Camp <ethan@betacantrips.com>
Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
2011-03-10 21:36:20 +01:00
|
|
|
# imaplib2 polls on this fd
|
|
|
|
self.read_fd = self.infd.fileno()
|
2007-07-04 19:36:33 +02:00
|
|
|
|
2011-04-13 10:52:18 +02:00
|
|
|
self.set_nonblocking(self.read_fd)
|
|
|
|
|
|
|
|
def set_nonblocking(self, fd):
|
|
|
|
"Mark fd as nonblocking"
|
|
|
|
# get the file's current flag settings
|
|
|
|
fl = fcntl.fcntl(fd, fcntl.F_GETFL)
|
|
|
|
# clear non-blocking mode from flags
|
|
|
|
fl = fl & ~os.O_NONBLOCK
|
|
|
|
fcntl.fcntl(fd, fcntl.F_SETFL, fl)
|
|
|
|
|
2007-07-04 19:36:33 +02:00
|
|
|
def read(self, size):
|
2011-04-13 10:52:18 +02:00
|
|
|
"""data = read(size)
|
|
|
|
Read at most 'size' bytes from remote."""
|
2007-07-04 19:36:33 +02:00
|
|
|
|
2011-04-13 10:52:18 +02:00
|
|
|
if self.decompressor is None:
|
|
|
|
return os.read(self.read_fd, size)
|
|
|
|
|
|
|
|
if self.decompressor.unconsumed_tail:
|
|
|
|
data = self.decompressor.unconsumed_tail
|
|
|
|
else:
|
|
|
|
data = os.read(self.read_fd, 8192)
|
|
|
|
|
|
|
|
return self.decompressor.decompress(data, size)
|
2007-07-04 19:36:33 +02:00
|
|
|
|
|
|
|
def send(self, data):
|
2011-04-13 10:52:18 +02:00
|
|
|
if self.compressor is not None:
|
|
|
|
data = self.compressor.compress(data)
|
|
|
|
data += self.compressor.flush(zlib.Z_SYNC_FLUSH)
|
|
|
|
|
2007-07-04 19:36:33 +02:00
|
|
|
self.outfd.write(data)
|
|
|
|
|
2011-04-13 10:52:18 +02:00
|
|
|
|
2007-07-04 19:36:33 +02:00
|
|
|
def shutdown(self):
|
|
|
|
self.infd.close()
|
|
|
|
self.outfd.close()
|
|
|
|
self.process.wait()
|
|
|
|
|
|
|
|
|
Update to match semantics of new imaplib2
The biggest change here is that imapobj.untagged_responses is no
longer a dictionary, but a list. To access it, I use the semi-private
_get_untagged_response method.
* offlineimap/folder/IMAP.py (IMAPFolder.quickchanged,
IMAPFolder.cachemessagelist): imaplib2 now explicitly removes its
EXISTS response on select(), so instead we use the return values from
select() to get the number of messages.
* offlineimap/imapserver.py (UsefulIMAPMixIn.select): imaplib2 now
stores untagged_responses for different mailboxes, which confuses us
because it seems like our mailboxes are "still" in read-only mode when
we just re-opened them. Additionally, we have to return the value
from imaplib2's select() so that the above thing works.
* offlineimap/imapserver.py (UsefulIMAPMixIn._mesg): imaplib2 now
calls _mesg with the name of a thread, so we display this
information in debug output. This requires a corresponding change to
imaplibutil.new_mesg.
* offlineimap/imaplibutil.py: We override IMAP4_SSL.open, whose
default arguments have changed, so update the default arguments. We
also subclass imaplib.IMAP4 in a few different places, which now
relies on having a read_fd file descriptor to poll on.
Signed-off-by: Ethan Glasser-Camp <ethan@betacantrips.com>
Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
2011-03-10 21:36:20 +01:00
|
|
|
def new_mesg(self, s, tn=None, secs=None):
|
2007-07-04 19:36:33 +02:00
|
|
|
if secs is None:
|
|
|
|
secs = time.time()
|
Update to match semantics of new imaplib2
The biggest change here is that imapobj.untagged_responses is no
longer a dictionary, but a list. To access it, I use the semi-private
_get_untagged_response method.
* offlineimap/folder/IMAP.py (IMAPFolder.quickchanged,
IMAPFolder.cachemessagelist): imaplib2 now explicitly removes its
EXISTS response on select(), so instead we use the return values from
select() to get the number of messages.
* offlineimap/imapserver.py (UsefulIMAPMixIn.select): imaplib2 now
stores untagged_responses for different mailboxes, which confuses us
because it seems like our mailboxes are "still" in read-only mode when
we just re-opened them. Additionally, we have to return the value
from imaplib2's select() so that the above thing works.
* offlineimap/imapserver.py (UsefulIMAPMixIn._mesg): imaplib2 now
calls _mesg with the name of a thread, so we display this
information in debug output. This requires a corresponding change to
imaplibutil.new_mesg.
* offlineimap/imaplibutil.py: We override IMAP4_SSL.open, whose
default arguments have changed, so update the default arguments. We
also subclass imaplib.IMAP4 in a few different places, which now
relies on having a read_fd file descriptor to poll on.
Signed-off-by: Ethan Glasser-Camp <ethan@betacantrips.com>
Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
2011-03-10 21:36:20 +01:00
|
|
|
if tn is None:
|
|
|
|
tn = threading.currentThread().getName()
|
2007-07-04 19:36:33 +02:00
|
|
|
tm = time.strftime('%M:%S', time.localtime(secs))
|
Update to match semantics of new imaplib2
The biggest change here is that imapobj.untagged_responses is no
longer a dictionary, but a list. To access it, I use the semi-private
_get_untagged_response method.
* offlineimap/folder/IMAP.py (IMAPFolder.quickchanged,
IMAPFolder.cachemessagelist): imaplib2 now explicitly removes its
EXISTS response on select(), so instead we use the return values from
select() to get the number of messages.
* offlineimap/imapserver.py (UsefulIMAPMixIn.select): imaplib2 now
stores untagged_responses for different mailboxes, which confuses us
because it seems like our mailboxes are "still" in read-only mode when
we just re-opened them. Additionally, we have to return the value
from imaplib2's select() so that the above thing works.
* offlineimap/imapserver.py (UsefulIMAPMixIn._mesg): imaplib2 now
calls _mesg with the name of a thread, so we display this
information in debug output. This requires a corresponding change to
imaplibutil.new_mesg.
* offlineimap/imaplibutil.py: We override IMAP4_SSL.open, whose
default arguments have changed, so update the default arguments. We
also subclass imaplib.IMAP4 in a few different places, which now
relies on having a read_fd file descriptor to poll on.
Signed-off-by: Ethan Glasser-Camp <ethan@betacantrips.com>
Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
2011-03-10 21:36:20 +01:00
|
|
|
getglobalui().debug('imap', ' %s.%02d %s %s' % (tm, (secs*100)%100, tn, s))
|
2007-07-04 19:36:33 +02:00
|
|
|
|
2011-03-22 15:51:44 +01:00
|
|
|
class WrappedIMAP4_SSL(UsefulIMAPMixIn, IMAP4_SSL):
|
2010-12-16 13:43:47 +01:00
|
|
|
"""Provides an improved version of the standard IMAP4_SSL
|
|
|
|
|
|
|
|
It provides a better readline() implementation as impaplib's
|
|
|
|
readline() is extremly inefficient. It can also connect to IPv6
|
|
|
|
addresses."""
|
|
|
|
def __init__(self, *args, **kwargs):
|
|
|
|
self._readbuf = ''
|
|
|
|
self._cacertfile = kwargs.get('cacertfile', None)
|
|
|
|
if kwargs.has_key('cacertfile'):
|
|
|
|
del kwargs['cacertfile']
|
|
|
|
IMAP4_SSL.__init__(self, *args, **kwargs)
|
|
|
|
|
Update to match semantics of new imaplib2
The biggest change here is that imapobj.untagged_responses is no
longer a dictionary, but a list. To access it, I use the semi-private
_get_untagged_response method.
* offlineimap/folder/IMAP.py (IMAPFolder.quickchanged,
IMAPFolder.cachemessagelist): imaplib2 now explicitly removes its
EXISTS response on select(), so instead we use the return values from
select() to get the number of messages.
* offlineimap/imapserver.py (UsefulIMAPMixIn.select): imaplib2 now
stores untagged_responses for different mailboxes, which confuses us
because it seems like our mailboxes are "still" in read-only mode when
we just re-opened them. Additionally, we have to return the value
from imaplib2's select() so that the above thing works.
* offlineimap/imapserver.py (UsefulIMAPMixIn._mesg): imaplib2 now
calls _mesg with the name of a thread, so we display this
information in debug output. This requires a corresponding change to
imaplibutil.new_mesg.
* offlineimap/imaplibutil.py: We override IMAP4_SSL.open, whose
default arguments have changed, so update the default arguments. We
also subclass imaplib.IMAP4 in a few different places, which now
relies on having a read_fd file descriptor to poll on.
Signed-off-by: Ethan Glasser-Camp <ethan@betacantrips.com>
Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
2011-03-10 21:36:20 +01:00
|
|
|
def open(self, host=None, port=None):
|
2010-12-16 13:43:47 +01:00
|
|
|
"""Do whatever IMAP4_SSL would do in open, but call sslwrap
|
|
|
|
with cert verification"""
|
|
|
|
#IMAP4_SSL.open(self, host, port) uses the below 2 lines:
|
2009-08-12 21:49:58 +02:00
|
|
|
self.host = host
|
|
|
|
self.port = port
|
2010-12-16 13:43:47 +01:00
|
|
|
|
|
|
|
#rather than just self.sock = socket.create_connection((host, port))
|
|
|
|
#we use the below part to be able to connect to ipv6 addresses too
|
2010-12-16 13:43:46 +01:00
|
|
|
#This connects to the first ip found ipv4/ipv6
|
|
|
|
#Added by Adriaan Peeters <apeeters@lashout.net> based on a socket
|
|
|
|
#example from the python documentation:
|
|
|
|
#http://www.python.org/doc/lib/socket-example.html
|
2009-08-12 21:49:58 +02:00
|
|
|
res = socket.getaddrinfo(host, port, socket.AF_UNSPEC,
|
|
|
|
socket.SOCK_STREAM)
|
|
|
|
# Try all the addresses in turn until we connect()
|
|
|
|
last_error = 0
|
|
|
|
for remote in res:
|
|
|
|
af, socktype, proto, canonname, sa = remote
|
|
|
|
self.sock = socket.socket(af, socktype, proto)
|
|
|
|
last_error = self.sock.connect_ex(sa)
|
|
|
|
if last_error == 0:
|
|
|
|
break
|
|
|
|
else:
|
|
|
|
self.sock.close()
|
|
|
|
if last_error != 0:
|
|
|
|
# FIXME
|
|
|
|
raise socket.error(last_error)
|
2010-12-16 13:43:47 +01:00
|
|
|
|
2011-03-01 14:49:02 +01:00
|
|
|
# Allow sending of keep-alive message seems to prevent some servers
|
|
|
|
# from closing SSL on us leading to deadlocks
|
|
|
|
self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
|
|
|
|
|
2010-12-16 13:43:47 +01:00
|
|
|
#connected to socket, now wrap it in SSL
|
|
|
|
try:
|
|
|
|
if self._cacertfile:
|
|
|
|
requirecert = ssl.CERT_REQUIRED
|
|
|
|
else:
|
|
|
|
requirecert = ssl.CERT_NONE
|
|
|
|
|
|
|
|
self.sslobj = ssl.wrap_socket(self.sock, self.keyfile,
|
|
|
|
self.certfile,
|
|
|
|
ca_certs = self._cacertfile,
|
|
|
|
cert_reqs = requirecert)
|
|
|
|
except NameError:
|
|
|
|
#Python 2.4/2.5 don't have the ssl module, we need to
|
|
|
|
#socket.ssl() here but that doesn't allow cert
|
|
|
|
#verification!!!
|
|
|
|
if self._cacertfile:
|
|
|
|
#user configured a CA certificate, but python 2.4/5 doesn't
|
|
|
|
#allow us to easily check it. So bail out here.
|
|
|
|
raise Exception("SSL CA Certificates cannot be checked with python <=2.6. Abort")
|
|
|
|
self.sslobj = socket.ssl(self.sock, self.keyfile,
|
|
|
|
self.certfile)
|
|
|
|
|
|
|
|
else:
|
2011-01-18 11:25:49 +01:00
|
|
|
#ssl.wrap_socket worked and cert is verified (if configured),
|
|
|
|
#now check that hostnames also match if we have a CA cert.
|
|
|
|
if self._cacertfile:
|
|
|
|
error = self._verifycert(self.sslobj.getpeercert(), host)
|
|
|
|
if error:
|
|
|
|
raise ssl.SSLError("SSL Certificate host name mismatch: %s" % error)
|
2010-12-16 13:43:47 +01:00
|
|
|
|
Update to match semantics of new imaplib2
The biggest change here is that imapobj.untagged_responses is no
longer a dictionary, but a list. To access it, I use the semi-private
_get_untagged_response method.
* offlineimap/folder/IMAP.py (IMAPFolder.quickchanged,
IMAPFolder.cachemessagelist): imaplib2 now explicitly removes its
EXISTS response on select(), so instead we use the return values from
select() to get the number of messages.
* offlineimap/imapserver.py (UsefulIMAPMixIn.select): imaplib2 now
stores untagged_responses for different mailboxes, which confuses us
because it seems like our mailboxes are "still" in read-only mode when
we just re-opened them. Additionally, we have to return the value
from imaplib2's select() so that the above thing works.
* offlineimap/imapserver.py (UsefulIMAPMixIn._mesg): imaplib2 now
calls _mesg with the name of a thread, so we display this
information in debug output. This requires a corresponding change to
imaplibutil.new_mesg.
* offlineimap/imaplibutil.py: We override IMAP4_SSL.open, whose
default arguments have changed, so update the default arguments. We
also subclass imaplib.IMAP4 in a few different places, which now
relies on having a read_fd file descriptor to poll on.
Signed-off-by: Ethan Glasser-Camp <ethan@betacantrips.com>
Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
2011-03-10 21:36:20 +01:00
|
|
|
# imaplib2 uses this to poll()
|
|
|
|
self.read_fd = self.sock.fileno()
|
|
|
|
|
2010-12-16 13:43:47 +01:00
|
|
|
#TODO: Done for now. We should implement a mutt-like behavior
|
|
|
|
#that offers the users to accept a certificate (presenting a
|
|
|
|
#fingerprint of it) (get via self.sslobj.getpeercert()), and
|
|
|
|
#save that, and compare on future connects, rather than having
|
|
|
|
#to trust what the CA certs say.
|
|
|
|
|
|
|
|
def _verifycert(self, cert, hostname):
|
|
|
|
'''Verify that cert (in socket.getpeercert() format) matches hostname.
|
2011-02-23 10:00:14 +01:00
|
|
|
CRLs are not handled.
|
2010-12-16 13:43:47 +01:00
|
|
|
|
|
|
|
Returns error message if any problems are found and None on success.
|
|
|
|
'''
|
|
|
|
if not cert:
|
|
|
|
return ('no certificate received')
|
|
|
|
dnsname = hostname.lower()
|
2011-02-23 10:00:14 +01:00
|
|
|
certnames = []
|
|
|
|
|
|
|
|
# First read commonName
|
2010-12-16 13:43:47 +01:00
|
|
|
for s in cert.get('subject', []):
|
|
|
|
key, value = s[0]
|
|
|
|
if key == 'commonName':
|
2011-02-23 10:00:14 +01:00
|
|
|
certnames.append(value.lower())
|
|
|
|
if len(certnames) == 0:
|
|
|
|
return ('no commonName found in certificate')
|
|
|
|
|
|
|
|
# Then read subjectAltName
|
|
|
|
for key, value in cert.get('subjectAltName', []):
|
|
|
|
if key == 'DNS':
|
|
|
|
certnames.append(value.lower())
|
|
|
|
|
|
|
|
# And finally try to match hostname with one of these names
|
|
|
|
for certname in certnames:
|
|
|
|
if (certname == dnsname or
|
|
|
|
'.' in dnsname and certname == '*.' + dnsname.split('.', 1)[1]):
|
|
|
|
return None
|
|
|
|
|
|
|
|
return ('no matching domain name found in certificate')
|
2010-12-16 13:43:47 +01:00
|
|
|
|
2011-03-22 15:51:44 +01:00
|
|
|
class WrappedIMAP4(UsefulIMAPMixIn, IMAP4):
|
2010-12-16 13:43:46 +01:00
|
|
|
"""Improved version of imaplib.IMAP4 that can also connect to IPv6"""
|
|
|
|
|
|
|
|
def open(self, host = '', port = IMAP4_PORT):
|
|
|
|
"""Setup connection to remote server on "host:port"
|
|
|
|
(default: localhost:standard IMAP4 port).
|
2009-08-12 21:49:58 +02:00
|
|
|
"""
|
2010-12-16 13:43:47 +01:00
|
|
|
#self.host and self.port are needed by the parent IMAP4 class
|
2009-08-12 21:49:58 +02:00
|
|
|
self.host = host
|
|
|
|
self.port = port
|
|
|
|
res = socket.getaddrinfo(host, port, socket.AF_UNSPEC,
|
|
|
|
socket.SOCK_STREAM)
|
2010-12-16 13:43:46 +01:00
|
|
|
|
|
|
|
# Try each address returned by getaddrinfo in turn until we
|
|
|
|
# manage to connect to one.
|
2009-08-12 21:49:58 +02:00
|
|
|
# Try all the addresses in turn until we connect()
|
|
|
|
last_error = 0
|
|
|
|
for remote in res:
|
|
|
|
af, socktype, proto, canonname, sa = remote
|
|
|
|
self.sock = socket.socket(af, socktype, proto)
|
|
|
|
last_error = self.sock.connect_ex(sa)
|
|
|
|
if last_error == 0:
|
|
|
|
break
|
|
|
|
else:
|
|
|
|
self.sock.close()
|
|
|
|
if last_error != 0:
|
|
|
|
# FIXME
|
|
|
|
raise socket.error(last_error)
|
2010-12-16 13:43:46 +01:00
|
|
|
self.file = self.sock.makefile('rb')
|
|
|
|
|
Update to match semantics of new imaplib2
The biggest change here is that imapobj.untagged_responses is no
longer a dictionary, but a list. To access it, I use the semi-private
_get_untagged_response method.
* offlineimap/folder/IMAP.py (IMAPFolder.quickchanged,
IMAPFolder.cachemessagelist): imaplib2 now explicitly removes its
EXISTS response on select(), so instead we use the return values from
select() to get the number of messages.
* offlineimap/imapserver.py (UsefulIMAPMixIn.select): imaplib2 now
stores untagged_responses for different mailboxes, which confuses us
because it seems like our mailboxes are "still" in read-only mode when
we just re-opened them. Additionally, we have to return the value
from imaplib2's select() so that the above thing works.
* offlineimap/imapserver.py (UsefulIMAPMixIn._mesg): imaplib2 now
calls _mesg with the name of a thread, so we display this
information in debug output. This requires a corresponding change to
imaplibutil.new_mesg.
* offlineimap/imaplibutil.py: We override IMAP4_SSL.open, whose
default arguments have changed, so update the default arguments. We
also subclass imaplib.IMAP4 in a few different places, which now
relies on having a read_fd file descriptor to poll on.
Signed-off-by: Ethan Glasser-Camp <ethan@betacantrips.com>
Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
2011-03-10 21:36:20 +01:00
|
|
|
# imaplib2 uses this to poll()
|
|
|
|
self.read_fd = self.sock.fileno()
|
|
|
|
|
2007-07-04 19:36:33 +02:00
|
|
|
mustquote = re.compile(r"[^\w!#$%&'+,.:;<=>?^`|~-]")
|
|
|
|
|
|
|
|
def Internaldate2epoch(resp):
|
|
|
|
"""Convert IMAP4 INTERNALDATE to UT.
|
|
|
|
|
|
|
|
Returns seconds since the epoch.
|
|
|
|
"""
|
|
|
|
|
|
|
|
mo = InternalDate.match(resp)
|
|
|
|
if not mo:
|
|
|
|
return None
|
|
|
|
|
|
|
|
mon = Mon2num[mo.group('mon')]
|
|
|
|
zonen = mo.group('zonen')
|
|
|
|
|
|
|
|
day = int(mo.group('day'))
|
|
|
|
year = int(mo.group('year'))
|
|
|
|
hour = int(mo.group('hour'))
|
|
|
|
min = int(mo.group('min'))
|
|
|
|
sec = int(mo.group('sec'))
|
|
|
|
zoneh = int(mo.group('zoneh'))
|
|
|
|
zonem = int(mo.group('zonem'))
|
|
|
|
|
|
|
|
# INTERNALDATE timezone must be subtracted to get UT
|
|
|
|
|
|
|
|
zone = (zoneh*60 + zonem)*60
|
|
|
|
if zonen == '-':
|
|
|
|
zone = -zone
|
|
|
|
|
|
|
|
tt = (year, mon, day, hour, min, sec, -1, -1, -1)
|
|
|
|
|
|
|
|
return time.mktime(tt)
|