Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(430)

Unified Diff: net/tools/testserver/testserver.py

Issue 723343002: Update from https://crrev.com/304121 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/tools/quic/end_to_end_test.cc ('k') | net/udp/udp_socket_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/tools/testserver/testserver.py
diff --git a/net/tools/testserver/testserver.py b/net/tools/testserver/testserver.py
index 0dcbd25a6035a483ffff2d419ce30ede96f41171..93de5cab3970c5ccfce3f9c588d34753125fe3fb 100755
--- a/net/tools/testserver/testserver.py
+++ b/net/tools/testserver/testserver.py
@@ -1976,6 +1976,7 @@ class ServerRunner(testserver_base.TestServerRunner):
if self.options.server_type == SERVER_HTTP:
if self.options.https:
pem_cert_and_key = None
+ ocsp_der = None
if self.options.cert_and_key_file:
if not os.path.isfile(self.options.cert_and_key_file):
raise testserver_base.OptionError(
@@ -1988,7 +1989,6 @@ class ServerRunner(testserver_base.TestServerRunner):
print ('OCSP server started on %s:%d...' %
(host, self.__ocsp_server.server_port))
- ocsp_der = None
ocsp_state = None
if self.options.ocsp == 'ok':
@@ -2012,7 +2012,11 @@ class ServerRunner(testserver_base.TestServerRunner):
ocsp_state = ocsp_state,
serial = self.options.cert_serial)
- self.__ocsp_server.ocsp_response = ocsp_der
+ if self.options.ocsp_server_unavailable:
+ # SEQUENCE containing ENUMERATED with value 3 (tryLater).
+ self.__ocsp_server.ocsp_response = '30030a0103'.decode('hex')
+ else:
+ self.__ocsp_server.ocsp_response = ocsp_der
for ca_cert in self.options.ssl_client_ca:
if not os.path.isfile(ca_cert):
@@ -2021,8 +2025,8 @@ class ServerRunner(testserver_base.TestServerRunner):
' exiting...')
stapled_ocsp_response = None
- if self.__ocsp_server and self.options.staple_ocsp_response:
- stapled_ocsp_response = self.__ocsp_server.ocsp_response
+ if self.options.staple_ocsp_response:
+ stapled_ocsp_response = ocsp_der
server = HTTPSServer((host, port), TestPageHandler, pem_cert_and_key,
self.options.ssl_client_auth,
@@ -2269,6 +2273,12 @@ class ServerRunner(testserver_base.TestServerRunner):
self.option_parser.add_option('--ws-basic-auth', action='store_true',
dest='ws_basic_auth',
help='Enable basic-auth for WebSocket')
+ self.option_parser.add_option('--ocsp-server-unavailable',
+ dest='ocsp_server_unavailable',
+ default=False, action='store_true',
+ help='If set, the OCSP server will return '
+ 'a tryLater status rather than the actual '
+ 'OCSP response.')
if __name__ == '__main__':
« no previous file with comments | « net/tools/quic/end_to_end_test.cc ('k') | net/udp/udp_socket_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698