Skip to content

C
cpython
Kaydet (Commit) 6b240cd8 authored tarafından Trent Nelson's avatar Trent Nelson
Dosyalara gözat
Seçenekler

Revert r62242: trunk's test_ssl.py isn't as up-to-date as py3k's, and should't… 

Revert r62242: trunk's test_ssl.py isn't as up-to-date as py3k's, and should't have been brought over in the merge.
üst 8efc62cc
Hide whitespace changes
Inline Side-by-side
Showing with 133 additions and 61 deletions
Lib/test/test_ssl.py
Dosyayı görüntüle @ 6b240cd8
...@@ -25,10 +25,11 @@ try: ...@@ -25,10 +25,11 @@ try:
except ImportError: except ImportError:
skip_expected = True skip_expected = True
HOST = test_support.HOST
CERTFILE = None CERTFILE = None
SVN_PYTHON_ORG_ROOT_CERT = None SVN_PYTHON_ORG_ROOT_CERT = None
TESTPORT = 10025
def handle_error(prefix): def handle_error(prefix):
exc_format = ' '.join(traceback.format_exception(*sys.exc_info())) exc_format = ' '.join(traceback.format_exception(*sys.exc_info()))
if test_support.verbose: if test_support.verbose:
...@@ -298,7 +299,7 @@ else: ...@@ -298,7 +299,7 @@ else:
except: except:
handle_error('') handle_error('')
def __init__(self, certificate, ssl_version=None, def __init__(self, port, certificate, ssl_version=None,
certreqs=None, cacerts=None, expect_bad_connects=False, certreqs=None, cacerts=None, expect_bad_connects=False,
chatty=True, connectionchatty=False, starttls_server=False): chatty=True, connectionchatty=False, starttls_server=False):
if ssl_version is None: if ssl_version is None:
...@@ -314,8 +315,12 @@ else: ...@@ -314,8 +315,12 @@ else:
self.connectionchatty = connectionchatty self.connectionchatty = connectionchatty
self.starttls_server = starttls_server self.starttls_server = starttls_server
self.sock = socket.socket() self.sock = socket.socket()
self.port = test_support.bind_port(self.sock)
self.flag = None 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 self.active = False
threading.Thread.__init__(self) threading.Thread.__init__(self)
self.setDaemon(False) self.setDaemon(False)
...@@ -466,13 +471,12 @@ else: ...@@ -466,13 +471,12 @@ else:
format%args)) format%args))
def __init__(self, certfile): def __init__(self, port, certfile):
self.flag = None self.flag = None
self.active = False self.active = False
self.RootedHTTPRequestHandler.root = os.path.split(CERTFILE)[0] self.RootedHTTPRequestHandler.root = os.path.split(CERTFILE)[0]
self.port = test_support.find_unused_port()
self.server = self.HTTPSServer( self.server = self.HTTPSServer(
(HOST, self.port), self.RootedHTTPRequestHandler, certfile) ('', port), self.RootedHTTPRequestHandler, certfile)
threading.Thread.__init__(self) threading.Thread.__init__(self)
self.setDaemon(True) self.setDaemon(True)
...@@ -582,7 +586,7 @@ else: ...@@ -582,7 +586,7 @@ else:
self.server.close() self.server.close()
def badCertTest (certfile): def badCertTest (certfile):
server = ThreadedEchoServer(CERTFILE, server = ThreadedEchoServer(TESTPORT, CERTFILE,
certreqs=ssl.CERT_REQUIRED, certreqs=ssl.CERT_REQUIRED,
cacerts=CERTFILE, chatty=False, cacerts=CERTFILE, chatty=False,
connectionchatty=False) connectionchatty=False)
...@@ -596,7 +600,7 @@ else: ...@@ -596,7 +600,7 @@ else:
s = ssl.wrap_socket(socket.socket(), s = ssl.wrap_socket(socket.socket(),
certfile=certfile, certfile=certfile,
ssl_version=ssl.PROTOCOL_TLSv1) ssl_version=ssl.PROTOCOL_TLSv1)
s.connect((HOST, server.port)) s.connect(('127.0.0.1', TESTPORT))
except ssl.SSLError as x: except ssl.SSLError as x:
if test_support.verbose: if test_support.verbose:
sys.stdout.write("\nSSLError is %s\n" % x) sys.stdout.write("\nSSLError is %s\n" % x)
...@@ -612,7 +616,7 @@ else: ...@@ -612,7 +616,7 @@ else:
indata="FOO\n", indata="FOO\n",
chatty=False, connectionchatty=False): chatty=False, connectionchatty=False):
server = ThreadedEchoServer(certfile, server = ThreadedEchoServer(TESTPORT, certfile,
certreqs=certreqs, certreqs=certreqs,
ssl_version=protocol, ssl_version=protocol,
cacerts=cacertsfile, cacerts=cacertsfile,
...@@ -627,11 +631,12 @@ else: ...@@ -627,11 +631,12 @@ else:
client_protocol = protocol client_protocol = protocol
try: try:
s = ssl.wrap_socket(socket.socket(), s = ssl.wrap_socket(socket.socket(),
server_side=False,
certfile=client_certfile, certfile=client_certfile,
ca_certs=cacertsfile, ca_certs=cacertsfile,
cert_reqs=certreqs, cert_reqs=certreqs,
ssl_version=client_protocol) ssl_version=client_protocol)
s.connect((HOST, server.port)) s.connect(('127.0.0.1', TESTPORT))
except ssl.SSLError as x: except ssl.SSLError as x:
raise test_support.TestFailed("Unexpected SSL error: " + str(x)) raise test_support.TestFailed("Unexpected SSL error: " + str(x))
except Exception as x: except Exception as x:
...@@ -641,17 +646,18 @@ else: ...@@ -641,17 +646,18 @@ else:
if test_support.verbose: if test_support.verbose:
sys.stdout.write( sys.stdout.write(
" client: sending %s...\n" % (repr(indata))) " client: sending %s...\n" % (repr(indata)))
s.write(indata) s.write(indata.encode('ASCII', 'strict'))
outdata = s.read() outdata = s.read()
if connectionchatty: if connectionchatty:
if test_support.verbose: if test_support.verbose:
sys.stdout.write(" client: read %s\n" % repr(outdata)) sys.stdout.write(" client: read %s\n" % repr(outdata))
outdata = str(outdata, 'ASCII', 'strict')
if outdata != indata.lower(): if outdata != indata.lower():
raise test_support.TestFailed( raise test_support.TestFailed(
"bad data <<%s>> (%d) received; expected <<%s>> (%d)\n" "bad data <<%s>> (%d) received; expected <<%s>> (%d)\n"
% (outdata[:min(len(outdata),20)], len(outdata), % (repr(outdata[:min(len(outdata),20)]), len(outdata),
indata[:min(len(indata),20)].lower(), len(indata))) repr(indata[:min(len(indata),20)].lower()), len(indata)))
s.write("over\n") s.write("over\n".encode("ASCII", "strict"))
if connectionchatty: if connectionchatty:
if test_support.verbose: if test_support.verbose:
sys.stdout.write(" client: closing connection.\n") sys.stdout.write(" client: closing connection.\n")
...@@ -697,44 +703,7 @@ else: ...@@ -697,44 +703,7 @@ else:
class ThreadedTests(unittest.TestCase): class ThreadedTests(unittest.TestCase):
def testRudeShutdown(self): def testEcho (self):
listener_ready = threading.Event()
listener_gone = threading.Event()
port = test_support.find_unused_port()
# `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()
s.bind((HOST, port))
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((HOST, port))
listener_gone.wait()
try:
ssl_sock = ssl.wrap_socket(s)
except IOError:
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: if test_support.verbose:
sys.stdout.write("\n") sys.stdout.write("\n")
...@@ -747,7 +716,7 @@ else: ...@@ -747,7 +716,7 @@ else:
if test_support.verbose: if test_support.verbose:
sys.stdout.write("\n") sys.stdout.write("\n")
s2 = socket.socket() s2 = socket.socket()
server = ThreadedEchoServer(CERTFILE, server = ThreadedEchoServer(TESTPORT, CERTFILE,
certreqs=ssl.CERT_NONE, certreqs=ssl.CERT_NONE,
ssl_version=ssl.PROTOCOL_SSLv23, ssl_version=ssl.PROTOCOL_SSLv23,
cacerts=CERTFILE, cacerts=CERTFILE,
...@@ -764,7 +733,7 @@ else: ...@@ -764,7 +733,7 @@ else:
ca_certs=CERTFILE, ca_certs=CERTFILE,
cert_reqs=ssl.CERT_REQUIRED, cert_reqs=ssl.CERT_REQUIRED,
ssl_version=ssl.PROTOCOL_SSLv23) ssl_version=ssl.PROTOCOL_SSLv23)
s.connect((HOST, server.port)) s.connect(('127.0.0.1', TESTPORT))
except ssl.SSLError as x: except ssl.SSLError as x:
raise test_support.TestFailed( raise test_support.TestFailed(
"Unexpected SSL error: " + str(x)) "Unexpected SSL error: " + str(x))
...@@ -807,6 +776,46 @@ else: ...@@ -807,6 +776,46 @@ else:
badCertTest(os.path.join(os.path.dirname(__file__) or os.curdir, badCertTest(os.path.join(os.path.dirname(__file__) or os.curdir,
"badkey.pem")) "badkey.pem"))
def testRudeShutdown(self):
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()
if hasattr(socket, 'SO_REUSEADDR'):
s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
if hasattr(socket, 'SO_REUSEPORT'):
s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT, 1)
s.bind(('127.0.0.1', TESTPORT))
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(('127.0.0.1', TESTPORT))
listener_gone.wait()
try:
ssl_sock = ssl.wrap_socket(s)
except IOError:
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 testProtocolSSL2(self): def testProtocolSSL2(self):
if test_support.verbose: if test_support.verbose:
sys.stdout.write("\n") sys.stdout.write("\n")
...@@ -864,7 +873,7 @@ else: ...@@ -864,7 +873,7 @@ else:
msgs = ("msg 1", "MSG 2", "STARTTLS", "MSG 3", "msg 4") msgs = ("msg 1", "MSG 2", "STARTTLS", "MSG 3", "msg 4")
server = ThreadedEchoServer(CERTFILE, server = ThreadedEchoServer(TESTPORT, CERTFILE,
ssl_version=ssl.PROTOCOL_TLSv1, ssl_version=ssl.PROTOCOL_TLSv1,
starttls_server=True, starttls_server=True,
chatty=True, chatty=True,
...@@ -879,7 +888,7 @@ else: ...@@ -879,7 +888,7 @@ else:
try: try:
s = socket.socket() s = socket.socket()
s.setblocking(1) s.setblocking(1)
s.connect((HOST, server.port)) s.connect(('127.0.0.1', TESTPORT))
except Exception as x: except Exception as x:
raise test_support.TestFailed("Unexpected exception: " + str(x)) raise test_support.TestFailed("Unexpected exception: " + str(x))
else: else:
...@@ -927,8 +936,7 @@ else: ...@@ -927,8 +936,7 @@ else:
def testSocketServer(self): def testSocketServer(self):
server = OurHTTPSServer(TESTPORT, CERTFILE)
server = AsyncoreHTTPSServer(CERTFILE)
flag = threading.Event() flag = threading.Event()
server.start(flag) server.start(flag)
# wait for it to start # wait for it to start
...@@ -940,8 +948,8 @@ else: ...@@ -940,8 +948,8 @@ else:
d1 = open(CERTFILE, 'rb').read() d1 = open(CERTFILE, 'rb').read()
d2 = '' d2 = ''
# now fetch the same data from the HTTPS server # now fetch the same data from the HTTPS server
url = 'https://%s:%d/%s' % ( url = 'https://127.0.0.1:%d/%s' % (
HOST, server.port, os.path.split(CERTFILE)[1]) TESTPORT, os.path.split(CERTFILE)[1])
f = urllib.urlopen(url) f = urllib.urlopen(url)
dlen = f.info().getheader("content-length") dlen = f.info().getheader("content-length")
if dlen and (int(dlen) > 0): if dlen and (int(dlen) > 0):
...@@ -970,11 +978,71 @@ else: ...@@ -970,11 +978,71 @@ else:
sys.stdout.write('joining thread\n') sys.stdout.write('joining thread\n')
server.join() server.join()
def testAsyncoreServer(self):
if test_support.verbose:
sys.stdout.write("\n")
indata="FOO\n"
server = AsyncoreEchoServer(TESTPORT, CERTFILE)
flag = threading.Event()
server.start(flag)
# wait for it to start
flag.wait()
# try to connect
try:
s = ssl.wrap_socket(socket.socket())
s.connect(('127.0.0.1', TESTPORT))
except ssl.SSLError as x:
raise test_support.TestFailed("Unexpected SSL error: " + str(x))
except Exception as x:
raise test_support.TestFailed("Unexpected exception: " + str(x))
else:
if test_support.verbose:
sys.stdout.write(
" client: sending %s...\n" % (repr(indata)))
s.sendall(indata.encode('ASCII', 'strict'))
outdata = s.recv()
if test_support.verbose:
sys.stdout.write(" client: read %s\n" % repr(outdata))
outdata = str(outdata, 'ASCII', 'strict')
if outdata != indata.lower():
raise test_support.TestFailed(
"bad data <<%s>> (%d) received; expected <<%s>> (%d)\n"
% (repr(outdata[:min(len(outdata),20)]), len(outdata),
repr(indata[:min(len(indata),20)].lower()), len(indata)))
s.write("over\n".encode("ASCII", "strict"))
if test_support.verbose:
sys.stdout.write(" client: closing connection.\n")
s.close()
finally:
server.stop()
server.join()
def findtestsocket(start, end):
def testbind(i):
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
try:
s.bind(("127.0.0.1", i))
except:
return 0
else:
return 1
finally:
s.close()
for i in range(start, end):
if testbind(i) and testbind(i+1):
return i
return 0
def test_main(verbose=False): def test_main(verbose=False):
if skip_expected: if skip_expected:
raise test_support.TestSkipped("No SSL support") raise test_support.TestSkipped("No SSL support")
global CERTFILE, SVN_PYTHON_ORG_ROOT_CERT global CERTFILE, TESTPORT, SVN_PYTHON_ORG_ROOT_CERT
CERTFILE = os.path.join(os.path.dirname(__file__) or os.curdir, CERTFILE = os.path.join(os.path.dirname(__file__) or os.curdir,
"keycert.pem") "keycert.pem")
SVN_PYTHON_ORG_ROOT_CERT = os.path.join( SVN_PYTHON_ORG_ROOT_CERT = os.path.join(
...@@ -985,6 +1053,10 @@ def test_main(verbose=False): ...@@ -985,6 +1053,10 @@ def test_main(verbose=False):
not os.path.exists(SVN_PYTHON_ORG_ROOT_CERT)): not os.path.exists(SVN_PYTHON_ORG_ROOT_CERT)):
raise test_support.TestFailed("Can't read certificate files!") raise test_support.TestFailed("Can't read certificate files!")
TESTPORT = findtestsocket(10025, 12000)
if not TESTPORT:
raise test_support.TestFailed("Can't find open port to test servers on!")
tests = [BasicTests] tests = [BasicTests]
if test_support.is_resource_enabled('network'): if test_support.is_resource_enabled('network'):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment