mirror of
https://github.com/theupdateframework/python-tuf
synced 2026-05-24 10:08:28 +00:00
5d9a6f6598
These changes can be summarized with the following bullets: - Delegate generation of ports used for the tests to the OS - Use thread-safe Queue for processes communication instead of temporary files - Remove all instances of port generation or hardcoded ports - Make test_slow_retrieval.py fully conform with TestServerProcess Delegate generation of ports used for the tests to the OS is much better than if we manually generate them, because there is always a chance that the port we have randomly pick turns out to be taken. By giving 0 to the port argument we ask the OS to give us an arbitrary unused port. Use thread-safe Queue for processes communication instead of temporary files became a necessity because of findings made by Jussi Kukkonen. With the latest changes made in pr 1192 we were rapidly reading from the temporary files and Jussi found that it happened rarely the successful message "bind succeded..." to be corrupted. It seems, this is a thread issue related to the thread redirecting the subprocess stdout to the temp file and our thread rapidly reading from the file. By using a thread-safe Queue we eliminate this possibility. For reference read: https://github.com/theupdateframework/tuf/issues/1196 Lastly, test_slow_retrieval.py and slow_retrieval.py were refactored. Until now, slow_retrieval.py couldn't use the TestServerProcess class from utils.py for a port generation because of a bug related to httpd.handle_request(). Now, when we use httpd.serve_forever() we can refactor both of those files and fully conform with TestServerProcess. Signed-off-by: Martin Vrachev <mvrachev@vmware.com>
66 lines
1.8 KiB
Python
Executable file
66 lines
1.8 KiB
Python
Executable file
#!/usr/bin/env python
|
|
|
|
# Copyright 2014 - 2017, New York University and the TUF contributors
|
|
# SPDX-License-Identifier: MIT OR Apache-2.0
|
|
|
|
"""
|
|
<Program>
|
|
simple_https_server.py
|
|
|
|
<Author>
|
|
Vladimir Diaz.
|
|
|
|
<Started>
|
|
June 17, 2014
|
|
|
|
<Copyright>
|
|
See LICENSE-MIT OR LICENSE for licensing information.
|
|
|
|
<Purpose>
|
|
Provide a simple https server that can be used by the unit tests. For
|
|
example, 'download.py' can connect to the https server started by this module
|
|
to verify that https downloads are permitted.
|
|
|
|
<Reference>
|
|
ssl.wrap_socket:
|
|
https://docs.python.org/2/library/ssl.html#functions-constants-and-exceptions
|
|
|
|
SimpleHTTPServer:
|
|
http://docs.python.org/library/simplehttpserver.html#module-SimpleHTTPServer
|
|
"""
|
|
|
|
# Help with Python 3 compatibility, where the print statement is a function, an
|
|
# implicit relative import is invalid, and the '/' operator performs true
|
|
# division. Example: print 'hello world' raises a 'SyntaxError' exception.
|
|
from __future__ import print_function
|
|
from __future__ import absolute_import
|
|
from __future__ import division
|
|
from __future__ import unicode_literals
|
|
|
|
import sys
|
|
import random
|
|
import ssl
|
|
import os
|
|
import six
|
|
|
|
keyfile = os.path.join('ssl_certs', 'ssl_cert.key')
|
|
certfile = os.path.join('ssl_certs', 'ssl_cert.crt')
|
|
|
|
|
|
if len(sys.argv) > 1:
|
|
if os.path.exists(sys.argv[1]):
|
|
certfile = sys.argv[1]
|
|
else:
|
|
print('simple_https_server: cert file not found: ' + sys.argv[1] +
|
|
'; using default: ' + certfile)
|
|
|
|
httpd = six.moves.BaseHTTPServer.HTTPServer(('localhost', 0),
|
|
six.moves.SimpleHTTPServer.SimpleHTTPRequestHandler)
|
|
|
|
httpd.socket = ssl.wrap_socket(
|
|
httpd.socket, keyfile=keyfile, certfile=certfile, server_side=True)
|
|
|
|
port_message = 'bind succeeded, server port is: ' \
|
|
+ str(httpd.server_address[1])
|
|
print(port_message)
|
|
httpd.serve_forever()
|