mirror of
https://github.com/python/cpython.git
synced 2025-10-19 16:03:42 +00:00

svn+ssh://pythondev@svn.python.org/python/trunk ........ r57820 | georg.brandl | 2007-08-31 08:59:27 +0200 (Fri, 31 Aug 2007) | 2 lines Document new shorthand notation for index entries. ........ r57827 | georg.brandl | 2007-08-31 10:47:51 +0200 (Fri, 31 Aug 2007) | 2 lines Fix subitem markup. ........ r57833 | martin.v.loewis | 2007-08-31 12:01:07 +0200 (Fri, 31 Aug 2007) | 1 line Mark registry components as 64-bit on Win64. ........ r57854 | bill.janssen | 2007-08-31 21:02:23 +0200 (Fri, 31 Aug 2007) | 1 line deprecate use of FakeSocket ........ r57855 | bill.janssen | 2007-08-31 21:02:46 +0200 (Fri, 31 Aug 2007) | 1 line remove mentions of socket.ssl in comments ........ r57856 | bill.janssen | 2007-08-31 21:03:31 +0200 (Fri, 31 Aug 2007) | 1 line remove use of non-existent SSLFakeSocket in apparently untested code ........ r57859 | martin.v.loewis | 2007-09-01 08:36:03 +0200 (Sat, 01 Sep 2007) | 3 lines Bug #1737210: Change Manufacturer of Windows installer to PSF. Will backport to 2.5. ........ r57865 | georg.brandl | 2007-09-01 09:51:24 +0200 (Sat, 01 Sep 2007) | 2 lines Fix RST link (backport from Py3k). ........ r57876 | georg.brandl | 2007-09-01 17:49:49 +0200 (Sat, 01 Sep 2007) | 2 lines Document sets' ">" and "<" operations (backport from py3k). ........ r57878 | skip.montanaro | 2007-09-01 19:40:03 +0200 (Sat, 01 Sep 2007) | 4 lines Added a note and examples to explain that re.split does not split on an empty pattern match. (issue 852532). ........ r57879 | walter.doerwald | 2007-09-01 20:18:09 +0200 (Sat, 01 Sep 2007) | 2 lines Fix wrong function names. ........ r57880 | walter.doerwald | 2007-09-01 20:34:05 +0200 (Sat, 01 Sep 2007) | 2 lines Fix typo. ........ r57889 | andrew.kuchling | 2007-09-01 22:31:59 +0200 (Sat, 01 Sep 2007) | 1 line Markup fix ........ r57892 | andrew.kuchling | 2007-09-01 22:43:36 +0200 (Sat, 01 Sep 2007) | 1 line Add various items ........ r57895 | andrew.kuchling | 2007-09-01 23:17:58 +0200 (Sat, 01 Sep 2007) | 1 line Wording change ........ r57896 | andrew.kuchling | 2007-09-01 23:18:31 +0200 (Sat, 01 Sep 2007) | 1 line Add more items ........ r57904 | ronald.oussoren | 2007-09-02 11:46:07 +0200 (Sun, 02 Sep 2007) | 3 lines Macosx: this patch ensures that the value of MACOSX_DEPLOYMENT_TARGET used by the Makefile is also used at configure-time. ........ r57925 | georg.brandl | 2007-09-03 09:16:46 +0200 (Mon, 03 Sep 2007) | 2 lines Fix #883466: don't allow Unicode as arguments to quopri and uu codecs. ........ r57936 | matthias.klose | 2007-09-04 01:33:04 +0200 (Tue, 04 Sep 2007) | 2 lines - Added support for linking the bsddb module against BerkeleyDB 4.6.x. ........ r57954 | mark.summerfield | 2007-09-04 10:16:15 +0200 (Tue, 04 Sep 2007) | 3 lines Added cross-references plus a note about dict & list shallow copying. ........ r57958 | martin.v.loewis | 2007-09-04 11:51:57 +0200 (Tue, 04 Sep 2007) | 3 lines Document that we rely on the OS to release the crypto context. Fixes #1626801. ........ r57960 | martin.v.loewis | 2007-09-04 15:13:14 +0200 (Tue, 04 Sep 2007) | 3 lines Patch #1388440: Add set_completion_display_matches_hook and get_completion_type to readline. ........ r57961 | martin.v.loewis | 2007-09-04 16:19:28 +0200 (Tue, 04 Sep 2007) | 3 lines Patch #1031213: Decode source line in SyntaxErrors back to its original source encoding. Will backport to 2.5. ........ r57972 | matthias.klose | 2007-09-04 20:17:36 +0200 (Tue, 04 Sep 2007) | 3 lines - Makefile.pre.in(buildbottest): Run an optional script pybuildbot.identify to include some information about the build environment. ........ r57973 | matthias.klose | 2007-09-04 21:05:38 +0200 (Tue, 04 Sep 2007) | 2 lines - Makefile.pre.in(buildbottest): Remove whitespace at eol. ........ r57975 | matthias.klose | 2007-09-04 22:46:02 +0200 (Tue, 04 Sep 2007) | 2 lines - Fix libffi configure for hppa*-*-linux* | parisc*-*-linux*. ........ r57980 | bill.janssen | 2007-09-05 02:46:27 +0200 (Wed, 05 Sep 2007) | 1 line SSL certificate distinguished names should be represented by tuples ........ r57985 | martin.v.loewis | 2007-09-05 08:39:17 +0200 (Wed, 05 Sep 2007) | 3 lines Patch #1105: Explain that one needs to build the solution to get dependencies right. ........ r57987 | armin.rigo | 2007-09-05 09:51:21 +0200 (Wed, 05 Sep 2007) | 4 lines PyDict_GetItem() returns a borrowed reference. There are probably a number of places that are open to attacks such as the following one, in bltinmodule.c:min_max(). ........ r57991 | martin.v.loewis | 2007-09-05 13:47:34 +0200 (Wed, 05 Sep 2007) | 3 lines Patch #786737: Allow building in a tree of symlinks pointing to a readonly source. ........ r57993 | georg.brandl | 2007-09-05 15:36:44 +0200 (Wed, 05 Sep 2007) | 2 lines Backport from Py3k: Bug #1684991: explain lookup semantics for __special__ methods (new-style classes only). ........ r58004 | armin.rigo | 2007-09-06 10:30:51 +0200 (Thu, 06 Sep 2007) | 4 lines Patch #1733973 by peaker: ptrace_enter_call() assumes no exception is currently set. This assumption is broken when throwing into a generator. ........ r58006 | armin.rigo | 2007-09-06 11:30:38 +0200 (Thu, 06 Sep 2007) | 4 lines PyDict_GetItem() returns a borrowed reference. This attack is against ceval.c:IMPORT_NAME, which calls an object (__builtin__.__import__) without holding a reference to it. ........ r58013 | georg.brandl | 2007-09-06 16:49:56 +0200 (Thu, 06 Sep 2007) | 2 lines Backport from 3k: #1116: fix reference to old filename. ........ r58021 | thomas.heller | 2007-09-06 22:26:20 +0200 (Thu, 06 Sep 2007) | 1 line Fix typo: c_float represents to C float type. ........ r58022 | skip.montanaro | 2007-09-07 00:29:06 +0200 (Fri, 07 Sep 2007) | 3 lines If this is correct for py3k branch and it's already in the release25-maint branch, seems like it ought to be on the trunk as well. ........ r58023 | gregory.p.smith | 2007-09-07 00:59:59 +0200 (Fri, 07 Sep 2007) | 4 lines Apply the fix from Issue1112 to make this test more robust and keep windows happy. ........ r58031 | brett.cannon | 2007-09-07 05:17:50 +0200 (Fri, 07 Sep 2007) | 4 lines Make uuid1 and uuid4 tests conditional on whether ctypes can be imported; implementation of either function depends on ctypes but uuid as a whole does not. ........ r58032 | brett.cannon | 2007-09-07 06:18:30 +0200 (Fri, 07 Sep 2007) | 6 lines Fix a crasher where Python code managed to infinitely recurse in C code without ever going back out to Python code in PyObject_Call(). Required introducing a static RuntimeError instance so that normalizing an exception there is no reliance on a recursive call that would put the exception system over the recursion check itself. ........ r58034 | thomas.heller | 2007-09-07 08:32:17 +0200 (Fri, 07 Sep 2007) | 1 line Add a 'c_longdouble' type to the ctypes module. ........ r58035 | thomas.heller | 2007-09-07 11:30:40 +0200 (Fri, 07 Sep 2007) | 1 line Remove unneeded #include. ........ r58036 | thomas.heller | 2007-09-07 11:33:24 +0200 (Fri, 07 Sep 2007) | 6 lines Backport from py3k branch: Add a workaround for a strange bug on win64, when _ctypes is compiled with the SDK compiler. This should fix the failing Lib\ctypes\test\test_as_parameter.py test. ........ r58037 | georg.brandl | 2007-09-07 16:14:40 +0200 (Fri, 07 Sep 2007) | 2 lines Fix a wrong indentation for sublists. ........ r58043 | georg.brandl | 2007-09-07 22:10:49 +0200 (Fri, 07 Sep 2007) | 2 lines #1095: ln -f doesn't work portably, fix in Makefile. ........ r58049 | skip.montanaro | 2007-09-08 02:34:17 +0200 (Sat, 08 Sep 2007) | 1 line be explicit about the actual location of the missing file ........
369 lines
12 KiB
Python
369 lines
12 KiB
Python
# Test the support for SSL and sockets
|
|
|
|
import sys
|
|
import unittest
|
|
from test import test_support
|
|
import socket
|
|
import errno
|
|
import threading
|
|
import subprocess
|
|
import time
|
|
import os
|
|
import pprint
|
|
import urllib
|
|
import shutil
|
|
import traceback
|
|
|
|
# Optionally test SSL support, if we have it in the tested platform
|
|
skip_expected = False
|
|
try:
|
|
import ssl
|
|
except ImportError:
|
|
skip_expected = True
|
|
|
|
CERTFILE = None
|
|
|
|
|
|
def handle_error(prefix):
|
|
exc_format = ' '.join(traceback.format_exception(*sys.exc_info()))
|
|
sys.stdout.write(prefix + exc_format)
|
|
|
|
|
|
class BasicTests(unittest.TestCase):
|
|
|
|
def testRudeShutdown(self):
|
|
# Some random port to connect to.
|
|
PORT = [9934]
|
|
|
|
listener_ready = threading.Event()
|
|
listener_gone = threading.Event()
|
|
|
|
# `listener` runs in a thread. It opens a socket listening on
|
|
# PORT, and sits in an accept() until the main thread connects.
|
|
# Then it rudely closes the socket, and sets Event `listener_gone`
|
|
# to let the main thread know the socket is gone.
|
|
def listener():
|
|
s = socket.socket()
|
|
PORT[0] = test_support.bind_port(s, '', PORT[0])
|
|
s.listen(5)
|
|
listener_ready.set()
|
|
s.accept()
|
|
s = None # reclaim the socket object, which also closes it
|
|
listener_gone.set()
|
|
|
|
def connector():
|
|
listener_ready.wait()
|
|
s = socket.socket()
|
|
s.connect(('localhost', PORT[0]))
|
|
listener_gone.wait()
|
|
try:
|
|
ssl_sock = socket.ssl(s)
|
|
except socket.sslerror:
|
|
pass
|
|
else:
|
|
raise test_support.TestFailed(
|
|
'connecting to closed SSL socket should have failed')
|
|
|
|
t = threading.Thread(target=listener)
|
|
t.start()
|
|
connector()
|
|
t.join()
|
|
|
|
def testSSLconnect(self):
|
|
import os
|
|
with test_support.transient_internet():
|
|
s = ssl.sslsocket(socket.socket(socket.AF_INET),
|
|
cert_reqs=ssl.CERT_NONE)
|
|
s.connect(("pop.gmail.com", 995))
|
|
c = s.getpeercert()
|
|
if c:
|
|
raise test_support.TestFailed("Peer cert %s shouldn't be here!")
|
|
s.close()
|
|
|
|
# this should fail because we have no verification certs
|
|
s = ssl.sslsocket(socket.socket(socket.AF_INET),
|
|
cert_reqs=ssl.CERT_REQUIRED)
|
|
try:
|
|
s.connect(("pop.gmail.com", 995))
|
|
except ssl.sslerror:
|
|
pass
|
|
finally:
|
|
s.close()
|
|
|
|
class ConnectedTests(unittest.TestCase):
|
|
|
|
def testTLSecho (self):
|
|
|
|
s1 = socket.socket()
|
|
try:
|
|
s1.connect(('127.0.0.1', 10024))
|
|
except:
|
|
handle_error("connection failure:\n")
|
|
raise test_support.TestFailed("Can't connect to test server")
|
|
else:
|
|
try:
|
|
c1 = ssl.sslsocket(s1, ssl_version=ssl.PROTOCOL_TLSv1)
|
|
except:
|
|
handle_error("SSL handshake failure:\n")
|
|
raise test_support.TestFailed("Can't SSL-handshake with test server")
|
|
else:
|
|
if not c1:
|
|
raise test_support.TestFailed("Can't SSL-handshake with test server")
|
|
indata = "FOO\n"
|
|
c1.write(indata)
|
|
outdata = c1.read()
|
|
if outdata != indata.lower():
|
|
raise test_support.TestFailed("bad data <<%s>> received; expected <<%s>>\n" % (data, indata.lower()))
|
|
c1.close()
|
|
|
|
def testReadCert(self):
|
|
|
|
s2 = socket.socket()
|
|
try:
|
|
s2.connect(('127.0.0.1', 10024))
|
|
except:
|
|
handle_error("connection failure:\n")
|
|
raise test_support.TestFailed("Can't connect to test server")
|
|
else:
|
|
try:
|
|
c2 = ssl.sslsocket(s2, ssl_version=ssl.PROTOCOL_TLSv1,
|
|
cert_reqs=ssl.CERT_REQUIRED, ca_certs=CERTFILE)
|
|
except:
|
|
handle_error("SSL handshake failure:\n")
|
|
raise test_support.TestFailed("Can't SSL-handshake with test server")
|
|
else:
|
|
if not c2:
|
|
raise test_support.TestFailed("Can't SSL-handshake with test server")
|
|
cert = c2.getpeercert()
|
|
if not cert:
|
|
raise test_support.TestFailed("Can't get peer certificate.")
|
|
if test_support.verbose:
|
|
sys.stdout.write(pprint.pformat(cert) + '\n')
|
|
if not cert.has_key('subject'):
|
|
raise test_support.TestFailed(
|
|
"No subject field in certificate: %s." %
|
|
pprint.pformat(cert))
|
|
if not ('organizationName', 'Python Software Foundation') in cert['subject']:
|
|
raise test_support.TestFailed(
|
|
"Missing or invalid 'organizationName' field in certificate subject; "
|
|
"should be 'Python Software Foundation'.");
|
|
c2.close()
|
|
|
|
|
|
class ThreadedEchoServer(threading.Thread):
|
|
|
|
class ConnectionHandler(threading.Thread):
|
|
|
|
def __init__(self, server, connsock):
|
|
self.server = server
|
|
self.running = False
|
|
self.sock = connsock
|
|
threading.Thread.__init__(self)
|
|
self.setDaemon(True)
|
|
|
|
def run (self):
|
|
self.running = True
|
|
try:
|
|
sslconn = ssl.sslsocket(self.sock, server_side=True,
|
|
certfile=self.server.certificate,
|
|
ssl_version=self.server.protocol,
|
|
cert_reqs=self.server.certreqs)
|
|
except:
|
|
# here, we want to stop the server, because this shouldn't
|
|
# happen in the context of our test case
|
|
handle_error("Test server failure:\n")
|
|
self.running = False
|
|
# normally, we'd just stop here, but for the test
|
|
# harness, we want to stop the server
|
|
self.server.stop()
|
|
return
|
|
|
|
while self.running:
|
|
try:
|
|
msg = sslconn.read()
|
|
if not msg:
|
|
# eof, so quit this handler
|
|
self.running = False
|
|
sslconn.close()
|
|
elif msg.strip() == 'over':
|
|
sslconn.close()
|
|
self.server.stop()
|
|
self.running = False
|
|
else:
|
|
if test_support.verbose:
|
|
sys.stdout.write("\nserver: %s\n" % msg.strip().lower())
|
|
sslconn.write(msg.lower())
|
|
except ssl.sslerror:
|
|
handle_error("Test server failure:\n")
|
|
sslconn.close()
|
|
self.running = False
|
|
# normally, we'd just stop here, but for the test
|
|
# harness, we want to stop the server
|
|
self.server.stop()
|
|
except:
|
|
handle_error('')
|
|
|
|
def __init__(self, port, certificate, ssl_version=None,
|
|
certreqs=None, cacerts=None):
|
|
if ssl_version is None:
|
|
ssl_version = ssl.PROTOCOL_TLSv1
|
|
if certreqs is None:
|
|
certreqs = ssl.CERT_NONE
|
|
self.certificate = certificate
|
|
self.protocol = ssl_version
|
|
self.certreqs = certreqs
|
|
self.cacerts = cacerts
|
|
self.sock = socket.socket()
|
|
self.flag = None
|
|
if hasattr(socket, 'SO_REUSEADDR'):
|
|
self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
|
|
if hasattr(socket, 'SO_REUSEPORT'):
|
|
self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT, 1)
|
|
self.sock.bind(('127.0.0.1', port))
|
|
self.active = False
|
|
threading.Thread.__init__(self)
|
|
self.setDaemon(False)
|
|
|
|
def start (self, flag=None):
|
|
self.flag = flag
|
|
threading.Thread.start(self)
|
|
|
|
def run (self):
|
|
self.sock.settimeout(0.5)
|
|
self.sock.listen(5)
|
|
self.active = True
|
|
if self.flag:
|
|
# signal an event
|
|
self.flag.set()
|
|
while self.active:
|
|
try:
|
|
newconn, connaddr = self.sock.accept()
|
|
if test_support.verbose:
|
|
sys.stdout.write('\nserver: new connection from ' + str(connaddr) + '\n')
|
|
handler = self.ConnectionHandler(self, newconn)
|
|
handler.start()
|
|
except socket.timeout:
|
|
pass
|
|
except KeyboardInterrupt:
|
|
self.stop()
|
|
except:
|
|
handle_error("Test server failure:\n")
|
|
|
|
def stop (self):
|
|
self.active = False
|
|
self.sock.close()
|
|
|
|
CERTFILE_CONFIG_TEMPLATE = """
|
|
# create RSA certs - Server
|
|
|
|
[ req ]
|
|
default_bits = 1024
|
|
encrypt_key = yes
|
|
distinguished_name = req_dn
|
|
x509_extensions = cert_type
|
|
|
|
[ req_dn ]
|
|
countryName = Country Name (2 letter code)
|
|
countryName_default = US
|
|
countryName_min = 2
|
|
countryName_max = 2
|
|
|
|
stateOrProvinceName = State or Province Name (full name)
|
|
stateOrProvinceName_default = %(state)s
|
|
|
|
localityName = Locality Name (eg, city)
|
|
localityName_default = %(city)s
|
|
|
|
0.organizationName = Organization Name (eg, company)
|
|
0.organizationName_default = %(organization)s
|
|
|
|
organizationalUnitName = Organizational Unit Name (eg, section)
|
|
organizationalUnitName_default = %(unit)s
|
|
|
|
0.commonName = Common Name (FQDN of your server)
|
|
0.commonName_default = %(common-name)s
|
|
|
|
# To create a certificate for more than one name uncomment:
|
|
# 1.commonName = DNS alias of your server
|
|
# 2.commonName = DNS alias of your server
|
|
# ...
|
|
# See http://home.netscape.com/eng/security/ssl_2.0_certificate.html
|
|
# to see how Netscape understands commonName.
|
|
|
|
[ cert_type ]
|
|
nsCertType = server
|
|
"""
|
|
|
|
def create_cert_files(hostname=None):
|
|
|
|
"""This is the routine that was run to create the certificate
|
|
and private key contained in keycert.pem."""
|
|
|
|
import tempfile, socket, os
|
|
d = tempfile.mkdtemp()
|
|
# now create a configuration file for the CA signing cert
|
|
fqdn = hostname or socket.getfqdn()
|
|
crtfile = os.path.join(d, "cert.pem")
|
|
conffile = os.path.join(d, "ca.conf")
|
|
fp = open(conffile, "w")
|
|
fp.write(CERTFILE_CONFIG_TEMPLATE %
|
|
{'state': "Delaware",
|
|
'city': "Wilmington",
|
|
'organization': "Python Software Foundation",
|
|
'unit': "SSL",
|
|
'common-name': fqdn,
|
|
})
|
|
fp.close()
|
|
error = os.system(
|
|
"openssl req -batch -new -x509 -days 2000 -nodes -config %s "
|
|
"-keyout \"%s\" -out \"%s\" > /dev/null < /dev/null 2>&1" %
|
|
(conffile, crtfile, crtfile))
|
|
# now we have a self-signed server cert in crtfile
|
|
os.unlink(conffile)
|
|
if (os.WEXITSTATUS(error) or
|
|
not os.path.exists(crtfile) or os.path.getsize(crtfile) == 0):
|
|
if test_support.verbose:
|
|
sys.stdout.write("Unable to create certificate for test, "
|
|
+ "error status %d\n" % (error >> 8))
|
|
crtfile = None
|
|
elif test_support.verbose:
|
|
sys.stdout.write(open(crtfile, 'r').read() + '\n')
|
|
return d, crtfile
|
|
|
|
|
|
def test_main(verbose=False):
|
|
if skip_expected:
|
|
raise test_support.TestSkipped("No SSL support")
|
|
|
|
global CERTFILE
|
|
CERTFILE = os.path.join(os.path.dirname(__file__) or os.curdir,
|
|
"keycert.pem")
|
|
if not CERTFILE:
|
|
sys.__stdout__.write("Skipping test_ssl ConnectedTests; "
|
|
"couldn't create a certificate.\n")
|
|
|
|
tests = [BasicTests]
|
|
|
|
server = None
|
|
if CERTFILE and test_support.is_resource_enabled('network'):
|
|
server = ThreadedEchoServer(10024, CERTFILE)
|
|
flag = threading.Event()
|
|
server.start(flag)
|
|
# wait for it to start
|
|
flag.wait()
|
|
tests.append(ConnectedTests)
|
|
|
|
thread_info = test_support.threading_setup()
|
|
|
|
try:
|
|
test_support.run_unittest(*tests)
|
|
finally:
|
|
if server is not None and server.active:
|
|
server.stop()
|
|
# wait for it to stop
|
|
server.join()
|
|
|
|
test_support.threading_cleanup(*thread_info)
|
|
|
|
if __name__ == "__main__":
|
|
test_main()
|