mirror of
https://github.com/python/cpython.git
synced 2024-11-29 04:44:13 +08:00
1b7f891f41
svn+ssh://pythondev@svn.python.org/python/trunk ........ r58096 | brett.cannon | 2007-09-10 23:38:27 +0200 (Mon, 10 Sep 2007) | 4 lines Fix a possible segfault from recursing too deep to get the repr of a list. Closes issue #1096. ........ r58097 | bill.janssen | 2007-09-10 23:51:02 +0200 (Mon, 10 Sep 2007) | 33 lines More work on SSL support. * Much expanded test suite: All protocols tested against all other protocols. All protocols tested with all certificate options. Tests for bad key and bad cert. Test of STARTTLS functionality. Test of RAND_* functions. * Fixes for threading/malloc bug. * Issue 1065 fixed: sslsocket class renamed to SSLSocket. sslerror class renamed to SSLError. Function "wrap_socket" now used to wrap an existing socket. * Issue 1583946 finally fixed: Support for subjectAltName added. Subject name now returned as proper DN list of RDNs. * SSLError exported from socket as "sslerror". * RAND_* functions properly exported from ssl.py. * Documentation improved: Example of how to create a self-signed certificate. Better indexing. ........ r58098 | guido.van.rossum | 2007-09-11 00:02:25 +0200 (Tue, 11 Sep 2007) | 9 lines Patch # 1140 (my code, approved by Effbot). Make sure the type of the return value of re.sub(x, y, z) is the type of y+x (i.e. unicode if either is unicode, str if they are both str) even if there are no substitutions or if x==z (which triggered various special cases in join_list()). Could be backported to 2.5; no need to port to 3.0. ........ r58099 | guido.van.rossum | 2007-09-11 00:36:02 +0200 (Tue, 11 Sep 2007) | 8 lines Patch # 1026 by Benjamin Aranguren (with Alex Martelli): Backport abc.py and isinstance/issubclass overloading to 2.6. I had to backport test_typechecks.py myself, and make one small change to abc.py to avoid duplicate work when x.__class__ and type(x) are the same. ........ r58100 | bill.janssen | 2007-09-11 01:41:24 +0200 (Tue, 11 Sep 2007) | 3 lines A better way of finding an open port to test with. ........ r58101 | bill.janssen | 2007-09-11 03:09:19 +0200 (Tue, 11 Sep 2007) | 4 lines Make sure test_ssl doesn't reference the ssl module in a context where it can't be imported. ........ r58102 | bill.janssen | 2007-09-11 04:42:07 +0200 (Tue, 11 Sep 2007) | 3 lines Fix some documentation bugs. ........ r58103 | nick.coghlan | 2007-09-11 16:01:18 +0200 (Tue, 11 Sep 2007) | 1 line Always use the -E flag when spawning subprocesses in test_cmd_line (Issue 1056) ........ r58106 | thomas.heller | 2007-09-11 21:17:48 +0200 (Tue, 11 Sep 2007) | 3 lines Disable some tests that fail on the 'ppc Debian unstable' buildbot to find out if they cause the segfault on the 'alpha Debian' machine. ........ r58108 | brett.cannon | 2007-09-11 23:02:28 +0200 (Tue, 11 Sep 2007) | 6 lines Generators had their throw() method allowing string exceptions. That's a no-no. Fixes issue #1147. Need to fix 2.5 to raise a proper warning if a string exception is passed in. ........ r58112 | georg.brandl | 2007-09-12 20:03:51 +0200 (Wed, 12 Sep 2007) | 3 lines New documentation page for the bdb module. (This doesn't need to be merged to Py3k.) ........ r58114 | georg.brandl | 2007-09-12 20:05:57 +0200 (Wed, 12 Sep 2007) | 2 lines Bug #1152: use non-deprecated name in example. ........ r58115 | georg.brandl | 2007-09-12 20:08:33 +0200 (Wed, 12 Sep 2007) | 2 lines Fix #1122: wrong return type documented for various _Size() functions. ........ r58117 | georg.brandl | 2007-09-12 20:10:56 +0200 (Wed, 12 Sep 2007) | 2 lines Fix #1139: PyFile_Encoding really is PyFile_SetEncoding. ........ r58119 | georg.brandl | 2007-09-12 20:29:18 +0200 (Wed, 12 Sep 2007) | 2 lines bug #1154: release memory allocated by "es" PyArg_ParseTuple format specifier. ........ r58121 | bill.janssen | 2007-09-12 20:52:05 +0200 (Wed, 12 Sep 2007) | 1 line root certificate for https://svn.python.org/, used in test_ssl ........ r58122 | georg.brandl | 2007-09-12 21:00:07 +0200 (Wed, 12 Sep 2007) | 3 lines Bug #1153: repr.repr() now doesn't require set and dictionary items to be orderable to properly represent them. ........ r58125 | georg.brandl | 2007-09-12 21:29:28 +0200 (Wed, 12 Sep 2007) | 4 lines #1120: put explicit version in the shebang lines of pydoc, idle and smtpd.py scripts that are installed by setup.py. That way, they work when only "make altinstall" is used. ........ r58139 | mark.summerfield | 2007-09-13 16:54:30 +0200 (Thu, 13 Sep 2007) | 9 lines Replaced variable o with obj in operator.rst because o is easy to confuse. Added a note about Python 3's collections.Mapping etc., above section that describes isMappingType() etc. Added xrefs between os, os.path, fileinput, and open(). ........ r58143 | facundo.batista | 2007-09-13 20:13:15 +0200 (Thu, 13 Sep 2007) | 7 lines Merged the decimal-branch (revisions 54886 to 58140). Decimal is now fully updated to the latests Decimal Specification (v1.66) and the latests test cases (v2.56). Thanks to Mark Dickinson for all his help during this process. ........ r58145 | facundo.batista | 2007-09-13 20:42:09 +0200 (Thu, 13 Sep 2007) | 7 lines Put the parameter watchexp back in (changed watchexp from an int to a bool). Also second argument to watchexp is now converted to Decimal, just as with all the other two-argument operations. Thanks Mark Dickinson. ........ r58147 | andrew.kuchling | 2007-09-14 00:49:34 +0200 (Fri, 14 Sep 2007) | 1 line Add various items ........ r58148 | andrew.kuchling | 2007-09-14 00:50:10 +0200 (Fri, 14 Sep 2007) | 1 line Make target unique ........ r58154 | facundo.batista | 2007-09-14 20:58:34 +0200 (Fri, 14 Sep 2007) | 3 lines Included the new functions, and new descriptions. ........ r58155 | thomas.heller | 2007-09-14 21:40:35 +0200 (Fri, 14 Sep 2007) | 2 lines ctypes.util.find_library uses dump(1) instead of objdump(1) on Solaris. Fixes issue #1777530; will backport to release25-maint. ........ r58159 | facundo.batista | 2007-09-14 23:29:52 +0200 (Fri, 14 Sep 2007) | 3 lines Some additions (examples and a bit on the tutorial). ........ r58160 | georg.brandl | 2007-09-15 18:53:36 +0200 (Sat, 15 Sep 2007) | 2 lines Remove bdb from the "undocumented modules" list. ........ r58164 | bill.janssen | 2007-09-17 00:06:00 +0200 (Mon, 17 Sep 2007) | 15 lines Add support for asyncore server-side SSL support. This requires adding the 'makefile' method to ssl.SSLSocket, and importing the requisite fakefile class from socket.py, and making the appropriate changes to it to make it use the SSL connection. Added sample HTTPS server to test_ssl.py, and test that uses it. Change SSL tests to use https://svn.python.org/, instead of www.sf.net and pop.gmail.com. Added utility function to ssl module, get_server_certificate, to wrap up the several things to be done to pull a certificate from a remote server. ........ r58173 | bill.janssen | 2007-09-17 01:16:46 +0200 (Mon, 17 Sep 2007) | 1 line use binary mode when reading files for testAsyncore to make Windows happy ........ r58175 | raymond.hettinger | 2007-09-17 02:55:00 +0200 (Mon, 17 Sep 2007) | 7 lines Sync-up named tuples with the latest version of the ASPN recipe. Allows optional commas in the field-name spec (help when named tuples are used in conjuction with sql queries). Adds the __fields__ attribute for introspection and to support conversion to dictionary form. Adds a __replace__() method similar to str.replace() but using a named field as a target. Clean-up spelling and presentation in doc-strings. ........ r58176 | brett.cannon | 2007-09-17 05:28:34 +0200 (Mon, 17 Sep 2007) | 5 lines Add a bunch of GIL release/acquire points in tp_print implementations and for PyObject_Print(). Closes issue #1164. ........ r58177 | sean.reifschneider | 2007-09-17 07:45:04 +0200 (Mon, 17 Sep 2007) | 2 lines issue1597011: Fix for bz2 module corner-case error due to error checking bug. ........ r58180 | facundo.batista | 2007-09-17 18:26:50 +0200 (Mon, 17 Sep 2007) | 3 lines Decimal is updated, :) ........ r58181 | facundo.batista | 2007-09-17 19:30:13 +0200 (Mon, 17 Sep 2007) | 5 lines The methods always return Decimal classes, even if they're executed through a subclass (thanks Mark Dickinson). Added a bit of testing for this. ........ r58183 | sean.reifschneider | 2007-09-17 22:53:21 +0200 (Mon, 17 Sep 2007) | 2 lines issue1082: Fixing platform and system for Vista. ........ r58185 | andrew.kuchling | 2007-09-18 03:36:16 +0200 (Tue, 18 Sep 2007) | 1 line Add item; sort properly ........ r58186 | raymond.hettinger | 2007-09-18 05:33:19 +0200 (Tue, 18 Sep 2007) | 1 line Handle corner cased on 0-tuples and 1-tuples. Add verbose option so people can see how it works. ........ r58192 | georg.brandl | 2007-09-18 09:24:40 +0200 (Tue, 18 Sep 2007) | 2 lines A bit of reordering, also show more subheadings in the lang ref index. ........ r58193 | facundo.batista | 2007-09-18 18:53:18 +0200 (Tue, 18 Sep 2007) | 4 lines Speed up of the various division operations (remainder, divide, divideint and divmod). Thanks Mark Dickinson. ........ r58197 | raymond.hettinger | 2007-09-19 00:18:02 +0200 (Wed, 19 Sep 2007) | 1 line Cleanup docs for NamedTuple. ........
417 lines
12 KiB
Python
417 lines
12 KiB
Python
"""A POP3 client class.
|
|
|
|
Based on the J. Myers POP3 draft, Jan. 96
|
|
"""
|
|
|
|
# Author: David Ascher <david_ascher@brown.edu>
|
|
# [heavily stealing from nntplib.py]
|
|
# Updated: Piers Lauder <piers@cs.su.oz.au> [Jul '97]
|
|
# String method conversion and test jig improvements by ESR, February 2001.
|
|
# Added the POP3_SSL class. Methods loosely based on IMAP_SSL. Hector Urtubia <urtubia@mrbook.org> Aug 2003
|
|
|
|
# Example (see the test function at the end of this file)
|
|
|
|
# Imports
|
|
|
|
import re, socket
|
|
|
|
__all__ = ["POP3","error_proto"]
|
|
|
|
# Exception raised when an error or invalid response is received:
|
|
|
|
class error_proto(Exception): pass
|
|
|
|
# Standard Port
|
|
POP3_PORT = 110
|
|
|
|
# POP SSL PORT
|
|
POP3_SSL_PORT = 995
|
|
|
|
# Line terminators (we always output CRLF, but accept any of CRLF, LFCR, LF)
|
|
CR = b'\r'
|
|
LF = b'\n'
|
|
CRLF = CR+LF
|
|
|
|
|
|
class POP3:
|
|
|
|
"""This class supports both the minimal and optional command sets.
|
|
Arguments can be strings or integers (where appropriate)
|
|
(e.g.: retr(1) and retr('1') both work equally well.
|
|
|
|
Minimal Command Set:
|
|
USER name user(name)
|
|
PASS string pass_(string)
|
|
STAT stat()
|
|
LIST [msg] list(msg = None)
|
|
RETR msg retr(msg)
|
|
DELE msg dele(msg)
|
|
NOOP noop()
|
|
RSET rset()
|
|
QUIT quit()
|
|
|
|
Optional Commands (some servers support these):
|
|
RPOP name rpop(name)
|
|
APOP name digest apop(name, digest)
|
|
TOP msg n top(msg, n)
|
|
UIDL [msg] uidl(msg = None)
|
|
|
|
Raises one exception: 'error_proto'.
|
|
|
|
Instantiate with:
|
|
POP3(hostname, port=110)
|
|
|
|
NB: the POP protocol locks the mailbox from user
|
|
authorization until QUIT, so be sure to get in, suck
|
|
the messages, and quit, each time you access the
|
|
mailbox.
|
|
|
|
POP is a line-based protocol, which means large mail
|
|
messages consume lots of python cycles reading them
|
|
line-by-line.
|
|
|
|
If it's available on your mail server, use IMAP4
|
|
instead, it doesn't suffer from the two problems
|
|
above.
|
|
"""
|
|
|
|
|
|
def __init__(self, host, port=POP3_PORT, timeout=None):
|
|
self.host = host
|
|
self.port = port
|
|
self.sock = socket.create_connection((host, port), timeout)
|
|
self.file = self.sock.makefile('rb')
|
|
self._debugging = 0
|
|
self.welcome = self._getresp()
|
|
|
|
|
|
def _putline(self, line):
|
|
if self._debugging > 1: print('*put*', repr(line))
|
|
self.sock.sendall('%s%s' % (line, CRLF))
|
|
|
|
|
|
# Internal: send one command to the server (through _putline())
|
|
|
|
def _putcmd(self, line):
|
|
if self._debugging: print('*cmd*', repr(line))
|
|
self._putline(line)
|
|
|
|
|
|
# Internal: return one line from the server, stripping CRLF.
|
|
# This is where all the CPU time of this module is consumed.
|
|
# Raise error_proto('-ERR EOF') if the connection is closed.
|
|
|
|
def _getline(self):
|
|
line = self.file.readline()
|
|
if self._debugging > 1: print('*get*', repr(line))
|
|
if not line: raise error_proto('-ERR EOF')
|
|
octets = len(line)
|
|
# server can send any combination of CR & LF
|
|
# however, 'readline()' returns lines ending in LF
|
|
# so only possibilities are ...LF, ...CRLF, CR...LF
|
|
if line[-2:] == CRLF:
|
|
return line[:-2], octets
|
|
if line[0] == CR:
|
|
return line[1:-1], octets
|
|
return line[:-1], octets
|
|
|
|
|
|
# Internal: get a response from the server.
|
|
# Raise 'error_proto' if the response doesn't start with '+'.
|
|
|
|
def _getresp(self):
|
|
resp, o = self._getline()
|
|
if self._debugging > 1: print('*resp*', repr(resp))
|
|
c = resp[:1]
|
|
if c != b'+':
|
|
raise error_proto(resp)
|
|
return resp
|
|
|
|
|
|
# Internal: get a response plus following text from the server.
|
|
|
|
def _getlongresp(self):
|
|
resp = self._getresp()
|
|
list = []; octets = 0
|
|
line, o = self._getline()
|
|
while line != b'.':
|
|
if line[:2] == b'..':
|
|
o = o-1
|
|
line = line[1:]
|
|
octets = octets + o
|
|
list.append(line)
|
|
line, o = self._getline()
|
|
return resp, list, octets
|
|
|
|
|
|
# Internal: send a command and get the response
|
|
|
|
def _shortcmd(self, line):
|
|
self._putcmd(line)
|
|
return self._getresp()
|
|
|
|
|
|
# Internal: send a command and get the response plus following text
|
|
|
|
def _longcmd(self, line):
|
|
self._putcmd(line)
|
|
return self._getlongresp()
|
|
|
|
|
|
# These can be useful:
|
|
|
|
def getwelcome(self):
|
|
return self.welcome
|
|
|
|
|
|
def set_debuglevel(self, level):
|
|
self._debugging = level
|
|
|
|
|
|
# Here are all the POP commands:
|
|
|
|
def user(self, user):
|
|
"""Send user name, return response
|
|
|
|
(should indicate password required).
|
|
"""
|
|
return self._shortcmd('USER %s' % user)
|
|
|
|
|
|
def pass_(self, pswd):
|
|
"""Send password, return response
|
|
|
|
(response includes message count, mailbox size).
|
|
|
|
NB: mailbox is locked by server from here to 'quit()'
|
|
"""
|
|
return self._shortcmd('PASS %s' % pswd)
|
|
|
|
|
|
def stat(self):
|
|
"""Get mailbox status.
|
|
|
|
Result is tuple of 2 ints (message count, mailbox size)
|
|
"""
|
|
retval = self._shortcmd('STAT')
|
|
rets = retval.split()
|
|
if self._debugging: print('*stat*', repr(rets))
|
|
numMessages = int(rets[1])
|
|
sizeMessages = int(rets[2])
|
|
return (numMessages, sizeMessages)
|
|
|
|
|
|
def list(self, which=None):
|
|
"""Request listing, return result.
|
|
|
|
Result without a message number argument is in form
|
|
['response', ['mesg_num octets', ...], octets].
|
|
|
|
Result when a message number argument is given is a
|
|
single response: the "scan listing" for that message.
|
|
"""
|
|
if which is not None:
|
|
return self._shortcmd('LIST %s' % which)
|
|
return self._longcmd('LIST')
|
|
|
|
|
|
def retr(self, which):
|
|
"""Retrieve whole message number 'which'.
|
|
|
|
Result is in form ['response', ['line', ...], octets].
|
|
"""
|
|
return self._longcmd('RETR %s' % which)
|
|
|
|
|
|
def dele(self, which):
|
|
"""Delete message number 'which'.
|
|
|
|
Result is 'response'.
|
|
"""
|
|
return self._shortcmd('DELE %s' % which)
|
|
|
|
|
|
def noop(self):
|
|
"""Does nothing.
|
|
|
|
One supposes the response indicates the server is alive.
|
|
"""
|
|
return self._shortcmd('NOOP')
|
|
|
|
|
|
def rset(self):
|
|
"""Not sure what this does."""
|
|
return self._shortcmd('RSET')
|
|
|
|
|
|
def quit(self):
|
|
"""Signoff: commit changes on server, unlock mailbox, close connection."""
|
|
try:
|
|
resp = self._shortcmd('QUIT')
|
|
except error_proto as val:
|
|
resp = val
|
|
self.file.close()
|
|
self.sock.close()
|
|
del self.file, self.sock
|
|
return resp
|
|
|
|
#__del__ = quit
|
|
|
|
|
|
# optional commands:
|
|
|
|
def rpop(self, user):
|
|
"""Not sure what this does."""
|
|
return self._shortcmd('RPOP %s' % user)
|
|
|
|
|
|
timestamp = re.compile(r'\+OK.*(<[^>]+>)')
|
|
|
|
def apop(self, user, secret):
|
|
"""Authorisation
|
|
|
|
- only possible if server has supplied a timestamp in initial greeting.
|
|
|
|
Args:
|
|
user - mailbox user;
|
|
secret - secret shared between client and server.
|
|
|
|
NB: mailbox is locked by server from here to 'quit()'
|
|
"""
|
|
m = self.timestamp.match(self.welcome)
|
|
if not m:
|
|
raise error_proto('-ERR APOP not supported by server')
|
|
import hashlib
|
|
digest = hashlib.md5(m.group(1)+secret).digest()
|
|
digest = ''.join(map(lambda x:'%02x'%ord(x), digest))
|
|
return self._shortcmd('APOP %s %s' % (user, digest))
|
|
|
|
|
|
def top(self, which, howmuch):
|
|
"""Retrieve message header of message number 'which'
|
|
and first 'howmuch' lines of message body.
|
|
|
|
Result is in form ['response', ['line', ...], octets].
|
|
"""
|
|
return self._longcmd('TOP %s %s' % (which, howmuch))
|
|
|
|
|
|
def uidl(self, which=None):
|
|
"""Return message digest (unique id) list.
|
|
|
|
If 'which', result contains unique id for that message
|
|
in the form 'response mesgnum uid', otherwise result is
|
|
the list ['response', ['mesgnum uid', ...], octets]
|
|
"""
|
|
if which is not None:
|
|
return self._shortcmd('UIDL %s' % which)
|
|
return self._longcmd('UIDL')
|
|
|
|
try:
|
|
import ssl
|
|
except ImportError:
|
|
pass
|
|
else:
|
|
|
|
class POP3_SSL(POP3):
|
|
"""POP3 client class over SSL connection
|
|
|
|
Instantiate with: POP3_SSL(hostname, port=995, keyfile=None, certfile=None)
|
|
|
|
hostname - the hostname of the pop3 over ssl server
|
|
port - port number
|
|
keyfile - PEM formatted file that countains your private key
|
|
certfile - PEM formatted certificate chain file
|
|
|
|
See the methods of the parent class POP3 for more documentation.
|
|
"""
|
|
|
|
def __init__(self, host, port = POP3_SSL_PORT, keyfile = None, certfile = None):
|
|
self.host = host
|
|
self.port = port
|
|
self.keyfile = keyfile
|
|
self.certfile = certfile
|
|
self.buffer = ""
|
|
msg = "getaddrinfo returns an empty list"
|
|
self.sock = None
|
|
for res in socket.getaddrinfo(self.host, self.port, 0, socket.SOCK_STREAM):
|
|
af, socktype, proto, canonname, sa = res
|
|
try:
|
|
self.sock = socket.socket(af, socktype, proto)
|
|
self.sock.connect(sa)
|
|
except socket.error as msg:
|
|
if self.sock:
|
|
self.sock.close()
|
|
self.sock = None
|
|
continue
|
|
break
|
|
if not self.sock:
|
|
raise socket.error(msg)
|
|
self.file = self.sock.makefile('rb')
|
|
self.sslobj = ssl.wrap_socket(self.sock, self.keyfile, self.certfile)
|
|
self._debugging = 0
|
|
self.welcome = self._getresp()
|
|
|
|
def _fillBuffer(self):
|
|
localbuf = self.sslobj.read()
|
|
if len(localbuf) == 0:
|
|
raise error_proto('-ERR EOF')
|
|
self.buffer += localbuf
|
|
|
|
def _getline(self):
|
|
line = ""
|
|
renewline = re.compile(r'.*?\n')
|
|
match = renewline.match(self.buffer)
|
|
while not match:
|
|
self._fillBuffer()
|
|
match = renewline.match(self.buffer)
|
|
line = match.group(0)
|
|
self.buffer = renewline.sub('' ,self.buffer, 1)
|
|
if self._debugging > 1: print('*get*', repr(line))
|
|
|
|
octets = len(line)
|
|
if line[-2:] == CRLF:
|
|
return line[:-2], octets
|
|
if line[0] == CR:
|
|
return line[1:-1], octets
|
|
return line[:-1], octets
|
|
|
|
def _putline(self, line):
|
|
if self._debugging > 1: print('*put*', repr(line))
|
|
line += CRLF
|
|
bytes = len(line)
|
|
while bytes > 0:
|
|
sent = self.sslobj.write(line)
|
|
if sent == bytes:
|
|
break # avoid copy
|
|
line = line[sent:]
|
|
bytes = bytes - sent
|
|
|
|
def quit(self):
|
|
"""Signoff: commit changes on server, unlock mailbox, close connection."""
|
|
try:
|
|
resp = self._shortcmd('QUIT')
|
|
except error_proto as val:
|
|
resp = val
|
|
self.sock.close()
|
|
del self.sslobj, self.sock
|
|
return resp
|
|
|
|
__all__.append("POP3_SSL")
|
|
|
|
if __name__ == "__main__":
|
|
import sys
|
|
a = POP3(sys.argv[1])
|
|
print(a.getwelcome())
|
|
a.user(sys.argv[2])
|
|
a.pass_(sys.argv[3])
|
|
a.list()
|
|
(numMsgs, totalSize) = a.stat()
|
|
for i in range(1, numMsgs + 1):
|
|
(header, msg, octets) = a.retr(i)
|
|
print("Message %d:" % i)
|
|
for line in msg:
|
|
print(' ' + line)
|
|
print('-----------------------')
|
|
a.quit()
|