2007-08-25 12:08:43 -03:00
|
|
|
# Test the support for SSL and sockets
|
|
|
|
|
|
|
|
import sys
|
|
|
|
import unittest
|
|
|
|
from test import test_support
|
2008-06-28 19:19:33 -03:00
|
|
|
import asyncore
|
2007-08-25 12:08:43 -03:00
|
|
|
import socket
|
2008-06-28 19:19:33 -03:00
|
|
|
import select
|
2007-08-25 12:08:43 -03:00
|
|
|
import errno
|
|
|
|
import subprocess
|
|
|
|
import time
|
|
|
|
import os
|
|
|
|
import pprint
|
2007-09-16 19:06:00 -03:00
|
|
|
import urllib, urlparse
|
2007-08-25 12:08:43 -03:00
|
|
|
import shutil
|
|
|
|
import traceback
|
|
|
|
|
2007-09-16 19:06:00 -03:00
|
|
|
from BaseHTTPServer import HTTPServer
|
|
|
|
from SimpleHTTPServer import SimpleHTTPRequestHandler
|
|
|
|
|
2007-08-25 12:08:43 -03:00
|
|
|
# Optionally test SSL support, if we have it in the tested platform
|
|
|
|
skip_expected = False
|
|
|
|
try:
|
|
|
|
import ssl
|
|
|
|
except ImportError:
|
|
|
|
skip_expected = True
|
|
|
|
|
- Issue #2550: The approach used by client/server code for obtaining ports
to listen on in network-oriented tests has been refined in an effort to
facilitate running multiple instances of the entire regression test suite
in parallel without issue. test_support.bind_port() has been fixed such
that it will always return a unique port -- which wasn't always the case
with the previous implementation, especially if socket options had been
set that affected address reuse (i.e. SO_REUSEADDR, SO_REUSEPORT). The
new implementation of bind_port() will actually raise an exception if it
is passed an AF_INET/SOCK_STREAM socket with either the SO_REUSEADDR or
SO_REUSEPORT socket option set. Furthermore, if available, bind_port()
will set the SO_EXCLUSIVEADDRUSE option on the socket it's been passed.
This currently only applies to Windows. This option prevents any other
sockets from binding to the host/port we've bound to, thus removing the
possibility of the 'non-deterministic' behaviour, as Microsoft puts it,
that occurs when a second SOCK_STREAM socket binds and accepts to a
host/port that's already been bound by another socket. The optional
preferred port parameter to bind_port() has been removed. Under no
circumstances should tests be hard coding ports!
test_support.find_unused_port() has also been introduced, which will pass
a temporary socket object to bind_port() in order to obtain an unused port.
The temporary socket object is then closed and deleted, and the port is
returned. This method should only be used for obtaining an unused port
in order to pass to an external program (i.e. the -accept [port] argument
to openssl's s_server mode) or as a parameter to a server-oriented class
that doesn't give you direct access to the underlying socket used.
Finally, test_support.HOST has been introduced, which should be used for
the host argument of any relevant socket calls (i.e. bind and connect).
The following tests were updated to following the new conventions:
test_socket, test_smtplib, test_asyncore, test_ssl, test_httplib,
test_poplib, test_ftplib, test_telnetlib, test_socketserver,
test_asynchat and test_socket_ssl.
It is now possible for multiple instances of the regression test suite to
run in parallel without issue.
2008-04-08 20:47:30 -03:00
|
|
|
HOST = test_support.HOST
|
2007-08-25 12:08:43 -03:00
|
|
|
CERTFILE = None
|
2007-09-16 19:06:00 -03:00
|
|
|
SVN_PYTHON_ORG_ROOT_CERT = None
|
2007-08-25 12:08:43 -03:00
|
|
|
|
2007-08-26 22:03:18 -03:00
|
|
|
def handle_error(prefix):
|
|
|
|
exc_format = ' '.join(traceback.format_exception(*sys.exc_info()))
|
2007-09-10 18:51:02 -03:00
|
|
|
if test_support.verbose:
|
|
|
|
sys.stdout.write(prefix + exc_format)
|
2007-08-26 22:03:18 -03:00
|
|
|
|
|
|
|
|
2007-08-25 12:08:43 -03:00
|
|
|
class BasicTests(unittest.TestCase):
|
|
|
|
|
|
|
|
def testSSLconnect(self):
|
2008-01-19 12:39:27 -04:00
|
|
|
if not test_support.is_resource_enabled('network'):
|
|
|
|
return
|
2007-09-16 19:06:00 -03:00
|
|
|
s = ssl.wrap_socket(socket.socket(socket.AF_INET),
|
|
|
|
cert_reqs=ssl.CERT_NONE)
|
|
|
|
s.connect(("svn.python.org", 443))
|
|
|
|
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.wrap_socket(socket.socket(socket.AF_INET),
|
|
|
|
cert_reqs=ssl.CERT_REQUIRED)
|
|
|
|
try:
|
|
|
|
s.connect(("svn.python.org", 443))
|
|
|
|
except ssl.SSLError:
|
|
|
|
pass
|
|
|
|
finally:
|
2007-08-25 12:08:43 -03:00
|
|
|
s.close()
|
|
|
|
|
|
|
|
|
2007-09-10 18:51:02 -03:00
|
|
|
def testCrucialConstants(self):
|
|
|
|
ssl.PROTOCOL_SSLv2
|
|
|
|
ssl.PROTOCOL_SSLv23
|
|
|
|
ssl.PROTOCOL_SSLv3
|
|
|
|
ssl.PROTOCOL_TLSv1
|
|
|
|
ssl.CERT_NONE
|
|
|
|
ssl.CERT_OPTIONAL
|
|
|
|
ssl.CERT_REQUIRED
|
|
|
|
|
|
|
|
def testRAND(self):
|
|
|
|
v = ssl.RAND_status()
|
|
|
|
if test_support.verbose:
|
|
|
|
sys.stdout.write("\n RAND_status is %d (%s)\n"
|
|
|
|
% (v, (v and "sufficient randomness") or
|
|
|
|
"insufficient randomness"))
|
2007-08-26 16:35:09 -03:00
|
|
|
try:
|
2007-09-10 18:51:02 -03:00
|
|
|
ssl.RAND_egd(1)
|
|
|
|
except TypeError:
|
|
|
|
pass
|
2007-08-26 16:35:09 -03:00
|
|
|
else:
|
2007-09-10 18:51:02 -03:00
|
|
|
print "didn't raise TypeError"
|
|
|
|
ssl.RAND_add("this is a random string", 75.0)
|
|
|
|
|
|
|
|
def testParseCert(self):
|
|
|
|
# note that this uses an 'unofficial' function in _ssl.c,
|
|
|
|
# provided solely for this test, to exercise the certificate
|
|
|
|
# parsing code
|
|
|
|
p = ssl._ssl._test_decode_cert(CERTFILE, False)
|
|
|
|
if test_support.verbose:
|
|
|
|
sys.stdout.write("\n" + pprint.pformat(p) + "\n")
|
2007-08-25 12:08:43 -03:00
|
|
|
|
2007-09-16 19:06:00 -03:00
|
|
|
def testDERtoPEM(self):
|
|
|
|
|
|
|
|
pem = open(SVN_PYTHON_ORG_ROOT_CERT, 'r').read()
|
|
|
|
d1 = ssl.PEM_cert_to_DER_cert(pem)
|
|
|
|
p2 = ssl.DER_cert_to_PEM_cert(d1)
|
|
|
|
d2 = ssl.PEM_cert_to_DER_cert(p2)
|
|
|
|
if (d1 != d2):
|
|
|
|
raise test_support.TestFailed("PEM-to-DER or DER-to-PEM translation failed")
|
|
|
|
|
2008-06-28 19:19:33 -03:00
|
|
|
class NetworkedTests(unittest.TestCase):
|
2007-09-16 19:06:00 -03:00
|
|
|
|
|
|
|
def testConnect(self):
|
|
|
|
s = ssl.wrap_socket(socket.socket(socket.AF_INET),
|
|
|
|
cert_reqs=ssl.CERT_NONE)
|
|
|
|
s.connect(("svn.python.org", 443))
|
|
|
|
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.wrap_socket(socket.socket(socket.AF_INET),
|
|
|
|
cert_reqs=ssl.CERT_REQUIRED)
|
|
|
|
try:
|
|
|
|
s.connect(("svn.python.org", 443))
|
|
|
|
except ssl.SSLError:
|
|
|
|
pass
|
|
|
|
finally:
|
|
|
|
s.close()
|
|
|
|
|
|
|
|
# this should succeed because we specify the root cert
|
|
|
|
s = ssl.wrap_socket(socket.socket(socket.AF_INET),
|
|
|
|
cert_reqs=ssl.CERT_REQUIRED,
|
|
|
|
ca_certs=SVN_PYTHON_ORG_ROOT_CERT)
|
|
|
|
try:
|
|
|
|
s.connect(("svn.python.org", 443))
|
|
|
|
except ssl.SSLError, x:
|
|
|
|
raise test_support.TestFailed("Unexpected exception %s" % x)
|
|
|
|
finally:
|
|
|
|
s.close()
|
|
|
|
|
2008-06-28 19:19:33 -03:00
|
|
|
|
|
|
|
def testNonBlockingHandshake(self):
|
|
|
|
s = socket.socket(socket.AF_INET)
|
|
|
|
s.connect(("svn.python.org", 443))
|
|
|
|
s.setblocking(False)
|
|
|
|
s = ssl.wrap_socket(s,
|
|
|
|
cert_reqs=ssl.CERT_NONE,
|
|
|
|
do_handshake_on_connect=False)
|
|
|
|
count = 0
|
|
|
|
while True:
|
|
|
|
try:
|
|
|
|
count += 1
|
|
|
|
s.do_handshake()
|
|
|
|
break
|
|
|
|
except ssl.SSLError, err:
|
|
|
|
if err.args[0] == ssl.SSL_ERROR_WANT_READ:
|
|
|
|
select.select([s], [], [])
|
|
|
|
elif err.args[0] == ssl.SSL_ERROR_WANT_WRITE:
|
|
|
|
select.select([], [s], [])
|
|
|
|
else:
|
|
|
|
raise
|
|
|
|
s.close()
|
|
|
|
if test_support.verbose:
|
|
|
|
sys.stdout.write("\nNeeded %d calls to do_handshake() to establish session.\n" % count)
|
|
|
|
|
2007-09-16 19:06:00 -03:00
|
|
|
def testFetchServerCert(self):
|
|
|
|
|
|
|
|
pem = ssl.get_server_certificate(("svn.python.org", 443))
|
|
|
|
if not pem:
|
|
|
|
raise test_support.TestFailed("No server certificate on svn.python.org:443!")
|
|
|
|
|
|
|
|
try:
|
|
|
|
pem = ssl.get_server_certificate(("svn.python.org", 443), ca_certs=CERTFILE)
|
|
|
|
except ssl.SSLError:
|
|
|
|
#should fail
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
raise test_support.TestFailed("Got server certificate %s for svn.python.org!" % pem)
|
|
|
|
|
|
|
|
pem = ssl.get_server_certificate(("svn.python.org", 443), ca_certs=SVN_PYTHON_ORG_ROOT_CERT)
|
|
|
|
if not pem:
|
|
|
|
raise test_support.TestFailed("No server certificate on svn.python.org:443!")
|
|
|
|
if test_support.verbose:
|
|
|
|
sys.stdout.write("\nVerified certificate for svn.python.org:443 is\n%s\n" % pem)
|
|
|
|
|
|
|
|
|
2007-09-10 18:51:02 -03:00
|
|
|
try:
|
|
|
|
import threading
|
|
|
|
except ImportError:
|
|
|
|
_have_threads = False
|
|
|
|
else:
|
2007-08-25 12:08:43 -03:00
|
|
|
|
2007-09-10 18:51:02 -03:00
|
|
|
_have_threads = True
|
2007-08-25 12:08:43 -03:00
|
|
|
|
2007-09-10 18:51:02 -03:00
|
|
|
class ThreadedEchoServer(threading.Thread):
|
2007-08-25 12:08:43 -03:00
|
|
|
|
2007-09-10 18:51:02 -03:00
|
|
|
class ConnectionHandler(threading.Thread):
|
2007-08-25 12:08:43 -03:00
|
|
|
|
2007-09-10 18:51:02 -03:00
|
|
|
"""A mildly complicated class, because we want it to work both
|
|
|
|
with and without the SSL wrapper around the socket connection, so
|
|
|
|
that we can test the STARTTLS functionality."""
|
2007-08-25 12:08:43 -03:00
|
|
|
|
2007-09-10 18:51:02 -03:00
|
|
|
def __init__(self, server, connsock):
|
|
|
|
self.server = server
|
2007-08-26 16:35:09 -03:00
|
|
|
self.running = False
|
2007-09-10 18:51:02 -03:00
|
|
|
self.sock = connsock
|
|
|
|
self.sock.setblocking(1)
|
|
|
|
self.sslconn = None
|
|
|
|
threading.Thread.__init__(self)
|
|
|
|
self.setDaemon(True)
|
2007-08-26 16:35:09 -03:00
|
|
|
|
2008-06-28 19:19:33 -03:00
|
|
|
def show_conn_details(self):
|
|
|
|
if self.server.certreqs == ssl.CERT_REQUIRED:
|
|
|
|
cert = self.sslconn.getpeercert()
|
|
|
|
if test_support.verbose and self.server.chatty:
|
|
|
|
sys.stdout.write(" client cert is " + pprint.pformat(cert) + "\n")
|
|
|
|
cert_binary = self.sslconn.getpeercert(True)
|
|
|
|
if test_support.verbose and self.server.chatty:
|
|
|
|
sys.stdout.write(" cert binary is " + str(len(cert_binary)) + " bytes\n")
|
|
|
|
cipher = self.sslconn.cipher()
|
|
|
|
if test_support.verbose and self.server.chatty:
|
|
|
|
sys.stdout.write(" server: connection cipher is now " + str(cipher) + "\n")
|
|
|
|
|
2007-09-10 18:51:02 -03:00
|
|
|
def wrap_conn (self):
|
2007-08-25 12:08:43 -03:00
|
|
|
try:
|
2007-09-10 18:51:02 -03:00
|
|
|
self.sslconn = ssl.wrap_socket(self.sock, server_side=True,
|
|
|
|
certfile=self.server.certificate,
|
|
|
|
ssl_version=self.server.protocol,
|
|
|
|
ca_certs=self.server.cacerts,
|
|
|
|
cert_reqs=self.server.certreqs)
|
|
|
|
except:
|
|
|
|
if self.server.chatty:
|
|
|
|
handle_error("\n server: bad connection attempt from " +
|
|
|
|
str(self.sock.getpeername()) + ":\n")
|
2008-06-28 19:19:33 -03:00
|
|
|
self.close()
|
2007-09-10 18:51:02 -03:00
|
|
|
if not self.server.expect_bad_connects:
|
|
|
|
# here, we want to stop the server, because this shouldn't
|
|
|
|
# happen in the context of our test case
|
2007-08-25 12:08:43 -03:00
|
|
|
self.running = False
|
2007-09-10 18:51:02 -03:00
|
|
|
# normally, we'd just stop here, but for the test
|
|
|
|
# harness, we want to stop the server
|
2007-08-25 12:08:43 -03:00
|
|
|
self.server.stop()
|
2007-09-10 18:51:02 -03:00
|
|
|
return False
|
|
|
|
|
|
|
|
else:
|
|
|
|
return True
|
|
|
|
|
|
|
|
def read(self):
|
|
|
|
if self.sslconn:
|
|
|
|
return self.sslconn.read()
|
|
|
|
else:
|
|
|
|
return self.sock.recv(1024)
|
|
|
|
|
|
|
|
def write(self, bytes):
|
|
|
|
if self.sslconn:
|
|
|
|
return self.sslconn.write(bytes)
|
|
|
|
else:
|
|
|
|
return self.sock.send(bytes)
|
|
|
|
|
|
|
|
def close(self):
|
|
|
|
if self.sslconn:
|
|
|
|
self.sslconn.close()
|
|
|
|
else:
|
2008-06-28 19:19:33 -03:00
|
|
|
self.sock._sock.close()
|
2007-09-10 18:51:02 -03:00
|
|
|
|
|
|
|
def run (self):
|
|
|
|
self.running = True
|
|
|
|
if not self.server.starttls_server:
|
2008-06-28 19:19:33 -03:00
|
|
|
if isinstance(self.sock, ssl.SSLSocket):
|
|
|
|
self.sslconn = self.sock
|
|
|
|
elif not self.wrap_conn():
|
2007-09-10 18:51:02 -03:00
|
|
|
return
|
2008-06-28 19:19:33 -03:00
|
|
|
self.show_conn_details()
|
2007-09-10 18:51:02 -03:00
|
|
|
while self.running:
|
|
|
|
try:
|
|
|
|
msg = self.read()
|
|
|
|
if not msg:
|
|
|
|
# eof, so quit this handler
|
|
|
|
self.running = False
|
|
|
|
self.close()
|
|
|
|
elif msg.strip() == 'over':
|
|
|
|
if test_support.verbose and self.server.connectionchatty:
|
|
|
|
sys.stdout.write(" server: client closed connection\n")
|
|
|
|
self.close()
|
|
|
|
return
|
|
|
|
elif self.server.starttls_server and msg.strip() == 'STARTTLS':
|
|
|
|
if test_support.verbose and self.server.connectionchatty:
|
|
|
|
sys.stdout.write(" server: read STARTTLS from client, sending OK...\n")
|
|
|
|
self.write("OK\n")
|
|
|
|
if not self.wrap_conn():
|
|
|
|
return
|
|
|
|
else:
|
|
|
|
if (test_support.verbose and
|
|
|
|
self.server.connectionchatty):
|
|
|
|
ctype = (self.sslconn and "encrypted") or "unencrypted"
|
|
|
|
sys.stdout.write(" server: read %s (%s), sending back %s (%s)...\n"
|
|
|
|
% (repr(msg), ctype, repr(msg.lower()), ctype))
|
|
|
|
self.write(msg.lower())
|
|
|
|
except ssl.SSLError:
|
|
|
|
if self.server.chatty:
|
|
|
|
handle_error("Test server failure:\n")
|
|
|
|
self.close()
|
2007-08-25 12:08:43 -03:00
|
|
|
self.running = False
|
2007-09-10 18:51:02 -03:00
|
|
|
# normally, we'd just stop here, but for the test
|
|
|
|
# harness, we want to stop the server
|
|
|
|
self.server.stop()
|
|
|
|
except:
|
|
|
|
handle_error('')
|
|
|
|
|
- Issue #2550: The approach used by client/server code for obtaining ports
to listen on in network-oriented tests has been refined in an effort to
facilitate running multiple instances of the entire regression test suite
in parallel without issue. test_support.bind_port() has been fixed such
that it will always return a unique port -- which wasn't always the case
with the previous implementation, especially if socket options had been
set that affected address reuse (i.e. SO_REUSEADDR, SO_REUSEPORT). The
new implementation of bind_port() will actually raise an exception if it
is passed an AF_INET/SOCK_STREAM socket with either the SO_REUSEADDR or
SO_REUSEPORT socket option set. Furthermore, if available, bind_port()
will set the SO_EXCLUSIVEADDRUSE option on the socket it's been passed.
This currently only applies to Windows. This option prevents any other
sockets from binding to the host/port we've bound to, thus removing the
possibility of the 'non-deterministic' behaviour, as Microsoft puts it,
that occurs when a second SOCK_STREAM socket binds and accepts to a
host/port that's already been bound by another socket. The optional
preferred port parameter to bind_port() has been removed. Under no
circumstances should tests be hard coding ports!
test_support.find_unused_port() has also been introduced, which will pass
a temporary socket object to bind_port() in order to obtain an unused port.
The temporary socket object is then closed and deleted, and the port is
returned. This method should only be used for obtaining an unused port
in order to pass to an external program (i.e. the -accept [port] argument
to openssl's s_server mode) or as a parameter to a server-oriented class
that doesn't give you direct access to the underlying socket used.
Finally, test_support.HOST has been introduced, which should be used for
the host argument of any relevant socket calls (i.e. bind and connect).
The following tests were updated to following the new conventions:
test_socket, test_smtplib, test_asyncore, test_ssl, test_httplib,
test_poplib, test_ftplib, test_telnetlib, test_socketserver,
test_asynchat and test_socket_ssl.
It is now possible for multiple instances of the regression test suite to
run in parallel without issue.
2008-04-08 20:47:30 -03:00
|
|
|
def __init__(self, certificate, ssl_version=None,
|
2007-09-10 18:51:02 -03:00
|
|
|
certreqs=None, cacerts=None, expect_bad_connects=False,
|
2008-06-28 19:19:33 -03:00
|
|
|
chatty=True, connectionchatty=False, starttls_server=False,
|
|
|
|
wrap_accepting_socket=False):
|
|
|
|
|
2007-09-10 18:51:02 -03:00
|
|
|
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.expect_bad_connects = expect_bad_connects
|
|
|
|
self.chatty = chatty
|
|
|
|
self.connectionchatty = connectionchatty
|
|
|
|
self.starttls_server = starttls_server
|
|
|
|
self.sock = socket.socket()
|
|
|
|
self.flag = None
|
2008-06-28 19:19:33 -03:00
|
|
|
if wrap_accepting_socket:
|
|
|
|
self.sock = ssl.wrap_socket(self.sock, server_side=True,
|
|
|
|
certfile=self.certificate,
|
|
|
|
cert_reqs = self.certreqs,
|
|
|
|
ca_certs = self.cacerts,
|
|
|
|
ssl_version = self.protocol)
|
|
|
|
if test_support.verbose and self.chatty:
|
|
|
|
sys.stdout.write(' server: wrapped server socket as %s\n' % str(self.sock))
|
|
|
|
self.port = test_support.bind_port(self.sock)
|
2007-09-10 18:51:02 -03:00
|
|
|
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 and self.chatty:
|
|
|
|
sys.stdout.write(' server: new connection from '
|
|
|
|
+ str(connaddr) + '\n')
|
|
|
|
handler = self.ConnectionHandler(self, newconn)
|
|
|
|
handler.start()
|
|
|
|
except socket.timeout:
|
|
|
|
pass
|
|
|
|
except KeyboardInterrupt:
|
|
|
|
self.stop()
|
2007-08-25 12:08:43 -03:00
|
|
|
except:
|
2007-09-10 18:51:02 -03:00
|
|
|
if self.chatty:
|
|
|
|
handle_error("Test server failure:\n")
|
2008-06-28 19:19:33 -03:00
|
|
|
self.sock.close()
|
2007-09-10 18:51:02 -03:00
|
|
|
|
|
|
|
def stop (self):
|
|
|
|
self.active = False
|
|
|
|
|
2008-06-28 19:19:33 -03:00
|
|
|
class AsyncoreEchoServer(threading.Thread):
|
|
|
|
|
|
|
|
class EchoServer (asyncore.dispatcher):
|
|
|
|
|
|
|
|
class ConnectionHandler (asyncore.dispatcher_with_send):
|
|
|
|
|
|
|
|
def __init__(self, conn, certfile):
|
|
|
|
asyncore.dispatcher_with_send.__init__(self, conn)
|
|
|
|
self.socket = ssl.wrap_socket(conn, server_side=True,
|
|
|
|
certfile=certfile,
|
|
|
|
do_handshake_on_connect=True)
|
|
|
|
|
|
|
|
def readable(self):
|
|
|
|
if isinstance(self.socket, ssl.SSLSocket):
|
|
|
|
while self.socket.pending() > 0:
|
|
|
|
self.handle_read_event()
|
|
|
|
return True
|
|
|
|
|
|
|
|
def handle_read(self):
|
|
|
|
data = self.recv(1024)
|
|
|
|
self.send(data.lower())
|
|
|
|
|
|
|
|
def handle_close(self):
|
2008-06-28 20:00:39 -03:00
|
|
|
self.close()
|
2008-06-28 19:19:33 -03:00
|
|
|
if test_support.verbose:
|
|
|
|
sys.stdout.write(" server: closed connection %s\n" % self.socket)
|
|
|
|
|
|
|
|
def handle_error(self):
|
|
|
|
raise
|
|
|
|
|
|
|
|
def __init__(self, certfile):
|
|
|
|
self.certfile = certfile
|
|
|
|
asyncore.dispatcher.__init__(self)
|
|
|
|
self.create_socket(socket.AF_INET, socket.SOCK_STREAM)
|
|
|
|
self.port = test_support.bind_port(self.socket)
|
|
|
|
self.listen(5)
|
|
|
|
|
|
|
|
def handle_accept(self):
|
|
|
|
sock_obj, addr = self.accept()
|
|
|
|
if test_support.verbose:
|
|
|
|
sys.stdout.write(" server: new connection from %s:%s\n" %addr)
|
|
|
|
self.ConnectionHandler(sock_obj, self.certfile)
|
|
|
|
|
|
|
|
def handle_error(self):
|
|
|
|
raise
|
|
|
|
|
|
|
|
def __init__(self, certfile):
|
|
|
|
self.flag = None
|
|
|
|
self.active = False
|
|
|
|
self.server = self.EchoServer(certfile)
|
|
|
|
self.port = self.server.port
|
|
|
|
threading.Thread.__init__(self)
|
|
|
|
self.setDaemon(True)
|
|
|
|
|
|
|
|
def __str__(self):
|
|
|
|
return "<%s %s>" % (self.__class__.__name__, self.server)
|
|
|
|
|
|
|
|
def start (self, flag=None):
|
|
|
|
self.flag = flag
|
|
|
|
threading.Thread.start(self)
|
|
|
|
|
|
|
|
def run (self):
|
|
|
|
self.active = True
|
|
|
|
if self.flag:
|
|
|
|
self.flag.set()
|
|
|
|
while self.active:
|
|
|
|
try:
|
|
|
|
asyncore.loop(1)
|
|
|
|
except:
|
|
|
|
pass
|
|
|
|
|
|
|
|
def stop (self):
|
|
|
|
self.active = False
|
|
|
|
self.server.close()
|
2007-09-16 19:06:00 -03:00
|
|
|
|
2008-06-28 19:19:33 -03:00
|
|
|
class SocketServerHTTPSServer(threading.Thread):
|
2007-09-16 19:06:00 -03:00
|
|
|
|
|
|
|
class HTTPSServer(HTTPServer):
|
|
|
|
|
|
|
|
def __init__(self, server_address, RequestHandlerClass, certfile):
|
|
|
|
|
|
|
|
HTTPServer.__init__(self, server_address, RequestHandlerClass)
|
|
|
|
# we assume the certfile contains both private key and certificate
|
|
|
|
self.certfile = certfile
|
|
|
|
self.active = False
|
2008-03-09 16:03:42 -03:00
|
|
|
self.active_lock = threading.Lock()
|
2007-09-16 19:06:00 -03:00
|
|
|
self.allow_reuse_address = True
|
|
|
|
|
2008-06-28 19:19:33 -03:00
|
|
|
def __str__(self):
|
|
|
|
return ('<%s %s:%s>' %
|
|
|
|
(self.__class__.__name__,
|
|
|
|
self.server_name,
|
|
|
|
self.server_port))
|
|
|
|
|
2007-09-16 19:06:00 -03:00
|
|
|
def get_request (self):
|
|
|
|
# override this to wrap socket with SSL
|
|
|
|
sock, addr = self.socket.accept()
|
|
|
|
sslconn = ssl.wrap_socket(sock, server_side=True,
|
|
|
|
certfile=self.certfile)
|
|
|
|
return sslconn, addr
|
|
|
|
|
|
|
|
# The methods overridden below this are mainly so that we
|
|
|
|
# can run it in a thread and be able to stop it from another
|
|
|
|
# You probably wouldn't need them in other uses.
|
|
|
|
|
|
|
|
def server_activate(self):
|
|
|
|
# We want to run this in a thread for testing purposes,
|
|
|
|
# so we override this to set timeout, so that we get
|
|
|
|
# a chance to stop the server
|
|
|
|
self.socket.settimeout(0.5)
|
|
|
|
HTTPServer.server_activate(self)
|
|
|
|
|
|
|
|
def serve_forever(self):
|
|
|
|
# We want this to run in a thread, so we use a slightly
|
|
|
|
# modified version of "forever".
|
|
|
|
self.active = True
|
2008-03-09 16:03:42 -03:00
|
|
|
while 1:
|
2007-09-16 19:06:00 -03:00
|
|
|
try:
|
2008-03-09 16:03:42 -03:00
|
|
|
# We need to lock while handling the request.
|
|
|
|
# Another thread can close the socket after self.active
|
|
|
|
# has been checked and before the request is handled.
|
|
|
|
# This causes an exception when using the closed socket.
|
|
|
|
with self.active_lock:
|
|
|
|
if not self.active:
|
|
|
|
break
|
|
|
|
self.handle_request()
|
2007-09-16 19:06:00 -03:00
|
|
|
except socket.timeout:
|
|
|
|
pass
|
|
|
|
except KeyboardInterrupt:
|
|
|
|
self.server_close()
|
|
|
|
return
|
|
|
|
except:
|
2008-03-09 16:03:42 -03:00
|
|
|
sys.stdout.write(''.join(traceback.format_exception(*sys.exc_info())))
|
|
|
|
break
|
2008-04-02 02:54:27 -03:00
|
|
|
time.sleep(0.1)
|
2007-09-16 19:06:00 -03:00
|
|
|
|
|
|
|
def server_close(self):
|
|
|
|
# Again, we want this to run in a thread, so we need to override
|
|
|
|
# close to clear the "active" flag, so that serve_forever() will
|
|
|
|
# terminate.
|
2008-03-09 16:03:42 -03:00
|
|
|
with self.active_lock:
|
|
|
|
HTTPServer.server_close(self)
|
|
|
|
self.active = False
|
2007-09-16 19:06:00 -03:00
|
|
|
|
|
|
|
class RootedHTTPRequestHandler(SimpleHTTPRequestHandler):
|
|
|
|
|
|
|
|
# need to override translate_path to get a known root,
|
|
|
|
# instead of using os.curdir, since the test could be
|
|
|
|
# run from anywhere
|
|
|
|
|
|
|
|
server_version = "TestHTTPS/1.0"
|
|
|
|
|
|
|
|
root = None
|
|
|
|
|
|
|
|
def translate_path(self, path):
|
|
|
|
"""Translate a /-separated PATH to the local filename syntax.
|
|
|
|
|
|
|
|
Components that mean special things to the local file system
|
|
|
|
(e.g. drive or directory names) are ignored. (XXX They should
|
|
|
|
probably be diagnosed.)
|
|
|
|
|
|
|
|
"""
|
|
|
|
# abandon query parameters
|
|
|
|
path = urlparse.urlparse(path)[2]
|
|
|
|
path = os.path.normpath(urllib.unquote(path))
|
|
|
|
words = path.split('/')
|
|
|
|
words = filter(None, words)
|
|
|
|
path = self.root
|
|
|
|
for word in words:
|
|
|
|
drive, word = os.path.splitdrive(word)
|
|
|
|
head, word = os.path.split(word)
|
|
|
|
if word in self.root: continue
|
|
|
|
path = os.path.join(path, word)
|
|
|
|
return path
|
|
|
|
|
|
|
|
def log_message(self, format, *args):
|
|
|
|
|
|
|
|
# we override this to suppress logging unless "verbose"
|
|
|
|
|
|
|
|
if test_support.verbose:
|
2008-06-28 19:19:33 -03:00
|
|
|
sys.stdout.write(" server (%s:%d %s):\n [%s] %s\n" %
|
|
|
|
(self.server.server_address,
|
2007-09-16 19:06:00 -03:00
|
|
|
self.server.server_port,
|
|
|
|
self.request.cipher(),
|
|
|
|
self.log_date_time_string(),
|
|
|
|
format%args))
|
|
|
|
|
|
|
|
|
- Issue #2550: The approach used by client/server code for obtaining ports
to listen on in network-oriented tests has been refined in an effort to
facilitate running multiple instances of the entire regression test suite
in parallel without issue. test_support.bind_port() has been fixed such
that it will always return a unique port -- which wasn't always the case
with the previous implementation, especially if socket options had been
set that affected address reuse (i.e. SO_REUSEADDR, SO_REUSEPORT). The
new implementation of bind_port() will actually raise an exception if it
is passed an AF_INET/SOCK_STREAM socket with either the SO_REUSEADDR or
SO_REUSEPORT socket option set. Furthermore, if available, bind_port()
will set the SO_EXCLUSIVEADDRUSE option on the socket it's been passed.
This currently only applies to Windows. This option prevents any other
sockets from binding to the host/port we've bound to, thus removing the
possibility of the 'non-deterministic' behaviour, as Microsoft puts it,
that occurs when a second SOCK_STREAM socket binds and accepts to a
host/port that's already been bound by another socket. The optional
preferred port parameter to bind_port() has been removed. Under no
circumstances should tests be hard coding ports!
test_support.find_unused_port() has also been introduced, which will pass
a temporary socket object to bind_port() in order to obtain an unused port.
The temporary socket object is then closed and deleted, and the port is
returned. This method should only be used for obtaining an unused port
in order to pass to an external program (i.e. the -accept [port] argument
to openssl's s_server mode) or as a parameter to a server-oriented class
that doesn't give you direct access to the underlying socket used.
Finally, test_support.HOST has been introduced, which should be used for
the host argument of any relevant socket calls (i.e. bind and connect).
The following tests were updated to following the new conventions:
test_socket, test_smtplib, test_asyncore, test_ssl, test_httplib,
test_poplib, test_ftplib, test_telnetlib, test_socketserver,
test_asynchat and test_socket_ssl.
It is now possible for multiple instances of the regression test suite to
run in parallel without issue.
2008-04-08 20:47:30 -03:00
|
|
|
def __init__(self, certfile):
|
2007-09-16 19:06:00 -03:00
|
|
|
self.flag = None
|
|
|
|
self.active = False
|
|
|
|
self.RootedHTTPRequestHandler.root = os.path.split(CERTFILE)[0]
|
- Issue #2550: The approach used by client/server code for obtaining ports
to listen on in network-oriented tests has been refined in an effort to
facilitate running multiple instances of the entire regression test suite
in parallel without issue. test_support.bind_port() has been fixed such
that it will always return a unique port -- which wasn't always the case
with the previous implementation, especially if socket options had been
set that affected address reuse (i.e. SO_REUSEADDR, SO_REUSEPORT). The
new implementation of bind_port() will actually raise an exception if it
is passed an AF_INET/SOCK_STREAM socket with either the SO_REUSEADDR or
SO_REUSEPORT socket option set. Furthermore, if available, bind_port()
will set the SO_EXCLUSIVEADDRUSE option on the socket it's been passed.
This currently only applies to Windows. This option prevents any other
sockets from binding to the host/port we've bound to, thus removing the
possibility of the 'non-deterministic' behaviour, as Microsoft puts it,
that occurs when a second SOCK_STREAM socket binds and accepts to a
host/port that's already been bound by another socket. The optional
preferred port parameter to bind_port() has been removed. Under no
circumstances should tests be hard coding ports!
test_support.find_unused_port() has also been introduced, which will pass
a temporary socket object to bind_port() in order to obtain an unused port.
The temporary socket object is then closed and deleted, and the port is
returned. This method should only be used for obtaining an unused port
in order to pass to an external program (i.e. the -accept [port] argument
to openssl's s_server mode) or as a parameter to a server-oriented class
that doesn't give you direct access to the underlying socket used.
Finally, test_support.HOST has been introduced, which should be used for
the host argument of any relevant socket calls (i.e. bind and connect).
The following tests were updated to following the new conventions:
test_socket, test_smtplib, test_asyncore, test_ssl, test_httplib,
test_poplib, test_ftplib, test_telnetlib, test_socketserver,
test_asynchat and test_socket_ssl.
It is now possible for multiple instances of the regression test suite to
run in parallel without issue.
2008-04-08 20:47:30 -03:00
|
|
|
self.port = test_support.find_unused_port()
|
2007-09-16 19:06:00 -03:00
|
|
|
self.server = self.HTTPSServer(
|
- Issue #2550: The approach used by client/server code for obtaining ports
to listen on in network-oriented tests has been refined in an effort to
facilitate running multiple instances of the entire regression test suite
in parallel without issue. test_support.bind_port() has been fixed such
that it will always return a unique port -- which wasn't always the case
with the previous implementation, especially if socket options had been
set that affected address reuse (i.e. SO_REUSEADDR, SO_REUSEPORT). The
new implementation of bind_port() will actually raise an exception if it
is passed an AF_INET/SOCK_STREAM socket with either the SO_REUSEADDR or
SO_REUSEPORT socket option set. Furthermore, if available, bind_port()
will set the SO_EXCLUSIVEADDRUSE option on the socket it's been passed.
This currently only applies to Windows. This option prevents any other
sockets from binding to the host/port we've bound to, thus removing the
possibility of the 'non-deterministic' behaviour, as Microsoft puts it,
that occurs when a second SOCK_STREAM socket binds and accepts to a
host/port that's already been bound by another socket. The optional
preferred port parameter to bind_port() has been removed. Under no
circumstances should tests be hard coding ports!
test_support.find_unused_port() has also been introduced, which will pass
a temporary socket object to bind_port() in order to obtain an unused port.
The temporary socket object is then closed and deleted, and the port is
returned. This method should only be used for obtaining an unused port
in order to pass to an external program (i.e. the -accept [port] argument
to openssl's s_server mode) or as a parameter to a server-oriented class
that doesn't give you direct access to the underlying socket used.
Finally, test_support.HOST has been introduced, which should be used for
the host argument of any relevant socket calls (i.e. bind and connect).
The following tests were updated to following the new conventions:
test_socket, test_smtplib, test_asyncore, test_ssl, test_httplib,
test_poplib, test_ftplib, test_telnetlib, test_socketserver,
test_asynchat and test_socket_ssl.
It is now possible for multiple instances of the regression test suite to
run in parallel without issue.
2008-04-08 20:47:30 -03:00
|
|
|
(HOST, self.port), self.RootedHTTPRequestHandler, certfile)
|
2007-09-16 19:06:00 -03:00
|
|
|
threading.Thread.__init__(self)
|
|
|
|
self.setDaemon(True)
|
|
|
|
|
|
|
|
def __str__(self):
|
2008-06-28 19:19:33 -03:00
|
|
|
return "<%s %s>" % (self.__class__.__name__, self.server)
|
2007-09-16 19:06:00 -03:00
|
|
|
|
|
|
|
def start (self, flag=None):
|
|
|
|
self.flag = flag
|
|
|
|
threading.Thread.start(self)
|
|
|
|
|
|
|
|
def run (self):
|
|
|
|
self.active = True
|
|
|
|
if self.flag:
|
|
|
|
self.flag.set()
|
|
|
|
self.server.serve_forever()
|
|
|
|
self.active = False
|
|
|
|
|
|
|
|
def stop (self):
|
|
|
|
self.active = False
|
|
|
|
self.server.server_close()
|
|
|
|
|
|
|
|
|
2007-09-10 18:51:02 -03:00
|
|
|
def badCertTest (certfile):
|
- Issue #2550: The approach used by client/server code for obtaining ports
to listen on in network-oriented tests has been refined in an effort to
facilitate running multiple instances of the entire regression test suite
in parallel without issue. test_support.bind_port() has been fixed such
that it will always return a unique port -- which wasn't always the case
with the previous implementation, especially if socket options had been
set that affected address reuse (i.e. SO_REUSEADDR, SO_REUSEPORT). The
new implementation of bind_port() will actually raise an exception if it
is passed an AF_INET/SOCK_STREAM socket with either the SO_REUSEADDR or
SO_REUSEPORT socket option set. Furthermore, if available, bind_port()
will set the SO_EXCLUSIVEADDRUSE option on the socket it's been passed.
This currently only applies to Windows. This option prevents any other
sockets from binding to the host/port we've bound to, thus removing the
possibility of the 'non-deterministic' behaviour, as Microsoft puts it,
that occurs when a second SOCK_STREAM socket binds and accepts to a
host/port that's already been bound by another socket. The optional
preferred port parameter to bind_port() has been removed. Under no
circumstances should tests be hard coding ports!
test_support.find_unused_port() has also been introduced, which will pass
a temporary socket object to bind_port() in order to obtain an unused port.
The temporary socket object is then closed and deleted, and the port is
returned. This method should only be used for obtaining an unused port
in order to pass to an external program (i.e. the -accept [port] argument
to openssl's s_server mode) or as a parameter to a server-oriented class
that doesn't give you direct access to the underlying socket used.
Finally, test_support.HOST has been introduced, which should be used for
the host argument of any relevant socket calls (i.e. bind and connect).
The following tests were updated to following the new conventions:
test_socket, test_smtplib, test_asyncore, test_ssl, test_httplib,
test_poplib, test_ftplib, test_telnetlib, test_socketserver,
test_asynchat and test_socket_ssl.
It is now possible for multiple instances of the regression test suite to
run in parallel without issue.
2008-04-08 20:47:30 -03:00
|
|
|
server = ThreadedEchoServer(CERTFILE,
|
2007-09-10 18:51:02 -03:00
|
|
|
certreqs=ssl.CERT_REQUIRED,
|
|
|
|
cacerts=CERTFILE, chatty=False)
|
|
|
|
flag = threading.Event()
|
|
|
|
server.start(flag)
|
|
|
|
# wait for it to start
|
|
|
|
flag.wait()
|
|
|
|
# try to connect
|
|
|
|
try:
|
2007-08-25 12:08:43 -03:00
|
|
|
try:
|
2007-09-10 18:51:02 -03:00
|
|
|
s = ssl.wrap_socket(socket.socket(),
|
|
|
|
certfile=certfile,
|
|
|
|
ssl_version=ssl.PROTOCOL_TLSv1)
|
- Issue #2550: The approach used by client/server code for obtaining ports
to listen on in network-oriented tests has been refined in an effort to
facilitate running multiple instances of the entire regression test suite
in parallel without issue. test_support.bind_port() has been fixed such
that it will always return a unique port -- which wasn't always the case
with the previous implementation, especially if socket options had been
set that affected address reuse (i.e. SO_REUSEADDR, SO_REUSEPORT). The
new implementation of bind_port() will actually raise an exception if it
is passed an AF_INET/SOCK_STREAM socket with either the SO_REUSEADDR or
SO_REUSEPORT socket option set. Furthermore, if available, bind_port()
will set the SO_EXCLUSIVEADDRUSE option on the socket it's been passed.
This currently only applies to Windows. This option prevents any other
sockets from binding to the host/port we've bound to, thus removing the
possibility of the 'non-deterministic' behaviour, as Microsoft puts it,
that occurs when a second SOCK_STREAM socket binds and accepts to a
host/port that's already been bound by another socket. The optional
preferred port parameter to bind_port() has been removed. Under no
circumstances should tests be hard coding ports!
test_support.find_unused_port() has also been introduced, which will pass
a temporary socket object to bind_port() in order to obtain an unused port.
The temporary socket object is then closed and deleted, and the port is
returned. This method should only be used for obtaining an unused port
in order to pass to an external program (i.e. the -accept [port] argument
to openssl's s_server mode) or as a parameter to a server-oriented class
that doesn't give you direct access to the underlying socket used.
Finally, test_support.HOST has been introduced, which should be used for
the host argument of any relevant socket calls (i.e. bind and connect).
The following tests were updated to following the new conventions:
test_socket, test_smtplib, test_asyncore, test_ssl, test_httplib,
test_poplib, test_ftplib, test_telnetlib, test_socketserver,
test_asynchat and test_socket_ssl.
It is now possible for multiple instances of the regression test suite to
run in parallel without issue.
2008-04-08 20:47:30 -03:00
|
|
|
s.connect((HOST, server.port))
|
2007-09-10 18:51:02 -03:00
|
|
|
except ssl.SSLError, x:
|
2007-08-26 22:15:33 -03:00
|
|
|
if test_support.verbose:
|
2007-09-10 18:51:02 -03:00
|
|
|
sys.stdout.write("\nSSLError is %s\n" % x[1])
|
2008-07-17 15:01:57 -03:00
|
|
|
except socket.error, x:
|
|
|
|
if test_support.verbose:
|
|
|
|
sys.stdout.write("\nsocket.error is %s\n" % x[1])
|
2007-09-10 18:51:02 -03:00
|
|
|
else:
|
|
|
|
raise test_support.TestFailed(
|
|
|
|
"Use of invalid cert should have failed!")
|
|
|
|
finally:
|
|
|
|
server.stop()
|
|
|
|
server.join()
|
|
|
|
|
|
|
|
def serverParamsTest (certfile, protocol, certreqs, cacertsfile,
|
|
|
|
client_certfile, client_protocol=None, indata="FOO\n",
|
2008-06-28 19:19:33 -03:00
|
|
|
chatty=True, connectionchatty=False,
|
|
|
|
wrap_accepting_socket=False):
|
2007-09-10 18:51:02 -03:00
|
|
|
|
- Issue #2550: The approach used by client/server code for obtaining ports
to listen on in network-oriented tests has been refined in an effort to
facilitate running multiple instances of the entire regression test suite
in parallel without issue. test_support.bind_port() has been fixed such
that it will always return a unique port -- which wasn't always the case
with the previous implementation, especially if socket options had been
set that affected address reuse (i.e. SO_REUSEADDR, SO_REUSEPORT). The
new implementation of bind_port() will actually raise an exception if it
is passed an AF_INET/SOCK_STREAM socket with either the SO_REUSEADDR or
SO_REUSEPORT socket option set. Furthermore, if available, bind_port()
will set the SO_EXCLUSIVEADDRUSE option on the socket it's been passed.
This currently only applies to Windows. This option prevents any other
sockets from binding to the host/port we've bound to, thus removing the
possibility of the 'non-deterministic' behaviour, as Microsoft puts it,
that occurs when a second SOCK_STREAM socket binds and accepts to a
host/port that's already been bound by another socket. The optional
preferred port parameter to bind_port() has been removed. Under no
circumstances should tests be hard coding ports!
test_support.find_unused_port() has also been introduced, which will pass
a temporary socket object to bind_port() in order to obtain an unused port.
The temporary socket object is then closed and deleted, and the port is
returned. This method should only be used for obtaining an unused port
in order to pass to an external program (i.e. the -accept [port] argument
to openssl's s_server mode) or as a parameter to a server-oriented class
that doesn't give you direct access to the underlying socket used.
Finally, test_support.HOST has been introduced, which should be used for
the host argument of any relevant socket calls (i.e. bind and connect).
The following tests were updated to following the new conventions:
test_socket, test_smtplib, test_asyncore, test_ssl, test_httplib,
test_poplib, test_ftplib, test_telnetlib, test_socketserver,
test_asynchat and test_socket_ssl.
It is now possible for multiple instances of the regression test suite to
run in parallel without issue.
2008-04-08 20:47:30 -03:00
|
|
|
server = ThreadedEchoServer(certfile,
|
2007-09-10 18:51:02 -03:00
|
|
|
certreqs=certreqs,
|
|
|
|
ssl_version=protocol,
|
|
|
|
cacerts=cacertsfile,
|
|
|
|
chatty=chatty,
|
2008-06-28 19:19:33 -03:00
|
|
|
connectionchatty=connectionchatty,
|
|
|
|
wrap_accepting_socket=wrap_accepting_socket)
|
2007-09-10 18:51:02 -03:00
|
|
|
flag = threading.Event()
|
|
|
|
server.start(flag)
|
|
|
|
# wait for it to start
|
|
|
|
flag.wait()
|
|
|
|
# try to connect
|
|
|
|
if client_protocol is None:
|
|
|
|
client_protocol = protocol
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
s = ssl.wrap_socket(socket.socket(),
|
|
|
|
certfile=client_certfile,
|
|
|
|
ca_certs=cacertsfile,
|
|
|
|
cert_reqs=certreqs,
|
|
|
|
ssl_version=client_protocol)
|
- Issue #2550: The approach used by client/server code for obtaining ports
to listen on in network-oriented tests has been refined in an effort to
facilitate running multiple instances of the entire regression test suite
in parallel without issue. test_support.bind_port() has been fixed such
that it will always return a unique port -- which wasn't always the case
with the previous implementation, especially if socket options had been
set that affected address reuse (i.e. SO_REUSEADDR, SO_REUSEPORT). The
new implementation of bind_port() will actually raise an exception if it
is passed an AF_INET/SOCK_STREAM socket with either the SO_REUSEADDR or
SO_REUSEPORT socket option set. Furthermore, if available, bind_port()
will set the SO_EXCLUSIVEADDRUSE option on the socket it's been passed.
This currently only applies to Windows. This option prevents any other
sockets from binding to the host/port we've bound to, thus removing the
possibility of the 'non-deterministic' behaviour, as Microsoft puts it,
that occurs when a second SOCK_STREAM socket binds and accepts to a
host/port that's already been bound by another socket. The optional
preferred port parameter to bind_port() has been removed. Under no
circumstances should tests be hard coding ports!
test_support.find_unused_port() has also been introduced, which will pass
a temporary socket object to bind_port() in order to obtain an unused port.
The temporary socket object is then closed and deleted, and the port is
returned. This method should only be used for obtaining an unused port
in order to pass to an external program (i.e. the -accept [port] argument
to openssl's s_server mode) or as a parameter to a server-oriented class
that doesn't give you direct access to the underlying socket used.
Finally, test_support.HOST has been introduced, which should be used for
the host argument of any relevant socket calls (i.e. bind and connect).
The following tests were updated to following the new conventions:
test_socket, test_smtplib, test_asyncore, test_ssl, test_httplib,
test_poplib, test_ftplib, test_telnetlib, test_socketserver,
test_asynchat and test_socket_ssl.
It is now possible for multiple instances of the regression test suite to
run in parallel without issue.
2008-04-08 20:47:30 -03:00
|
|
|
s.connect((HOST, server.port))
|
2007-09-10 18:51:02 -03:00
|
|
|
except ssl.SSLError, x:
|
|
|
|
raise test_support.TestFailed("Unexpected SSL error: " + str(x))
|
|
|
|
except Exception, x:
|
|
|
|
raise test_support.TestFailed("Unexpected exception: " + str(x))
|
|
|
|
else:
|
|
|
|
if connectionchatty:
|
|
|
|
if test_support.verbose:
|
|
|
|
sys.stdout.write(
|
|
|
|
" client: sending %s...\n" % (repr(indata)))
|
|
|
|
s.write(indata)
|
|
|
|
outdata = s.read()
|
|
|
|
if connectionchatty:
|
|
|
|
if test_support.verbose:
|
|
|
|
sys.stdout.write(" client: read %s\n" % repr(outdata))
|
|
|
|
if outdata != indata.lower():
|
|
|
|
raise test_support.TestFailed(
|
|
|
|
"bad data <<%s>> (%d) received; expected <<%s>> (%d)\n"
|
|
|
|
% (outdata[:min(len(outdata),20)], len(outdata),
|
|
|
|
indata[:min(len(indata),20)].lower(), len(indata)))
|
|
|
|
s.write("over\n")
|
|
|
|
if connectionchatty:
|
|
|
|
if test_support.verbose:
|
|
|
|
sys.stdout.write(" client: closing connection.\n")
|
|
|
|
s.close()
|
|
|
|
finally:
|
|
|
|
server.stop()
|
|
|
|
server.join()
|
|
|
|
|
|
|
|
def tryProtocolCombo (server_protocol,
|
|
|
|
client_protocol,
|
|
|
|
expectedToWork,
|
2007-09-10 22:09:19 -03:00
|
|
|
certsreqs=None):
|
|
|
|
|
2008-03-29 12:24:25 -03:00
|
|
|
if certsreqs is None:
|
2007-09-10 22:09:19 -03:00
|
|
|
certsreqs = ssl.CERT_NONE
|
2007-09-10 18:51:02 -03:00
|
|
|
|
|
|
|
if certsreqs == ssl.CERT_NONE:
|
|
|
|
certtype = "CERT_NONE"
|
|
|
|
elif certsreqs == ssl.CERT_OPTIONAL:
|
|
|
|
certtype = "CERT_OPTIONAL"
|
|
|
|
elif certsreqs == ssl.CERT_REQUIRED:
|
|
|
|
certtype = "CERT_REQUIRED"
|
|
|
|
if test_support.verbose:
|
|
|
|
formatstr = (expectedToWork and " %s->%s %s\n") or " {%s->%s} %s\n"
|
|
|
|
sys.stdout.write(formatstr %
|
|
|
|
(ssl.get_protocol_name(client_protocol),
|
|
|
|
ssl.get_protocol_name(server_protocol),
|
|
|
|
certtype))
|
|
|
|
try:
|
|
|
|
serverParamsTest(CERTFILE, server_protocol, certsreqs,
|
|
|
|
CERTFILE, CERTFILE, client_protocol, chatty=False)
|
|
|
|
except test_support.TestFailed:
|
|
|
|
if expectedToWork:
|
|
|
|
raise
|
|
|
|
else:
|
|
|
|
if not expectedToWork:
|
|
|
|
raise test_support.TestFailed(
|
|
|
|
"Client protocol %s succeeded with server protocol %s!"
|
|
|
|
% (ssl.get_protocol_name(client_protocol),
|
|
|
|
ssl.get_protocol_name(server_protocol)))
|
|
|
|
|
|
|
|
|
2008-06-28 19:19:33 -03:00
|
|
|
class ThreadedTests(unittest.TestCase):
|
2007-09-10 18:51:02 -03:00
|
|
|
|
|
|
|
def testRudeShutdown(self):
|
|
|
|
|
|
|
|
listener_ready = threading.Event()
|
|
|
|
listener_gone = threading.Event()
|
- Issue #2550: The approach used by client/server code for obtaining ports
to listen on in network-oriented tests has been refined in an effort to
facilitate running multiple instances of the entire regression test suite
in parallel without issue. test_support.bind_port() has been fixed such
that it will always return a unique port -- which wasn't always the case
with the previous implementation, especially if socket options had been
set that affected address reuse (i.e. SO_REUSEADDR, SO_REUSEPORT). The
new implementation of bind_port() will actually raise an exception if it
is passed an AF_INET/SOCK_STREAM socket with either the SO_REUSEADDR or
SO_REUSEPORT socket option set. Furthermore, if available, bind_port()
will set the SO_EXCLUSIVEADDRUSE option on the socket it's been passed.
This currently only applies to Windows. This option prevents any other
sockets from binding to the host/port we've bound to, thus removing the
possibility of the 'non-deterministic' behaviour, as Microsoft puts it,
that occurs when a second SOCK_STREAM socket binds and accepts to a
host/port that's already been bound by another socket. The optional
preferred port parameter to bind_port() has been removed. Under no
circumstances should tests be hard coding ports!
test_support.find_unused_port() has also been introduced, which will pass
a temporary socket object to bind_port() in order to obtain an unused port.
The temporary socket object is then closed and deleted, and the port is
returned. This method should only be used for obtaining an unused port
in order to pass to an external program (i.e. the -accept [port] argument
to openssl's s_server mode) or as a parameter to a server-oriented class
that doesn't give you direct access to the underlying socket used.
Finally, test_support.HOST has been introduced, which should be used for
the host argument of any relevant socket calls (i.e. bind and connect).
The following tests were updated to following the new conventions:
test_socket, test_smtplib, test_asyncore, test_ssl, test_httplib,
test_poplib, test_ftplib, test_telnetlib, test_socketserver,
test_asynchat and test_socket_ssl.
It is now possible for multiple instances of the regression test suite to
run in parallel without issue.
2008-04-08 20:47:30 -03:00
|
|
|
port = test_support.find_unused_port()
|
2007-09-10 18:51:02 -03:00
|
|
|
|
|
|
|
# `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()
|
- Issue #2550: The approach used by client/server code for obtaining ports
to listen on in network-oriented tests has been refined in an effort to
facilitate running multiple instances of the entire regression test suite
in parallel without issue. test_support.bind_port() has been fixed such
that it will always return a unique port -- which wasn't always the case
with the previous implementation, especially if socket options had been
set that affected address reuse (i.e. SO_REUSEADDR, SO_REUSEPORT). The
new implementation of bind_port() will actually raise an exception if it
is passed an AF_INET/SOCK_STREAM socket with either the SO_REUSEADDR or
SO_REUSEPORT socket option set. Furthermore, if available, bind_port()
will set the SO_EXCLUSIVEADDRUSE option on the socket it's been passed.
This currently only applies to Windows. This option prevents any other
sockets from binding to the host/port we've bound to, thus removing the
possibility of the 'non-deterministic' behaviour, as Microsoft puts it,
that occurs when a second SOCK_STREAM socket binds and accepts to a
host/port that's already been bound by another socket. The optional
preferred port parameter to bind_port() has been removed. Under no
circumstances should tests be hard coding ports!
test_support.find_unused_port() has also been introduced, which will pass
a temporary socket object to bind_port() in order to obtain an unused port.
The temporary socket object is then closed and deleted, and the port is
returned. This method should only be used for obtaining an unused port
in order to pass to an external program (i.e. the -accept [port] argument
to openssl's s_server mode) or as a parameter to a server-oriented class
that doesn't give you direct access to the underlying socket used.
Finally, test_support.HOST has been introduced, which should be used for
the host argument of any relevant socket calls (i.e. bind and connect).
The following tests were updated to following the new conventions:
test_socket, test_smtplib, test_asyncore, test_ssl, test_httplib,
test_poplib, test_ftplib, test_telnetlib, test_socketserver,
test_asynchat and test_socket_ssl.
It is now possible for multiple instances of the regression test suite to
run in parallel without issue.
2008-04-08 20:47:30 -03:00
|
|
|
s.bind((HOST, port))
|
2007-09-10 18:51:02 -03:00
|
|
|
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()
|
- Issue #2550: The approach used by client/server code for obtaining ports
to listen on in network-oriented tests has been refined in an effort to
facilitate running multiple instances of the entire regression test suite
in parallel without issue. test_support.bind_port() has been fixed such
that it will always return a unique port -- which wasn't always the case
with the previous implementation, especially if socket options had been
set that affected address reuse (i.e. SO_REUSEADDR, SO_REUSEPORT). The
new implementation of bind_port() will actually raise an exception if it
is passed an AF_INET/SOCK_STREAM socket with either the SO_REUSEADDR or
SO_REUSEPORT socket option set. Furthermore, if available, bind_port()
will set the SO_EXCLUSIVEADDRUSE option on the socket it's been passed.
This currently only applies to Windows. This option prevents any other
sockets from binding to the host/port we've bound to, thus removing the
possibility of the 'non-deterministic' behaviour, as Microsoft puts it,
that occurs when a second SOCK_STREAM socket binds and accepts to a
host/port that's already been bound by another socket. The optional
preferred port parameter to bind_port() has been removed. Under no
circumstances should tests be hard coding ports!
test_support.find_unused_port() has also been introduced, which will pass
a temporary socket object to bind_port() in order to obtain an unused port.
The temporary socket object is then closed and deleted, and the port is
returned. This method should only be used for obtaining an unused port
in order to pass to an external program (i.e. the -accept [port] argument
to openssl's s_server mode) or as a parameter to a server-oriented class
that doesn't give you direct access to the underlying socket used.
Finally, test_support.HOST has been introduced, which should be used for
the host argument of any relevant socket calls (i.e. bind and connect).
The following tests were updated to following the new conventions:
test_socket, test_smtplib, test_asyncore, test_ssl, test_httplib,
test_poplib, test_ftplib, test_telnetlib, test_socketserver,
test_asynchat and test_socket_ssl.
It is now possible for multiple instances of the regression test suite to
run in parallel without issue.
2008-04-08 20:47:30 -03:00
|
|
|
s.connect((HOST, port))
|
2007-09-10 18:51:02 -03:00
|
|
|
listener_gone.wait()
|
|
|
|
try:
|
|
|
|
ssl_sock = ssl.wrap_socket(s)
|
2008-06-28 19:19:33 -03:00
|
|
|
except IOError:
|
2007-09-10 18:51:02 -03:00
|
|
|
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 testEcho (self):
|
|
|
|
|
|
|
|
if test_support.verbose:
|
|
|
|
sys.stdout.write("\n")
|
|
|
|
serverParamsTest(CERTFILE, ssl.PROTOCOL_TLSv1, ssl.CERT_NONE,
|
|
|
|
CERTFILE, CERTFILE, ssl.PROTOCOL_TLSv1,
|
|
|
|
chatty=True, connectionchatty=True)
|
|
|
|
|
|
|
|
def testReadCert(self):
|
|
|
|
|
|
|
|
if test_support.verbose:
|
|
|
|
sys.stdout.write("\n")
|
|
|
|
s2 = socket.socket()
|
- Issue #2550: The approach used by client/server code for obtaining ports
to listen on in network-oriented tests has been refined in an effort to
facilitate running multiple instances of the entire regression test suite
in parallel without issue. test_support.bind_port() has been fixed such
that it will always return a unique port -- which wasn't always the case
with the previous implementation, especially if socket options had been
set that affected address reuse (i.e. SO_REUSEADDR, SO_REUSEPORT). The
new implementation of bind_port() will actually raise an exception if it
is passed an AF_INET/SOCK_STREAM socket with either the SO_REUSEADDR or
SO_REUSEPORT socket option set. Furthermore, if available, bind_port()
will set the SO_EXCLUSIVEADDRUSE option on the socket it's been passed.
This currently only applies to Windows. This option prevents any other
sockets from binding to the host/port we've bound to, thus removing the
possibility of the 'non-deterministic' behaviour, as Microsoft puts it,
that occurs when a second SOCK_STREAM socket binds and accepts to a
host/port that's already been bound by another socket. The optional
preferred port parameter to bind_port() has been removed. Under no
circumstances should tests be hard coding ports!
test_support.find_unused_port() has also been introduced, which will pass
a temporary socket object to bind_port() in order to obtain an unused port.
The temporary socket object is then closed and deleted, and the port is
returned. This method should only be used for obtaining an unused port
in order to pass to an external program (i.e. the -accept [port] argument
to openssl's s_server mode) or as a parameter to a server-oriented class
that doesn't give you direct access to the underlying socket used.
Finally, test_support.HOST has been introduced, which should be used for
the host argument of any relevant socket calls (i.e. bind and connect).
The following tests were updated to following the new conventions:
test_socket, test_smtplib, test_asyncore, test_ssl, test_httplib,
test_poplib, test_ftplib, test_telnetlib, test_socketserver,
test_asynchat and test_socket_ssl.
It is now possible for multiple instances of the regression test suite to
run in parallel without issue.
2008-04-08 20:47:30 -03:00
|
|
|
server = ThreadedEchoServer(CERTFILE,
|
2007-09-10 18:51:02 -03:00
|
|
|
certreqs=ssl.CERT_NONE,
|
|
|
|
ssl_version=ssl.PROTOCOL_SSLv23,
|
|
|
|
cacerts=CERTFILE,
|
|
|
|
chatty=False)
|
|
|
|
flag = threading.Event()
|
|
|
|
server.start(flag)
|
|
|
|
# wait for it to start
|
|
|
|
flag.wait()
|
|
|
|
# try to connect
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
s = ssl.wrap_socket(socket.socket(),
|
|
|
|
certfile=CERTFILE,
|
|
|
|
ca_certs=CERTFILE,
|
|
|
|
cert_reqs=ssl.CERT_REQUIRED,
|
|
|
|
ssl_version=ssl.PROTOCOL_SSLv23)
|
- Issue #2550: The approach used by client/server code for obtaining ports
to listen on in network-oriented tests has been refined in an effort to
facilitate running multiple instances of the entire regression test suite
in parallel without issue. test_support.bind_port() has been fixed such
that it will always return a unique port -- which wasn't always the case
with the previous implementation, especially if socket options had been
set that affected address reuse (i.e. SO_REUSEADDR, SO_REUSEPORT). The
new implementation of bind_port() will actually raise an exception if it
is passed an AF_INET/SOCK_STREAM socket with either the SO_REUSEADDR or
SO_REUSEPORT socket option set. Furthermore, if available, bind_port()
will set the SO_EXCLUSIVEADDRUSE option on the socket it's been passed.
This currently only applies to Windows. This option prevents any other
sockets from binding to the host/port we've bound to, thus removing the
possibility of the 'non-deterministic' behaviour, as Microsoft puts it,
that occurs when a second SOCK_STREAM socket binds and accepts to a
host/port that's already been bound by another socket. The optional
preferred port parameter to bind_port() has been removed. Under no
circumstances should tests be hard coding ports!
test_support.find_unused_port() has also been introduced, which will pass
a temporary socket object to bind_port() in order to obtain an unused port.
The temporary socket object is then closed and deleted, and the port is
returned. This method should only be used for obtaining an unused port
in order to pass to an external program (i.e. the -accept [port] argument
to openssl's s_server mode) or as a parameter to a server-oriented class
that doesn't give you direct access to the underlying socket used.
Finally, test_support.HOST has been introduced, which should be used for
the host argument of any relevant socket calls (i.e. bind and connect).
The following tests were updated to following the new conventions:
test_socket, test_smtplib, test_asyncore, test_ssl, test_httplib,
test_poplib, test_ftplib, test_telnetlib, test_socketserver,
test_asynchat and test_socket_ssl.
It is now possible for multiple instances of the regression test suite to
run in parallel without issue.
2008-04-08 20:47:30 -03:00
|
|
|
s.connect((HOST, server.port))
|
2007-09-10 18:51:02 -03:00
|
|
|
except ssl.SSLError, x:
|
|
|
|
raise test_support.TestFailed(
|
|
|
|
"Unexpected SSL error: " + str(x))
|
|
|
|
except Exception, x:
|
|
|
|
raise test_support.TestFailed(
|
|
|
|
"Unexpected exception: " + str(x))
|
|
|
|
else:
|
|
|
|
if not s:
|
|
|
|
raise test_support.TestFailed(
|
|
|
|
"Can't SSL-handshake with test server")
|
|
|
|
cert = s.getpeercert()
|
|
|
|
if not cert:
|
|
|
|
raise test_support.TestFailed(
|
|
|
|
"Can't get peer certificate.")
|
|
|
|
cipher = s.cipher()
|
|
|
|
if test_support.verbose:
|
|
|
|
sys.stdout.write(pprint.pformat(cert) + '\n')
|
|
|
|
sys.stdout.write("Connection cipher is " + str(cipher) + '.\n')
|
|
|
|
if not cert.has_key('subject'):
|
|
|
|
raise test_support.TestFailed(
|
|
|
|
"No subject field in certificate: %s." %
|
|
|
|
pprint.pformat(cert))
|
|
|
|
if ((('organizationName', 'Python Software Foundation'),)
|
|
|
|
not in cert['subject']):
|
|
|
|
raise test_support.TestFailed(
|
|
|
|
"Missing or invalid 'organizationName' field in certificate subject; "
|
2008-03-09 16:03:42 -03:00
|
|
|
"should be 'Python Software Foundation'.")
|
2007-09-10 18:51:02 -03:00
|
|
|
s.close()
|
|
|
|
finally:
|
|
|
|
server.stop()
|
|
|
|
server.join()
|
|
|
|
|
|
|
|
def testNULLcert(self):
|
|
|
|
badCertTest(os.path.join(os.path.dirname(__file__) or os.curdir,
|
|
|
|
"nullcert.pem"))
|
|
|
|
def testMalformedCert(self):
|
|
|
|
badCertTest(os.path.join(os.path.dirname(__file__) or os.curdir,
|
|
|
|
"badcert.pem"))
|
2008-06-28 19:19:33 -03:00
|
|
|
def testWrongCert(self):
|
|
|
|
badCertTest(os.path.join(os.path.dirname(__file__) or os.curdir,
|
|
|
|
"wrongcert.pem"))
|
2007-09-10 18:51:02 -03:00
|
|
|
def testMalformedKey(self):
|
|
|
|
badCertTest(os.path.join(os.path.dirname(__file__) or os.curdir,
|
|
|
|
"badkey.pem"))
|
|
|
|
|
|
|
|
def testProtocolSSL2(self):
|
|
|
|
if test_support.verbose:
|
|
|
|
sys.stdout.write("\n")
|
|
|
|
tryProtocolCombo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv2, True)
|
|
|
|
tryProtocolCombo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv2, True, ssl.CERT_OPTIONAL)
|
|
|
|
tryProtocolCombo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv2, True, ssl.CERT_REQUIRED)
|
|
|
|
tryProtocolCombo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv23, True)
|
|
|
|
tryProtocolCombo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv3, False)
|
|
|
|
tryProtocolCombo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_TLSv1, False)
|
|
|
|
|
|
|
|
def testProtocolSSL23(self):
|
|
|
|
if test_support.verbose:
|
|
|
|
sys.stdout.write("\n")
|
|
|
|
try:
|
|
|
|
tryProtocolCombo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv2, True)
|
|
|
|
except test_support.TestFailed, x:
|
|
|
|
# this fails on some older versions of OpenSSL (0.9.7l, for instance)
|
|
|
|
if test_support.verbose:
|
|
|
|
sys.stdout.write(
|
|
|
|
" SSL2 client to SSL23 server test unexpectedly failed:\n %s\n"
|
|
|
|
% str(x))
|
|
|
|
tryProtocolCombo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, True)
|
|
|
|
tryProtocolCombo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv23, True)
|
|
|
|
tryProtocolCombo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1, True)
|
|
|
|
|
|
|
|
tryProtocolCombo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, True, ssl.CERT_OPTIONAL)
|
|
|
|
tryProtocolCombo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv23, True, ssl.CERT_OPTIONAL)
|
|
|
|
tryProtocolCombo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1, True, ssl.CERT_OPTIONAL)
|
|
|
|
|
|
|
|
tryProtocolCombo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, True, ssl.CERT_REQUIRED)
|
|
|
|
tryProtocolCombo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv23, True, ssl.CERT_REQUIRED)
|
|
|
|
tryProtocolCombo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1, True, ssl.CERT_REQUIRED)
|
|
|
|
|
|
|
|
def testProtocolSSL3(self):
|
|
|
|
if test_support.verbose:
|
|
|
|
sys.stdout.write("\n")
|
|
|
|
tryProtocolCombo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv3, True)
|
|
|
|
tryProtocolCombo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv3, True, ssl.CERT_OPTIONAL)
|
|
|
|
tryProtocolCombo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv3, True, ssl.CERT_REQUIRED)
|
|
|
|
tryProtocolCombo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv2, False)
|
|
|
|
tryProtocolCombo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv23, False)
|
|
|
|
tryProtocolCombo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_TLSv1, False)
|
|
|
|
|
|
|
|
def testProtocolTLS1(self):
|
|
|
|
if test_support.verbose:
|
|
|
|
sys.stdout.write("\n")
|
|
|
|
tryProtocolCombo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_TLSv1, True)
|
|
|
|
tryProtocolCombo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_TLSv1, True, ssl.CERT_OPTIONAL)
|
|
|
|
tryProtocolCombo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_TLSv1, True, ssl.CERT_REQUIRED)
|
|
|
|
tryProtocolCombo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_SSLv2, False)
|
|
|
|
tryProtocolCombo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_SSLv3, False)
|
|
|
|
tryProtocolCombo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_SSLv23, False)
|
|
|
|
|
|
|
|
def testSTARTTLS (self):
|
|
|
|
|
|
|
|
msgs = ("msg 1", "MSG 2", "STARTTLS", "MSG 3", "msg 4")
|
|
|
|
|
- Issue #2550: The approach used by client/server code for obtaining ports
to listen on in network-oriented tests has been refined in an effort to
facilitate running multiple instances of the entire regression test suite
in parallel without issue. test_support.bind_port() has been fixed such
that it will always return a unique port -- which wasn't always the case
with the previous implementation, especially if socket options had been
set that affected address reuse (i.e. SO_REUSEADDR, SO_REUSEPORT). The
new implementation of bind_port() will actually raise an exception if it
is passed an AF_INET/SOCK_STREAM socket with either the SO_REUSEADDR or
SO_REUSEPORT socket option set. Furthermore, if available, bind_port()
will set the SO_EXCLUSIVEADDRUSE option on the socket it's been passed.
This currently only applies to Windows. This option prevents any other
sockets from binding to the host/port we've bound to, thus removing the
possibility of the 'non-deterministic' behaviour, as Microsoft puts it,
that occurs when a second SOCK_STREAM socket binds and accepts to a
host/port that's already been bound by another socket. The optional
preferred port parameter to bind_port() has been removed. Under no
circumstances should tests be hard coding ports!
test_support.find_unused_port() has also been introduced, which will pass
a temporary socket object to bind_port() in order to obtain an unused port.
The temporary socket object is then closed and deleted, and the port is
returned. This method should only be used for obtaining an unused port
in order to pass to an external program (i.e. the -accept [port] argument
to openssl's s_server mode) or as a parameter to a server-oriented class
that doesn't give you direct access to the underlying socket used.
Finally, test_support.HOST has been introduced, which should be used for
the host argument of any relevant socket calls (i.e. bind and connect).
The following tests were updated to following the new conventions:
test_socket, test_smtplib, test_asyncore, test_ssl, test_httplib,
test_poplib, test_ftplib, test_telnetlib, test_socketserver,
test_asynchat and test_socket_ssl.
It is now possible for multiple instances of the regression test suite to
run in parallel without issue.
2008-04-08 20:47:30 -03:00
|
|
|
server = ThreadedEchoServer(CERTFILE,
|
2007-09-10 18:51:02 -03:00
|
|
|
ssl_version=ssl.PROTOCOL_TLSv1,
|
|
|
|
starttls_server=True,
|
|
|
|
chatty=True,
|
|
|
|
connectionchatty=True)
|
|
|
|
flag = threading.Event()
|
|
|
|
server.start(flag)
|
|
|
|
# wait for it to start
|
|
|
|
flag.wait()
|
|
|
|
# try to connect
|
|
|
|
wrapped = False
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
s = socket.socket()
|
|
|
|
s.setblocking(1)
|
- Issue #2550: The approach used by client/server code for obtaining ports
to listen on in network-oriented tests has been refined in an effort to
facilitate running multiple instances of the entire regression test suite
in parallel without issue. test_support.bind_port() has been fixed such
that it will always return a unique port -- which wasn't always the case
with the previous implementation, especially if socket options had been
set that affected address reuse (i.e. SO_REUSEADDR, SO_REUSEPORT). The
new implementation of bind_port() will actually raise an exception if it
is passed an AF_INET/SOCK_STREAM socket with either the SO_REUSEADDR or
SO_REUSEPORT socket option set. Furthermore, if available, bind_port()
will set the SO_EXCLUSIVEADDRUSE option on the socket it's been passed.
This currently only applies to Windows. This option prevents any other
sockets from binding to the host/port we've bound to, thus removing the
possibility of the 'non-deterministic' behaviour, as Microsoft puts it,
that occurs when a second SOCK_STREAM socket binds and accepts to a
host/port that's already been bound by another socket. The optional
preferred port parameter to bind_port() has been removed. Under no
circumstances should tests be hard coding ports!
test_support.find_unused_port() has also been introduced, which will pass
a temporary socket object to bind_port() in order to obtain an unused port.
The temporary socket object is then closed and deleted, and the port is
returned. This method should only be used for obtaining an unused port
in order to pass to an external program (i.e. the -accept [port] argument
to openssl's s_server mode) or as a parameter to a server-oriented class
that doesn't give you direct access to the underlying socket used.
Finally, test_support.HOST has been introduced, which should be used for
the host argument of any relevant socket calls (i.e. bind and connect).
The following tests were updated to following the new conventions:
test_socket, test_smtplib, test_asyncore, test_ssl, test_httplib,
test_poplib, test_ftplib, test_telnetlib, test_socketserver,
test_asynchat and test_socket_ssl.
It is now possible for multiple instances of the regression test suite to
run in parallel without issue.
2008-04-08 20:47:30 -03:00
|
|
|
s.connect((HOST, server.port))
|
2007-09-10 18:51:02 -03:00
|
|
|
except Exception, x:
|
|
|
|
raise test_support.TestFailed("Unexpected exception: " + str(x))
|
|
|
|
else:
|
|
|
|
if test_support.verbose:
|
|
|
|
sys.stdout.write("\n")
|
|
|
|
for indata in msgs:
|
|
|
|
if test_support.verbose:
|
2007-09-16 19:06:00 -03:00
|
|
|
sys.stdout.write(
|
|
|
|
" client: sending %s...\n" % repr(indata))
|
2007-09-10 18:51:02 -03:00
|
|
|
if wrapped:
|
|
|
|
conn.write(indata)
|
|
|
|
outdata = conn.read()
|
|
|
|
else:
|
|
|
|
s.send(indata)
|
|
|
|
outdata = s.recv(1024)
|
2007-09-16 19:06:00 -03:00
|
|
|
if (indata == "STARTTLS" and
|
|
|
|
outdata.strip().lower().startswith("ok")):
|
2007-09-10 18:51:02 -03:00
|
|
|
if test_support.verbose:
|
2007-09-16 19:06:00 -03:00
|
|
|
sys.stdout.write(
|
|
|
|
" client: read %s from server, starting TLS...\n"
|
|
|
|
% repr(outdata))
|
2007-09-10 18:51:02 -03:00
|
|
|
conn = ssl.wrap_socket(s, ssl_version=ssl.PROTOCOL_TLSv1)
|
|
|
|
|
|
|
|
wrapped = True
|
|
|
|
else:
|
|
|
|
if test_support.verbose:
|
2007-09-16 19:06:00 -03:00
|
|
|
sys.stdout.write(
|
|
|
|
" client: read %s from server\n" % repr(outdata))
|
2007-09-10 18:51:02 -03:00
|
|
|
if test_support.verbose:
|
|
|
|
sys.stdout.write(" client: closing connection.\n")
|
|
|
|
if wrapped:
|
|
|
|
conn.write("over\n")
|
|
|
|
else:
|
|
|
|
s.send("over\n")
|
|
|
|
s.close()
|
|
|
|
finally:
|
|
|
|
server.stop()
|
|
|
|
server.join()
|
2007-08-25 12:08:43 -03:00
|
|
|
|
2008-06-28 19:19:33 -03:00
|
|
|
def testSocketServer(self):
|
2007-08-25 12:08:43 -03:00
|
|
|
|
2008-06-28 19:19:33 -03:00
|
|
|
server = SocketServerHTTPSServer(CERTFILE)
|
2007-09-16 19:06:00 -03:00
|
|
|
flag = threading.Event()
|
|
|
|
server.start(flag)
|
|
|
|
# wait for it to start
|
|
|
|
flag.wait()
|
|
|
|
# try to connect
|
|
|
|
try:
|
|
|
|
if test_support.verbose:
|
|
|
|
sys.stdout.write('\n')
|
2007-09-16 20:16:46 -03:00
|
|
|
d1 = open(CERTFILE, 'rb').read()
|
2007-09-16 19:06:00 -03:00
|
|
|
d2 = ''
|
|
|
|
# now fetch the same data from the HTTPS server
|
2008-06-28 19:19:33 -03:00
|
|
|
url = 'https://127.0.0.1:%d/%s' % (
|
|
|
|
server.port, os.path.split(CERTFILE)[1])
|
2007-09-16 19:06:00 -03:00
|
|
|
f = urllib.urlopen(url)
|
|
|
|
dlen = f.info().getheader("content-length")
|
|
|
|
if dlen and (int(dlen) > 0):
|
|
|
|
d2 = f.read(int(dlen))
|
|
|
|
if test_support.verbose:
|
|
|
|
sys.stdout.write(
|
|
|
|
" client: read %d bytes from remote server '%s'\n"
|
|
|
|
% (len(d2), server))
|
|
|
|
f.close()
|
|
|
|
except:
|
|
|
|
msg = ''.join(traceback.format_exception(*sys.exc_info()))
|
|
|
|
if test_support.verbose:
|
|
|
|
sys.stdout.write('\n' + msg)
|
|
|
|
raise test_support.TestFailed(msg)
|
|
|
|
else:
|
|
|
|
if not (d1 == d2):
|
|
|
|
raise test_support.TestFailed(
|
|
|
|
"Couldn't fetch data from HTTPS server")
|
|
|
|
finally:
|
|
|
|
server.stop()
|
|
|
|
server.join()
|
2007-08-26 15:50:39 -03:00
|
|
|
|
2008-06-28 19:19:33 -03:00
|
|
|
def testWrappedAccept (self):
|
|
|
|
|
|
|
|
if test_support.verbose:
|
|
|
|
sys.stdout.write("\n")
|
|
|
|
serverParamsTest(CERTFILE, ssl.PROTOCOL_SSLv23, ssl.CERT_REQUIRED,
|
|
|
|
CERTFILE, CERTFILE, ssl.PROTOCOL_SSLv23,
|
|
|
|
chatty=True, connectionchatty=True,
|
|
|
|
wrap_accepting_socket=True)
|
|
|
|
|
|
|
|
|
|
|
|
def testAsyncoreServer (self):
|
|
|
|
|
|
|
|
indata = "TEST MESSAGE of mixed case\n"
|
|
|
|
|
|
|
|
if test_support.verbose:
|
|
|
|
sys.stdout.write("\n")
|
|
|
|
server = AsyncoreEchoServer(CERTFILE)
|
|
|
|
flag = threading.Event()
|
|
|
|
server.start(flag)
|
|
|
|
# wait for it to start
|
|
|
|
flag.wait()
|
|
|
|
# try to connect
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
s = ssl.wrap_socket(socket.socket())
|
|
|
|
s.connect(('127.0.0.1', server.port))
|
|
|
|
except ssl.SSLError, x:
|
|
|
|
raise test_support.TestFailed("Unexpected SSL error: " + str(x))
|
|
|
|
except Exception, x:
|
|
|
|
raise test_support.TestFailed("Unexpected exception: " + str(x))
|
|
|
|
else:
|
|
|
|
if test_support.verbose:
|
|
|
|
sys.stdout.write(
|
|
|
|
" client: sending %s...\n" % (repr(indata)))
|
|
|
|
s.write(indata)
|
|
|
|
outdata = s.read()
|
|
|
|
if test_support.verbose:
|
|
|
|
sys.stdout.write(" client: read %s\n" % repr(outdata))
|
|
|
|
if outdata != indata.lower():
|
|
|
|
raise test_support.TestFailed(
|
|
|
|
"bad data <<%s>> (%d) received; expected <<%s>> (%d)\n"
|
|
|
|
% (outdata[:min(len(outdata),20)], len(outdata),
|
|
|
|
indata[:min(len(indata),20)].lower(), len(indata)))
|
|
|
|
s.write("over\n")
|
|
|
|
if test_support.verbose:
|
|
|
|
sys.stdout.write(" client: closing connection.\n")
|
|
|
|
s.close()
|
|
|
|
finally:
|
|
|
|
server.stop()
|
|
|
|
# wait for server thread to end
|
|
|
|
server.join()
|
|
|
|
|
2007-08-25 12:08:43 -03:00
|
|
|
|
2007-08-26 22:15:33 -03:00
|
|
|
def test_main(verbose=False):
|
2007-08-25 12:08:43 -03:00
|
|
|
if skip_expected:
|
2007-09-04 21:46:27 -03:00
|
|
|
raise test_support.TestSkipped("No SSL support")
|
2007-08-25 12:08:43 -03:00
|
|
|
|
- Issue #2550: The approach used by client/server code for obtaining ports
to listen on in network-oriented tests has been refined in an effort to
facilitate running multiple instances of the entire regression test suite
in parallel without issue. test_support.bind_port() has been fixed such
that it will always return a unique port -- which wasn't always the case
with the previous implementation, especially if socket options had been
set that affected address reuse (i.e. SO_REUSEADDR, SO_REUSEPORT). The
new implementation of bind_port() will actually raise an exception if it
is passed an AF_INET/SOCK_STREAM socket with either the SO_REUSEADDR or
SO_REUSEPORT socket option set. Furthermore, if available, bind_port()
will set the SO_EXCLUSIVEADDRUSE option on the socket it's been passed.
This currently only applies to Windows. This option prevents any other
sockets from binding to the host/port we've bound to, thus removing the
possibility of the 'non-deterministic' behaviour, as Microsoft puts it,
that occurs when a second SOCK_STREAM socket binds and accepts to a
host/port that's already been bound by another socket. The optional
preferred port parameter to bind_port() has been removed. Under no
circumstances should tests be hard coding ports!
test_support.find_unused_port() has also been introduced, which will pass
a temporary socket object to bind_port() in order to obtain an unused port.
The temporary socket object is then closed and deleted, and the port is
returned. This method should only be used for obtaining an unused port
in order to pass to an external program (i.e. the -accept [port] argument
to openssl's s_server mode) or as a parameter to a server-oriented class
that doesn't give you direct access to the underlying socket used.
Finally, test_support.HOST has been introduced, which should be used for
the host argument of any relevant socket calls (i.e. bind and connect).
The following tests were updated to following the new conventions:
test_socket, test_smtplib, test_asyncore, test_ssl, test_httplib,
test_poplib, test_ftplib, test_telnetlib, test_socketserver,
test_asynchat and test_socket_ssl.
It is now possible for multiple instances of the regression test suite to
run in parallel without issue.
2008-04-08 20:47:30 -03:00
|
|
|
global CERTFILE, SVN_PYTHON_ORG_ROOT_CERT
|
2007-08-27 14:19:42 -03:00
|
|
|
CERTFILE = os.path.join(os.path.dirname(__file__) or os.curdir,
|
2007-09-16 19:06:00 -03:00
|
|
|
"keycert.pem")
|
|
|
|
SVN_PYTHON_ORG_ROOT_CERT = os.path.join(
|
|
|
|
os.path.dirname(__file__) or os.curdir,
|
|
|
|
"https_svn_python_org_root.pem")
|
|
|
|
|
|
|
|
if (not os.path.exists(CERTFILE) or
|
|
|
|
not os.path.exists(SVN_PYTHON_ORG_ROOT_CERT)):
|
2007-09-10 18:51:02 -03:00
|
|
|
raise test_support.TestFailed("Can't read certificate files!")
|
2007-08-25 12:08:43 -03:00
|
|
|
|
2008-06-28 19:19:33 -03:00
|
|
|
TESTPORT = test_support.find_unused_port()
|
|
|
|
if not TESTPORT:
|
|
|
|
raise test_support.TestFailed("Can't find open port to test servers on!")
|
|
|
|
|
2007-08-25 12:08:43 -03:00
|
|
|
tests = [BasicTests]
|
|
|
|
|
2007-09-16 19:06:00 -03:00
|
|
|
if test_support.is_resource_enabled('network'):
|
2008-06-28 19:19:33 -03:00
|
|
|
tests.append(NetworkedTests)
|
2007-09-16 19:06:00 -03:00
|
|
|
|
2007-09-10 18:51:02 -03:00
|
|
|
if _have_threads:
|
|
|
|
thread_info = test_support.threading_setup()
|
2007-09-16 19:06:00 -03:00
|
|
|
if thread_info and test_support.is_resource_enabled('network'):
|
2008-06-28 19:19:33 -03:00
|
|
|
tests.append(ThreadedTests)
|
2007-08-25 12:08:43 -03:00
|
|
|
|
2007-09-10 18:51:02 -03:00
|
|
|
test_support.run_unittest(*tests)
|
2007-08-25 12:08:43 -03:00
|
|
|
|
2007-09-10 18:51:02 -03:00
|
|
|
if _have_threads:
|
|
|
|
test_support.threading_cleanup(*thread_info)
|
2007-08-25 12:08:43 -03:00
|
|
|
|
|
|
|
if __name__ == "__main__":
|
|
|
|
test_main()
|