mirror of
https://github.com/python/cpython.git
synced 2025-08-31 14:07:50 +00:00
Issue #14001: CVE-2012-0845: xmlrpc: Fix an endless loop in SimpleXMLRPCServer
upon malformed POST request.
This commit is contained in:
commit
cd96b4f1ff
3 changed files with 15 additions and 7 deletions
|
@ -474,12 +474,7 @@ class BaseServerTestCase(unittest.TestCase):
|
|||
|
||||
def tearDown(self):
|
||||
# wait on the server thread to terminate
|
||||
self.evt.wait(4.0)
|
||||
# XXX this code does not work, and in fact stop_serving doesn't exist.
|
||||
if not self.evt.is_set():
|
||||
self.evt.set()
|
||||
stop_serving()
|
||||
raise RuntimeError("timeout reached, test has failed")
|
||||
self.evt.wait()
|
||||
|
||||
# disable traceback reporting
|
||||
xmlrpc.server.SimpleXMLRPCServer._send_traceback_header = False
|
||||
|
@ -626,6 +621,13 @@ class SimpleServerTestCase(BaseServerTestCase):
|
|||
server = xmlrpclib.ServerProxy("http://%s:%d/RPC2" % (ADDR, PORT))
|
||||
self.assertEqual(server.add("a", "\xe9"), "a\xe9")
|
||||
|
||||
def test_partial_post(self):
|
||||
# Check that a partial POST doesn't make the server loop: issue #14001.
|
||||
conn = http.client.HTTPConnection(ADDR, PORT)
|
||||
conn.request('POST', '/RPC2 HTTP/1.0\r\nContent-Length: 100\r\n\r\nbye')
|
||||
conn.close()
|
||||
|
||||
|
||||
class MultiPathServerTestCase(BaseServerTestCase):
|
||||
threadFunc = staticmethod(http_multi_server)
|
||||
request_count = 2
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue