mirror of
https://github.com/python/cpython.git
synced 2025-08-03 00:23:06 +00:00

svn+ssh://pythondev@svn.python.org/python/trunk ........ r57771 | thomas.wouters | 2007-08-30 23:54:39 +0200 (Thu, 30 Aug 2007) | 5 lines Don't lie in __all__ attributes when SSL is not available: only add the SSL classes when they are actually created. ........ r57620 | walter.doerwald | 2007-08-28 18:38:26 +0200 (Tue, 28 Aug 2007) | 5 lines Fix title endtag in HTMLCalender.formatyearpage(). Fix documentation for HTMLCalender.formatyearpage() (there's no themonth parameter). This fixes issue1046. ........ r57622 | georg.brandl | 2007-08-28 20:54:44 +0200 (Tue, 28 Aug 2007) | 2 lines Add a crasher for the thread-unsafety of file objects. ........ r57626 | skip.montanaro | 2007-08-29 01:22:52 +0200 (Wed, 29 Aug 2007) | 1 line fixes 813986 ........ r57628 | walter.doerwald | 2007-08-29 01:35:33 +0200 (Wed, 29 Aug 2007) | 2 lines Fix test output. ........ r57631 | skip.montanaro | 2007-08-29 03:24:11 +0200 (Wed, 29 Aug 2007) | 2 lines Install pygettext (once the scriptsinstall target is working again). ........ r57633 | skip.montanaro | 2007-08-29 03:33:45 +0200 (Wed, 29 Aug 2007) | 2 lines Recent items. ........ r57650 | neal.norwitz | 2007-08-29 08:15:33 +0200 (Wed, 29 Aug 2007) | 1 line Add Bill as a developer ........ r57651 | facundo.batista | 2007-08-29 12:28:28 +0200 (Wed, 29 Aug 2007) | 5 lines Ignore test failures caused by 'resource temporarily unavailable' exceptions raised during FailingServerTestCase tests. [GSoC - Alan McIntyre] ........ r57680 | bill.janssen | 2007-08-30 00:35:05 +0200 (Thu, 30 Aug 2007) | 17 lines This contains a number of things: 1) Improve the documentation of the SSL module, with a fuller explanation of certificate usage, another reference, proper formatting of this and that. 2) Fix Windows bug in ssl.py, and general bug in sslsocket.close(). Remove some unused code from ssl.py. Allow accept() to be called on sslsocket sockets. 3) Use try-except-else in import of ssl in socket.py. Deprecate use of socket.ssl(). 4) Remove use of socket.ssl() in every library module, except for test_socket_ssl.py and test_ssl.py. ........ r57714 | georg.brandl | 2007-08-30 12:09:42 +0200 (Thu, 30 Aug 2007) | 2 lines Stronger urge to convert filenames to str before using them as argument to ZipFile.write(). ........ r57716 | georg.brandl | 2007-08-30 12:38:56 +0200 (Thu, 30 Aug 2007) | 2 lines Patch #1680959: add test suite for pipes module. ........ r57717 | georg.brandl | 2007-08-30 14:32:23 +0200 (Thu, 30 Aug 2007) | 3 lines * Skip test_pipes on non-POSIX. * Don't raise TestSkipped within a test function. ........ r57723 | mark.summerfield | 2007-08-30 17:03:03 +0200 (Thu, 30 Aug 2007) | 3 lines Added more cross-references. ........ r57726 | walter.doerwald | 2007-08-30 17:30:09 +0200 (Thu, 30 Aug 2007) | 2 lines Rewrap line. ........ r57727 | walter.doerwald | 2007-08-30 17:34:55 +0200 (Thu, 30 Aug 2007) | 2 lines Set startinpos before calling the error handler. ........ r57730 | bill.janssen | 2007-08-30 19:07:28 +0200 (Thu, 30 Aug 2007) | 3 lines Added docstrings to methods and functions. ........ r57743 | bill.janssen | 2007-08-30 20:08:06 +0200 (Thu, 30 Aug 2007) | 1 line added note on new ssl module and deprecation of socket.ssl ........ r57747 | martin.v.loewis | 2007-08-30 20:14:01 +0200 (Thu, 30 Aug 2007) | 1 line Fix popen usage. ........ r57748 | martin.v.loewis | 2007-08-30 20:15:22 +0200 (Thu, 30 Aug 2007) | 1 line Fix typo. ........ r57750 | martin.v.loewis | 2007-08-30 20:25:47 +0200 (Thu, 30 Aug 2007) | 1 line Bug #1746880: Correctly install DLLs into system32 folder on Win64. ........ r57760 | martin.v.loewis | 2007-08-30 21:04:09 +0200 (Thu, 30 Aug 2007) | 1 line Bug #1709599: Run test_1565150 only if the file system is NTFS. ........ r57762 | martin.v.loewis | 2007-08-30 22:10:57 +0200 (Thu, 30 Aug 2007) | 2 lines Bump autoconf minimum version to 2.61. ........ r57764 | lars.gustaebel | 2007-08-30 22:24:31 +0200 (Thu, 30 Aug 2007) | 2 lines Warn about possible risks when extracting untrusted archives. ........ r57769 | thomas.wouters | 2007-08-30 23:01:17 +0200 (Thu, 30 Aug 2007) | 7 lines Somewhat-preliminary slice-object and extended slicing support for ctypes. The exact behaviour of omitted and negative indices for the Pointer type may need a closer look (especially as it's subtly different from simple slices) but there's time yet before 2.6, and not enough before 3.0a1 :-) ........
240 lines
7.3 KiB
Python
240 lines
7.3 KiB
Python
# Test just the SSL support in the socket module, in a moderately bogus way.
|
|
|
|
import sys
|
|
import unittest
|
|
from test import test_support
|
|
import socket
|
|
import errno
|
|
import threading
|
|
import subprocess
|
|
import time
|
|
import os
|
|
import urllib
|
|
|
|
# Optionally test SSL support, if we have it in the tested platform
|
|
skip_expected = not hasattr(socket, "ssl")
|
|
|
|
class ConnectedTests(unittest.TestCase):
|
|
|
|
def testBasic(self):
|
|
socket.RAND_status()
|
|
try:
|
|
socket.RAND_egd(1)
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
print("didn't raise TypeError")
|
|
socket.RAND_add("this is a random string", 75.0)
|
|
|
|
with test_support.transient_internet():
|
|
f = urllib.urlopen('https://sf.net')
|
|
buf = f.read()
|
|
f.close()
|
|
|
|
def testTimeout(self):
|
|
def error_msg(extra_msg):
|
|
print("""\
|
|
WARNING: an attempt to connect to %r %s, in
|
|
test_timeout. That may be legitimate, but is not the outcome we
|
|
hoped for. If this message is seen often, test_timeout should be
|
|
changed to use a more reliable address.""" % (ADDR, extra_msg), file=sys.stderr)
|
|
|
|
# A service which issues a welcome banner (without need to write
|
|
# anything).
|
|
# XXX ("gmail.org", 995) has been unreliable so far, from time to
|
|
# XXX time non-responsive for hours on end (& across all buildbot
|
|
# XXX slaves, so that's not just a local thing).
|
|
ADDR = "gmail.org", 995
|
|
|
|
s = socket.socket()
|
|
s.settimeout(30.0)
|
|
try:
|
|
s.connect(ADDR)
|
|
except socket.timeout:
|
|
error_msg('timed out')
|
|
return
|
|
except socket.error as exc: # In case connection is refused.
|
|
if exc.args[0] == errno.ECONNREFUSED:
|
|
error_msg('was refused')
|
|
return
|
|
else:
|
|
raise
|
|
|
|
ss = socket.ssl(s)
|
|
# Read part of return welcome banner twice.
|
|
ss.read(1)
|
|
ss.read(1)
|
|
s.close()
|
|
|
|
class BasicTests(unittest.TestCase):
|
|
|
|
def testRudeShutdown(self):
|
|
# Some random port to connect to.
|
|
PORT = [9934]
|
|
|
|
listener_ready = threading.Event()
|
|
listener_gone = threading.Event()
|
|
|
|
# `listener` runs in a thread. It opens a socket listening on
|
|
# PORT, and sits in an accept() until the main thread connects.
|
|
# Then it rudely closes the socket, and sets Event `listener_gone`
|
|
# to let the main thread know the socket is gone.
|
|
def listener():
|
|
s = socket.socket()
|
|
PORT[0] = test_support.bind_port(s, '', PORT[0])
|
|
s.listen(5)
|
|
listener_ready.set()
|
|
s.accept()
|
|
s = None # reclaim the socket object, which also closes it
|
|
listener_gone.set()
|
|
|
|
def connector():
|
|
listener_ready.wait()
|
|
s = socket.socket()
|
|
s.connect(('localhost', PORT[0]))
|
|
listener_gone.wait()
|
|
try:
|
|
ssl_sock = socket.ssl(s)
|
|
except socket.sslerror:
|
|
pass
|
|
else:
|
|
raise test_support.TestFailed(
|
|
'connecting to closed SSL socket should have failed')
|
|
|
|
t = threading.Thread(target=listener)
|
|
t.start()
|
|
connector()
|
|
t.join()
|
|
|
|
def test_978833(self):
|
|
if test_support.verbose:
|
|
print("test_978833 ...")
|
|
|
|
import os, httplib, ssl
|
|
with test_support.transient_internet():
|
|
s = socket.socket(socket.AF_INET)
|
|
s.connect(("www.sf.net", 443))
|
|
fd = s.fileno()
|
|
sock = ssl.sslsocket(s)
|
|
s = None
|
|
sock.close()
|
|
try:
|
|
os.fstat(fd)
|
|
except OSError:
|
|
pass
|
|
else:
|
|
raise test_support.TestFailed("Failed to close socket")
|
|
|
|
class OpenSSLTests(unittest.TestCase):
|
|
|
|
def testBasic(self):
|
|
s = socket.socket()
|
|
s.connect(("localhost", 4433))
|
|
ss = socket.ssl(s)
|
|
ss.write("Foo\n")
|
|
i = ss.read(4)
|
|
self.assertEqual(i, "Foo\n")
|
|
s.close()
|
|
|
|
def testMethods(self):
|
|
# read & write is already tried in the Basic test
|
|
# now we'll try to get the server info about certificates
|
|
# this came from the certificate I used, one I found in /usr/share/openssl
|
|
info = "/C=PT/ST=Queensland/L=Lisboa/O=Neuronio, Lda./OU=Desenvolvimento/CN=brutus.neuronio.pt/emailAddress=sampo@iki.fi"
|
|
|
|
s = socket.socket()
|
|
s.connect(("localhost", 4433))
|
|
ss = socket.ssl(s)
|
|
cert = ss.server()
|
|
self.assertEqual(cert, info)
|
|
cert = ss.issuer()
|
|
self.assertEqual(cert, info)
|
|
s.close()
|
|
|
|
|
|
class OpenSSLServer(threading.Thread):
|
|
def __init__(self):
|
|
self.s = None
|
|
self.keepServing = True
|
|
self._external()
|
|
if self.haveServer:
|
|
threading.Thread.__init__(self)
|
|
|
|
def _external(self):
|
|
# let's find the .pem files
|
|
curdir = os.path.dirname(__file__) or os.curdir
|
|
cert_file = os.path.join(curdir, "ssl_cert.pem")
|
|
if not os.access(cert_file, os.F_OK):
|
|
raise ValueError("No cert file found! (tried %r)" % cert_file)
|
|
key_file = os.path.join(curdir, "ssl_key.pem")
|
|
if not os.access(key_file, os.F_OK):
|
|
raise ValueError("No key file found! (tried %r)" % key_file)
|
|
|
|
try:
|
|
cmd = "openssl s_server -cert %s -key %s -quiet" % (cert_file, key_file)
|
|
self.s = subprocess.Popen(cmd.split(), stdin=subprocess.PIPE,
|
|
stdout=subprocess.PIPE,
|
|
stderr=subprocess.STDOUT)
|
|
time.sleep(1)
|
|
except:
|
|
self.haveServer = False
|
|
else:
|
|
# let's try if it is actually up
|
|
try:
|
|
s = socket.socket()
|
|
s.connect(("localhost", 4433))
|
|
s.close()
|
|
if self.s.stdout.readline() != "ERROR\n":
|
|
raise ValueError
|
|
except:
|
|
self.haveServer = False
|
|
else:
|
|
self.haveServer = True
|
|
|
|
def run(self):
|
|
while self.keepServing:
|
|
time.sleep(.5)
|
|
l = self.s.stdout.readline()
|
|
self.s.stdin.write(l)
|
|
|
|
def shutdown(self):
|
|
self.keepServing = False
|
|
if not self.s:
|
|
return
|
|
if sys.platform == "win32":
|
|
subprocess.TerminateProcess(int(self.s._handle), -1)
|
|
else:
|
|
os.kill(self.s.pid, 15)
|
|
|
|
def test_main():
|
|
if not hasattr(socket, "ssl"):
|
|
raise test_support.TestSkipped("socket module has no ssl support")
|
|
|
|
tests = [BasicTests]
|
|
|
|
if test_support.is_resource_enabled('network'):
|
|
tests.append(ConnectedTests)
|
|
|
|
# in these platforms we can kill the openssl process
|
|
if sys.platform in ("sunos5", "darwin", "linux1",
|
|
"linux2", "win32", "hp-ux11"):
|
|
|
|
server = OpenSSLServer()
|
|
if server.haveServer:
|
|
tests.append(OpenSSLTests)
|
|
server.start()
|
|
else:
|
|
server = None
|
|
|
|
thread_info = test_support.threading_setup()
|
|
|
|
try:
|
|
test_support.run_unittest(*tests)
|
|
finally:
|
|
if server is not None and server.haveServer:
|
|
server.shutdown()
|
|
|
|
test_support.threading_cleanup(*thread_info)
|
|
|
|
if __name__ == "__main__":
|
|
test_main()
|