From f8b3874034c3ca96cdf2f68672eedd4cba33fac5 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Tue, 3 Nov 2020 07:10:13 +0100 Subject: [PATCH] sync minor sans-io changes --- mitmproxy/io/proto/http_pb2.py | 295 +++++++++--------- .../net/data/verificationcerts/generate.py | 11 +- .../data/verificationcerts/self-signed.pem | 49 +++ .../data/verificationcerts/trusted-leaf.pem | 47 +++ .../data/verificationcerts/trusted-root.pem | 48 +++ 5 files changed, 304 insertions(+), 146 deletions(-) create mode 100644 test/mitmproxy/net/data/verificationcerts/self-signed.pem create mode 100644 test/mitmproxy/net/data/verificationcerts/trusted-leaf.pem create mode 100644 test/mitmproxy/net/data/verificationcerts/trusted-root.pem diff --git a/mitmproxy/io/proto/http_pb2.py b/mitmproxy/io/proto/http_pb2.py index 47b09815b..3982abadd 100644 --- a/mitmproxy/io/proto/http_pb2.py +++ b/mitmproxy/io/proto/http_pb2.py @@ -1,13 +1,11 @@ +# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: http.proto - -import sys -_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) +"""Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database -from google.protobuf import descriptor_pb2 # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -19,7 +17,9 @@ DESCRIPTOR = _descriptor.FileDescriptor( name='http.proto', package='', syntax='proto2', - serialized_pb=_b('\n\nhttp.proto\"\xf4\x01\n\x08HTTPFlow\x12\x1d\n\x07request\x18\x01 \x01(\x0b\x32\x0c.HTTPRequest\x12\x1f\n\x08response\x18\x02 \x01(\x0b\x32\r.HTTPResponse\x12\x19\n\x05\x65rror\x18\x03 \x01(\x0b\x32\n.HTTPError\x12&\n\x0b\x63lient_conn\x18\x04 \x01(\x0b\x32\x11.ClientConnection\x12&\n\x0bserver_conn\x18\x05 \x01(\x0b\x32\x11.ServerConnection\x12\x13\n\x0bintercepted\x18\x06 \x01(\x08\x12\x0e\n\x06marked\x18\x07 \x01(\x08\x12\x0c\n\x04mode\x18\x08 \x01(\t\x12\n\n\x02id\x18\t \x01(\t\"\xfa\x01\n\x0bHTTPRequest\x12\x19\n\x11\x66irst_line_format\x18\x01 \x01(\t\x12\x0e\n\x06method\x18\x02 \x01(\t\x12\x0e\n\x06scheme\x18\x03 \x01(\t\x12\x0c\n\x04host\x18\x04 \x01(\t\x12\x0c\n\x04port\x18\x05 \x01(\x05\x12\x0c\n\x04path\x18\x06 \x01(\t\x12\x14\n\x0chttp_version\x18\x07 \x01(\t\x12\x1c\n\x07headers\x18\x08 \x03(\x0b\x32\x0b.HTTPHeader\x12\x0f\n\x07\x63ontent\x18\t \x01(\x0c\x12\x17\n\x0ftimestamp_start\x18\n \x01(\x01\x12\x15\n\rtimestamp_end\x18\x0b \x01(\x01\x12\x11\n\tis_replay\x18\x0c \x01(\x08\"\xbb\x01\n\x0cHTTPResponse\x12\x14\n\x0chttp_version\x18\x01 \x01(\t\x12\x13\n\x0bstatus_code\x18\x02 \x01(\x05\x12\x0e\n\x06reason\x18\x03 \x01(\t\x12\x1c\n\x07headers\x18\x04 \x03(\x0b\x32\x0b.HTTPHeader\x12\x0f\n\x07\x63ontent\x18\x05 \x01(\x0c\x12\x17\n\x0ftimestamp_start\x18\x06 \x01(\x01\x12\x15\n\rtimestamp_end\x18\x07 \x01(\x01\x12\x11\n\tis_replay\x18\x08 \x01(\x08\"+\n\tHTTPError\x12\x0b\n\x03msg\x18\x01 \x01(\t\x12\x11\n\ttimestamp\x18\x02 \x01(\x01\")\n\nHTTPHeader\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\"%\n\x07\x41\x64\x64ress\x12\x0c\n\x04host\x18\x01 \x01(\t\x12\x0c\n\x04port\x18\x02 \x01(\x05\"\xc2\x02\n\x10\x43lientConnection\x12\n\n\x02id\x18\x01 \x01(\t\x12\x19\n\x07\x61\x64\x64ress\x18\x02 \x01(\x0b\x32\x08.Address\x12\x17\n\x0ftls_established\x18\x03 \x01(\x08\x12\x12\n\nclientcert\x18\x04 \x01(\t\x12\x10\n\x08mitmcert\x18\x05 \x01(\t\x12\x17\n\x0ftimestamp_start\x18\x06 \x01(\x01\x12\x1b\n\x13timestamp_tls_setup\x18\x07 \x01(\x01\x12\x15\n\rtimestamp_end\x18\x08 \x01(\x01\x12\x0b\n\x03sni\x18\t \x01(\t\x12\x13\n\x0b\x63ipher_name\x18\n \x01(\t\x12\x1d\n\x15\x61lpn_proto_negotiated\x18\x0b \x01(\x0c\x12\x13\n\x0btls_version\x18\x0c \x01(\t\x12%\n\x0etls_extensions\x18\r \x03(\x0b\x32\r.TLSExtension\"\xeb\x02\n\x10ServerConnection\x12\n\n\x02id\x18\x01 \x01(\t\x12\x19\n\x07\x61\x64\x64ress\x18\x02 \x01(\x0b\x32\x08.Address\x12\x1c\n\nip_address\x18\x03 \x01(\x0b\x32\x08.Address\x12 \n\x0esource_address\x18\x04 \x01(\x0b\x32\x08.Address\x12\x17\n\x0ftls_established\x18\x05 \x01(\x08\x12\x0c\n\x04\x63\x65rt\x18\x06 \x01(\t\x12\x0b\n\x03sni\x18\x07 \x01(\t\x12\x1d\n\x15\x61lpn_proto_negotiated\x18\x08 \x01(\x0c\x12\x13\n\x0btls_version\x18\t \x01(\t\x12\x17\n\x0ftimestamp_start\x18\n \x01(\x01\x12\x1b\n\x13timestamp_tcp_setup\x18\x0b \x01(\x01\x12\x1b\n\x13timestamp_tls_setup\x18\x0c \x01(\x01\x12\x15\n\rtimestamp_end\x18\r \x01(\x01\x12\x1e\n\x03via\x18\x0e \x01(\x0b\x32\x11.ServerConnection\"*\n\x0cTLSExtension\x12\x0b\n\x03int\x18\x01 \x01(\x03\x12\r\n\x05\x62ytes\x18\x02 \x01(\x0c') + serialized_options=None, + create_key=_descriptor._internal_create_key, + serialized_pb=b'\n\nhttp.proto\"\xf4\x01\n\x08HTTPFlow\x12\x1d\n\x07request\x18\x01 \x01(\x0b\x32\x0c.HTTPRequest\x12\x1f\n\x08response\x18\x02 \x01(\x0b\x32\r.HTTPResponse\x12\x19\n\x05\x65rror\x18\x03 \x01(\x0b\x32\n.HTTPError\x12&\n\x0b\x63lient_conn\x18\x04 \x01(\x0b\x32\x11.ClientConnection\x12&\n\x0bserver_conn\x18\x05 \x01(\x0b\x32\x11.ServerConnection\x12\x13\n\x0bintercepted\x18\x06 \x01(\x08\x12\x0e\n\x06marked\x18\x07 \x01(\x08\x12\x0c\n\x04mode\x18\x08 \x01(\t\x12\n\n\x02id\x18\t \x01(\t\"\xfa\x01\n\x0bHTTPRequest\x12\x19\n\x11\x66irst_line_format\x18\x01 \x01(\t\x12\x0e\n\x06method\x18\x02 \x01(\t\x12\x0e\n\x06scheme\x18\x03 \x01(\t\x12\x0c\n\x04host\x18\x04 \x01(\t\x12\x0c\n\x04port\x18\x05 \x01(\x05\x12\x0c\n\x04path\x18\x06 \x01(\t\x12\x14\n\x0chttp_version\x18\x07 \x01(\t\x12\x1c\n\x07headers\x18\x08 \x03(\x0b\x32\x0b.HTTPHeader\x12\x0f\n\x07\x63ontent\x18\t \x01(\x0c\x12\x17\n\x0ftimestamp_start\x18\n \x01(\x01\x12\x15\n\rtimestamp_end\x18\x0b \x01(\x01\x12\x11\n\tis_replay\x18\x0c \x01(\x08\"\xbb\x01\n\x0cHTTPResponse\x12\x14\n\x0chttp_version\x18\x01 \x01(\t\x12\x13\n\x0bstatus_code\x18\x02 \x01(\x05\x12\x0e\n\x06reason\x18\x03 \x01(\t\x12\x1c\n\x07headers\x18\x04 \x03(\x0b\x32\x0b.HTTPHeader\x12\x0f\n\x07\x63ontent\x18\x05 \x01(\x0c\x12\x17\n\x0ftimestamp_start\x18\x06 \x01(\x01\x12\x15\n\rtimestamp_end\x18\x07 \x01(\x01\x12\x11\n\tis_replay\x18\x08 \x01(\x08\"+\n\tHTTPError\x12\x0b\n\x03msg\x18\x01 \x01(\t\x12\x11\n\ttimestamp\x18\x02 \x01(\x01\")\n\nHTTPHeader\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\"%\n\x07\x41\x64\x64ress\x12\x0c\n\x04host\x18\x01 \x01(\t\x12\x0c\n\x04port\x18\x02 \x01(\x05\"\xc2\x02\n\x10\x43lientConnection\x12\n\n\x02id\x18\x01 \x01(\t\x12\x19\n\x07\x61\x64\x64ress\x18\x02 \x01(\x0b\x32\x08.Address\x12\x17\n\x0ftls_established\x18\x03 \x01(\x08\x12\x12\n\nclientcert\x18\x04 \x01(\t\x12\x10\n\x08mitmcert\x18\x05 \x01(\t\x12\x17\n\x0ftimestamp_start\x18\x06 \x01(\x01\x12\x1b\n\x13timestamp_tls_setup\x18\x07 \x01(\x01\x12\x15\n\rtimestamp_end\x18\x08 \x01(\x01\x12\x0b\n\x03sni\x18\t \x01(\t\x12\x13\n\x0b\x63ipher_name\x18\n \x01(\t\x12\x1d\n\x15\x61lpn_proto_negotiated\x18\x0b \x01(\x0c\x12\x13\n\x0btls_version\x18\x0c \x01(\t\x12%\n\x0etls_extensions\x18\r \x03(\x0b\x32\r.TLSExtension\"\xeb\x02\n\x10ServerConnection\x12\n\n\x02id\x18\x01 \x01(\t\x12\x19\n\x07\x61\x64\x64ress\x18\x02 \x01(\x0b\x32\x08.Address\x12\x1c\n\nip_address\x18\x03 \x01(\x0b\x32\x08.Address\x12 \n\x0esource_address\x18\x04 \x01(\x0b\x32\x08.Address\x12\x17\n\x0ftls_established\x18\x05 \x01(\x08\x12\x0c\n\x04\x63\x65rt\x18\x06 \x01(\t\x12\x0b\n\x03sni\x18\x07 \x01(\t\x12\x1d\n\x15\x61lpn_proto_negotiated\x18\x08 \x01(\x0c\x12\x13\n\x0btls_version\x18\t \x01(\t\x12\x17\n\x0ftimestamp_start\x18\n \x01(\x01\x12\x1b\n\x13timestamp_tcp_setup\x18\x0b \x01(\x01\x12\x1b\n\x13timestamp_tls_setup\x18\x0c \x01(\x01\x12\x15\n\rtimestamp_end\x18\r \x01(\x01\x12\x1e\n\x03via\x18\x0e \x01(\x0b\x32\x11.ServerConnection\"*\n\x0cTLSExtension\x12\x0b\n\x03int\x18\x01 \x01(\x03\x12\r\n\x05\x62ytes\x18\x02 \x01(\x0c' ) @@ -31,6 +31,7 @@ _HTTPFLOW = _descriptor.Descriptor( filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name='request', full_name='HTTPFlow.request', index=0, @@ -38,70 +39,70 @@ _HTTPFLOW = _descriptor.Descriptor( has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='response', full_name='HTTPFlow.response', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='error', full_name='HTTPFlow.error', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='client_conn', full_name='HTTPFlow.client_conn', index=3, number=4, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='server_conn', full_name='HTTPFlow.server_conn', index=4, number=5, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='intercepted', full_name='HTTPFlow.intercepted', index=5, number=6, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='marked', full_name='HTTPFlow.marked', index=6, number=7, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='mode', full_name='HTTPFlow.mode', index=7, number=8, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='id', full_name='HTTPFlow.id', index=8, number=9, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto2', extension_ranges=[], @@ -118,98 +119,99 @@ _HTTPREQUEST = _descriptor.Descriptor( filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name='first_line_format', full_name='HTTPRequest.first_line_format', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='method', full_name='HTTPRequest.method', index=1, number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='scheme', full_name='HTTPRequest.scheme', index=2, number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='host', full_name='HTTPRequest.host', index=3, number=4, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='port', full_name='HTTPRequest.port', index=4, number=5, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='path', full_name='HTTPRequest.path', index=5, number=6, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='http_version', full_name='HTTPRequest.http_version', index=6, number=7, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='headers', full_name='HTTPRequest.headers', index=7, number=8, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='content', full_name='HTTPRequest.content', index=8, number=9, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), + has_default_value=False, default_value=b"", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='timestamp_start', full_name='HTTPRequest.timestamp_start', index=9, number=10, type=1, cpp_type=5, label=1, has_default_value=False, default_value=float(0), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='timestamp_end', full_name='HTTPRequest.timestamp_end', index=10, number=11, type=1, cpp_type=5, label=1, has_default_value=False, default_value=float(0), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='is_replay', full_name='HTTPRequest.is_replay', index=11, number=12, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto2', extension_ranges=[], @@ -226,70 +228,71 @@ _HTTPRESPONSE = _descriptor.Descriptor( filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name='http_version', full_name='HTTPResponse.http_version', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='status_code', full_name='HTTPResponse.status_code', index=1, number=2, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='reason', full_name='HTTPResponse.reason', index=2, number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='headers', full_name='HTTPResponse.headers', index=3, number=4, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='content', full_name='HTTPResponse.content', index=4, number=5, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), + has_default_value=False, default_value=b"", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='timestamp_start', full_name='HTTPResponse.timestamp_start', index=5, number=6, type=1, cpp_type=5, label=1, has_default_value=False, default_value=float(0), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='timestamp_end', full_name='HTTPResponse.timestamp_end', index=6, number=7, type=1, cpp_type=5, label=1, has_default_value=False, default_value=float(0), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='is_replay', full_name='HTTPResponse.is_replay', index=7, number=8, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto2', extension_ranges=[], @@ -306,28 +309,29 @@ _HTTPERROR = _descriptor.Descriptor( filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name='msg', full_name='HTTPError.msg', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='timestamp', full_name='HTTPError.timestamp', index=1, number=2, type=1, cpp_type=5, label=1, has_default_value=False, default_value=float(0), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto2', extension_ranges=[], @@ -344,28 +348,29 @@ _HTTPHEADER = _descriptor.Descriptor( filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name='name', full_name='HTTPHeader.name', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='value', full_name='HTTPHeader.value', index=1, number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto2', extension_ranges=[], @@ -382,28 +387,29 @@ _ADDRESS = _descriptor.Descriptor( filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name='host', full_name='Address.host', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='port', full_name='Address.port', index=1, number=2, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto2', extension_ranges=[], @@ -420,105 +426,106 @@ _CLIENTCONNECTION = _descriptor.Descriptor( filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name='id', full_name='ClientConnection.id', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='address', full_name='ClientConnection.address', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='tls_established', full_name='ClientConnection.tls_established', index=2, number=3, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='clientcert', full_name='ClientConnection.clientcert', index=3, number=4, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='mitmcert', full_name='ClientConnection.mitmcert', index=4, number=5, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='timestamp_start', full_name='ClientConnection.timestamp_start', index=5, number=6, type=1, cpp_type=5, label=1, has_default_value=False, default_value=float(0), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='timestamp_tls_setup', full_name='ClientConnection.timestamp_tls_setup', index=6, number=7, type=1, cpp_type=5, label=1, has_default_value=False, default_value=float(0), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='timestamp_end', full_name='ClientConnection.timestamp_end', index=7, number=8, type=1, cpp_type=5, label=1, has_default_value=False, default_value=float(0), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='sni', full_name='ClientConnection.sni', index=8, number=9, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='cipher_name', full_name='ClientConnection.cipher_name', index=9, number=10, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='alpn_proto_negotiated', full_name='ClientConnection.alpn_proto_negotiated', index=10, number=11, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), + has_default_value=False, default_value=b"", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='tls_version', full_name='ClientConnection.tls_version', index=11, number=12, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='tls_extensions', full_name='ClientConnection.tls_extensions', index=12, number=13, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto2', extension_ranges=[], @@ -535,112 +542,113 @@ _SERVERCONNECTION = _descriptor.Descriptor( filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name='id', full_name='ServerConnection.id', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='address', full_name='ServerConnection.address', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='ip_address', full_name='ServerConnection.ip_address', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='source_address', full_name='ServerConnection.source_address', index=3, number=4, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='tls_established', full_name='ServerConnection.tls_established', index=4, number=5, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='cert', full_name='ServerConnection.cert', index=5, number=6, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='sni', full_name='ServerConnection.sni', index=6, number=7, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='alpn_proto_negotiated', full_name='ServerConnection.alpn_proto_negotiated', index=7, number=8, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), + has_default_value=False, default_value=b"", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='tls_version', full_name='ServerConnection.tls_version', index=8, number=9, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='timestamp_start', full_name='ServerConnection.timestamp_start', index=9, number=10, type=1, cpp_type=5, label=1, has_default_value=False, default_value=float(0), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='timestamp_tcp_setup', full_name='ServerConnection.timestamp_tcp_setup', index=10, number=11, type=1, cpp_type=5, label=1, has_default_value=False, default_value=float(0), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='timestamp_tls_setup', full_name='ServerConnection.timestamp_tls_setup', index=11, number=12, type=1, cpp_type=5, label=1, has_default_value=False, default_value=float(0), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='timestamp_end', full_name='ServerConnection.timestamp_end', index=12, number=13, type=1, cpp_type=5, label=1, has_default_value=False, default_value=float(0), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='via', full_name='ServerConnection.via', index=13, number=14, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto2', extension_ranges=[], @@ -657,6 +665,7 @@ _TLSEXTENSION = _descriptor.Descriptor( filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name='int', full_name='TLSExtension.int', index=0, @@ -664,21 +673,21 @@ _TLSEXTENSION = _descriptor.Descriptor( has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='bytes', full_name='TLSExtension.bytes', index=1, number=2, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), + has_default_value=False, default_value=b"", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto2', extension_ranges=[], @@ -712,67 +721,67 @@ DESCRIPTOR.message_types_by_name['ServerConnection'] = _SERVERCONNECTION DESCRIPTOR.message_types_by_name['TLSExtension'] = _TLSEXTENSION _sym_db.RegisterFileDescriptor(DESCRIPTOR) -HTTPFlow = _reflection.GeneratedProtocolMessageType('HTTPFlow', (_message.Message,), dict( - DESCRIPTOR = _HTTPFLOW, - __module__ = 'http_pb2' +HTTPFlow = _reflection.GeneratedProtocolMessageType('HTTPFlow', (_message.Message,), { + 'DESCRIPTOR' : _HTTPFLOW, + '__module__' : 'http_pb2' # @@protoc_insertion_point(class_scope:HTTPFlow) - )) + }) _sym_db.RegisterMessage(HTTPFlow) -HTTPRequest = _reflection.GeneratedProtocolMessageType('HTTPRequest', (_message.Message,), dict( - DESCRIPTOR = _HTTPREQUEST, - __module__ = 'http_pb2' +HTTPRequest = _reflection.GeneratedProtocolMessageType('HTTPRequest', (_message.Message,), { + 'DESCRIPTOR' : _HTTPREQUEST, + '__module__' : 'http_pb2' # @@protoc_insertion_point(class_scope:HTTPRequest) - )) + }) _sym_db.RegisterMessage(HTTPRequest) -HTTPResponse = _reflection.GeneratedProtocolMessageType('HTTPResponse', (_message.Message,), dict( - DESCRIPTOR = _HTTPRESPONSE, - __module__ = 'http_pb2' +HTTPResponse = _reflection.GeneratedProtocolMessageType('HTTPResponse', (_message.Message,), { + 'DESCRIPTOR' : _HTTPRESPONSE, + '__module__' : 'http_pb2' # @@protoc_insertion_point(class_scope:HTTPResponse) - )) + }) _sym_db.RegisterMessage(HTTPResponse) -HTTPError = _reflection.GeneratedProtocolMessageType('HTTPError', (_message.Message,), dict( - DESCRIPTOR = _HTTPERROR, - __module__ = 'http_pb2' +HTTPError = _reflection.GeneratedProtocolMessageType('HTTPError', (_message.Message,), { + 'DESCRIPTOR' : _HTTPERROR, + '__module__' : 'http_pb2' # @@protoc_insertion_point(class_scope:HTTPError) - )) + }) _sym_db.RegisterMessage(HTTPError) -HTTPHeader = _reflection.GeneratedProtocolMessageType('HTTPHeader', (_message.Message,), dict( - DESCRIPTOR = _HTTPHEADER, - __module__ = 'http_pb2' +HTTPHeader = _reflection.GeneratedProtocolMessageType('HTTPHeader', (_message.Message,), { + 'DESCRIPTOR' : _HTTPHEADER, + '__module__' : 'http_pb2' # @@protoc_insertion_point(class_scope:HTTPHeader) - )) + }) _sym_db.RegisterMessage(HTTPHeader) -Address = _reflection.GeneratedProtocolMessageType('Address', (_message.Message,), dict( - DESCRIPTOR = _ADDRESS, - __module__ = 'http_pb2' +Address = _reflection.GeneratedProtocolMessageType('Address', (_message.Message,), { + 'DESCRIPTOR' : _ADDRESS, + '__module__' : 'http_pb2' # @@protoc_insertion_point(class_scope:Address) - )) + }) _sym_db.RegisterMessage(Address) -ClientConnection = _reflection.GeneratedProtocolMessageType('ClientConnection', (_message.Message,), dict( - DESCRIPTOR = _CLIENTCONNECTION, - __module__ = 'http_pb2' +ClientConnection = _reflection.GeneratedProtocolMessageType('ClientConnection', (_message.Message,), { + 'DESCRIPTOR' : _CLIENTCONNECTION, + '__module__' : 'http_pb2' # @@protoc_insertion_point(class_scope:ClientConnection) - )) + }) _sym_db.RegisterMessage(ClientConnection) -ServerConnection = _reflection.GeneratedProtocolMessageType('ServerConnection', (_message.Message,), dict( - DESCRIPTOR = _SERVERCONNECTION, - __module__ = 'http_pb2' +ServerConnection = _reflection.GeneratedProtocolMessageType('ServerConnection', (_message.Message,), { + 'DESCRIPTOR' : _SERVERCONNECTION, + '__module__' : 'http_pb2' # @@protoc_insertion_point(class_scope:ServerConnection) - )) + }) _sym_db.RegisterMessage(ServerConnection) -TLSExtension = _reflection.GeneratedProtocolMessageType('TLSExtension', (_message.Message,), dict( - DESCRIPTOR = _TLSEXTENSION, - __module__ = 'http_pb2' +TLSExtension = _reflection.GeneratedProtocolMessageType('TLSExtension', (_message.Message,), { + 'DESCRIPTOR' : _TLSEXTENSION, + '__module__' : 'http_pb2' # @@protoc_insertion_point(class_scope:TLSExtension) - )) + }) _sym_db.RegisterMessage(TLSExtension) diff --git a/test/mitmproxy/net/data/verificationcerts/generate.py b/test/mitmproxy/net/data/verificationcerts/generate.py index edb379910..5b8fce699 100644 --- a/test/mitmproxy/net/data/verificationcerts/generate.py +++ b/test/mitmproxy/net/data/verificationcerts/generate.py @@ -1,10 +1,10 @@ """ Generate SSL test certificates. """ -import subprocess -import shlex import os +import shlex import shutil +import subprocess import textwrap ROOT_CA = "trusted-root" @@ -74,4 +74,9 @@ do("openssl req -x509 -new -nodes -batch " f'-addext "subjectAltName = DNS:{SUBJECT}" ' "-days 7300 " "-out self-signed.crt" - ) \ No newline at end of file + ) + +for x in ["self-signed", "trusted-leaf", "trusted-root"]: + with open(f"{x}.crt") as crt, open(f"{x}.key") as key, open(f"{x}.pem", "w") as pem: + pem.write(crt.read()) + pem.write(key.read()) diff --git a/test/mitmproxy/net/data/verificationcerts/self-signed.pem b/test/mitmproxy/net/data/verificationcerts/self-signed.pem new file mode 100644 index 000000000..a36ec73c3 --- /dev/null +++ b/test/mitmproxy/net/data/verificationcerts/self-signed.pem @@ -0,0 +1,49 @@ +-----BEGIN CERTIFICATE----- +MIIDjTCCAnWgAwIBAgIUR5bIx5hi9BsJ9j2CF4yeWvQrHQEwDQYJKoZIhvcNAQEL +BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM +GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMDExMDEwMDI0NTNaFw00MDEw +MjcwMDI0NTNaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw +HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggEiMA0GCSqGSIb3DQEB +AQUAA4IBDwAwggEKAoIBAQDLpkN07c5l5Llw3fSkLcsb0VoGTVMa7Z7YiU2Dpdnv +gQoI6JzUDXHuXsItaUk/V5nqiLQaNto/Hfsx7q/NmPAHoLFVxxgQc6Z9t0fE6Ko2 +X6TLXNwRtUM38OIdMSobJgwWZaa5HmBZlO+WcvfCCp01gsx69HhVzAWHtX+HEl+j +XXCujerj6bOHUYhItbkUD8EqVmEyyyrzitTd7xN4HLsECI2yAaC+laNWpAoYKSVD +P+G6kyzV3UlpqN/h6sOxWFVcmgxZrIwCpRKxYciO9OrOPPW/VCggXNfX2R6JT6Bi +TwjdhChWmpyOg196Vyz/fTNMECNBA9S1YXvYX4SW3CxXAgMBAAGjdTBzMB0GA1Ud +DgQWBBSYrvmp80kdLiIeEw3LzI8caaAIGDAfBgNVHSMEGDAWgBSYrvmp80kdLiIe +Ew3LzI8caaAIGDAPBgNVHRMBAf8EBTADAQH/MCAGA1UdEQQZMBeCFWV4YW1wbGUu +bWl0bXByb3h5Lm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAtgnRA72vhXqoarlFNhbv +ghkEEi5f6auAkfZmITMOdXE3oI4QuPvZRtjYxtRM8cu17wf8W/h2lOsXDyg0Ndx0 +56XO7K17lV/HA73is85ikchk4KnbOxyrMKD/ssOO8eUWz07vnzM+nfWny8xeeAmV +DT2tC/l6gG3SYYZKfp/wkHw503OJS8ZtWQviTeRJCDFcOzrI8OVBdb/lybNJ7uEi +aPEqViFlPnMFYLqquej5D/pRo4B664++6f4UVXqudGPYXy9TSTjw+R0mdaQKNX70 +Jz8HH31q3puDMUgP9X3LTxNhbvvK1JJDOuOCBJdY3ayr8MHzn43f6CYwfEirGJ4u +Ng== +-----END CERTIFICATE----- +-----BEGIN RSA PRIVATE KEY----- +MIIEowIBAAKCAQEAy6ZDdO3OZeS5cN30pC3LG9FaBk1TGu2e2IlNg6XZ74EKCOic +1A1x7l7CLWlJP1eZ6oi0GjbaPx37Me6vzZjwB6CxVccYEHOmfbdHxOiqNl+ky1zc +EbVDN/DiHTEqGyYMFmWmuR5gWZTvlnL3wgqdNYLMevR4VcwFh7V/hxJfo11wro3q +4+mzh1GISLW5FA/BKlZhMssq84rU3e8TeBy7BAiNsgGgvpWjVqQKGCklQz/hupMs +1d1Jaajf4erDsVhVXJoMWayMAqUSsWHIjvTqzjz1v1QoIFzX19keiU+gYk8I3YQo +VpqcjoNfelcs/30zTBAjQQPUtWF72F+EltwsVwIDAQABAoIBAH2Z2djwInAtlUHL +YusvYymRARkJ78uX6nRamngrfjJ9P5cnADK46B/ASbqASTDL8p34GjxgwFJVR2wQ +blU7ki7iKP1igbED4xd+RsFnTjOi4ZybdQ9m4EJMSuj+PZ3o5WOa5i0eUwZtGSeN +WMlQio1KUpsy1FT2NCLzCehgqKO0D9i3qpSZ7V+Oz/ZDTKhfOs2P13XJDPzfzOoW +CtD0GDAsKGQmXkgwdkiVzgsNz4deLZpFNQhz3DLKx3fl6xih/Fd5KsLv5EQbCvq6 +vPZPz4mrEDl95KUM5t9i+ErW2kHLjkg5upsuMT1dCbefowD+0ufLkzlPoYegQo9G +7psLgsECgYEA60p1BYSDSDcA8Q8zMiBaY9udUGLJhBM5mijVt94Qskbofny99xJX +Z8vwRUmtu7Or7B5A6zmOiO/6e664IjBKyHtpFQ6SwPWm1tLtTWL6eBFqThqQbWZY +PnUvLYkBGQZsM7rYSY3cFT3CCoSFoM7XRKcnN1Apx+eRHQUau/ReX+kCgYEA3ZLd +7EMF1WC0aOHIbjPnz0e2x3XW69K7uNvXYeQUcBMOUnFJ1DFBJ9nE4L6ZPUt+pbrO +Psm5zyb44mWhBHfGGi71Avi/m/Ry5xcXR4JWRa8zuQTrQyGsxEYmw5daer0OR6V+ +/F5WH+ErfLR/uj5EK0B4XnHikc/nw+KwCTLUwj8CgYEAmeiBdZOBoJpCJmzv6ykY +l1tPowaLlLZSppFxgy1iNIuHhz2nsVcxD3dqephAaZiUrAX6JyPmJZL8gSz/y3VV +ZaC8UwbOXiQR91HP4iANgL67j812jek1bd2Pd7S3oBwAaTIeSrbdsJNOOz0Gf/Lt +Az5nu5nXSqkh1h7BpxKpLQkCgYB2odjiU6w+560QbrrSjkXyDDKHrscoskbCHiq+ +hdCPhRRo/bEKxGhfPtCTiFkhoVcowtEEextaF0KwbLt+WeaeRD/4nFhy1rniktFq +/xTT8I9f44tXASOwXuMIW/QcvTZ1E93en1+7Z+LRvQ6aGBaFldocrxsg+NDdZ3Tb +J/UUHwKBgF9h8mbPapp6yMOSnm1mr6VMRpn3AqBffaN0SoCKfFEwIDRD7nDpyqDq +0X26F6galBZEX1oMn/BgYCb/PwXsQ3nIzT8fYrOy56bvGV04VIL6gWfj2L+oGISn +zgAPifo4u6q8nmx3LQvvtJjmHgCPVAGIWCPAt8spbtXTLtLUv5AA +-----END RSA PRIVATE KEY----- diff --git a/test/mitmproxy/net/data/verificationcerts/trusted-leaf.pem b/test/mitmproxy/net/data/verificationcerts/trusted-leaf.pem new file mode 100644 index 000000000..56b2ee251 --- /dev/null +++ b/test/mitmproxy/net/data/verificationcerts/trusted-leaf.pem @@ -0,0 +1,47 @@ +-----BEGIN CERTIFICATE----- +MIIDUDCCAjigAwIBAgIUSWoLwl7Rc//TKPwKwv25Vhb6uE8wDQYJKoZIhvcNAQEL +BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM +GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMDExMDEwMDI0NTNaFw00MDEw +MjcwMDI0NTNaMCAxHjAcBgNVBAMMFWV4YW1wbGUubWl0bXByb3h5Lm9yZzCCASIw +DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALVyHPsi0UUkdv94efFUihuDpJt+ +6+AmwM/QCXiQz6c042oqEeAFfuANWqJiJKrWBP4+waezPT48iKtn597lV09R3gDH +hLGzEDHoDKY7+2gxT0ETYc6UcrYlRkDOYy+twMcj8I4xdU1Qt0TZhHlLxvDvO/jS +BLQke7xymJr29YPUpRLtvigyihT/zRx1zKKSG9nObUoRq+I73i46baC55fWL3aS7 +u1W+/auqnPLVKAlGS/kgGScuk/SnwMrhfcSLizEjYUt1JzRfyHg88tGY6pzJEnUh +UGYHBxetRlD7Rt2pChrkHHngNbgDkh7gSD4Qm/PwcQEzmWuYP6fcO60o9RkCAwEA +AaNdMFswHwYDVR0jBBgwFoAUcERk2OfXolBurKKp4+GcoyAGMGgwCQYDVR0TBAIw +ADALBgNVHQ8EBAMCBaAwIAYDVR0RBBkwF4IVZXhhbXBsZS5taXRtcHJveHkub3Jn +MA0GCSqGSIb3DQEBCwUAA4IBAQCAD7jv+dTx4Dr5jqtIPFjKmeuUiqti6mx1bpY9 +/e9J923+7xWU50DHxDnwnPKNqYS4jr2Hmht9PRYE+ZxgkxKZzHDzHX+zBMph5TUr +8H84pbV1WuLjWpOC2hBobNHS1Rq707M7wtL+RV6EDKW3T9Foo/F+AUficubOmBF6 +XFD+oXcxRYYGdUaMBzd3tpJMRrUYlGRL+7aFKCM+gMKqFzJwZdcfENjIw/jj40SM +pyTauRIxouwPTxpAYeKZ9JGLgzoJviuq+he7S1m6eiN/NAvK6M+E22FZcYMHsEOV +sTsNwqivVdb0eFVjsAIFgAwJ2BMO6ye13/6QJ3WI6RJOKEDG +-----END CERTIFICATE----- +-----BEGIN RSA PRIVATE KEY----- +MIIEogIBAAKCAQEAtXIc+yLRRSR2/3h58VSKG4Okm37r4CbAz9AJeJDPpzTjaioR +4AV+4A1aomIkqtYE/j7Bp7M9PjyIq2fn3uVXT1HeAMeEsbMQMegMpjv7aDFPQRNh +zpRytiVGQM5jL63AxyPwjjF1TVC3RNmEeUvG8O87+NIEtCR7vHKYmvb1g9SlEu2+ +KDKKFP/NHHXMopIb2c5tShGr4jveLjptoLnl9YvdpLu7Vb79q6qc8tUoCUZL+SAZ +Jy6T9KfAyuF9xIuLMSNhS3UnNF/IeDzy0ZjqnMkSdSFQZgcHF61GUPtG3akKGuQc +eeA1uAOSHuBIPhCb8/BxATOZa5g/p9w7rSj1GQIDAQABAoIBAFx1GIVz+XUlHqoR +RvoNXQ6mJxPBOgqPVMLQPHM+P0HxtkxbwZ4Iztz2kQ+buRmAUy0G54E/2V5EVFQb +b1DqRnI5wkldYaV3HDKCDygJ+pLeRYdgi/9LL6TXG5RcVrht7oTLMIIUe7R5A9pG +iLWSQn51OXcR9amhyZd+QXr9ip+wt/knCeSCOgYhPigleIXFSYkgi9gwkg6CjkLp +zx48QDQmAFcbRS+tPnbgJiB302I5l9RCz6ZoBvl8tVWVV3vSz8khZ8PL4oL9Qlz4 +EnIJLmwXd1odLSOdG1APjGooRwRU7cBjqncinEkw7IvDsIpACchcP7+gF2VskUJX +bqj3Zi0CgYEA7Ytc0VV6sQYcnVIs8vIrE7FGl0fP/vxcF1C0Y42t191uoSxuhEJZ +7f2l3ZrSyRLjV7FyqngOcBYv4NSTrkYNyVu5/ZHf7sJNCgDpg02BtUNrX5w6TEL3 +s0V2GgDBeVCVPsDFg1LQPzSDB9r0A7TERrD48b7FFetr5JOpKjk0v9sCgYEAw4r6 +MRc4D/FTdUMzS+5QJaVCsMUx8242s4dOO2FvVuDJ1gXqTvpqjnqpGEsP4w1A/I9o +xylKXkFvuEQrC6d4brLCvj3KT8QXcMGHF6ZIdyZ/GlTU5l9H2Rr+8NBFM18ZIQ2u +MgqLgIXehmlsG7VpGE6/uENz1WX4xmDIi0CH+xsCgYBZuCZxhliV3hoWrX/+rsro +YC+qWdxMkaJyx++qHkwH2UG8rFx9pdXzlrb8EUsF2RV2/LWzfy7s1OR2hbPVwe3Z +HMUN6ffrZQXV/mw0RKT2AqXecdJvFWgbFOQ7hAePO4lzLzoqlK/E/59x6xf5AmCT +1qngHM6xrb6Nkdv1769luwKBgAZa8/q4eHf8Lew3vOkQ28X9cwdvwUnaISkAkshX +SFkYgTbVhmH+vYvX7Lr/ZYrJmX0b5Bnk+6fIlKr2fDeqv71JTg8Ezxh8lQ5zG8Ln +Ap/svmDKtQivvBQQTozhF/6tbpGmcizqLtKEh1DzCDJ2WO4TUSPZ/V/IKqe36Yyt +Ej5VAoGAIeXj6eECrVyW/q1NUpt/Tmvn2ubzuJfg4KruLOPpLsi05EKeCmjE6Puw +7GxZFfrfxv3IGl12UdegTkYL9eTjte+RqUm/Ofre9aD/hVDoWrUzJkD91uMP/sdh +PmXA4vx5VvMPbQzoMsWrJlVygRw2jQHqL1GRhRkV/NnQVYTegd4= +-----END RSA PRIVATE KEY----- diff --git a/test/mitmproxy/net/data/verificationcerts/trusted-root.pem b/test/mitmproxy/net/data/verificationcerts/trusted-root.pem new file mode 100644 index 000000000..dea702f2b --- /dev/null +++ b/test/mitmproxy/net/data/verificationcerts/trusted-root.pem @@ -0,0 +1,48 @@ +-----BEGIN CERTIFICATE----- +MIIDazCCAlOgAwIBAgIUN1abbPeW/FETKzGlISahLuBhKEwwDQYJKoZIhvcNAQEL +BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM +GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMDExMDEwMDI0NTNaFw00MDEw +MjcwMDI0NTNaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw +HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggEiMA0GCSqGSIb3DQEB +AQUAA4IBDwAwggEKAoIBAQDOyhGCoQjxdBmDKcU8NDyilLm33sKMhVMaKiv44n+s +UovY92Ie/GQ5C63H0LPyctQfCDXatx2SzGRXy4ii5QsD0Jz0mva9M/Y15iW8+9Ng +wjYXQBBRkin0ll2QXrxnqvRExiVnRZ5mJsUHyTG/6krFkA+O0kOwP40vkD0joKp1 +L0mN5jFHUJcnidwBujyt832zFgRnKZejMBOm1t5ihwtdQDzCtLvfmm6C/+4jyypJ +7HW+yjGQXj7uM5hD72azf5PXmfNZ+WrGHXsSXoJSPAYHQnH1gLhYIfcMa4yH+HIr +/BCk2BNggqKnyOWIKAYo5e3H8JYatGIpzoisU9Pm//cjAgMBAAGjUzBRMB0GA1Ud +DgQWBBRwRGTY59eiUG6soqnj4ZyjIAYwaDAfBgNVHSMEGDAWgBRwRGTY59eiUG6s +oqnj4ZyjIAYwaDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCI +cyriRs4fySXNG3SP/od3BbUulKHC37DvV8r/0vMPD6r5znjX08KvjIEiSNQkGpyN +G06/Jt1p1mucPwVf2VrSmC7RV4/5NpzOIUNfjMaA3EASl+Mtz8Cinp0e/MECi7Tz +VtBtmia1pbPIjr8/GSZP74kbysNccz06c8OyrI+91vq3isa+xJgjXYcyLnY5rNok +bet7QHb1QE2oDPTZlrmZ9Rsh6K6xcwfKtXbsjMDFrdROKwdP1zGpQQIqOelaOixO +9qGk0Y9Tq/T4ItTdQJYvCSxOvU8LDVDeYfOYwW3kbvclyyZ7CnieWxlzCY41As1u +2OuNWUhfNcoqamAkv0nH +-----END CERTIFICATE----- +-----BEGIN RSA PRIVATE KEY----- +MIIEpQIBAAKCAQEAzsoRgqEI8XQZgynFPDQ8opS5t97CjIVTGior+OJ/rFKL2Pdi +HvxkOQutx9Cz8nLUHwg12rcdksxkV8uIouULA9Cc9Jr2vTP2NeYlvPvTYMI2F0AQ +UZIp9JZdkF68Z6r0RMYlZ0WeZibFB8kxv+pKxZAPjtJDsD+NL5A9I6CqdS9JjeYx +R1CXJ4ncAbo8rfN9sxYEZymXozATptbeYocLXUA8wrS735pugv/uI8sqSex1vsox +kF4+7jOYQ+9ms3+T15nzWflqxh17El6CUjwGB0Jx9YC4WCH3DGuMh/hyK/wQpNgT +YIKip8jliCgGKOXtx/CWGrRiKc6IrFPT5v/3IwIDAQABAoIBAEawNqoj6E25tVrr +9XtuE+gz1QSwxmqIzO6dyehLbP94PEwPzN/wwUXq4x3yDwFrFW4CPX6lqBtdeVO1 +xOCCUXCdaHoJWx00XQ7xvKbMouZpnVn3UVzBDUyJ9jP63obFnri/z1ttJgefay0N +Ls9/BM5iP58/61mdb+L5eJzsODjUMjaxvgJ8DPQWEuticz3s5sEE6TPCoIZH9Vc2 +Ri8kWy2/tpCLZpJbrrKZNdAFnc8zgSSXwwu97m8KpXNnhRFA1Qu0y3U3NP6oFYnL +57qR+Kqdi7QG7GcvUXsHhsYYTiusJu9PaEomuBqyYFuhyFtHtLPX65nWZMQSK3pu +Eu9Hk9ECgYEA/z8eTD+uMqC7Hz+YUWPMENynAy5KVOSqkBzHg8ePuW/gyTRrT2rQ +wXp6l/nTO5A5jzrAdvMIqnEmyhdnB1AoRM4OtA2/wblsNFykWecVQyD3uplafVtS +D3JgAN3FId/x2fZ8U2rSvHW2gTbel9HS3yhGtHN9giMKVtHTUs4FLlsCgYEAz2ZV +HQf5+deYr/da/XFkkEA9i8deiCcy+wqVlTW6TrEzBPwczLtV36bgubDZLy0NHO4j +oHPMGWtn343MzcOx6/hZGoCoBTLkZghipMMexWgldeBgOqqWGV+7mq8uhc9j2g9E +aLJKUkGhRmPXvlcS396P9bjKCX1nFLgZqw26xNkCgYEArzrl0fLl5Fv0Gr/OEhIx +RmI1RjnBTgauEcGwNwgJ44SrDXavNRZfunQbNbqNCZc57NqoxwCSMnD78EGguaSO +AK516aaGvrhNUKVJL281aaB4ceJV/Tl0XKZowi995oOXxcsyDxKHGlq1sH+60P97 +hThhUgD3aSAlOPVT3sURSYECgYEAkJKQ+i+5PUPgl6khsFH++98MCAfuCZLpor16 +EAzn1jsHiY4EtWJRNhopxMdWXeBVp7kI9KxDteR9AATkovqraAYydpsAhL85Hzbx +LFEnfgxfMJA8BCktgHqPWACNuZEb1cGWujSuQjClr1+h4HjqG0wVpgAuNfdIh9Td +b7OeYeECgYEAjLrVoYhgqiG6qW+UNgzhr2EM4my0Q9dda4DjVIWZW+19XCmqPkEd +ryaqBpolHKzD0GCiutI5S68W9wil3MBgV05qTbFhnTqWGJ3twGNykpYXx6F0aBTa +6hwH9Q/IQ5AONkmSipMRnVWAuDwvdutX/knhEULe8TdGl5CmGkJ/OZs= +-----END RSA PRIVATE KEY-----