From 730e1e4bd989a80c498beb465cae900981a7f6bb Mon Sep 17 00:00:00 2001 From: Mark Gritter Date: Fri, 9 Jul 2021 14:03:04 -0500 Subject: [PATCH 1/5] Add additional HTTP authorization types --- go/api_spec/method.pb.go | 260 +++++++++++++++++++++--------------- proto/api_spec/method.proto | 16 +++ py/api_spec/method_pb2.py | 117 ++++++++++------ 3 files changed, 246 insertions(+), 147 deletions(-) diff --git a/go/api_spec/method.pb.go b/go/api_spec/method.pb.go index 6d7bfaa..86fbe7a 100644 --- a/go/api_spec/method.pb.go +++ b/go/api_spec/method.pb.go @@ -26,18 +26,47 @@ const ( HTTPAuth_UNKNOWN HTTPAuth_HTTPAuthType = 0 HTTPAuth_BASIC HTTPAuth_HTTPAuthType = 1 HTTPAuth_BEARER HTTPAuth_HTTPAuthType = 2 + // Less common types listed at https://www.iana.org/assignments/http-authschemes/http-authschemes.xhtml + // excluded HOBA as I couldn't find any references to its use. + HTTPAuth_DIGEST HTTPAuth_HTTPAuthType = 3 + HTTPAuth_MUTUAL HTTPAuth_HTTPAuthType = 4 + HTTPAuth_OAUTH HTTPAuth_HTTPAuthType = 5 + HTTPAuth_VAPID HTTPAuth_HTTPAuthType = 6 + HTTPAuth_SCRAM_SHA_1 HTTPAuth_HTTPAuthType = 7 + HTTPAuth_SCRAM_SHA_256 HTTPAuth_HTTPAuthType = 8 + HTTPAuth_NEGOTIATE HTTPAuth_HTTPAuthType = 9 + // An application-specific authorization header, such as + // Github webhook's X-Hub-Signature-256 or X-Hub-Signature, + // not carried in "Authorization". + HTTPAuth_PROPRIETARY_HEADER HTTPAuth_HTTPAuthType = 10 ) var HTTPAuth_HTTPAuthType_name = map[int32]string{ - 0: "UNKNOWN", - 1: "BASIC", - 2: "BEARER", + 0: "UNKNOWN", + 1: "BASIC", + 2: "BEARER", + 3: "DIGEST", + 4: "MUTUAL", + 5: "OAUTH", + 6: "VAPID", + 7: "SCRAM_SHA_1", + 8: "SCRAM_SHA_256", + 9: "NEGOTIATE", + 10: "PROPRIETARY_HEADER", } var HTTPAuth_HTTPAuthType_value = map[string]int32{ - "UNKNOWN": 0, - "BASIC": 1, - "BEARER": 2, + "UNKNOWN": 0, + "BASIC": 1, + "BEARER": 2, + "DIGEST": 3, + "MUTUAL": 4, + "OAUTH": 5, + "VAPID": 6, + "SCRAM_SHA_1": 7, + "SCRAM_SHA_256": 8, + "NEGOTIATE": 9, + "PROPRIETARY_HEADER": 10, } func (x HTTPAuth_HTTPAuthType) String() string { @@ -1154,6 +1183,7 @@ func (m *HTTPHeader) GetKey() string { type HTTPAuth struct { Type HTTPAuth_HTTPAuthType `protobuf:"varint,1,opt,name=type,proto3,enum=api_spec.HTTPAuth_HTTPAuthType" json:"type,omitempty"` + ProprietaryHeader string `protobuf:"bytes,2,opt,name=proprietary_header,json=proprietaryHeader,proto3" json:"proprietary_header,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1191,6 +1221,13 @@ func (m *HTTPAuth) GetType() HTTPAuth_HTTPAuthType { return HTTPAuth_UNKNOWN } +func (m *HTTPAuth) GetProprietaryHeader() string { + if m != nil { + return m.ProprietaryHeader + } + return "" +} + type HTTPCookie struct { // Cookie parameter name Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` @@ -2149,106 +2186,113 @@ func init() { func init() { proto.RegisterFile("method.proto", fileDescriptor_4d10d17d32e60d7d) } var fileDescriptor_4d10d17d32e60d7d = []byte{ - // 1606 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0xcd, 0x72, 0xdb, 0x46, - 0x12, 0xe6, 0xbf, 0xc0, 0x26, 0xc5, 0x85, 0xc6, 0x5a, 0x2f, 0x8b, 0xeb, 0xb5, 0xb5, 0xb0, 0x2b, - 0x56, 0x39, 0x0a, 0x95, 0xa2, 0x14, 0x25, 0xe5, 0xaa, 0x1c, 0x48, 0x8a, 0x32, 0x65, 0x4b, 0xa2, - 0x02, 0xd1, 0x89, 0x93, 0x0b, 0x0b, 0x22, 0x87, 0x22, 0x4a, 0x20, 0x06, 0x01, 0x86, 0x4e, 0xf8, - 0x08, 0xb9, 0xe5, 0x21, 0x72, 0xcc, 0x13, 0xe4, 0x90, 0xf7, 0x48, 0x55, 0x1e, 0x26, 0xd5, 0x33, - 0x03, 0x10, 0xe0, 0x8f, 0x2f, 0xbe, 0x81, 0xd3, 0x5f, 0x77, 0x7f, 0x33, 0xfd, 0x4d, 0x37, 0x40, - 0x28, 0x4f, 0x29, 0x9f, 0xb0, 0x51, 0xdd, 0xf3, 0x19, 0x67, 0x44, 0xb3, 0x3c, 0x7b, 0x10, 0x78, - 0x74, 0x58, 0xab, 0xe0, 0x13, 0x9f, 0x7b, 0x54, 0x5a, 0x6a, 0x25, 0x7c, 0x0e, 0xe4, 0x0f, 0xe3, - 0x14, 0x72, 0x2d, 0xc6, 0x1c, 0xf2, 0x09, 0xe4, 0x70, 0xb9, 0x9a, 0xde, 0x4b, 0xef, 0x97, 0x1a, - 0xa4, 0x1e, 0x7a, 0xd7, 0xd1, 0xda, 0x9f, 0x7b, 0xd4, 0x14, 0x76, 0xb2, 0x0b, 0xf9, 0xf7, 0x96, - 0x33, 0xa3, 0xd5, 0xcc, 0x5e, 0x7a, 0x5f, 0x33, 0xe5, 0x0f, 0xe3, 0x0c, 0xf2, 0xad, 0x39, 0xa7, - 0x01, 0x79, 0x9e, 0x08, 0xf3, 0x20, 0x16, 0x06, 0xcd, 0x9b, 0xe2, 0x94, 0xc3, 0x38, 0x5d, 0x28, - 0xdc, 0x70, 0xdf, 0x76, 0xef, 0xc8, 0x7e, 0x22, 0xd0, 0xee, 0x22, 0x90, 0xb4, 0x6f, 0x8a, 0x54, - 0x8c, 0x31, 0x3a, 0x77, 0xf9, 0x51, 0x63, 0x33, 0x23, 0x61, 0xde, 0x14, 0x27, 0x9f, 0x8c, 0x73, - 0x72, 0xfc, 0xc1, 0x38, 0x27, 0xc7, 0x9b, 0xe2, 0x64, 0x63, 0x3b, 0x7b, 0x6b, 0x0b, 0x42, 0x1b, - 0x77, 0x26, 0xed, 0x9b, 0x22, 0x6d, 0x2f, 0x45, 0x3a, 0x39, 0xfe, 0x70, 0xa4, 0xcd, 0x9c, 0x72, - 0xb1, 0x48, 0xa7, 0x6c, 0x76, 0xeb, 0xd0, 0xcd, 0x91, 0xa4, 0x7d, 0x53, 0xa4, 0x74, 0xec, 0x94, - 0xce, 0x1c, 0x66, 0xf1, 0xcd, 0xa7, 0x24, 0xcc, 0x9b, 0xe2, 0x64, 0xc2, 0x38, 0xbf, 0x15, 0xa0, - 0x78, 0xed, 0xdb, 0x53, 0x9b, 0xdb, 0xef, 0x29, 0xf9, 0x2f, 0x14, 0x11, 0x3b, 0x98, 0xd8, 0x2e, - 0x17, 0x11, 0x8b, 0xa6, 0x86, 0x0b, 0x5d, 0xdb, 0xe5, 0xe4, 0x10, 0xe0, 0x96, 0x31, 0x67, 0xb0, - 0x88, 0x52, 0x6a, 0x54, 0x92, 0xb2, 0xed, 0xa6, 0xcc, 0x22, 0x62, 0xbe, 0x45, 0x08, 0x69, 0x40, - 0xe9, 0x16, 0x45, 0xa8, 0x3c, 0xb2, 0xc2, 0xe3, 0x5f, 0x4b, 0x0a, 0xed, 0xa6, 0x4c, 0x10, 0x28, - 0xe9, 0xf3, 0x05, 0x94, 0x03, 0xa1, 0x37, 0xe5, 0x94, 0x13, 0x4e, 0xfa, 0xb2, 0x1a, 0xbb, 0x29, - 0xb3, 0x24, 0x71, 0x51, 0x2a, 0x51, 0x4b, 0xe5, 0x95, 0x5f, 0x4e, 0x25, 0xa4, 0x87, 0xa9, 0x04, - 0x2a, 0xee, 0x73, 0x72, 0xac, 0x7c, 0x0a, 0x6b, 0x7c, 0x4e, 0x8e, 0x95, 0xcf, 0xc9, 0x71, 0x44, - 0x6f, 0x16, 0x4f, 0xb4, 0xb5, 0x4c, 0x4f, 0x4a, 0x0a, 0xe9, 0xcd, 0x62, 0xa9, 0x94, 0x5b, 0x94, - 0x4b, 0x5b, 0xe7, 0x26, 0x92, 0x95, 0x66, 0xc9, 0x6c, 0x23, 0x21, 0x07, 0xe5, 0x56, 0x5c, 0x76, - 0x93, 0x62, 0x41, 0x37, 0x89, 0x8b, 0x36, 0x36, 0xc6, 0xe2, 0x2b, 0x2f, 0x58, 0xde, 0x98, 0x50, - 0x06, 0x6e, 0x4c, 0xa0, 0xa4, 0xcf, 0x2b, 0xd8, 0xb1, 0xee, 0x6d, 0x6e, 0x0d, 0x2c, 0xd7, 0x65, - 0xdc, 0xe2, 0x36, 0x73, 0x83, 0x6a, 0x49, 0x78, 0xd6, 0x16, 0x9e, 0x4d, 0x84, 0x34, 0x17, 0x08, - 0x53, 0xb7, 0x96, 0x56, 0x48, 0x03, 0xfe, 0x3d, 0x64, 0x2e, 0xb7, 0x6c, 0x37, 0x18, 0xf8, 0x96, - 0x3b, 0x62, 0x53, 0x45, 0xa3, 0x2c, 0xda, 0xd7, 0x83, 0xd0, 0x68, 0x0a, 0x9b, 0x4c, 0xfe, 0x12, - 0xb6, 0xc6, 0xcc, 0x9f, 0x5a, 0x3c, 0xa8, 0x6e, 0xef, 0x65, 0xf7, 0x4b, 0x8d, 0xbd, 0x45, 0xca, - 0x48, 0x9c, 0xf5, 0x33, 0x09, 0xe9, 0xb8, 0xdc, 0x9f, 0x9b, 0xa1, 0x03, 0x79, 0x02, 0x25, 0xf9, - 0x38, 0xb8, 0xb7, 0xdd, 0x51, 0xb5, 0x22, 0x44, 0x0b, 0x72, 0xe9, 0x8d, 0xed, 0x8e, 0x6a, 0x2f, - 0xa1, 0x1c, 0xf7, 0x24, 0x3a, 0x64, 0xef, 0xe9, 0x5c, 0xa9, 0x1b, 0x1f, 0xd7, 0x77, 0xd8, 0x97, - 0x99, 0xaf, 0xd2, 0xad, 0x2d, 0x65, 0x31, 0x0e, 0x20, 0x77, 0x61, 0x07, 0x9c, 0x3c, 0x83, 0x3c, - 0x75, 0xe8, 0x34, 0xa8, 0xa6, 0x05, 0xcf, 0x98, 0xfc, 0x4f, 0x2d, 0x6e, 0x99, 0xd2, 0x68, 0xfc, - 0x92, 0x16, 0x5d, 0x75, 0x36, 0xe4, 0xe4, 0x18, 0x0a, 0x63, 0x9b, 0x3a, 0xa3, 0xd0, 0xe3, 0x51, - 0x42, 0xc9, 0xb3, 0x21, 0xaf, 0x9f, 0x09, 0xb3, 0xdc, 0x95, 0xc2, 0xd6, 0xce, 0xa1, 0x14, 0x5b, - 0x5e, 0x43, 0xf9, 0x59, 0x9c, 0xf2, 0x1a, 0x1e, 0xd1, 0x16, 0x8c, 0x02, 0xe4, 0xae, 0x98, 0x4b, - 0x8d, 0x01, 0x68, 0x3d, 0x0f, 0x4b, 0x64, 0x39, 0xe4, 0x19, 0xe4, 0x46, 0x16, 0xb7, 0x54, 0xcf, - 0x58, 0x72, 0xee, 0xa6, 0x4c, 0x61, 0x45, 0x94, 0xcb, 0xdc, 0x35, 0x29, 0x30, 0x1e, 0xa2, 0xd0, - 0xba, 0x38, 0xa2, 0x3f, 0xd2, 0x90, 0xef, 0xb9, 0xb4, 0x37, 0x26, 0x27, 0xb0, 0xc5, 0x3c, 0xa9, - 0xa0, 0x95, 0x4d, 0x0b, 0x44, 0x5d, 0x32, 0x09, 0x4b, 0xa9, 0xc0, 0xe4, 0x33, 0x20, 0x1e, 0xe3, - 0xd4, 0xe5, 0xb6, 0xe5, 0x0c, 0x86, 0xcc, 0x1d, 0x3b, 0xf6, 0x90, 0xab, 0xa2, 0xec, 0x44, 0x96, - 0xb6, 0x32, 0xd4, 0x5e, 0x43, 0x39, 0x1e, 0xe7, 0xa3, 0x4e, 0x09, 0x40, 0x7b, 0x65, 0x5e, 0xb7, - 0x2f, 0x29, 0xb7, 0x8c, 0x47, 0xa0, 0x75, 0xfb, 0xfd, 0xeb, 0x6b, 0x8b, 0x4f, 0x56, 0x63, 0x1a, - 0xff, 0x83, 0x22, 0x5a, 0xbf, 0x99, 0xd1, 0x75, 0x29, 0x8d, 0xc7, 0x00, 0x68, 0xee, 0x52, 0x6b, - 0x44, 0xfd, 0x35, 0xf6, 0x40, 0x06, 0x6f, 0xce, 0xf8, 0x84, 0x1c, 0xc5, 0x5a, 0x77, 0xa5, 0xf1, - 0x64, 0xc1, 0x2e, 0x44, 0x44, 0x0f, 0x8b, 0x36, 0x6e, 0x34, 0xa0, 0x1c, 0x5f, 0x25, 0x25, 0xd8, - 0x7a, 0x7b, 0xf5, 0xe6, 0xaa, 0xf7, 0xdd, 0x95, 0x9e, 0x22, 0x45, 0xc8, 0xb7, 0x9a, 0x37, 0xe7, - 0x6d, 0x3d, 0x4d, 0x00, 0x0a, 0xad, 0x4e, 0xd3, 0xec, 0x98, 0x7a, 0x26, 0x24, 0xd5, 0x66, 0xec, - 0xde, 0xa6, 0x6b, 0x48, 0xfd, 0x99, 0x96, 0xac, 0x5a, 0x6c, 0x34, 0x27, 0x4d, 0x28, 0xe3, 0x1d, - 0xa5, 0x2e, 0x1f, 0xc4, 0xd8, 0x3d, 0x4e, 0xb2, 0x43, 0x64, 0xbd, 0x2d, 0x61, 0x82, 0x5c, 0x69, - 0xb8, 0xf8, 0x61, 0x30, 0x28, 0xc5, 0x6c, 0x49, 0x8a, 0x1a, 0xe4, 0x5e, 0xdf, 0xf4, 0xae, 0xf4, - 0x34, 0xd9, 0x05, 0xfd, 0xac, 0x67, 0x5e, 0x0e, 0xde, 0x9a, 0x17, 0x83, 0xce, 0x55, 0xbb, 0x77, - 0xda, 0x39, 0xd5, 0x33, 0x44, 0x87, 0x72, 0xaf, 0xdd, 0xef, 0xf4, 0x07, 0x37, 0x7d, 0xb3, 0xd3, - 0xbc, 0xd4, 0xb3, 0x64, 0x0b, 0xb2, 0xd7, 0xa7, 0x67, 0x7a, 0x8e, 0x54, 0x00, 0xfa, 0x9d, 0x77, - 0xfd, 0xc1, 0xf5, 0x45, 0xf3, 0xfc, 0x4a, 0xcf, 0x63, 0xa8, 0xef, 0x9b, 0x97, 0x17, 0x7a, 0xc1, - 0x78, 0x0a, 0xdb, 0xc8, 0xea, 0x72, 0xe6, 0x70, 0xdb, 0xb3, 0x7c, 0x4e, 0x48, 0xec, 0x68, 0x8b, - 0xea, 0xe4, 0x4a, 0xb2, 0x72, 0x9d, 0xa9, 0xc7, 0xe7, 0xc6, 0xef, 0x59, 0xb9, 0x65, 0xac, 0x38, - 0x0e, 0x63, 0xcf, 0xe2, 0x93, 0xd5, 0x57, 0xb1, 0x50, 0x07, 0xa8, 0x76, 0x44, 0x90, 0x4f, 0x21, - 0xff, 0x23, 0x56, 0x5e, 0x29, 0xea, 0x41, 0x12, 0x2a, 0x44, 0xd1, 0x4d, 0x99, 0x12, 0x43, 0xea, - 0x50, 0x98, 0x08, 0x1d, 0xa8, 0xd1, 0xb7, 0x9b, 0x44, 0x4b, 0x8d, 0x74, 0x53, 0xa6, 0x42, 0x21, - 0x7e, 0x28, 0x4a, 0xa4, 0xa6, 0xde, 0x12, 0x5e, 0x96, 0x0f, 0xf1, 0x12, 0x85, 0xb4, 0x6f, 0xd9, - 0x68, 0xae, 0xa6, 0x1d, 0x59, 0xad, 0x10, 0xd2, 0x46, 0x04, 0xd2, 0xa6, 0xb8, 0x6d, 0x35, 0xe4, - 0x96, 0x68, 0x8b, 0x13, 0x41, 0xda, 0x02, 0x83, 0x61, 0xad, 0x19, 0x9f, 0xa8, 0x21, 0x45, 0x56, - 0x65, 0x89, 0x61, 0x11, 0x41, 0xbe, 0x84, 0xe2, 0x34, 0x3c, 0x72, 0x35, 0x9c, 0xfe, 0x93, 0x84, - 0x47, 0x15, 0xc1, 0x37, 0x83, 0x08, 0x4b, 0x9e, 0xc2, 0xb6, 0x4f, 0x03, 0x8f, 0xb9, 0x01, 0x1d, - 0x0c, 0xd9, 0x48, 0xce, 0xd1, 0xbc, 0x59, 0x0e, 0x17, 0xdb, 0x6c, 0x44, 0x5b, 0x00, 0x9a, 0xc3, - 0x86, 0x62, 0xac, 0x18, 0x63, 0xd0, 0xf0, 0xca, 0x86, 0xd5, 0xba, 0xf3, 0xbd, 0xe1, 0x6a, 0xb5, - 0xc2, 0x1b, 0x8c, 0xfc, 0x10, 0x81, 0xc8, 0x09, 0xe7, 0x9e, 0x2a, 0xd6, 0xd2, 0x4e, 0x42, 0x24, - 0x22, 0x5a, 0x05, 0xc8, 0x4d, 0xf1, 0xee, 0x57, 0xa0, 0xdc, 0xf9, 0xd9, 0x9a, 0x7a, 0x6a, 0x94, - 0x1a, 0x7f, 0x65, 0x21, 0x87, 0x89, 0xc9, 0x11, 0x14, 0xbd, 0x70, 0x12, 0xad, 0xbe, 0x6b, 0x45, - 0x43, 0x0a, 0xb7, 0x19, 0xe1, 0xc8, 0x0b, 0x28, 0x04, 0xa2, 0xc9, 0x2b, 0x06, 0xfa, 0x72, 0xf3, - 0xc7, 0x62, 0x4a, 0x04, 0x76, 0x5b, 0xc7, 0x0e, 0xb8, 0x92, 0x4a, 0xac, 0x55, 0xe1, 0xdc, 0x41, - 0x9e, 0x68, 0x25, 0x9f, 0x83, 0xc6, 0x54, 0x17, 0x57, 0x22, 0x89, 0xed, 0x2a, 0xec, 0xef, 0xdd, - 0x94, 0x19, 0xa1, 0xc8, 0x73, 0xc8, 0x33, 0x97, 0xb2, 0xf1, 0xea, 0xfb, 0x8d, 0x68, 0xc5, 0x58, - 0x76, 0x61, 0xc7, 0xef, 0x11, 0x3c, 0x82, 0x55, 0x35, 0x85, 0x07, 0x6f, 0x0a, 0x3b, 0xa9, 0x81, - 0xe6, 0xce, 0x1c, 0xc7, 0xba, 0x75, 0x64, 0xd9, 0x34, 0x33, 0xfa, 0x4d, 0xba, 0x50, 0xa1, 0xf2, - 0xf8, 0xe4, 0xd0, 0x0f, 0xaa, 0x9a, 0x18, 0x00, 0xff, 0x4f, 0x46, 0xab, 0xc7, 0xcf, 0x58, 0x4d, - 0x81, 0x6d, 0x1a, 0x5f, 0xab, 0xbd, 0x03, 0xb2, 0x0a, 0x5a, 0xd3, 0xe2, 0x0f, 0x92, 0x2d, 0xfe, - 0xe1, 0x22, 0x51, 0xdc, 0x7d, 0xed, 0x4c, 0xbf, 0x00, 0xed, 0x52, 0x7c, 0xbf, 0x9d, 0x9f, 0x62, - 0xbf, 0x70, 0xad, 0x69, 0xd4, 0x2f, 0xf0, 0x99, 0x1c, 0x80, 0x16, 0x7e, 0xc7, 0x89, 0xe8, 0x95, - 0xc6, 0x4e, 0xec, 0x4d, 0xc8, 0xb3, 0x45, 0xdf, 0xdb, 0xb2, 0xe4, 0x83, 0xa1, 0x43, 0x45, 0xe9, - 0x6f, 0xc2, 0x46, 0x62, 0x8e, 0xfc, 0x9a, 0x86, 0x8a, 0x12, 0x9a, 0x5a, 0x22, 0x0f, 0xa1, 0x20, - 0x3f, 0x19, 0x55, 0x22, 0xf5, 0x0b, 0xef, 0x03, 0xb6, 0x97, 0x01, 0xa7, 0x53, 0xcf, 0xb1, 0x78, - 0xf8, 0x65, 0x55, 0xc6, 0xc5, 0xbe, 0x5a, 0x43, 0x8e, 0x13, 0xa6, 0x14, 0x52, 0x34, 0xc5, 0xb3, - 0x18, 0x99, 0x3e, 0x1b, 0xd2, 0x20, 0xc0, 0x57, 0x66, 0x84, 0xb9, 0xc3, 0xb9, 0x50, 0x46, 0xc6, - 0xdc, 0x59, 0x58, 0x2e, 0xa4, 0xc1, 0xe0, 0x00, 0x31, 0x36, 0xf5, 0xc4, 0x45, 0xaa, 0xae, 0x5c, - 0x24, 0x85, 0x8b, 0xae, 0x53, 0x3d, 0x71, 0x9d, 0xaa, 0x2b, 0xd7, 0x29, 0x86, 0x4f, 0x5c, 0xaa, - 0xbf, 0x33, 0x50, 0x90, 0x66, 0x62, 0x40, 0xc6, 0x1e, 0xad, 0xde, 0xdc, 0xb0, 0x0e, 0x66, 0xc6, - 0x1e, 0x61, 0x1a, 0xcb, 0xbf, 0x0b, 0xaa, 0x19, 0x21, 0x9d, 0xda, 0x32, 0xaa, 0xde, 0xf4, 0xef, - 0x94, 0x66, 0x04, 0x8e, 0x7c, 0x0d, 0xc5, 0xb0, 0x6f, 0x04, 0xd5, 0xac, 0x70, 0x7a, 0xb2, 0xe2, - 0x64, 0x86, 0x08, 0xe9, 0xb9, 0xf0, 0xc0, 0x26, 0x21, 0x74, 0xbf, 0xd2, 0x73, 0x17, 0x3b, 0x92, - 0xca, 0xaf, 0xbd, 0x82, 0x62, 0x94, 0xfb, 0x63, 0xde, 0x36, 0x6a, 0x17, 0x50, 0x49, 0xf2, 0xf9, - 0x98, 0x68, 0xad, 0x83, 0x1f, 0x5e, 0x88, 0xb7, 0xf0, 0x80, 0x8d, 0xf9, 0x4f, 0x96, 0x4f, 0xeb, - 0x43, 0x36, 0x3d, 0x0c, 0x66, 0x1e, 0xf5, 0x03, 0x6e, 0xf9, 0x87, 0xde, 0xed, 0xe1, 0x1d, 0x3b, - 0x0c, 0xbd, 0x6f, 0x0b, 0xe2, 0x5f, 0x88, 0xa3, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xec, 0x02, - 0x10, 0x86, 0xbc, 0x10, 0x00, 0x00, + // 1722 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0xdd, 0x72, 0xe3, 0x48, + 0x15, 0x8e, 0x7f, 0x23, 0x1f, 0x3b, 0x5e, 0xa5, 0x67, 0x18, 0x5c, 0x66, 0xd9, 0x19, 0xb4, 0x53, + 0xec, 0xd4, 0x32, 0x38, 0xe0, 0xc9, 0x06, 0x6a, 0xaa, 0xb8, 0x90, 0x7f, 0x12, 0x7b, 0x37, 0x89, + 0x8d, 0xe2, 0x2c, 0xbb, 0xdc, 0xa8, 0x14, 0xbb, 0x1d, 0xab, 0x22, 0xab, 0x85, 0xd4, 0x5e, 0xf0, + 0x23, 0x70, 0xc7, 0x03, 0x70, 0xc9, 0x1d, 0x3c, 0x01, 0x17, 0xbc, 0x07, 0x55, 0x3c, 0x0c, 0x75, + 0xba, 0x5b, 0xb2, 0xe4, 0x9f, 0xb9, 0x99, 0xbb, 0x76, 0x9f, 0xef, 0xfc, 0xf4, 0x39, 0x5f, 0x9f, + 0xd3, 0x32, 0xd4, 0x96, 0x94, 0x2f, 0xd8, 0xac, 0x15, 0x84, 0x8c, 0x33, 0xa2, 0x39, 0x81, 0x6b, + 0x47, 0x01, 0x9d, 0x36, 0xeb, 0xb8, 0xe2, 0xeb, 0x80, 0x4a, 0x49, 0xb3, 0x8a, 0xeb, 0x48, 0xfe, + 0x30, 0x7a, 0x50, 0xec, 0x30, 0xe6, 0x91, 0x9f, 0x43, 0x11, 0xb7, 0x1b, 0xb9, 0x57, 0xb9, 0x37, + 0xd5, 0x36, 0x69, 0xc5, 0xda, 0x2d, 0x94, 0x4e, 0xd6, 0x01, 0xb5, 0x84, 0x9c, 0x3c, 0x87, 0xd2, + 0x0f, 0x8e, 0xb7, 0xa2, 0x8d, 0xfc, 0xab, 0xdc, 0x1b, 0xcd, 0x92, 0x3f, 0x8c, 0x4b, 0x28, 0x75, + 0xd6, 0x9c, 0x46, 0xe4, 0x8b, 0x8c, 0x99, 0x67, 0x29, 0x33, 0x28, 0x3e, 0x64, 0xa7, 0x16, 0xdb, + 0x19, 0x40, 0xf9, 0x8e, 0x87, 0xae, 0xff, 0x48, 0xde, 0x64, 0x0c, 0x3d, 0xdf, 0x18, 0x92, 0xf2, + 0x43, 0x96, 0x2a, 0xa9, 0x88, 0x86, 0x3e, 0x7f, 0xd7, 0x3e, 0x1c, 0x91, 0x10, 0x1f, 0xb2, 0x53, + 0xca, 0xda, 0xb9, 0x38, 0xff, 0xa0, 0x9d, 0x8b, 0xf3, 0x43, 0x76, 0x0a, 0xa9, 0x93, 0xdd, 0xbb, + 0x22, 0xa0, 0x83, 0x27, 0x93, 0xf2, 0x43, 0x96, 0x4e, 0xb6, 0x2c, 0x5d, 0x9c, 0x7f, 0xd8, 0xd2, + 0xe1, 0x98, 0x8a, 0x29, 0x4b, 0x3d, 0xb6, 0x7a, 0xf0, 0xe8, 0x61, 0x4b, 0x52, 0x7e, 0xc8, 0x52, + 0x2e, 0x95, 0xa5, 0x4b, 0x8f, 0x39, 0xfc, 0x70, 0x96, 0x84, 0xf8, 0x90, 0x9d, 0x7c, 0x6c, 0xe7, + 0x1f, 0x65, 0xa8, 0x8c, 0x43, 0x77, 0xe9, 0x72, 0xf7, 0x07, 0x4a, 0x7e, 0x02, 0x15, 0xc4, 0xda, + 0x0b, 0xd7, 0xe7, 0xc2, 0x62, 0xc5, 0xd2, 0x70, 0x63, 0xe0, 0xfa, 0x9c, 0x9c, 0x01, 0x3c, 0x30, + 0xe6, 0xd9, 0x1b, 0x2b, 0xd5, 0x76, 0x3d, 0x4b, 0xdb, 0xc1, 0x91, 0x55, 0x41, 0xcc, 0xb7, 0x08, + 0x21, 0x6d, 0xa8, 0x3e, 0x20, 0x09, 0x95, 0x46, 0x41, 0x68, 0x7c, 0xb2, 0xc5, 0xd0, 0xc1, 0x91, + 0x05, 0x02, 0x25, 0x75, 0xbe, 0x82, 0x5a, 0x24, 0xf8, 0xa6, 0x94, 0x8a, 0x42, 0x49, 0xdf, 0x66, + 0xe3, 0xe0, 0xc8, 0xaa, 0x4a, 0x5c, 0xe2, 0x4a, 0xd4, 0x52, 0x69, 0x95, 0xb6, 0x5d, 0x09, 0xea, + 0xa1, 0x2b, 0x81, 0x4a, 0xeb, 0x5c, 0x9c, 0x2b, 0x9d, 0xf2, 0x1e, 0x9d, 0x8b, 0x73, 0xa5, 0x73, + 0x71, 0x9e, 0x84, 0xb7, 0x4a, 0x3b, 0x3a, 0xde, 0x0e, 0x4f, 0x52, 0x0a, 0xc3, 0x5b, 0xa5, 0x5c, + 0x29, 0xb5, 0xc4, 0x97, 0xb6, 0x4f, 0x4d, 0x38, 0xab, 0xae, 0xb2, 0xde, 0x66, 0x82, 0x0e, 0x4a, + 0xad, 0xb2, 0xad, 0x26, 0xc9, 0x82, 0x6a, 0x12, 0x97, 0x1c, 0x6c, 0x8e, 0xc5, 0x57, 0x5a, 0xb0, + 0x7d, 0x30, 0xc1, 0x0c, 0x3c, 0x98, 0x40, 0x49, 0x9d, 0x2b, 0x38, 0x75, 0x9e, 0x5c, 0xee, 0xd8, + 0x8e, 0xef, 0x33, 0xee, 0x70, 0x97, 0xf9, 0x51, 0xa3, 0x2a, 0x34, 0x9b, 0x1b, 0x4d, 0x13, 0x21, + 0xe6, 0x06, 0x61, 0xe9, 0xce, 0xd6, 0x0e, 0x69, 0xc3, 0x8f, 0xa6, 0xcc, 0xe7, 0x8e, 0xeb, 0x47, + 0x76, 0xe8, 0xf8, 0x33, 0xb6, 0x54, 0x61, 0xd4, 0x44, 0xfb, 0x7a, 0x16, 0x0b, 0x2d, 0x21, 0x93, + 0xce, 0xdf, 0xc3, 0xf1, 0x9c, 0x85, 0x4b, 0x87, 0x47, 0x8d, 0x93, 0x57, 0x85, 0x37, 0xd5, 0xf6, + 0xab, 0x8d, 0xcb, 0x84, 0x9c, 0xad, 0x4b, 0x09, 0xe9, 0xfb, 0x3c, 0x5c, 0x5b, 0xb1, 0x02, 0x79, + 0x09, 0x55, 0xb9, 0xb4, 0x9f, 0x5c, 0x7f, 0xd6, 0xa8, 0x0b, 0xd2, 0x82, 0xdc, 0xfa, 0xc6, 0xf5, + 0x67, 0xcd, 0xf7, 0x50, 0x4b, 0x6b, 0x12, 0x1d, 0x0a, 0x4f, 0x74, 0xad, 0xd8, 0x8d, 0xcb, 0xfd, + 0x1d, 0xf6, 0x7d, 0xfe, 0xb7, 0xb9, 0xce, 0xb1, 0x92, 0x18, 0x6f, 0xa1, 0x78, 0xed, 0x46, 0x9c, + 0xbc, 0x86, 0x12, 0xf5, 0xe8, 0x32, 0x6a, 0xe4, 0x44, 0x9c, 0x29, 0xfa, 0xf7, 0x1c, 0xee, 0x58, + 0x52, 0x68, 0xfc, 0x35, 0x27, 0xba, 0xea, 0x6a, 0xca, 0xc9, 0x39, 0x94, 0xe7, 0x2e, 0xf5, 0x66, + 0xb1, 0xc6, 0xa7, 0x19, 0x26, 0xaf, 0xa6, 0xbc, 0x75, 0x29, 0xc4, 0xf2, 0x54, 0x0a, 0xdb, 0x1c, + 0x42, 0x35, 0xb5, 0xbd, 0x27, 0xe4, 0xd7, 0xe9, 0x90, 0xf7, 0xc4, 0x91, 0x1c, 0xc1, 0x28, 0x43, + 0xf1, 0x96, 0xf9, 0xd4, 0xb0, 0x41, 0x1b, 0x05, 0x58, 0x22, 0xc7, 0x23, 0xaf, 0xa1, 0x38, 0x73, + 0xb8, 0xa3, 0x7a, 0xc6, 0x96, 0xf2, 0xe0, 0xc8, 0x12, 0x52, 0x44, 0xf9, 0xcc, 0xdf, 0xe3, 0x02, + 0xed, 0x21, 0x0a, 0xa5, 0x9b, 0x14, 0xfd, 0x3b, 0x07, 0xa5, 0x91, 0x4f, 0x47, 0x73, 0x72, 0x01, + 0xc7, 0x2c, 0x90, 0x0c, 0xda, 0x39, 0xb4, 0x40, 0xb4, 0x64, 0x24, 0x71, 0x29, 0x15, 0x98, 0xfc, + 0x12, 0x48, 0xc0, 0x38, 0xf5, 0xb9, 0xeb, 0x78, 0xf6, 0x94, 0xf9, 0x73, 0xcf, 0x9d, 0x72, 0x55, + 0x94, 0xd3, 0x44, 0xd2, 0x55, 0x82, 0xe6, 0xd7, 0x50, 0x4b, 0xdb, 0xf9, 0xa8, 0x2c, 0x01, 0x68, + 0x57, 0xd6, 0xb8, 0x7b, 0x43, 0xb9, 0x63, 0x7c, 0x0a, 0xda, 0x60, 0x32, 0x19, 0x8f, 0x1d, 0xbe, + 0xd8, 0xb5, 0x69, 0xfc, 0x14, 0x2a, 0x28, 0xfd, 0xfd, 0x8a, 0xee, 0x73, 0x69, 0x7c, 0x06, 0x80, + 0xe2, 0x01, 0x75, 0x66, 0x34, 0xdc, 0x23, 0xff, 0x7b, 0x5e, 0x5a, 0x37, 0x57, 0x7c, 0x41, 0xde, + 0xa5, 0x7a, 0x77, 0xbd, 0xfd, 0x72, 0x13, 0x5e, 0x8c, 0x48, 0x16, 0xa9, 0x3e, 0x8e, 0x59, 0x0a, + 0x59, 0x10, 0xba, 0x94, 0x3b, 0xe1, 0xda, 0x5e, 0x08, 0x4f, 0x6a, 0x14, 0x9f, 0xa6, 0x24, 0x32, + 0x04, 0xe3, 0x9f, 0x39, 0xa8, 0xa5, 0xad, 0x90, 0x2a, 0x1c, 0xdf, 0xdf, 0x7e, 0x73, 0x3b, 0xfa, + 0xc3, 0xad, 0x7e, 0x44, 0x2a, 0x50, 0xea, 0x98, 0x77, 0xc3, 0xae, 0x9e, 0x23, 0x00, 0xe5, 0x4e, + 0xdf, 0xb4, 0xfa, 0x96, 0x9e, 0xc7, 0x75, 0x6f, 0x78, 0xd5, 0xbf, 0x9b, 0xe8, 0x05, 0x5c, 0xdf, + 0xdc, 0x4f, 0xee, 0xcd, 0x6b, 0xbd, 0x88, 0xf0, 0x91, 0x79, 0x3f, 0x19, 0xe8, 0x25, 0x5c, 0x7e, + 0x6b, 0x8e, 0x87, 0x3d, 0xbd, 0x4c, 0x3e, 0x81, 0xea, 0x5d, 0xd7, 0x32, 0x6f, 0xec, 0xbb, 0x81, + 0x69, 0xff, 0x5a, 0x3f, 0x26, 0xa7, 0x70, 0xb2, 0xd9, 0x68, 0x7f, 0x75, 0xa1, 0x6b, 0xe4, 0x04, + 0x2a, 0xb7, 0xfd, 0xab, 0xd1, 0x64, 0x68, 0x4e, 0xfa, 0x7a, 0x85, 0xbc, 0x00, 0x32, 0xb6, 0x46, + 0x63, 0x6b, 0xd8, 0x9f, 0x98, 0xd6, 0xf7, 0xf6, 0xa0, 0x6f, 0xf6, 0xfa, 0x96, 0x0e, 0x71, 0xfa, + 0xba, 0x8c, 0x3d, 0xb9, 0x74, 0x4f, 0xfa, 0xfe, 0x93, 0x93, 0xe9, 0xeb, 0xb0, 0xd9, 0x9a, 0x98, + 0x50, 0xc3, 0x6e, 0x42, 0x7d, 0x6e, 0xa7, 0xd2, 0xf8, 0x59, 0x36, 0x8d, 0x88, 0x6c, 0x75, 0x25, + 0x4c, 0x64, 0xb1, 0x3a, 0xdd, 0xfc, 0x30, 0x18, 0x54, 0x53, 0xb2, 0x6c, 0x6e, 0x34, 0x28, 0x7e, + 0x7d, 0x37, 0xba, 0xd5, 0x73, 0xe4, 0x39, 0xe8, 0x97, 0x23, 0xeb, 0xc6, 0xbe, 0xb7, 0xae, 0xed, + 0xfe, 0x6d, 0x77, 0xd4, 0xeb, 0xf7, 0xf4, 0x3c, 0xd1, 0xa1, 0x36, 0xea, 0x4e, 0xfa, 0x13, 0xfb, + 0x6e, 0x62, 0xf5, 0xcd, 0x1b, 0xbd, 0x40, 0x8e, 0xa1, 0x30, 0xee, 0x5d, 0xea, 0x45, 0x52, 0x07, + 0x98, 0xf4, 0xbf, 0x9b, 0xd8, 0xe3, 0x6b, 0x73, 0x78, 0xab, 0x97, 0xd0, 0xd4, 0xf7, 0xe6, 0xcd, + 0xb5, 0x5e, 0x36, 0x3e, 0x87, 0x13, 0x8c, 0xea, 0x66, 0xe5, 0x71, 0x37, 0x70, 0x42, 0x4e, 0x48, + 0x8a, 0x03, 0x15, 0x59, 0x62, 0xa3, 0x2a, 0x39, 0xd6, 0x5f, 0x06, 0x7c, 0x6d, 0xfc, 0xab, 0x20, + 0x8f, 0x8c, 0xdc, 0xc4, 0x67, 0x43, 0xe0, 0xf0, 0xc5, 0xee, 0xa3, 0x31, 0x66, 0x2c, 0xde, 0x4b, + 0x44, 0x90, 0x5f, 0x40, 0xe9, 0x4f, 0xc8, 0x51, 0xc5, 0xfd, 0x67, 0x59, 0xa8, 0xa0, 0xef, 0xe0, + 0xc8, 0x92, 0x18, 0xd2, 0x82, 0xb2, 0xe2, 0x51, 0x61, 0xfb, 0x3d, 0xb2, 0x61, 0xf3, 0xe0, 0xc8, + 0x52, 0x28, 0xc4, 0x4f, 0x45, 0x89, 0xd4, 0x7c, 0xde, 0xc2, 0xcb, 0xf2, 0x21, 0x5e, 0xa2, 0x30, + 0xec, 0x07, 0x36, 0x5b, 0xab, 0xb9, 0x4c, 0x76, 0x2b, 0x84, 0x61, 0x23, 0x02, 0xc3, 0xa6, 0x78, + 0x6c, 0x35, 0x8e, 0xb7, 0xc2, 0x16, 0x19, 0xc1, 0xb0, 0x05, 0x06, 0xcd, 0x3a, 0x2b, 0xbe, 0x50, + 0xe3, 0x94, 0xec, 0xde, 0x1f, 0x34, 0x8b, 0x08, 0xf2, 0x1b, 0xa8, 0x2c, 0xe3, 0x94, 0xab, 0x31, + 0xfa, 0xe3, 0x2c, 0x3c, 0xa9, 0x08, 0xbe, 0x61, 0x12, 0x2c, 0xf9, 0x1c, 0x4e, 0x42, 0x1a, 0x05, + 0xcc, 0x8f, 0xa8, 0x3d, 0x65, 0x33, 0x39, 0xf1, 0x4b, 0x56, 0x2d, 0xde, 0xec, 0xb2, 0x19, 0xed, + 0x00, 0x68, 0x1e, 0x9b, 0x8a, 0x01, 0x68, 0xcc, 0x41, 0xc3, 0xe6, 0x12, 0x57, 0xeb, 0x31, 0x0c, + 0xa6, 0xbb, 0xd5, 0x8a, 0x7b, 0x0d, 0xc6, 0x87, 0x08, 0x44, 0x2e, 0x38, 0x0f, 0x54, 0xb1, 0xb6, + 0x4e, 0x12, 0x23, 0x11, 0xd1, 0x29, 0x43, 0x71, 0x89, 0x5d, 0xaa, 0x0e, 0xb5, 0xfe, 0x5f, 0x9c, + 0x65, 0xa0, 0x86, 0xbe, 0xf1, 0xdf, 0x02, 0x14, 0xd1, 0x31, 0x79, 0x07, 0x95, 0x20, 0x9e, 0x99, + 0xbb, 0xaf, 0xc2, 0x64, 0x9c, 0xe2, 0x31, 0x13, 0x1c, 0xf9, 0x12, 0xca, 0x91, 0x18, 0x47, 0x2a, + 0x02, 0x7d, 0x7b, 0x4c, 0x61, 0x31, 0x25, 0x02, 0xe7, 0x82, 0xe7, 0x46, 0x5c, 0x51, 0x25, 0xd5, + 0x54, 0x71, 0x42, 0x62, 0x9c, 0x28, 0x25, 0xbf, 0x02, 0x8d, 0xa9, 0x79, 0xa3, 0x48, 0x92, 0x3a, + 0x55, 0x3c, 0x89, 0x06, 0x47, 0x56, 0x82, 0x22, 0x5f, 0x40, 0x89, 0xf9, 0x94, 0xcd, 0x77, 0x5f, + 0x62, 0x62, 0x68, 0x60, 0xd9, 0x85, 0x1c, 0xbf, 0x9c, 0x30, 0x05, 0xbb, 0x6c, 0x8a, 0x13, 0x6f, + 0x09, 0x39, 0x69, 0x82, 0xe6, 0xaf, 0x3c, 0xcf, 0x79, 0xf0, 0x64, 0xd9, 0x34, 0x2b, 0xf9, 0x4d, + 0x06, 0x50, 0xa7, 0x32, 0x7d, 0xf2, 0x79, 0x12, 0x35, 0x34, 0x31, 0xaa, 0x7e, 0x96, 0xb5, 0xd6, + 0x4a, 0xe7, 0x58, 0xcd, 0xab, 0x13, 0x9a, 0xde, 0x6b, 0x7e, 0x07, 0x64, 0x17, 0xb4, 0x67, 0x18, + 0xbd, 0xcd, 0x0e, 0xa3, 0x17, 0x1b, 0x47, 0x69, 0xf5, 0xbd, 0xaf, 0x8f, 0x6b, 0xd0, 0x6e, 0xc4, + 0x97, 0xe6, 0xb0, 0x87, 0xfd, 0xc2, 0x77, 0x96, 0x49, 0xbf, 0xc0, 0x35, 0x79, 0x0b, 0x5a, 0xfc, + 0xc5, 0x29, 0xac, 0xd7, 0xdb, 0xa7, 0xa9, 0x37, 0x5b, 0xe0, 0x8a, 0xbe, 0x77, 0xec, 0xc8, 0x85, + 0xa1, 0x43, 0x5d, 0xf1, 0x6f, 0xc1, 0x66, 0x62, 0xe2, 0xfd, 0x2d, 0x07, 0x75, 0x45, 0x34, 0xb5, + 0x45, 0x5e, 0x40, 0x59, 0x7e, 0xdc, 0x2a, 0x47, 0xea, 0x17, 0xde, 0x07, 0x6c, 0x2f, 0x36, 0xa7, + 0xcb, 0xc0, 0x73, 0x78, 0xfc, 0x0d, 0x58, 0xc3, 0xcd, 0x89, 0xda, 0xc3, 0x18, 0x17, 0x4c, 0x31, + 0xa4, 0x62, 0x89, 0xb5, 0x1a, 0x5b, 0x53, 0x1a, 0x45, 0xf8, 0xb8, 0x47, 0x98, 0x3f, 0x5d, 0x0b, + 0x66, 0xe4, 0xc5, 0xd8, 0x52, 0x92, 0x6b, 0x29, 0x30, 0x38, 0x40, 0x2a, 0x9a, 0x56, 0xe6, 0x22, + 0x35, 0x76, 0x2e, 0x92, 0xc2, 0x25, 0xd7, 0xa9, 0x95, 0xb9, 0x4e, 0x8d, 0x9d, 0xeb, 0x94, 0xc2, + 0x67, 0x2e, 0xd5, 0xff, 0xf2, 0x50, 0x96, 0x62, 0x62, 0x40, 0xde, 0x9d, 0xed, 0xde, 0xdc, 0xb8, + 0x0e, 0x56, 0xde, 0x9d, 0xa1, 0x1b, 0x27, 0x7c, 0x8c, 0x1a, 0x79, 0x41, 0x9d, 0xe6, 0x36, 0xaa, + 0x65, 0x86, 0x8f, 0x8a, 0x33, 0x02, 0x47, 0x7e, 0x07, 0x95, 0xb8, 0x6f, 0x44, 0x8d, 0x82, 0x50, + 0x7a, 0xb9, 0xa3, 0x64, 0xc5, 0x08, 0xa9, 0xb9, 0xd1, 0xc0, 0x26, 0x21, 0x78, 0xbf, 0xd3, 0x73, + 0x37, 0x27, 0x92, 0xcc, 0x6f, 0x5e, 0x41, 0x25, 0xf1, 0xfd, 0x31, 0xef, 0xa2, 0xe6, 0x35, 0xd4, + 0xb3, 0xf1, 0x7c, 0x8c, 0xb5, 0xce, 0xdb, 0x3f, 0x7e, 0x29, 0xbe, 0x17, 0x22, 0x36, 0xe7, 0x7f, + 0x76, 0x42, 0xda, 0x9a, 0xb2, 0xe5, 0x59, 0xb4, 0x0a, 0x68, 0x18, 0x71, 0x27, 0x3c, 0x0b, 0x1e, + 0xce, 0x1e, 0xd9, 0x59, 0xac, 0xfd, 0x50, 0x16, 0xff, 0x97, 0xbc, 0xfb, 0x7f, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xd0, 0x4f, 0x68, 0x5d, 0x66, 0x11, 0x00, 0x00, } diff --git a/proto/api_spec/method.proto b/proto/api_spec/method.proto index 47ce9e2..9fb1274 100644 --- a/proto/api_spec/method.proto +++ b/proto/api_spec/method.proto @@ -153,8 +153,24 @@ message HTTPAuth { UNKNOWN = 0; BASIC = 1; BEARER = 2; + + // Less common types listed at https://www.iana.org/assignments/http-authschemes/http-authschemes.xhtml + // excluded HOBA as I couldn't find any references to its use. + DIGEST = 3; + MUTUAL = 4; + OAUTH = 5; + VAPID = 6; + SCRAM_SHA_1 = 7; + SCRAM_SHA_256 = 8; + NEGOTIATE = 9; + + // An application-specific authorization header, such as + // Github webhook's X-Hub-Signature-256 or X-Hub-Signature, + // not carried in "Authorization". + PROPRIETARY_HEADER = 10; } HTTPAuthType type = 1; + string proprietary_header = 2; } message HTTPCookie { diff --git a/py/api_spec/method_pb2.py b/py/api_spec/method_pb2.py index 4dbd160..5770d92 100644 --- a/py/api_spec/method_pb2.py +++ b/py/api_spec/method_pb2.py @@ -22,7 +22,7 @@ package='api_spec', syntax='proto3', serialized_options=_b('Z*akitasoftware.com/superstar/pb/go/api_spec'), - serialized_pb=_b('\n\x0cmethod.proto\x12\x08\x61pi_spec\x1a\x0e\x61pi_type.proto\x1a\x0btypes.proto\"7\n\x04\x42ool\x12 \n\x04type\x18\x01 \x01(\x0b\x32\x12.api_spec.BoolType\x12\r\n\x05value\x18\x02 \x01(\x08\"9\n\x05\x42ytes\x12!\n\x04type\x18\x01 \x01(\x0b\x32\x13.api_spec.BytesType\x12\r\n\x05value\x18\x02 \x01(\x0c\";\n\x06String\x12\"\n\x04type\x18\x01 \x01(\x0b\x32\x14.api_spec.StringType\x12\r\n\x05value\x18\x02 \x01(\t\"9\n\x05Int32\x12!\n\x04type\x18\x01 \x01(\x0b\x32\x13.api_spec.Int32Type\x12\r\n\x05value\x18\x02 \x01(\x05\"9\n\x05Int64\x12!\n\x04type\x18\x01 \x01(\x0b\x32\x13.api_spec.Int64Type\x12\r\n\x05value\x18\x02 \x01(\x03\";\n\x06Uint32\x12\"\n\x04type\x18\x01 \x01(\x0b\x32\x14.api_spec.Uint32Type\x12\r\n\x05value\x18\x02 \x01(\r\";\n\x06Uint64\x12\"\n\x04type\x18\x01 \x01(\x0b\x32\x14.api_spec.Uint64Type\x12\r\n\x05value\x18\x02 \x01(\x04\";\n\x06\x44ouble\x12\"\n\x04type\x18\x01 \x01(\x0b\x32\x14.api_spec.DoubleType\x12\r\n\x05value\x18\x02 \x01(\x01\"9\n\x05\x46loat\x12!\n\x04type\x18\x01 \x01(\x0b\x32\x13.api_spec.FloatType\x12\r\n\x05value\x18\x02 \x01(\x02\"\xe3\x04\n\tPrimitive\x12\x11\n\ttype_hint\x18\x01 \x01(\t\x12$\n\nbool_value\x18\x02 \x01(\x0b\x32\x0e.api_spec.BoolH\x00\x12&\n\x0b\x62ytes_value\x18\x03 \x01(\x0b\x32\x0f.api_spec.BytesH\x00\x12(\n\x0cstring_value\x18\x04 \x01(\x0b\x32\x10.api_spec.StringH\x00\x12&\n\x0bint32_value\x18\x05 \x01(\x0b\x32\x0f.api_spec.Int32H\x00\x12&\n\x0bint64_value\x18\x06 \x01(\x0b\x32\x0f.api_spec.Int64H\x00\x12(\n\x0cuint32_value\x18\x07 \x01(\x0b\x32\x10.api_spec.Uint32H\x00\x12(\n\x0cuint64_value\x18\x08 \x01(\x0b\x32\x10.api_spec.Uint64H\x00\x12(\n\x0c\x64ouble_value\x18\t \x01(\x0b\x32\x10.api_spec.DoubleH\x00\x12&\n\x0b\x66loat_value\x18\n \x01(\x0b\x32\x0f.api_spec.FloatH\x00\x12\x35\n\x11\x61kita_annotations\x18\x0b \x01(\x0b\x32\x1a.api_spec.AkitaAnnotations\x12\x1d\n\x15\x63ontains_random_value\x18\x0c \x01(\x08\x12\x31\n\x07\x66ormats\x18\r \x03(\x0b\x32 .api_spec.Primitive.FormatsEntry\x12\x13\n\x0b\x66ormat_kind\x18\x0e \x01(\t\x1a.\n\x0c\x46ormatsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x08:\x02\x38\x01\x42\x07\n\x05value\"%\n\x04List\x12\x1d\n\x05\x65lems\x18\x01 \x03(\x0b\x32\x0e.api_spec.Data\"u\n\x06Struct\x12,\n\x06\x66ields\x18\x01 \x03(\x0b\x32\x1c.api_spec.Struct.FieldsEntry\x1a=\n\x0b\x46ieldsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x1d\n\x05value\x18\x02 \x01(\x0b\x32\x0e.api_spec.Data:\x02\x38\x01\"\x06\n\x04None\"S\n\x08Optional\x12\x1e\n\x04\x64\x61ta\x18\x01 \x01(\x0b\x32\x0e.api_spec.DataH\x00\x12\x1e\n\x04none\x18\x02 \x01(\x0b\x32\x0e.api_spec.NoneH\x00\x42\x07\n\x05value\"\x92\x01\n\x05OneOf\x12-\n\x07options\x18\x01 \x03(\x0b\x32\x1c.api_spec.OneOf.OptionsEntry\x12\x1a\n\x12potential_conflict\x18\x02 \x01(\x08\x1a>\n\x0cOptionsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x1d\n\x05value\x18\x02 \x01(\x0b\x32\x0e.api_spec.Data:\x02\x38\x01\"\n\n\x08GRPCMeta\"\x17\n\x08HTTPPath\x12\x0b\n\x03key\x18\x01 \x01(\t\"\x18\n\tHTTPQuery\x12\x0b\n\x03key\x18\x01 \x01(\t\"\x19\n\nHTTPHeader\x12\x0b\n\x03key\x18\x01 \x01(\t\"m\n\x08HTTPAuth\x12-\n\x04type\x18\x01 \x01(\x0e\x32\x1f.api_spec.HTTPAuth.HTTPAuthType\"2\n\x0cHTTPAuthType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\t\n\x05\x42\x41SIC\x10\x01\x12\n\n\x06\x42\x45\x41RER\x10\x02\"\x19\n\nHTTPCookie\x12\x0b\n\x03key\x18\x01 \x01(\t\"\xb1\x01\n\x08HTTPBody\x12\x34\n\x0c\x63ontent_type\x18\x01 \x01(\x0e\x32\x1e.api_spec.HTTPBody.ContentType\"o\n\x0b\x43ontentType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x08\n\x04JSON\x10\x01\x12\x14\n\x10\x46ORM_URL_ENCODED\x10\x02\x12\x10\n\x0cOCTET_STREAM\x10\x03\x12\x07\n\x03PDF\x10\x04\x12\x0e\n\nTEXT_PLAIN\x10\x05\x12\x08\n\x04YAML\x10\x06\"\x1d\n\rHTTPMultipart\x12\x0c\n\x04type\x18\x01 \x01(\t\"\x0b\n\tHTTPEmpty\"\xe3\x02\n\x08HTTPMeta\x12\"\n\x04path\x18\x01 \x01(\x0b\x32\x12.api_spec.HTTPPathH\x00\x12$\n\x05query\x18\x02 \x01(\x0b\x32\x13.api_spec.HTTPQueryH\x00\x12&\n\x06header\x18\x03 \x01(\x0b\x32\x14.api_spec.HTTPHeaderH\x00\x12&\n\x06\x63ookie\x18\x04 \x01(\x0b\x32\x14.api_spec.HTTPCookieH\x00\x12\"\n\x04\x62ody\x18\x05 \x01(\x0b\x32\x12.api_spec.HTTPBodyH\x00\x12$\n\x05\x65mpty\x18\x06 \x01(\x0b\x32\x13.api_spec.HTTPEmptyH\x00\x12\"\n\x04\x61uth\x18\x08 \x01(\x0b\x32\x12.api_spec.HTTPAuthH\x00\x12,\n\tmultipart\x18\t \x01(\x0b\x32\x17.api_spec.HTTPMultipartH\x00\x12\x15\n\rresponse_code\x18\x07 \x01(\x05\x42\n\n\x08location\"Z\n\x08\x44\x61taMeta\x12\"\n\x04grpc\x18\x01 \x01(\x0b\x32\x12.api_spec.GRPCMetaH\x00\x12\"\n\x04http\x18\x02 \x01(\x0b\x32\x12.api_spec.HTTPMetaH\x00\x42\x06\n\x04meta\"\x0e\n\x0c\x45xampleValue\"\x84\x03\n\x04\x44\x61ta\x12(\n\tprimitive\x18\x01 \x01(\x0b\x32\x13.api_spec.PrimitiveH\x00\x12\"\n\x06struct\x18\x02 \x01(\x0b\x32\x10.api_spec.StructH\x00\x12\x1e\n\x04list\x18\x03 \x01(\x0b\x32\x0e.api_spec.ListH\x00\x12&\n\x08optional\x18\x04 \x01(\x0b\x32\x12.api_spec.OptionalH\x00\x12 \n\x05oneof\x18\x06 \x01(\x0b\x32\x0f.api_spec.OneOfH\x00\x12 \n\x04meta\x18\x05 \x01(\x0b\x32\x12.api_spec.DataMeta\x12\x10\n\x08nullable\x18\x07 \x01(\x08\x12\x39\n\x0e\x65xample_values\x18\x08 \x03(\x0b\x32!.api_spec.Data.ExampleValuesEntry\x1aL\n\x12\x45xampleValuesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12%\n\x05value\x18\x02 \x01(\x0b\x32\x16.api_spec.ExampleValue:\x02\x38\x01\x42\x07\n\x05value\"=\n\x08MethodID\x12\x0c\n\x04name\x18\x01 \x01(\t\x12#\n\x08\x61pi_type\x18\x02 \x01(\x0e\x32\x11.api_spec.ApiType\"\x10\n\x0eGRPCMethodMeta\"a\n\x0eHTTPMethodMeta\x12\x0e\n\x06method\x18\x01 \x01(\t\x12\x15\n\rpath_template\x18\x02 \x01(\t\x12\x0c\n\x04host\x18\x03 \x01(\t\x12\x1a\n\x12processing_latency\x18\x04 \x01(\x02\"h\n\nMethodMeta\x12(\n\x04grpc\x18\x01 \x01(\x0b\x32\x18.api_spec.GRPCMethodMetaH\x00\x12(\n\x04http\x18\x02 \x01(\x0b\x32\x18.api_spec.HTTPMethodMetaH\x00\x42\x06\n\x04meta\"\xa9\x02\n\x06Method\x12\x1e\n\x02id\x18\x01 \x01(\x0b\x32\x12.api_spec.MethodID\x12(\n\x04\x61rgs\x18\x02 \x03(\x0b\x32\x1a.api_spec.Method.ArgsEntry\x12\x32\n\tresponses\x18\x03 \x03(\x0b\x32\x1f.api_spec.Method.ResponsesEntry\x12\"\n\x04meta\x18\x04 \x01(\x0b\x32\x14.api_spec.MethodMeta\x1a;\n\tArgsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x1d\n\x05value\x18\x02 \x01(\x0b\x32\x0e.api_spec.Data:\x02\x38\x01\x1a@\n\x0eResponsesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x1d\n\x05value\x18\x02 \x01(\x0b\x32\x0e.api_spec.Data:\x02\x38\x01\x42,Z*akitasoftware.com/superstar/pb/go/api_specb\x06proto3') + serialized_pb=_b('\n\x0cmethod.proto\x12\x08\x61pi_spec\x1a\x0e\x61pi_type.proto\x1a\x0btypes.proto\"7\n\x04\x42ool\x12 \n\x04type\x18\x01 \x01(\x0b\x32\x12.api_spec.BoolType\x12\r\n\x05value\x18\x02 \x01(\x08\"9\n\x05\x42ytes\x12!\n\x04type\x18\x01 \x01(\x0b\x32\x13.api_spec.BytesType\x12\r\n\x05value\x18\x02 \x01(\x0c\";\n\x06String\x12\"\n\x04type\x18\x01 \x01(\x0b\x32\x14.api_spec.StringType\x12\r\n\x05value\x18\x02 \x01(\t\"9\n\x05Int32\x12!\n\x04type\x18\x01 \x01(\x0b\x32\x13.api_spec.Int32Type\x12\r\n\x05value\x18\x02 \x01(\x05\"9\n\x05Int64\x12!\n\x04type\x18\x01 \x01(\x0b\x32\x13.api_spec.Int64Type\x12\r\n\x05value\x18\x02 \x01(\x03\";\n\x06Uint32\x12\"\n\x04type\x18\x01 \x01(\x0b\x32\x14.api_spec.Uint32Type\x12\r\n\x05value\x18\x02 \x01(\r\";\n\x06Uint64\x12\"\n\x04type\x18\x01 \x01(\x0b\x32\x14.api_spec.Uint64Type\x12\r\n\x05value\x18\x02 \x01(\x04\";\n\x06\x44ouble\x12\"\n\x04type\x18\x01 \x01(\x0b\x32\x14.api_spec.DoubleType\x12\r\n\x05value\x18\x02 \x01(\x01\"9\n\x05\x46loat\x12!\n\x04type\x18\x01 \x01(\x0b\x32\x13.api_spec.FloatType\x12\r\n\x05value\x18\x02 \x01(\x02\"\xe3\x04\n\tPrimitive\x12\x11\n\ttype_hint\x18\x01 \x01(\t\x12$\n\nbool_value\x18\x02 \x01(\x0b\x32\x0e.api_spec.BoolH\x00\x12&\n\x0b\x62ytes_value\x18\x03 \x01(\x0b\x32\x0f.api_spec.BytesH\x00\x12(\n\x0cstring_value\x18\x04 \x01(\x0b\x32\x10.api_spec.StringH\x00\x12&\n\x0bint32_value\x18\x05 \x01(\x0b\x32\x0f.api_spec.Int32H\x00\x12&\n\x0bint64_value\x18\x06 \x01(\x0b\x32\x0f.api_spec.Int64H\x00\x12(\n\x0cuint32_value\x18\x07 \x01(\x0b\x32\x10.api_spec.Uint32H\x00\x12(\n\x0cuint64_value\x18\x08 \x01(\x0b\x32\x10.api_spec.Uint64H\x00\x12(\n\x0c\x64ouble_value\x18\t \x01(\x0b\x32\x10.api_spec.DoubleH\x00\x12&\n\x0b\x66loat_value\x18\n \x01(\x0b\x32\x0f.api_spec.FloatH\x00\x12\x35\n\x11\x61kita_annotations\x18\x0b \x01(\x0b\x32\x1a.api_spec.AkitaAnnotations\x12\x1d\n\x15\x63ontains_random_value\x18\x0c \x01(\x08\x12\x31\n\x07\x66ormats\x18\r \x03(\x0b\x32 .api_spec.Primitive.FormatsEntry\x12\x13\n\x0b\x66ormat_kind\x18\x0e \x01(\t\x1a.\n\x0c\x46ormatsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x08:\x02\x38\x01\x42\x07\n\x05value\"%\n\x04List\x12\x1d\n\x05\x65lems\x18\x01 \x03(\x0b\x32\x0e.api_spec.Data\"u\n\x06Struct\x12,\n\x06\x66ields\x18\x01 \x03(\x0b\x32\x1c.api_spec.Struct.FieldsEntry\x1a=\n\x0b\x46ieldsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x1d\n\x05value\x18\x02 \x01(\x0b\x32\x0e.api_spec.Data:\x02\x38\x01\"\x06\n\x04None\"S\n\x08Optional\x12\x1e\n\x04\x64\x61ta\x18\x01 \x01(\x0b\x32\x0e.api_spec.DataH\x00\x12\x1e\n\x04none\x18\x02 \x01(\x0b\x32\x0e.api_spec.NoneH\x00\x42\x07\n\x05value\"\x92\x01\n\x05OneOf\x12-\n\x07options\x18\x01 \x03(\x0b\x32\x1c.api_spec.OneOf.OptionsEntry\x12\x1a\n\x12potential_conflict\x18\x02 \x01(\x08\x1a>\n\x0cOptionsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x1d\n\x05value\x18\x02 \x01(\x0b\x32\x0e.api_spec.Data:\x02\x38\x01\"\n\n\x08GRPCMeta\"\x17\n\x08HTTPPath\x12\x0b\n\x03key\x18\x01 \x01(\t\"\x18\n\tHTTPQuery\x12\x0b\n\x03key\x18\x01 \x01(\t\"\x19\n\nHTTPHeader\x12\x0b\n\x03key\x18\x01 \x01(\t\"\x83\x02\n\x08HTTPAuth\x12-\n\x04type\x18\x01 \x01(\x0e\x32\x1f.api_spec.HTTPAuth.HTTPAuthType\x12\x1a\n\x12proprietary_header\x18\x02 \x01(\t\"\xab\x01\n\x0cHTTPAuthType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\t\n\x05\x42\x41SIC\x10\x01\x12\n\n\x06\x42\x45\x41RER\x10\x02\x12\n\n\x06\x44IGEST\x10\x03\x12\n\n\x06MUTUAL\x10\x04\x12\t\n\x05OAUTH\x10\x05\x12\t\n\x05VAPID\x10\x06\x12\x0f\n\x0bSCRAM_SHA_1\x10\x07\x12\x11\n\rSCRAM_SHA_256\x10\x08\x12\r\n\tNEGOTIATE\x10\t\x12\x16\n\x12PROPRIETARY_HEADER\x10\n\"\x19\n\nHTTPCookie\x12\x0b\n\x03key\x18\x01 \x01(\t\"\xb1\x01\n\x08HTTPBody\x12\x34\n\x0c\x63ontent_type\x18\x01 \x01(\x0e\x32\x1e.api_spec.HTTPBody.ContentType\"o\n\x0b\x43ontentType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x08\n\x04JSON\x10\x01\x12\x14\n\x10\x46ORM_URL_ENCODED\x10\x02\x12\x10\n\x0cOCTET_STREAM\x10\x03\x12\x07\n\x03PDF\x10\x04\x12\x0e\n\nTEXT_PLAIN\x10\x05\x12\x08\n\x04YAML\x10\x06\"\x1d\n\rHTTPMultipart\x12\x0c\n\x04type\x18\x01 \x01(\t\"\x0b\n\tHTTPEmpty\"\xe3\x02\n\x08HTTPMeta\x12\"\n\x04path\x18\x01 \x01(\x0b\x32\x12.api_spec.HTTPPathH\x00\x12$\n\x05query\x18\x02 \x01(\x0b\x32\x13.api_spec.HTTPQueryH\x00\x12&\n\x06header\x18\x03 \x01(\x0b\x32\x14.api_spec.HTTPHeaderH\x00\x12&\n\x06\x63ookie\x18\x04 \x01(\x0b\x32\x14.api_spec.HTTPCookieH\x00\x12\"\n\x04\x62ody\x18\x05 \x01(\x0b\x32\x12.api_spec.HTTPBodyH\x00\x12$\n\x05\x65mpty\x18\x06 \x01(\x0b\x32\x13.api_spec.HTTPEmptyH\x00\x12\"\n\x04\x61uth\x18\x08 \x01(\x0b\x32\x12.api_spec.HTTPAuthH\x00\x12,\n\tmultipart\x18\t \x01(\x0b\x32\x17.api_spec.HTTPMultipartH\x00\x12\x15\n\rresponse_code\x18\x07 \x01(\x05\x42\n\n\x08location\"Z\n\x08\x44\x61taMeta\x12\"\n\x04grpc\x18\x01 \x01(\x0b\x32\x12.api_spec.GRPCMetaH\x00\x12\"\n\x04http\x18\x02 \x01(\x0b\x32\x12.api_spec.HTTPMetaH\x00\x42\x06\n\x04meta\"\x0e\n\x0c\x45xampleValue\"\x84\x03\n\x04\x44\x61ta\x12(\n\tprimitive\x18\x01 \x01(\x0b\x32\x13.api_spec.PrimitiveH\x00\x12\"\n\x06struct\x18\x02 \x01(\x0b\x32\x10.api_spec.StructH\x00\x12\x1e\n\x04list\x18\x03 \x01(\x0b\x32\x0e.api_spec.ListH\x00\x12&\n\x08optional\x18\x04 \x01(\x0b\x32\x12.api_spec.OptionalH\x00\x12 \n\x05oneof\x18\x06 \x01(\x0b\x32\x0f.api_spec.OneOfH\x00\x12 \n\x04meta\x18\x05 \x01(\x0b\x32\x12.api_spec.DataMeta\x12\x10\n\x08nullable\x18\x07 \x01(\x08\x12\x39\n\x0e\x65xample_values\x18\x08 \x03(\x0b\x32!.api_spec.Data.ExampleValuesEntry\x1aL\n\x12\x45xampleValuesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12%\n\x05value\x18\x02 \x01(\x0b\x32\x16.api_spec.ExampleValue:\x02\x38\x01\x42\x07\n\x05value\"=\n\x08MethodID\x12\x0c\n\x04name\x18\x01 \x01(\t\x12#\n\x08\x61pi_type\x18\x02 \x01(\x0e\x32\x11.api_spec.ApiType\"\x10\n\x0eGRPCMethodMeta\"a\n\x0eHTTPMethodMeta\x12\x0e\n\x06method\x18\x01 \x01(\t\x12\x15\n\rpath_template\x18\x02 \x01(\t\x12\x0c\n\x04host\x18\x03 \x01(\t\x12\x1a\n\x12processing_latency\x18\x04 \x01(\x02\"h\n\nMethodMeta\x12(\n\x04grpc\x18\x01 \x01(\x0b\x32\x18.api_spec.GRPCMethodMetaH\x00\x12(\n\x04http\x18\x02 \x01(\x0b\x32\x18.api_spec.HTTPMethodMetaH\x00\x42\x06\n\x04meta\"\xa9\x02\n\x06Method\x12\x1e\n\x02id\x18\x01 \x01(\x0b\x32\x12.api_spec.MethodID\x12(\n\x04\x61rgs\x18\x02 \x03(\x0b\x32\x1a.api_spec.Method.ArgsEntry\x12\x32\n\tresponses\x18\x03 \x03(\x0b\x32\x1f.api_spec.Method.ResponsesEntry\x12\"\n\x04meta\x18\x04 \x01(\x0b\x32\x14.api_spec.MethodMeta\x1a;\n\tArgsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x1d\n\x05value\x18\x02 \x01(\x0b\x32\x0e.api_spec.Data:\x02\x38\x01\x1a@\n\x0eResponsesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x1d\n\x05value\x18\x02 \x01(\x0b\x32\x0e.api_spec.Data:\x02\x38\x01\x42,Z*akitasoftware.com/superstar/pb/go/api_specb\x06proto3') , dependencies=[api__type__pb2.DESCRIPTOR,types__pb2.DESCRIPTOR,]) @@ -46,11 +46,43 @@ name='BEARER', index=2, number=2, serialized_options=None, type=None), + _descriptor.EnumValueDescriptor( + name='DIGEST', index=3, number=3, + serialized_options=None, + type=None), + _descriptor.EnumValueDescriptor( + name='MUTUAL', index=4, number=4, + serialized_options=None, + type=None), + _descriptor.EnumValueDescriptor( + name='OAUTH', index=5, number=5, + serialized_options=None, + type=None), + _descriptor.EnumValueDescriptor( + name='VAPID', index=6, number=6, + serialized_options=None, + type=None), + _descriptor.EnumValueDescriptor( + name='SCRAM_SHA_1', index=7, number=7, + serialized_options=None, + type=None), + _descriptor.EnumValueDescriptor( + name='SCRAM_SHA_256', index=8, number=8, + serialized_options=None, + type=None), + _descriptor.EnumValueDescriptor( + name='NEGOTIATE', index=9, number=9, + serialized_options=None, + type=None), + _descriptor.EnumValueDescriptor( + name='PROPRIETARY_HEADER', index=10, number=10, + serialized_options=None, + type=None), ], containing_type=None, serialized_options=None, - serialized_start=1755, - serialized_end=1805, + serialized_start=1785, + serialized_end=1956, ) _sym_db.RegisterEnumDescriptor(_HTTPAUTH_HTTPAUTHTYPE) @@ -91,8 +123,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=1901, - serialized_end=2012, + serialized_start=2052, + serialized_end=2163, ) _sym_db.RegisterEnumDescriptor(_HTTPBODY_CONTENTTYPE) @@ -971,6 +1003,13 @@ message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='proprietary_header', full_name='api_spec.HTTPAuth.proprietary_header', index=1, + number=2, type=9, cpp_type=9, label=1, + 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, + serialized_options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -984,8 +1023,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1696, - serialized_end=1805, + serialized_start=1697, + serialized_end=1956, ) @@ -1015,8 +1054,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1807, - serialized_end=1832, + serialized_start=1958, + serialized_end=1983, ) @@ -1047,8 +1086,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1835, - serialized_end=2012, + serialized_start=1986, + serialized_end=2163, ) @@ -1078,8 +1117,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2014, - serialized_end=2043, + serialized_start=2165, + serialized_end=2194, ) @@ -1102,8 +1141,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2045, - serialized_end=2056, + serialized_start=2196, + serialized_end=2207, ) @@ -1192,8 +1231,8 @@ name='location', full_name='api_spec.HTTPMeta.location', index=0, containing_type=None, fields=[]), ], - serialized_start=2059, - serialized_end=2414, + serialized_start=2210, + serialized_end=2565, ) @@ -1233,8 +1272,8 @@ name='meta', full_name='api_spec.DataMeta.meta', index=0, containing_type=None, fields=[]), ], - serialized_start=2416, - serialized_end=2506, + serialized_start=2567, + serialized_end=2657, ) @@ -1257,8 +1296,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2508, - serialized_end=2522, + serialized_start=2659, + serialized_end=2673, ) @@ -1295,8 +1334,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2828, - serialized_end=2904, + serialized_start=2979, + serialized_end=3055, ) _DATA = _descriptor.Descriptor( @@ -1377,8 +1416,8 @@ name='value', full_name='api_spec.Data.value', index=0, containing_type=None, fields=[]), ], - serialized_start=2525, - serialized_end=2913, + serialized_start=2676, + serialized_end=3064, ) @@ -1415,8 +1454,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2915, - serialized_end=2976, + serialized_start=3066, + serialized_end=3127, ) @@ -1439,8 +1478,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2978, - serialized_end=2994, + serialized_start=3129, + serialized_end=3145, ) @@ -1491,8 +1530,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2996, - serialized_end=3093, + serialized_start=3147, + serialized_end=3244, ) @@ -1532,8 +1571,8 @@ name='meta', full_name='api_spec.MethodMeta.meta', index=0, containing_type=None, fields=[]), ], - serialized_start=3095, - serialized_end=3199, + serialized_start=3246, + serialized_end=3350, ) @@ -1570,8 +1609,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=3374, - serialized_end=3433, + serialized_start=3525, + serialized_end=3584, ) _METHOD_RESPONSESENTRY = _descriptor.Descriptor( @@ -1607,8 +1646,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=3435, - serialized_end=3499, + serialized_start=3586, + serialized_end=3650, ) _METHOD = _descriptor.Descriptor( @@ -1658,8 +1697,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=3202, - serialized_end=3499, + serialized_start=3353, + serialized_end=3650, ) _BOOL.fields_by_name['type'].message_type = types__pb2._BOOLTYPE From 532373cae956911f33d765c96e56a5953e4674b8 Mon Sep 17 00:00:00 2001 From: Mark Gritter Date: Fri, 9 Jul 2021 14:11:29 -0500 Subject: [PATCH 2/5] Updated with complete IANA list and a couple non-IETF extensions --- go/api_spec/method.pb.go | 252 +++++++++++++++++++----------------- proto/api_spec/method.proto | 27 +++- py/api_spec/method_pb2.py | 88 +++++++------ 3 files changed, 204 insertions(+), 163 deletions(-) diff --git a/go/api_spec/method.pb.go b/go/api_spec/method.pb.go index 86fbe7a..f0b7c3d 100644 --- a/go/api_spec/method.pb.go +++ b/go/api_spec/method.pb.go @@ -23,11 +23,13 @@ const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type HTTPAuth_HTTPAuthType int32 const ( - HTTPAuth_UNKNOWN HTTPAuth_HTTPAuthType = 0 - HTTPAuth_BASIC HTTPAuth_HTTPAuthType = 1 - HTTPAuth_BEARER HTTPAuth_HTTPAuthType = 2 - // Less common types listed at https://www.iana.org/assignments/http-authschemes/http-authschemes.xhtml - // excluded HOBA as I couldn't find any references to its use. + // + // Standard types (IETF/IANA) + // https://www.iana.org/assignments/http-authschemes/http-authschemes.xhtml + // + HTTPAuth_UNKNOWN HTTPAuth_HTTPAuthType = 0 + HTTPAuth_BASIC HTTPAuth_HTTPAuthType = 1 + HTTPAuth_BEARER HTTPAuth_HTTPAuthType = 2 HTTPAuth_DIGEST HTTPAuth_HTTPAuthType = 3 HTTPAuth_MUTUAL HTTPAuth_HTTPAuthType = 4 HTTPAuth_OAUTH HTTPAuth_HTTPAuthType = 5 @@ -35,10 +37,16 @@ const ( HTTPAuth_SCRAM_SHA_1 HTTPAuth_HTTPAuthType = 7 HTTPAuth_SCRAM_SHA_256 HTTPAuth_HTTPAuthType = 8 HTTPAuth_NEGOTIATE HTTPAuth_HTTPAuthType = 9 + HTTPAuth_HOBA HTTPAuth_HTTPAuthType = 10 // An application-specific authorization header, such as // Github webhook's X-Hub-Signature-256 or X-Hub-Signature, - // not carried in "Authorization". - HTTPAuth_PROPRIETARY_HEADER HTTPAuth_HTTPAuthType = 10 + // *not* carried in "Authorization". + HTTPAuth_PROPRIETARY_HEADER HTTPAuth_HTTPAuthType = 11 + // AWS request signing + HTTPAuth_AWS4_HMAC_SHA256 HTTPAuth_HTTPAuthType = 12 + // NTLM-over-HTTP + // https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-ntht/f09cf6e1-529e-403b-a8a5-7368ee096a6a + HTTPAuth_NTLM HTTPAuth_HTTPAuthType = 13 ) var HTTPAuth_HTTPAuthType_name = map[int32]string{ @@ -52,7 +60,10 @@ var HTTPAuth_HTTPAuthType_name = map[int32]string{ 7: "SCRAM_SHA_1", 8: "SCRAM_SHA_256", 9: "NEGOTIATE", - 10: "PROPRIETARY_HEADER", + 10: "HOBA", + 11: "PROPRIETARY_HEADER", + 12: "AWS4_HMAC_SHA256", + 13: "NTLM", } var HTTPAuth_HTTPAuthType_value = map[string]int32{ @@ -66,7 +77,10 @@ var HTTPAuth_HTTPAuthType_value = map[string]int32{ "SCRAM_SHA_1": 7, "SCRAM_SHA_256": 8, "NEGOTIATE": 9, - "PROPRIETARY_HEADER": 10, + "HOBA": 10, + "PROPRIETARY_HEADER": 11, + "AWS4_HMAC_SHA256": 12, + "NTLM": 13, } func (x HTTPAuth_HTTPAuthType) String() string { @@ -2186,113 +2200,115 @@ func init() { func init() { proto.RegisterFile("method.proto", fileDescriptor_4d10d17d32e60d7d) } var fileDescriptor_4d10d17d32e60d7d = []byte{ - // 1722 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0xdd, 0x72, 0xe3, 0x48, - 0x15, 0x8e, 0x7f, 0x23, 0x1f, 0x3b, 0x5e, 0xa5, 0x67, 0x18, 0x5c, 0x66, 0xd9, 0x19, 0xb4, 0x53, - 0xec, 0xd4, 0x32, 0x38, 0xe0, 0xc9, 0x06, 0x6a, 0xaa, 0xb8, 0x90, 0x7f, 0x12, 0x7b, 0x37, 0x89, - 0x8d, 0xe2, 0x2c, 0xbb, 0xdc, 0xa8, 0x14, 0xbb, 0x1d, 0xab, 0x22, 0xab, 0x85, 0xd4, 0x5e, 0xf0, - 0x23, 0x70, 0xc7, 0x03, 0x70, 0xc9, 0x1d, 0x3c, 0x01, 0x17, 0xbc, 0x07, 0x55, 0x3c, 0x0c, 0x75, - 0xba, 0x5b, 0xb2, 0xe4, 0x9f, 0xb9, 0x99, 0xbb, 0x76, 0x9f, 0xef, 0xfc, 0xf4, 0x39, 0x5f, 0x9f, - 0xd3, 0x32, 0xd4, 0x96, 0x94, 0x2f, 0xd8, 0xac, 0x15, 0x84, 0x8c, 0x33, 0xa2, 0x39, 0x81, 0x6b, - 0x47, 0x01, 0x9d, 0x36, 0xeb, 0xb8, 0xe2, 0xeb, 0x80, 0x4a, 0x49, 0xb3, 0x8a, 0xeb, 0x48, 0xfe, - 0x30, 0x7a, 0x50, 0xec, 0x30, 0xe6, 0x91, 0x9f, 0x43, 0x11, 0xb7, 0x1b, 0xb9, 0x57, 0xb9, 0x37, - 0xd5, 0x36, 0x69, 0xc5, 0xda, 0x2d, 0x94, 0x4e, 0xd6, 0x01, 0xb5, 0x84, 0x9c, 0x3c, 0x87, 0xd2, - 0x0f, 0x8e, 0xb7, 0xa2, 0x8d, 0xfc, 0xab, 0xdc, 0x1b, 0xcd, 0x92, 0x3f, 0x8c, 0x4b, 0x28, 0x75, - 0xd6, 0x9c, 0x46, 0xe4, 0x8b, 0x8c, 0x99, 0x67, 0x29, 0x33, 0x28, 0x3e, 0x64, 0xa7, 0x16, 0xdb, - 0x19, 0x40, 0xf9, 0x8e, 0x87, 0xae, 0xff, 0x48, 0xde, 0x64, 0x0c, 0x3d, 0xdf, 0x18, 0x92, 0xf2, - 0x43, 0x96, 0x2a, 0xa9, 0x88, 0x86, 0x3e, 0x7f, 0xd7, 0x3e, 0x1c, 0x91, 0x10, 0x1f, 0xb2, 0x53, - 0xca, 0xda, 0xb9, 0x38, 0xff, 0xa0, 0x9d, 0x8b, 0xf3, 0x43, 0x76, 0x0a, 0xa9, 0x93, 0xdd, 0xbb, - 0x22, 0xa0, 0x83, 0x27, 0x93, 0xf2, 0x43, 0x96, 0x4e, 0xb6, 0x2c, 0x5d, 0x9c, 0x7f, 0xd8, 0xd2, - 0xe1, 0x98, 0x8a, 0x29, 0x4b, 0x3d, 0xb6, 0x7a, 0xf0, 0xe8, 0x61, 0x4b, 0x52, 0x7e, 0xc8, 0x52, - 0x2e, 0x95, 0xa5, 0x4b, 0x8f, 0x39, 0xfc, 0x70, 0x96, 0x84, 0xf8, 0x90, 0x9d, 0x7c, 0x6c, 0xe7, - 0x1f, 0x65, 0xa8, 0x8c, 0x43, 0x77, 0xe9, 0x72, 0xf7, 0x07, 0x4a, 0x7e, 0x02, 0x15, 0xc4, 0xda, - 0x0b, 0xd7, 0xe7, 0xc2, 0x62, 0xc5, 0xd2, 0x70, 0x63, 0xe0, 0xfa, 0x9c, 0x9c, 0x01, 0x3c, 0x30, - 0xe6, 0xd9, 0x1b, 0x2b, 0xd5, 0x76, 0x3d, 0x4b, 0xdb, 0xc1, 0x91, 0x55, 0x41, 0xcc, 0xb7, 0x08, - 0x21, 0x6d, 0xa8, 0x3e, 0x20, 0x09, 0x95, 0x46, 0x41, 0x68, 0x7c, 0xb2, 0xc5, 0xd0, 0xc1, 0x91, - 0x05, 0x02, 0x25, 0x75, 0xbe, 0x82, 0x5a, 0x24, 0xf8, 0xa6, 0x94, 0x8a, 0x42, 0x49, 0xdf, 0x66, - 0xe3, 0xe0, 0xc8, 0xaa, 0x4a, 0x5c, 0xe2, 0x4a, 0xd4, 0x52, 0x69, 0x95, 0xb6, 0x5d, 0x09, 0xea, - 0xa1, 0x2b, 0x81, 0x4a, 0xeb, 0x5c, 0x9c, 0x2b, 0x9d, 0xf2, 0x1e, 0x9d, 0x8b, 0x73, 0xa5, 0x73, - 0x71, 0x9e, 0x84, 0xb7, 0x4a, 0x3b, 0x3a, 0xde, 0x0e, 0x4f, 0x52, 0x0a, 0xc3, 0x5b, 0xa5, 0x5c, - 0x29, 0xb5, 0xc4, 0x97, 0xb6, 0x4f, 0x4d, 0x38, 0xab, 0xae, 0xb2, 0xde, 0x66, 0x82, 0x0e, 0x4a, - 0xad, 0xb2, 0xad, 0x26, 0xc9, 0x82, 0x6a, 0x12, 0x97, 0x1c, 0x6c, 0x8e, 0xc5, 0x57, 0x5a, 0xb0, - 0x7d, 0x30, 0xc1, 0x0c, 0x3c, 0x98, 0x40, 0x49, 0x9d, 0x2b, 0x38, 0x75, 0x9e, 0x5c, 0xee, 0xd8, - 0x8e, 0xef, 0x33, 0xee, 0x70, 0x97, 0xf9, 0x51, 0xa3, 0x2a, 0x34, 0x9b, 0x1b, 0x4d, 0x13, 0x21, - 0xe6, 0x06, 0x61, 0xe9, 0xce, 0xd6, 0x0e, 0x69, 0xc3, 0x8f, 0xa6, 0xcc, 0xe7, 0x8e, 0xeb, 0x47, - 0x76, 0xe8, 0xf8, 0x33, 0xb6, 0x54, 0x61, 0xd4, 0x44, 0xfb, 0x7a, 0x16, 0x0b, 0x2d, 0x21, 0x93, - 0xce, 0xdf, 0xc3, 0xf1, 0x9c, 0x85, 0x4b, 0x87, 0x47, 0x8d, 0x93, 0x57, 0x85, 0x37, 0xd5, 0xf6, - 0xab, 0x8d, 0xcb, 0x84, 0x9c, 0xad, 0x4b, 0x09, 0xe9, 0xfb, 0x3c, 0x5c, 0x5b, 0xb1, 0x02, 0x79, - 0x09, 0x55, 0xb9, 0xb4, 0x9f, 0x5c, 0x7f, 0xd6, 0xa8, 0x0b, 0xd2, 0x82, 0xdc, 0xfa, 0xc6, 0xf5, - 0x67, 0xcd, 0xf7, 0x50, 0x4b, 0x6b, 0x12, 0x1d, 0x0a, 0x4f, 0x74, 0xad, 0xd8, 0x8d, 0xcb, 0xfd, - 0x1d, 0xf6, 0x7d, 0xfe, 0xb7, 0xb9, 0xce, 0xb1, 0x92, 0x18, 0x6f, 0xa1, 0x78, 0xed, 0x46, 0x9c, - 0xbc, 0x86, 0x12, 0xf5, 0xe8, 0x32, 0x6a, 0xe4, 0x44, 0x9c, 0x29, 0xfa, 0xf7, 0x1c, 0xee, 0x58, - 0x52, 0x68, 0xfc, 0x35, 0x27, 0xba, 0xea, 0x6a, 0xca, 0xc9, 0x39, 0x94, 0xe7, 0x2e, 0xf5, 0x66, - 0xb1, 0xc6, 0xa7, 0x19, 0x26, 0xaf, 0xa6, 0xbc, 0x75, 0x29, 0xc4, 0xf2, 0x54, 0x0a, 0xdb, 0x1c, - 0x42, 0x35, 0xb5, 0xbd, 0x27, 0xe4, 0xd7, 0xe9, 0x90, 0xf7, 0xc4, 0x91, 0x1c, 0xc1, 0x28, 0x43, - 0xf1, 0x96, 0xf9, 0xd4, 0xb0, 0x41, 0x1b, 0x05, 0x58, 0x22, 0xc7, 0x23, 0xaf, 0xa1, 0x38, 0x73, - 0xb8, 0xa3, 0x7a, 0xc6, 0x96, 0xf2, 0xe0, 0xc8, 0x12, 0x52, 0x44, 0xf9, 0xcc, 0xdf, 0xe3, 0x02, - 0xed, 0x21, 0x0a, 0xa5, 0x9b, 0x14, 0xfd, 0x3b, 0x07, 0xa5, 0x91, 0x4f, 0x47, 0x73, 0x72, 0x01, - 0xc7, 0x2c, 0x90, 0x0c, 0xda, 0x39, 0xb4, 0x40, 0xb4, 0x64, 0x24, 0x71, 0x29, 0x15, 0x98, 0xfc, - 0x12, 0x48, 0xc0, 0x38, 0xf5, 0xb9, 0xeb, 0x78, 0xf6, 0x94, 0xf9, 0x73, 0xcf, 0x9d, 0x72, 0x55, - 0x94, 0xd3, 0x44, 0xd2, 0x55, 0x82, 0xe6, 0xd7, 0x50, 0x4b, 0xdb, 0xf9, 0xa8, 0x2c, 0x01, 0x68, - 0x57, 0xd6, 0xb8, 0x7b, 0x43, 0xb9, 0x63, 0x7c, 0x0a, 0xda, 0x60, 0x32, 0x19, 0x8f, 0x1d, 0xbe, - 0xd8, 0xb5, 0x69, 0xfc, 0x14, 0x2a, 0x28, 0xfd, 0xfd, 0x8a, 0xee, 0x73, 0x69, 0x7c, 0x06, 0x80, - 0xe2, 0x01, 0x75, 0x66, 0x34, 0xdc, 0x23, 0xff, 0x7b, 0x5e, 0x5a, 0x37, 0x57, 0x7c, 0x41, 0xde, - 0xa5, 0x7a, 0x77, 0xbd, 0xfd, 0x72, 0x13, 0x5e, 0x8c, 0x48, 0x16, 0xa9, 0x3e, 0x8e, 0x59, 0x0a, - 0x59, 0x10, 0xba, 0x94, 0x3b, 0xe1, 0xda, 0x5e, 0x08, 0x4f, 0x6a, 0x14, 0x9f, 0xa6, 0x24, 0x32, - 0x04, 0xe3, 0x9f, 0x39, 0xa8, 0xa5, 0xad, 0x90, 0x2a, 0x1c, 0xdf, 0xdf, 0x7e, 0x73, 0x3b, 0xfa, - 0xc3, 0xad, 0x7e, 0x44, 0x2a, 0x50, 0xea, 0x98, 0x77, 0xc3, 0xae, 0x9e, 0x23, 0x00, 0xe5, 0x4e, - 0xdf, 0xb4, 0xfa, 0x96, 0x9e, 0xc7, 0x75, 0x6f, 0x78, 0xd5, 0xbf, 0x9b, 0xe8, 0x05, 0x5c, 0xdf, - 0xdc, 0x4f, 0xee, 0xcd, 0x6b, 0xbd, 0x88, 0xf0, 0x91, 0x79, 0x3f, 0x19, 0xe8, 0x25, 0x5c, 0x7e, - 0x6b, 0x8e, 0x87, 0x3d, 0xbd, 0x4c, 0x3e, 0x81, 0xea, 0x5d, 0xd7, 0x32, 0x6f, 0xec, 0xbb, 0x81, - 0x69, 0xff, 0x5a, 0x3f, 0x26, 0xa7, 0x70, 0xb2, 0xd9, 0x68, 0x7f, 0x75, 0xa1, 0x6b, 0xe4, 0x04, - 0x2a, 0xb7, 0xfd, 0xab, 0xd1, 0x64, 0x68, 0x4e, 0xfa, 0x7a, 0x85, 0xbc, 0x00, 0x32, 0xb6, 0x46, - 0x63, 0x6b, 0xd8, 0x9f, 0x98, 0xd6, 0xf7, 0xf6, 0xa0, 0x6f, 0xf6, 0xfa, 0x96, 0x0e, 0x71, 0xfa, - 0xba, 0x8c, 0x3d, 0xb9, 0x74, 0x4f, 0xfa, 0xfe, 0x93, 0x93, 0xe9, 0xeb, 0xb0, 0xd9, 0x9a, 0x98, - 0x50, 0xc3, 0x6e, 0x42, 0x7d, 0x6e, 0xa7, 0xd2, 0xf8, 0x59, 0x36, 0x8d, 0x88, 0x6c, 0x75, 0x25, - 0x4c, 0x64, 0xb1, 0x3a, 0xdd, 0xfc, 0x30, 0x18, 0x54, 0x53, 0xb2, 0x6c, 0x6e, 0x34, 0x28, 0x7e, - 0x7d, 0x37, 0xba, 0xd5, 0x73, 0xe4, 0x39, 0xe8, 0x97, 0x23, 0xeb, 0xc6, 0xbe, 0xb7, 0xae, 0xed, - 0xfe, 0x6d, 0x77, 0xd4, 0xeb, 0xf7, 0xf4, 0x3c, 0xd1, 0xa1, 0x36, 0xea, 0x4e, 0xfa, 0x13, 0xfb, - 0x6e, 0x62, 0xf5, 0xcd, 0x1b, 0xbd, 0x40, 0x8e, 0xa1, 0x30, 0xee, 0x5d, 0xea, 0x45, 0x52, 0x07, - 0x98, 0xf4, 0xbf, 0x9b, 0xd8, 0xe3, 0x6b, 0x73, 0x78, 0xab, 0x97, 0xd0, 0xd4, 0xf7, 0xe6, 0xcd, - 0xb5, 0x5e, 0x36, 0x3e, 0x87, 0x13, 0x8c, 0xea, 0x66, 0xe5, 0x71, 0x37, 0x70, 0x42, 0x4e, 0x48, - 0x8a, 0x03, 0x15, 0x59, 0x62, 0xa3, 0x2a, 0x39, 0xd6, 0x5f, 0x06, 0x7c, 0x6d, 0xfc, 0xab, 0x20, - 0x8f, 0x8c, 0xdc, 0xc4, 0x67, 0x43, 0xe0, 0xf0, 0xc5, 0xee, 0xa3, 0x31, 0x66, 0x2c, 0xde, 0x4b, - 0x44, 0x90, 0x5f, 0x40, 0xe9, 0x4f, 0xc8, 0x51, 0xc5, 0xfd, 0x67, 0x59, 0xa8, 0xa0, 0xef, 0xe0, - 0xc8, 0x92, 0x18, 0xd2, 0x82, 0xb2, 0xe2, 0x51, 0x61, 0xfb, 0x3d, 0xb2, 0x61, 0xf3, 0xe0, 0xc8, - 0x52, 0x28, 0xc4, 0x4f, 0x45, 0x89, 0xd4, 0x7c, 0xde, 0xc2, 0xcb, 0xf2, 0x21, 0x5e, 0xa2, 0x30, - 0xec, 0x07, 0x36, 0x5b, 0xab, 0xb9, 0x4c, 0x76, 0x2b, 0x84, 0x61, 0x23, 0x02, 0xc3, 0xa6, 0x78, - 0x6c, 0x35, 0x8e, 0xb7, 0xc2, 0x16, 0x19, 0xc1, 0xb0, 0x05, 0x06, 0xcd, 0x3a, 0x2b, 0xbe, 0x50, - 0xe3, 0x94, 0xec, 0xde, 0x1f, 0x34, 0x8b, 0x08, 0xf2, 0x1b, 0xa8, 0x2c, 0xe3, 0x94, 0xab, 0x31, - 0xfa, 0xe3, 0x2c, 0x3c, 0xa9, 0x08, 0xbe, 0x61, 0x12, 0x2c, 0xf9, 0x1c, 0x4e, 0x42, 0x1a, 0x05, - 0xcc, 0x8f, 0xa8, 0x3d, 0x65, 0x33, 0x39, 0xf1, 0x4b, 0x56, 0x2d, 0xde, 0xec, 0xb2, 0x19, 0xed, - 0x00, 0x68, 0x1e, 0x9b, 0x8a, 0x01, 0x68, 0xcc, 0x41, 0xc3, 0xe6, 0x12, 0x57, 0xeb, 0x31, 0x0c, - 0xa6, 0xbb, 0xd5, 0x8a, 0x7b, 0x0d, 0xc6, 0x87, 0x08, 0x44, 0x2e, 0x38, 0x0f, 0x54, 0xb1, 0xb6, - 0x4e, 0x12, 0x23, 0x11, 0xd1, 0x29, 0x43, 0x71, 0x89, 0x5d, 0xaa, 0x0e, 0xb5, 0xfe, 0x5f, 0x9c, - 0x65, 0xa0, 0x86, 0xbe, 0xf1, 0xdf, 0x02, 0x14, 0xd1, 0x31, 0x79, 0x07, 0x95, 0x20, 0x9e, 0x99, - 0xbb, 0xaf, 0xc2, 0x64, 0x9c, 0xe2, 0x31, 0x13, 0x1c, 0xf9, 0x12, 0xca, 0x91, 0x18, 0x47, 0x2a, - 0x02, 0x7d, 0x7b, 0x4c, 0x61, 0x31, 0x25, 0x02, 0xe7, 0x82, 0xe7, 0x46, 0x5c, 0x51, 0x25, 0xd5, - 0x54, 0x71, 0x42, 0x62, 0x9c, 0x28, 0x25, 0xbf, 0x02, 0x8d, 0xa9, 0x79, 0xa3, 0x48, 0x92, 0x3a, - 0x55, 0x3c, 0x89, 0x06, 0x47, 0x56, 0x82, 0x22, 0x5f, 0x40, 0x89, 0xf9, 0x94, 0xcd, 0x77, 0x5f, - 0x62, 0x62, 0x68, 0x60, 0xd9, 0x85, 0x1c, 0xbf, 0x9c, 0x30, 0x05, 0xbb, 0x6c, 0x8a, 0x13, 0x6f, - 0x09, 0x39, 0x69, 0x82, 0xe6, 0xaf, 0x3c, 0xcf, 0x79, 0xf0, 0x64, 0xd9, 0x34, 0x2b, 0xf9, 0x4d, - 0x06, 0x50, 0xa7, 0x32, 0x7d, 0xf2, 0x79, 0x12, 0x35, 0x34, 0x31, 0xaa, 0x7e, 0x96, 0xb5, 0xd6, - 0x4a, 0xe7, 0x58, 0xcd, 0xab, 0x13, 0x9a, 0xde, 0x6b, 0x7e, 0x07, 0x64, 0x17, 0xb4, 0x67, 0x18, - 0xbd, 0xcd, 0x0e, 0xa3, 0x17, 0x1b, 0x47, 0x69, 0xf5, 0xbd, 0xaf, 0x8f, 0x6b, 0xd0, 0x6e, 0xc4, - 0x97, 0xe6, 0xb0, 0x87, 0xfd, 0xc2, 0x77, 0x96, 0x49, 0xbf, 0xc0, 0x35, 0x79, 0x0b, 0x5a, 0xfc, - 0xc5, 0x29, 0xac, 0xd7, 0xdb, 0xa7, 0xa9, 0x37, 0x5b, 0xe0, 0x8a, 0xbe, 0x77, 0xec, 0xc8, 0x85, - 0xa1, 0x43, 0x5d, 0xf1, 0x6f, 0xc1, 0x66, 0x62, 0xe2, 0xfd, 0x2d, 0x07, 0x75, 0x45, 0x34, 0xb5, - 0x45, 0x5e, 0x40, 0x59, 0x7e, 0xdc, 0x2a, 0x47, 0xea, 0x17, 0xde, 0x07, 0x6c, 0x2f, 0x36, 0xa7, - 0xcb, 0xc0, 0x73, 0x78, 0xfc, 0x0d, 0x58, 0xc3, 0xcd, 0x89, 0xda, 0xc3, 0x18, 0x17, 0x4c, 0x31, - 0xa4, 0x62, 0x89, 0xb5, 0x1a, 0x5b, 0x53, 0x1a, 0x45, 0xf8, 0xb8, 0x47, 0x98, 0x3f, 0x5d, 0x0b, - 0x66, 0xe4, 0xc5, 0xd8, 0x52, 0x92, 0x6b, 0x29, 0x30, 0x38, 0x40, 0x2a, 0x9a, 0x56, 0xe6, 0x22, - 0x35, 0x76, 0x2e, 0x92, 0xc2, 0x25, 0xd7, 0xa9, 0x95, 0xb9, 0x4e, 0x8d, 0x9d, 0xeb, 0x94, 0xc2, - 0x67, 0x2e, 0xd5, 0xff, 0xf2, 0x50, 0x96, 0x62, 0x62, 0x40, 0xde, 0x9d, 0xed, 0xde, 0xdc, 0xb8, - 0x0e, 0x56, 0xde, 0x9d, 0xa1, 0x1b, 0x27, 0x7c, 0x8c, 0x1a, 0x79, 0x41, 0x9d, 0xe6, 0x36, 0xaa, - 0x65, 0x86, 0x8f, 0x8a, 0x33, 0x02, 0x47, 0x7e, 0x07, 0x95, 0xb8, 0x6f, 0x44, 0x8d, 0x82, 0x50, - 0x7a, 0xb9, 0xa3, 0x64, 0xc5, 0x08, 0xa9, 0xb9, 0xd1, 0xc0, 0x26, 0x21, 0x78, 0xbf, 0xd3, 0x73, - 0x37, 0x27, 0x92, 0xcc, 0x6f, 0x5e, 0x41, 0x25, 0xf1, 0xfd, 0x31, 0xef, 0xa2, 0xe6, 0x35, 0xd4, - 0xb3, 0xf1, 0x7c, 0x8c, 0xb5, 0xce, 0xdb, 0x3f, 0x7e, 0x29, 0xbe, 0x17, 0x22, 0x36, 0xe7, 0x7f, - 0x76, 0x42, 0xda, 0x9a, 0xb2, 0xe5, 0x59, 0xb4, 0x0a, 0x68, 0x18, 0x71, 0x27, 0x3c, 0x0b, 0x1e, - 0xce, 0x1e, 0xd9, 0x59, 0xac, 0xfd, 0x50, 0x16, 0xff, 0x97, 0xbc, 0xfb, 0x7f, 0x00, 0x00, 0x00, - 0xff, 0xff, 0xd0, 0x4f, 0x68, 0x5d, 0x66, 0x11, 0x00, 0x00, + // 1751 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0xcd, 0x72, 0xe3, 0xb8, + 0x11, 0xb6, 0x7e, 0x4d, 0xb5, 0x64, 0x2d, 0x8d, 0x99, 0x4c, 0x54, 0xca, 0x66, 0x67, 0xc2, 0x9d, + 0xca, 0x4e, 0x6d, 0x26, 0x72, 0xa2, 0xf1, 0x3a, 0xa9, 0xa9, 0xca, 0x81, 0xfa, 0xb1, 0xa5, 0x5d, + 0xfd, 0x85, 0x96, 0xf7, 0x27, 0x17, 0x16, 0x2d, 0xc1, 0x16, 0xcb, 0x14, 0xc1, 0x90, 0xd0, 0x26, + 0x7a, 0x84, 0xdc, 0xf2, 0x10, 0x39, 0xe6, 0x09, 0x72, 0xc8, 0x31, 0x6f, 0x90, 0x43, 0xaa, 0xf2, + 0x30, 0x5b, 0x0d, 0x80, 0x14, 0xf5, 0xb7, 0x97, 0xb9, 0x41, 0xe8, 0xaf, 0x3f, 0x34, 0x1a, 0x1f, + 0xba, 0x41, 0x41, 0x65, 0x49, 0xf9, 0x82, 0xcd, 0x1b, 0x41, 0xc8, 0x38, 0x23, 0x9a, 0x13, 0xb8, + 0x76, 0x14, 0xd0, 0x59, 0xbd, 0x8a, 0x23, 0xbe, 0x0e, 0xa8, 0xb4, 0xd4, 0xcb, 0x38, 0x8e, 0xe4, + 0x0f, 0xa3, 0x03, 0xf9, 0x16, 0x63, 0x1e, 0xf9, 0x25, 0xe4, 0x71, 0xba, 0x96, 0x79, 0x95, 0x79, + 0x53, 0x6e, 0x92, 0x46, 0xec, 0xdd, 0x40, 0xeb, 0x74, 0x1d, 0x50, 0x4b, 0xd8, 0xc9, 0x73, 0x28, + 0x7c, 0xef, 0x78, 0x2b, 0x5a, 0xcb, 0xbe, 0xca, 0xbc, 0xd1, 0x2c, 0xf9, 0xc3, 0xb8, 0x86, 0x42, + 0x6b, 0xcd, 0x69, 0x44, 0x3e, 0xdb, 0xa2, 0x79, 0x96, 0xa2, 0x41, 0xf3, 0x31, 0x9e, 0x4a, 0xcc, + 0xd3, 0x83, 0xe2, 0x2d, 0x0f, 0x5d, 0xff, 0x91, 0xbc, 0xd9, 0x22, 0x7a, 0xbe, 0x21, 0x92, 0xf6, + 0x63, 0x4c, 0xa5, 0x54, 0x44, 0x7d, 0x9f, 0xbf, 0x6b, 0x1e, 0x8f, 0x48, 0x98, 0x8f, 0xf1, 0x14, + 0xb6, 0x79, 0xae, 0x2e, 0x7f, 0x94, 0xe7, 0xea, 0xf2, 0x18, 0x4f, 0x2e, 0xb5, 0xb3, 0x3b, 0x57, + 0x04, 0x74, 0x74, 0x67, 0xd2, 0x7e, 0x8c, 0xe9, 0x6c, 0x87, 0xe9, 0xea, 0xf2, 0xc7, 0x99, 0x8e, + 0xc7, 0x94, 0x4f, 0x31, 0x75, 0xd8, 0xea, 0xde, 0xa3, 0xc7, 0x99, 0xa4, 0xfd, 0x18, 0x53, 0x26, + 0x95, 0xa5, 0x6b, 0x8f, 0x39, 0xfc, 0x78, 0x96, 0x84, 0xf9, 0x18, 0x4f, 0x36, 0xe6, 0xf9, 0x47, + 0x11, 0x4a, 0x93, 0xd0, 0x5d, 0xba, 0xdc, 0xfd, 0x9e, 0x92, 0x9f, 0x41, 0x09, 0xb1, 0xf6, 0xc2, + 0xf5, 0xb9, 0x60, 0x2c, 0x59, 0x1a, 0x4e, 0xf4, 0x5c, 0x9f, 0x93, 0x0b, 0x80, 0x7b, 0xc6, 0x3c, + 0x7b, 0xc3, 0x52, 0x6e, 0x56, 0xb7, 0x65, 0xdb, 0x3b, 0xb1, 0x4a, 0x88, 0xf9, 0x1a, 0x21, 0xa4, + 0x09, 0xe5, 0x7b, 0x14, 0xa1, 0xf2, 0xc8, 0x09, 0x8f, 0x8f, 0x76, 0x14, 0xda, 0x3b, 0xb1, 0x40, + 0xa0, 0xa4, 0xcf, 0x17, 0x50, 0x89, 0x84, 0xde, 0x94, 0x53, 0x5e, 0x38, 0xe9, 0xbb, 0x6a, 0xec, + 0x9d, 0x58, 0x65, 0x89, 0x4b, 0x96, 0x12, 0x67, 0xa9, 0xbc, 0x0a, 0xbb, 0x4b, 0x09, 0xe9, 0xe1, + 0x52, 0x02, 0x95, 0xf6, 0xb9, 0xba, 0x54, 0x3e, 0xc5, 0x03, 0x3e, 0x57, 0x97, 0xca, 0xe7, 0xea, + 0x32, 0x09, 0x6f, 0x95, 0x5e, 0xe8, 0x74, 0x37, 0x3c, 0x29, 0x29, 0x0c, 0x6f, 0x95, 0x5a, 0x4a, + 0xb9, 0x25, 0x6b, 0x69, 0x87, 0xdc, 0xc4, 0x62, 0xe5, 0xd5, 0xf6, 0x6a, 0x73, 0x21, 0x07, 0xe5, + 0x56, 0xda, 0x75, 0x93, 0x62, 0x41, 0x37, 0x89, 0x4b, 0x36, 0xf6, 0x80, 0x87, 0xaf, 0xbc, 0x60, + 0x77, 0x63, 0x42, 0x19, 0xb8, 0x31, 0x81, 0x92, 0x3e, 0x37, 0x70, 0xee, 0x3c, 0xb9, 0xdc, 0xb1, + 0x1d, 0xdf, 0x67, 0xdc, 0xe1, 0x2e, 0xf3, 0xa3, 0x5a, 0x59, 0x78, 0xd6, 0x37, 0x9e, 0x26, 0x42, + 0xcc, 0x0d, 0xc2, 0xd2, 0x9d, 0x9d, 0x19, 0xd2, 0x84, 0x9f, 0xcc, 0x98, 0xcf, 0x1d, 0xd7, 0x8f, + 0xec, 0xd0, 0xf1, 0xe7, 0x6c, 0xa9, 0xc2, 0xa8, 0x88, 0xf2, 0xf5, 0x2c, 0x36, 0x5a, 0xc2, 0x26, + 0x17, 0x7f, 0x0f, 0xa7, 0x0f, 0x2c, 0x5c, 0x3a, 0x3c, 0xaa, 0x9d, 0xbd, 0xca, 0xbd, 0x29, 0x37, + 0x5f, 0x6d, 0x96, 0x4c, 0xc4, 0xd9, 0xb8, 0x96, 0x90, 0xae, 0xcf, 0xc3, 0xb5, 0x15, 0x3b, 0x90, + 0x97, 0x50, 0x96, 0x43, 0xfb, 0xc9, 0xf5, 0xe7, 0xb5, 0xaa, 0x10, 0x2d, 0xc8, 0xa9, 0xaf, 0x5c, + 0x7f, 0x5e, 0x7f, 0x0f, 0x95, 0xb4, 0x27, 0xd1, 0x21, 0xf7, 0x44, 0xd7, 0x4a, 0xdd, 0x38, 0x3c, + 0x5c, 0x61, 0xdf, 0x67, 0x7f, 0x9f, 0x69, 0x9d, 0x2a, 0x8b, 0xf1, 0x16, 0xf2, 0x03, 0x37, 0xe2, + 0xe4, 0x35, 0x14, 0xa8, 0x47, 0x97, 0x51, 0x2d, 0x23, 0xe2, 0x4c, 0xc9, 0xbf, 0xe3, 0x70, 0xc7, + 0x92, 0x46, 0xe3, 0x6f, 0x19, 0x51, 0x55, 0x57, 0x33, 0x4e, 0x2e, 0xa1, 0xf8, 0xe0, 0x52, 0x6f, + 0x1e, 0x7b, 0x7c, 0xbc, 0xa5, 0xe4, 0xd5, 0x8c, 0x37, 0xae, 0x85, 0x59, 0xee, 0x4a, 0x61, 0xeb, + 0x7d, 0x28, 0xa7, 0xa6, 0x0f, 0x84, 0xfc, 0x3a, 0x1d, 0xf2, 0x81, 0x38, 0x92, 0x2d, 0x18, 0x45, + 0xc8, 0x8f, 0x98, 0x4f, 0x0d, 0x1b, 0xb4, 0x71, 0x80, 0x47, 0xe4, 0x78, 0xe4, 0x35, 0xe4, 0xe7, + 0x0e, 0x77, 0x54, 0xcd, 0xd8, 0x71, 0xee, 0x9d, 0x58, 0xc2, 0x8a, 0x28, 0x9f, 0xf9, 0x07, 0x96, + 0x40, 0x3e, 0x44, 0xa1, 0x75, 0x93, 0xa2, 0x7f, 0x65, 0xa0, 0x30, 0xf6, 0xe9, 0xf8, 0x81, 0x5c, + 0xc1, 0x29, 0x0b, 0xa4, 0x82, 0xf6, 0x36, 0x2d, 0x10, 0x0d, 0x19, 0x49, 0x7c, 0x94, 0x0a, 0x4c, + 0x7e, 0x0d, 0x24, 0x60, 0x9c, 0xfa, 0xdc, 0x75, 0x3c, 0x7b, 0xc6, 0xfc, 0x07, 0xcf, 0x9d, 0x71, + 0x75, 0x28, 0xe7, 0x89, 0xa5, 0xad, 0x0c, 0xf5, 0x2f, 0xa1, 0x92, 0xe6, 0xf9, 0xa0, 0x2c, 0x01, + 0x68, 0x37, 0xd6, 0xa4, 0x3d, 0xa4, 0xdc, 0x31, 0x3e, 0x06, 0xad, 0x37, 0x9d, 0x4e, 0x26, 0x0e, + 0x5f, 0xec, 0x73, 0x1a, 0x3f, 0x87, 0x12, 0x5a, 0xff, 0xb8, 0xa2, 0x87, 0x96, 0x34, 0x3e, 0x01, + 0x40, 0x73, 0x8f, 0x3a, 0x73, 0x1a, 0x1e, 0xb0, 0xff, 0x27, 0x2b, 0xd9, 0xcd, 0x15, 0x5f, 0x90, + 0x77, 0xa9, 0xda, 0x5d, 0x6d, 0xbe, 0xdc, 0x84, 0x17, 0x23, 0x92, 0x41, 0xaa, 0x8e, 0x63, 0x96, + 0x42, 0x16, 0x84, 0x2e, 0xe5, 0x4e, 0xb8, 0xb6, 0x17, 0x62, 0x25, 0xd5, 0x8a, 0xcf, 0x53, 0x16, + 0x19, 0x82, 0xf1, 0xdf, 0x0c, 0x54, 0xd2, 0x2c, 0xa4, 0x0c, 0xa7, 0x77, 0xa3, 0xaf, 0x46, 0xe3, + 0x6f, 0x46, 0xfa, 0x09, 0x29, 0x41, 0xa1, 0x65, 0xde, 0xf6, 0xdb, 0x7a, 0x86, 0x00, 0x14, 0x5b, + 0x5d, 0xd3, 0xea, 0x5a, 0x7a, 0x16, 0xc7, 0x9d, 0xfe, 0x4d, 0xf7, 0x76, 0xaa, 0xe7, 0x70, 0x3c, + 0xbc, 0x9b, 0xde, 0x99, 0x03, 0x3d, 0x8f, 0xf0, 0xb1, 0x79, 0x37, 0xed, 0xe9, 0x05, 0x1c, 0x7e, + 0x6d, 0x4e, 0xfa, 0x1d, 0xbd, 0x48, 0x3e, 0x82, 0xf2, 0x6d, 0xdb, 0x32, 0x87, 0xf6, 0x6d, 0xcf, + 0xb4, 0x7f, 0xab, 0x9f, 0x92, 0x73, 0x38, 0xdb, 0x4c, 0x34, 0xbf, 0xb8, 0xd2, 0x35, 0x72, 0x06, + 0xa5, 0x51, 0xf7, 0x66, 0x3c, 0xed, 0x9b, 0xd3, 0xae, 0x5e, 0x22, 0x1a, 0xe4, 0x7b, 0xe3, 0x96, + 0xa9, 0x03, 0x79, 0x01, 0x64, 0x62, 0x8d, 0x27, 0x56, 0xbf, 0x3b, 0x35, 0xad, 0xef, 0xec, 0x5e, + 0xd7, 0xec, 0x74, 0x2d, 0xbd, 0x4c, 0x9e, 0x83, 0x6e, 0x7e, 0x73, 0x7b, 0x69, 0xf7, 0x86, 0x66, + 0x1b, 0x79, 0x90, 0xa6, 0x82, 0x7e, 0xa3, 0xe9, 0x60, 0xa8, 0x9f, 0xc5, 0x89, 0x6e, 0x33, 0xf6, + 0xe4, 0xd2, 0x03, 0x89, 0xfe, 0x77, 0x46, 0x26, 0xba, 0xc5, 0xe6, 0x6b, 0x62, 0x42, 0x05, 0xeb, + 0x0e, 0xf5, 0xb9, 0x9d, 0x4a, 0xf8, 0x27, 0xdb, 0x09, 0x47, 0x64, 0xa3, 0x2d, 0x61, 0x22, 0xdf, + 0xe5, 0xd9, 0xe6, 0x87, 0xc1, 0xa0, 0x9c, 0xb2, 0x6d, 0x67, 0x51, 0x83, 0xfc, 0x97, 0xb7, 0xe3, + 0x91, 0x9e, 0xc1, 0xa8, 0xaf, 0xc7, 0xd6, 0xd0, 0xbe, 0xb3, 0x06, 0x76, 0x77, 0xd4, 0x1e, 0x77, + 0xba, 0x1d, 0x3d, 0x4b, 0x74, 0xa8, 0x8c, 0xdb, 0xd3, 0xee, 0xd4, 0xbe, 0x9d, 0x5a, 0x5d, 0x73, + 0xa8, 0xe7, 0xc8, 0x29, 0xe4, 0x26, 0x9d, 0x6b, 0x3d, 0x4f, 0xaa, 0x00, 0xd3, 0xee, 0xb7, 0x53, + 0x7b, 0x32, 0x30, 0xfb, 0x23, 0xbd, 0x80, 0x54, 0xdf, 0x99, 0xc3, 0x81, 0x5e, 0x34, 0x3e, 0x85, + 0x33, 0x8c, 0x6a, 0xb8, 0xf2, 0xb8, 0x1b, 0x38, 0x21, 0x27, 0x24, 0xa5, 0x96, 0x92, 0x14, 0x83, + 0x51, 0x96, 0x6a, 0xec, 0x2e, 0x03, 0xbe, 0x36, 0xfe, 0x99, 0x93, 0x5b, 0x46, 0x15, 0xe3, 0x03, + 0x23, 0x70, 0xf8, 0x62, 0xff, 0x79, 0x19, 0x6b, 0x1b, 0x6f, 0x30, 0x22, 0xc8, 0xaf, 0xa0, 0xf0, + 0x67, 0x54, 0xb3, 0xba, 0x25, 0xcf, 0xb6, 0xa1, 0x42, 0xe8, 0xbd, 0x13, 0x4b, 0x62, 0x48, 0x03, + 0x8a, 0x4a, 0x71, 0xb9, 0xdd, 0x97, 0xcb, 0x46, 0xf7, 0xbd, 0x13, 0x4b, 0xa1, 0x10, 0x3f, 0x13, + 0x47, 0xa4, 0x3a, 0xf9, 0x0e, 0x5e, 0x1e, 0x1f, 0xe2, 0x25, 0x0a, 0xc3, 0xbe, 0x67, 0xf3, 0xb5, + 0xea, 0xe0, 0x64, 0xff, 0x84, 0x30, 0x6c, 0x44, 0x60, 0xd8, 0x14, 0xb7, 0xad, 0x1a, 0xf7, 0x4e, + 0xd8, 0x22, 0x23, 0x18, 0xb6, 0xc0, 0x20, 0xad, 0xb3, 0xe2, 0x0b, 0xd5, 0x78, 0xc9, 0xfe, 0x4d, + 0x43, 0x5a, 0x44, 0x90, 0xdf, 0x41, 0x69, 0x19, 0xa7, 0x5c, 0x35, 0xdc, 0x9f, 0x6e, 0xc3, 0x93, + 0x13, 0xc1, 0xd7, 0x4e, 0x82, 0x25, 0x9f, 0xc2, 0x59, 0x48, 0xa3, 0x80, 0xf9, 0x11, 0xb5, 0x67, + 0x6c, 0x2e, 0xdf, 0x06, 0x05, 0xab, 0x12, 0x4f, 0xb6, 0xd9, 0x9c, 0xb6, 0x00, 0x34, 0x8f, 0xcd, + 0x44, 0xab, 0x34, 0x1e, 0x40, 0xc3, 0x32, 0x14, 0x9f, 0xd6, 0x63, 0x18, 0xcc, 0xf6, 0x4f, 0x2b, + 0xae, 0x4a, 0x18, 0x1f, 0x22, 0x10, 0xb9, 0xe0, 0x3c, 0x50, 0x87, 0xb5, 0xb3, 0x93, 0x18, 0x89, + 0x88, 0x56, 0x11, 0xf2, 0x4b, 0xac, 0x67, 0x55, 0xa8, 0x74, 0xff, 0xea, 0x2c, 0x03, 0xf5, 0x3c, + 0x30, 0xfe, 0x97, 0x83, 0x3c, 0x2e, 0x4c, 0xde, 0x41, 0x29, 0x88, 0xbb, 0xeb, 0xfe, 0xfb, 0x31, + 0x69, 0xbc, 0xb8, 0xcd, 0x04, 0x47, 0x3e, 0x87, 0x62, 0x24, 0x1a, 0x97, 0x8a, 0x40, 0xdf, 0x6d, + 0x68, 0x78, 0x98, 0x12, 0x81, 0x1d, 0xc4, 0x73, 0x23, 0xae, 0xa4, 0x92, 0x2a, 0xbf, 0xd8, 0x4b, + 0x31, 0x4e, 0xb4, 0x92, 0xdf, 0x80, 0xc6, 0x54, 0x67, 0x52, 0x22, 0x49, 0xed, 0x2a, 0xee, 0x59, + 0xbd, 0x13, 0x2b, 0x41, 0x91, 0xcf, 0xa0, 0xc0, 0x7c, 0xca, 0x1e, 0xf6, 0xdf, 0x6c, 0xa2, 0xbd, + 0xe0, 0xb1, 0x0b, 0x3b, 0x7e, 0x63, 0x61, 0x0a, 0xf6, 0xd5, 0x14, 0x27, 0xde, 0x12, 0x76, 0x52, + 0x07, 0xcd, 0x5f, 0x79, 0x9e, 0x73, 0xef, 0xc9, 0x63, 0xd3, 0xac, 0xe4, 0x37, 0xe9, 0x41, 0x95, + 0xca, 0xf4, 0xc9, 0x87, 0x4c, 0x54, 0xd3, 0x44, 0x53, 0xfb, 0xc5, 0x36, 0x5b, 0x23, 0x9d, 0x63, + 0xd5, 0xd9, 0xce, 0x68, 0x7a, 0xae, 0xfe, 0x2d, 0x90, 0x7d, 0xd0, 0x81, 0xb6, 0xf5, 0x76, 0xbb, + 0x6d, 0xbd, 0xd8, 0x2c, 0x94, 0x76, 0x3f, 0xf8, 0x4e, 0x19, 0x80, 0x36, 0x14, 0xdf, 0xa4, 0xfd, + 0x0e, 0xd6, 0x0b, 0xdf, 0x59, 0x26, 0xf5, 0x02, 0xc7, 0xe4, 0x2d, 0x68, 0xf1, 0xb7, 0xa9, 0x60, + 0xaf, 0x36, 0xcf, 0x53, 0xaf, 0xbb, 0xc0, 0x15, 0x75, 0xef, 0xd4, 0x91, 0x03, 0x43, 0x87, 0xaa, + 0xd2, 0xdf, 0x82, 0xcd, 0x45, 0x6f, 0xfc, 0x7b, 0x06, 0xaa, 0x4a, 0x68, 0x6a, 0x8a, 0xbc, 0x80, + 0xa2, 0xfc, 0x0c, 0x56, 0x0b, 0xa9, 0x5f, 0x78, 0x1f, 0xb0, 0xbc, 0xd8, 0x9c, 0x2e, 0x03, 0xcf, + 0xe1, 0xf1, 0xd7, 0x62, 0x05, 0x27, 0xa7, 0x6a, 0x0e, 0x63, 0x5c, 0x30, 0xa5, 0x90, 0x92, 0x25, + 0xc6, 0xaa, 0xc1, 0xcd, 0x68, 0x14, 0xe1, 0x67, 0x00, 0xc2, 0xfc, 0xd9, 0x5a, 0x28, 0x23, 0x2b, + 0x1a, 0x9c, 0xb2, 0x0c, 0xa4, 0xc1, 0xe0, 0x00, 0xa9, 0x68, 0x1a, 0x5b, 0x17, 0xa9, 0xb6, 0x77, + 0x91, 0x14, 0x2e, 0xb9, 0x4e, 0x8d, 0xad, 0xeb, 0x54, 0xdb, 0xbb, 0x4e, 0x29, 0xfc, 0xd6, 0xa5, + 0xfa, 0x7f, 0x16, 0x8a, 0xd2, 0x4c, 0x0c, 0xc8, 0xba, 0xf3, 0xfd, 0x9b, 0x1b, 0x9f, 0x83, 0x95, + 0x75, 0xe7, 0xb8, 0x8c, 0x13, 0x3e, 0x46, 0xb5, 0xac, 0x90, 0x4e, 0x7d, 0x17, 0xd5, 0x30, 0xc3, + 0x47, 0xa5, 0x19, 0x81, 0x23, 0x7f, 0x80, 0x52, 0x5c, 0x37, 0xa2, 0x5a, 0x4e, 0x38, 0xbd, 0xdc, + 0x73, 0xb2, 0x62, 0x84, 0xf4, 0xdc, 0x78, 0x60, 0x91, 0x10, 0xba, 0xdf, 0xab, 0xb9, 0x9b, 0x1d, + 0x49, 0xe5, 0xd7, 0x6f, 0xa0, 0x94, 0xac, 0xfd, 0x21, 0x2f, 0xa8, 0xfa, 0x00, 0xaa, 0xdb, 0xf1, + 0x7c, 0x08, 0x5b, 0xeb, 0xed, 0x9f, 0x3e, 0x17, 0x5f, 0x16, 0x11, 0x7b, 0xe0, 0x7f, 0x71, 0x42, + 0xda, 0x98, 0xb1, 0xe5, 0x45, 0xb4, 0x0a, 0x68, 0x18, 0x71, 0x27, 0xbc, 0x08, 0xee, 0x2f, 0x1e, + 0xd9, 0x45, 0xec, 0x7d, 0x5f, 0x14, 0xff, 0xac, 0xbc, 0xfb, 0x21, 0x00, 0x00, 0xff, 0xff, 0xe9, + 0x9a, 0x27, 0x41, 0x90, 0x11, 0x00, 0x00, } diff --git a/proto/api_spec/method.proto b/proto/api_spec/method.proto index 9fb1274..3de7495 100644 --- a/proto/api_spec/method.proto +++ b/proto/api_spec/method.proto @@ -150,24 +150,37 @@ message HTTPHeader { message HTTPAuth { enum HTTPAuthType { + // + // Standard types (IETF/IANA) + // https://www.iana.org/assignments/http-authschemes/http-authschemes.xhtml + // UNKNOWN = 0; BASIC = 1; BEARER = 2; - - // Less common types listed at https://www.iana.org/assignments/http-authschemes/http-authschemes.xhtml - // excluded HOBA as I couldn't find any references to its use. - DIGEST = 3; + DIGEST = 3; MUTUAL = 4; OAUTH = 5; VAPID = 6; SCRAM_SHA_1 = 7; SCRAM_SHA_256 = 8; NEGOTIATE = 9; - + HOBA = 10; + // An application-specific authorization header, such as // Github webhook's X-Hub-Signature-256 or X-Hub-Signature, - // not carried in "Authorization". - PROPRIETARY_HEADER = 10; + // *not* carried in "Authorization". + PROPRIETARY_HEADER = 11; + + // + // Non-IETF types in Authorization header + // + + // AWS request signing + AWS4_HMAC_SHA256 = 12; + + // NTLM-over-HTTP + // https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-ntht/f09cf6e1-529e-403b-a8a5-7368ee096a6a + NTLM = 13; } HTTPAuthType type = 1; string proprietary_header = 2; diff --git a/py/api_spec/method_pb2.py b/py/api_spec/method_pb2.py index 5770d92..4baa346 100644 --- a/py/api_spec/method_pb2.py +++ b/py/api_spec/method_pb2.py @@ -22,7 +22,7 @@ package='api_spec', syntax='proto3', serialized_options=_b('Z*akitasoftware.com/superstar/pb/go/api_spec'), - serialized_pb=_b('\n\x0cmethod.proto\x12\x08\x61pi_spec\x1a\x0e\x61pi_type.proto\x1a\x0btypes.proto\"7\n\x04\x42ool\x12 \n\x04type\x18\x01 \x01(\x0b\x32\x12.api_spec.BoolType\x12\r\n\x05value\x18\x02 \x01(\x08\"9\n\x05\x42ytes\x12!\n\x04type\x18\x01 \x01(\x0b\x32\x13.api_spec.BytesType\x12\r\n\x05value\x18\x02 \x01(\x0c\";\n\x06String\x12\"\n\x04type\x18\x01 \x01(\x0b\x32\x14.api_spec.StringType\x12\r\n\x05value\x18\x02 \x01(\t\"9\n\x05Int32\x12!\n\x04type\x18\x01 \x01(\x0b\x32\x13.api_spec.Int32Type\x12\r\n\x05value\x18\x02 \x01(\x05\"9\n\x05Int64\x12!\n\x04type\x18\x01 \x01(\x0b\x32\x13.api_spec.Int64Type\x12\r\n\x05value\x18\x02 \x01(\x03\";\n\x06Uint32\x12\"\n\x04type\x18\x01 \x01(\x0b\x32\x14.api_spec.Uint32Type\x12\r\n\x05value\x18\x02 \x01(\r\";\n\x06Uint64\x12\"\n\x04type\x18\x01 \x01(\x0b\x32\x14.api_spec.Uint64Type\x12\r\n\x05value\x18\x02 \x01(\x04\";\n\x06\x44ouble\x12\"\n\x04type\x18\x01 \x01(\x0b\x32\x14.api_spec.DoubleType\x12\r\n\x05value\x18\x02 \x01(\x01\"9\n\x05\x46loat\x12!\n\x04type\x18\x01 \x01(\x0b\x32\x13.api_spec.FloatType\x12\r\n\x05value\x18\x02 \x01(\x02\"\xe3\x04\n\tPrimitive\x12\x11\n\ttype_hint\x18\x01 \x01(\t\x12$\n\nbool_value\x18\x02 \x01(\x0b\x32\x0e.api_spec.BoolH\x00\x12&\n\x0b\x62ytes_value\x18\x03 \x01(\x0b\x32\x0f.api_spec.BytesH\x00\x12(\n\x0cstring_value\x18\x04 \x01(\x0b\x32\x10.api_spec.StringH\x00\x12&\n\x0bint32_value\x18\x05 \x01(\x0b\x32\x0f.api_spec.Int32H\x00\x12&\n\x0bint64_value\x18\x06 \x01(\x0b\x32\x0f.api_spec.Int64H\x00\x12(\n\x0cuint32_value\x18\x07 \x01(\x0b\x32\x10.api_spec.Uint32H\x00\x12(\n\x0cuint64_value\x18\x08 \x01(\x0b\x32\x10.api_spec.Uint64H\x00\x12(\n\x0c\x64ouble_value\x18\t \x01(\x0b\x32\x10.api_spec.DoubleH\x00\x12&\n\x0b\x66loat_value\x18\n \x01(\x0b\x32\x0f.api_spec.FloatH\x00\x12\x35\n\x11\x61kita_annotations\x18\x0b \x01(\x0b\x32\x1a.api_spec.AkitaAnnotations\x12\x1d\n\x15\x63ontains_random_value\x18\x0c \x01(\x08\x12\x31\n\x07\x66ormats\x18\r \x03(\x0b\x32 .api_spec.Primitive.FormatsEntry\x12\x13\n\x0b\x66ormat_kind\x18\x0e \x01(\t\x1a.\n\x0c\x46ormatsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x08:\x02\x38\x01\x42\x07\n\x05value\"%\n\x04List\x12\x1d\n\x05\x65lems\x18\x01 \x03(\x0b\x32\x0e.api_spec.Data\"u\n\x06Struct\x12,\n\x06\x66ields\x18\x01 \x03(\x0b\x32\x1c.api_spec.Struct.FieldsEntry\x1a=\n\x0b\x46ieldsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x1d\n\x05value\x18\x02 \x01(\x0b\x32\x0e.api_spec.Data:\x02\x38\x01\"\x06\n\x04None\"S\n\x08Optional\x12\x1e\n\x04\x64\x61ta\x18\x01 \x01(\x0b\x32\x0e.api_spec.DataH\x00\x12\x1e\n\x04none\x18\x02 \x01(\x0b\x32\x0e.api_spec.NoneH\x00\x42\x07\n\x05value\"\x92\x01\n\x05OneOf\x12-\n\x07options\x18\x01 \x03(\x0b\x32\x1c.api_spec.OneOf.OptionsEntry\x12\x1a\n\x12potential_conflict\x18\x02 \x01(\x08\x1a>\n\x0cOptionsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x1d\n\x05value\x18\x02 \x01(\x0b\x32\x0e.api_spec.Data:\x02\x38\x01\"\n\n\x08GRPCMeta\"\x17\n\x08HTTPPath\x12\x0b\n\x03key\x18\x01 \x01(\t\"\x18\n\tHTTPQuery\x12\x0b\n\x03key\x18\x01 \x01(\t\"\x19\n\nHTTPHeader\x12\x0b\n\x03key\x18\x01 \x01(\t\"\x83\x02\n\x08HTTPAuth\x12-\n\x04type\x18\x01 \x01(\x0e\x32\x1f.api_spec.HTTPAuth.HTTPAuthType\x12\x1a\n\x12proprietary_header\x18\x02 \x01(\t\"\xab\x01\n\x0cHTTPAuthType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\t\n\x05\x42\x41SIC\x10\x01\x12\n\n\x06\x42\x45\x41RER\x10\x02\x12\n\n\x06\x44IGEST\x10\x03\x12\n\n\x06MUTUAL\x10\x04\x12\t\n\x05OAUTH\x10\x05\x12\t\n\x05VAPID\x10\x06\x12\x0f\n\x0bSCRAM_SHA_1\x10\x07\x12\x11\n\rSCRAM_SHA_256\x10\x08\x12\r\n\tNEGOTIATE\x10\t\x12\x16\n\x12PROPRIETARY_HEADER\x10\n\"\x19\n\nHTTPCookie\x12\x0b\n\x03key\x18\x01 \x01(\t\"\xb1\x01\n\x08HTTPBody\x12\x34\n\x0c\x63ontent_type\x18\x01 \x01(\x0e\x32\x1e.api_spec.HTTPBody.ContentType\"o\n\x0b\x43ontentType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x08\n\x04JSON\x10\x01\x12\x14\n\x10\x46ORM_URL_ENCODED\x10\x02\x12\x10\n\x0cOCTET_STREAM\x10\x03\x12\x07\n\x03PDF\x10\x04\x12\x0e\n\nTEXT_PLAIN\x10\x05\x12\x08\n\x04YAML\x10\x06\"\x1d\n\rHTTPMultipart\x12\x0c\n\x04type\x18\x01 \x01(\t\"\x0b\n\tHTTPEmpty\"\xe3\x02\n\x08HTTPMeta\x12\"\n\x04path\x18\x01 \x01(\x0b\x32\x12.api_spec.HTTPPathH\x00\x12$\n\x05query\x18\x02 \x01(\x0b\x32\x13.api_spec.HTTPQueryH\x00\x12&\n\x06header\x18\x03 \x01(\x0b\x32\x14.api_spec.HTTPHeaderH\x00\x12&\n\x06\x63ookie\x18\x04 \x01(\x0b\x32\x14.api_spec.HTTPCookieH\x00\x12\"\n\x04\x62ody\x18\x05 \x01(\x0b\x32\x12.api_spec.HTTPBodyH\x00\x12$\n\x05\x65mpty\x18\x06 \x01(\x0b\x32\x13.api_spec.HTTPEmptyH\x00\x12\"\n\x04\x61uth\x18\x08 \x01(\x0b\x32\x12.api_spec.HTTPAuthH\x00\x12,\n\tmultipart\x18\t \x01(\x0b\x32\x17.api_spec.HTTPMultipartH\x00\x12\x15\n\rresponse_code\x18\x07 \x01(\x05\x42\n\n\x08location\"Z\n\x08\x44\x61taMeta\x12\"\n\x04grpc\x18\x01 \x01(\x0b\x32\x12.api_spec.GRPCMetaH\x00\x12\"\n\x04http\x18\x02 \x01(\x0b\x32\x12.api_spec.HTTPMetaH\x00\x42\x06\n\x04meta\"\x0e\n\x0c\x45xampleValue\"\x84\x03\n\x04\x44\x61ta\x12(\n\tprimitive\x18\x01 \x01(\x0b\x32\x13.api_spec.PrimitiveH\x00\x12\"\n\x06struct\x18\x02 \x01(\x0b\x32\x10.api_spec.StructH\x00\x12\x1e\n\x04list\x18\x03 \x01(\x0b\x32\x0e.api_spec.ListH\x00\x12&\n\x08optional\x18\x04 \x01(\x0b\x32\x12.api_spec.OptionalH\x00\x12 \n\x05oneof\x18\x06 \x01(\x0b\x32\x0f.api_spec.OneOfH\x00\x12 \n\x04meta\x18\x05 \x01(\x0b\x32\x12.api_spec.DataMeta\x12\x10\n\x08nullable\x18\x07 \x01(\x08\x12\x39\n\x0e\x65xample_values\x18\x08 \x03(\x0b\x32!.api_spec.Data.ExampleValuesEntry\x1aL\n\x12\x45xampleValuesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12%\n\x05value\x18\x02 \x01(\x0b\x32\x16.api_spec.ExampleValue:\x02\x38\x01\x42\x07\n\x05value\"=\n\x08MethodID\x12\x0c\n\x04name\x18\x01 \x01(\t\x12#\n\x08\x61pi_type\x18\x02 \x01(\x0e\x32\x11.api_spec.ApiType\"\x10\n\x0eGRPCMethodMeta\"a\n\x0eHTTPMethodMeta\x12\x0e\n\x06method\x18\x01 \x01(\t\x12\x15\n\rpath_template\x18\x02 \x01(\t\x12\x0c\n\x04host\x18\x03 \x01(\t\x12\x1a\n\x12processing_latency\x18\x04 \x01(\x02\"h\n\nMethodMeta\x12(\n\x04grpc\x18\x01 \x01(\x0b\x32\x18.api_spec.GRPCMethodMetaH\x00\x12(\n\x04http\x18\x02 \x01(\x0b\x32\x18.api_spec.HTTPMethodMetaH\x00\x42\x06\n\x04meta\"\xa9\x02\n\x06Method\x12\x1e\n\x02id\x18\x01 \x01(\x0b\x32\x12.api_spec.MethodID\x12(\n\x04\x61rgs\x18\x02 \x03(\x0b\x32\x1a.api_spec.Method.ArgsEntry\x12\x32\n\tresponses\x18\x03 \x03(\x0b\x32\x1f.api_spec.Method.ResponsesEntry\x12\"\n\x04meta\x18\x04 \x01(\x0b\x32\x14.api_spec.MethodMeta\x1a;\n\tArgsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x1d\n\x05value\x18\x02 \x01(\x0b\x32\x0e.api_spec.Data:\x02\x38\x01\x1a@\n\x0eResponsesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x1d\n\x05value\x18\x02 \x01(\x0b\x32\x0e.api_spec.Data:\x02\x38\x01\x42,Z*akitasoftware.com/superstar/pb/go/api_specb\x06proto3') + serialized_pb=_b('\n\x0cmethod.proto\x12\x08\x61pi_spec\x1a\x0e\x61pi_type.proto\x1a\x0btypes.proto\"7\n\x04\x42ool\x12 \n\x04type\x18\x01 \x01(\x0b\x32\x12.api_spec.BoolType\x12\r\n\x05value\x18\x02 \x01(\x08\"9\n\x05\x42ytes\x12!\n\x04type\x18\x01 \x01(\x0b\x32\x13.api_spec.BytesType\x12\r\n\x05value\x18\x02 \x01(\x0c\";\n\x06String\x12\"\n\x04type\x18\x01 \x01(\x0b\x32\x14.api_spec.StringType\x12\r\n\x05value\x18\x02 \x01(\t\"9\n\x05Int32\x12!\n\x04type\x18\x01 \x01(\x0b\x32\x13.api_spec.Int32Type\x12\r\n\x05value\x18\x02 \x01(\x05\"9\n\x05Int64\x12!\n\x04type\x18\x01 \x01(\x0b\x32\x13.api_spec.Int64Type\x12\r\n\x05value\x18\x02 \x01(\x03\";\n\x06Uint32\x12\"\n\x04type\x18\x01 \x01(\x0b\x32\x14.api_spec.Uint32Type\x12\r\n\x05value\x18\x02 \x01(\r\";\n\x06Uint64\x12\"\n\x04type\x18\x01 \x01(\x0b\x32\x14.api_spec.Uint64Type\x12\r\n\x05value\x18\x02 \x01(\x04\";\n\x06\x44ouble\x12\"\n\x04type\x18\x01 \x01(\x0b\x32\x14.api_spec.DoubleType\x12\r\n\x05value\x18\x02 \x01(\x01\"9\n\x05\x46loat\x12!\n\x04type\x18\x01 \x01(\x0b\x32\x13.api_spec.FloatType\x12\r\n\x05value\x18\x02 \x01(\x02\"\xe3\x04\n\tPrimitive\x12\x11\n\ttype_hint\x18\x01 \x01(\t\x12$\n\nbool_value\x18\x02 \x01(\x0b\x32\x0e.api_spec.BoolH\x00\x12&\n\x0b\x62ytes_value\x18\x03 \x01(\x0b\x32\x0f.api_spec.BytesH\x00\x12(\n\x0cstring_value\x18\x04 \x01(\x0b\x32\x10.api_spec.StringH\x00\x12&\n\x0bint32_value\x18\x05 \x01(\x0b\x32\x0f.api_spec.Int32H\x00\x12&\n\x0bint64_value\x18\x06 \x01(\x0b\x32\x0f.api_spec.Int64H\x00\x12(\n\x0cuint32_value\x18\x07 \x01(\x0b\x32\x10.api_spec.Uint32H\x00\x12(\n\x0cuint64_value\x18\x08 \x01(\x0b\x32\x10.api_spec.Uint64H\x00\x12(\n\x0c\x64ouble_value\x18\t \x01(\x0b\x32\x10.api_spec.DoubleH\x00\x12&\n\x0b\x66loat_value\x18\n \x01(\x0b\x32\x0f.api_spec.FloatH\x00\x12\x35\n\x11\x61kita_annotations\x18\x0b \x01(\x0b\x32\x1a.api_spec.AkitaAnnotations\x12\x1d\n\x15\x63ontains_random_value\x18\x0c \x01(\x08\x12\x31\n\x07\x66ormats\x18\r \x03(\x0b\x32 .api_spec.Primitive.FormatsEntry\x12\x13\n\x0b\x66ormat_kind\x18\x0e \x01(\t\x1a.\n\x0c\x46ormatsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x08:\x02\x38\x01\x42\x07\n\x05value\"%\n\x04List\x12\x1d\n\x05\x65lems\x18\x01 \x03(\x0b\x32\x0e.api_spec.Data\"u\n\x06Struct\x12,\n\x06\x66ields\x18\x01 \x03(\x0b\x32\x1c.api_spec.Struct.FieldsEntry\x1a=\n\x0b\x46ieldsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x1d\n\x05value\x18\x02 \x01(\x0b\x32\x0e.api_spec.Data:\x02\x38\x01\"\x06\n\x04None\"S\n\x08Optional\x12\x1e\n\x04\x64\x61ta\x18\x01 \x01(\x0b\x32\x0e.api_spec.DataH\x00\x12\x1e\n\x04none\x18\x02 \x01(\x0b\x32\x0e.api_spec.NoneH\x00\x42\x07\n\x05value\"\x92\x01\n\x05OneOf\x12-\n\x07options\x18\x01 \x03(\x0b\x32\x1c.api_spec.OneOf.OptionsEntry\x12\x1a\n\x12potential_conflict\x18\x02 \x01(\x08\x1a>\n\x0cOptionsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x1d\n\x05value\x18\x02 \x01(\x0b\x32\x0e.api_spec.Data:\x02\x38\x01\"\n\n\x08GRPCMeta\"\x17\n\x08HTTPPath\x12\x0b\n\x03key\x18\x01 \x01(\t\"\x18\n\tHTTPQuery\x12\x0b\n\x03key\x18\x01 \x01(\t\"\x19\n\nHTTPHeader\x12\x0b\n\x03key\x18\x01 \x01(\t\"\xad\x02\n\x08HTTPAuth\x12-\n\x04type\x18\x01 \x01(\x0e\x32\x1f.api_spec.HTTPAuth.HTTPAuthType\x12\x1a\n\x12proprietary_header\x18\x02 \x01(\t\"\xd5\x01\n\x0cHTTPAuthType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\t\n\x05\x42\x41SIC\x10\x01\x12\n\n\x06\x42\x45\x41RER\x10\x02\x12\n\n\x06\x44IGEST\x10\x03\x12\n\n\x06MUTUAL\x10\x04\x12\t\n\x05OAUTH\x10\x05\x12\t\n\x05VAPID\x10\x06\x12\x0f\n\x0bSCRAM_SHA_1\x10\x07\x12\x11\n\rSCRAM_SHA_256\x10\x08\x12\r\n\tNEGOTIATE\x10\t\x12\x08\n\x04HOBA\x10\n\x12\x16\n\x12PROPRIETARY_HEADER\x10\x0b\x12\x14\n\x10\x41WS4_HMAC_SHA256\x10\x0c\x12\x08\n\x04NTLM\x10\r\"\x19\n\nHTTPCookie\x12\x0b\n\x03key\x18\x01 \x01(\t\"\xb1\x01\n\x08HTTPBody\x12\x34\n\x0c\x63ontent_type\x18\x01 \x01(\x0e\x32\x1e.api_spec.HTTPBody.ContentType\"o\n\x0b\x43ontentType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x08\n\x04JSON\x10\x01\x12\x14\n\x10\x46ORM_URL_ENCODED\x10\x02\x12\x10\n\x0cOCTET_STREAM\x10\x03\x12\x07\n\x03PDF\x10\x04\x12\x0e\n\nTEXT_PLAIN\x10\x05\x12\x08\n\x04YAML\x10\x06\"\x1d\n\rHTTPMultipart\x12\x0c\n\x04type\x18\x01 \x01(\t\"\x0b\n\tHTTPEmpty\"\xe3\x02\n\x08HTTPMeta\x12\"\n\x04path\x18\x01 \x01(\x0b\x32\x12.api_spec.HTTPPathH\x00\x12$\n\x05query\x18\x02 \x01(\x0b\x32\x13.api_spec.HTTPQueryH\x00\x12&\n\x06header\x18\x03 \x01(\x0b\x32\x14.api_spec.HTTPHeaderH\x00\x12&\n\x06\x63ookie\x18\x04 \x01(\x0b\x32\x14.api_spec.HTTPCookieH\x00\x12\"\n\x04\x62ody\x18\x05 \x01(\x0b\x32\x12.api_spec.HTTPBodyH\x00\x12$\n\x05\x65mpty\x18\x06 \x01(\x0b\x32\x13.api_spec.HTTPEmptyH\x00\x12\"\n\x04\x61uth\x18\x08 \x01(\x0b\x32\x12.api_spec.HTTPAuthH\x00\x12,\n\tmultipart\x18\t \x01(\x0b\x32\x17.api_spec.HTTPMultipartH\x00\x12\x15\n\rresponse_code\x18\x07 \x01(\x05\x42\n\n\x08location\"Z\n\x08\x44\x61taMeta\x12\"\n\x04grpc\x18\x01 \x01(\x0b\x32\x12.api_spec.GRPCMetaH\x00\x12\"\n\x04http\x18\x02 \x01(\x0b\x32\x12.api_spec.HTTPMetaH\x00\x42\x06\n\x04meta\"\x0e\n\x0c\x45xampleValue\"\x84\x03\n\x04\x44\x61ta\x12(\n\tprimitive\x18\x01 \x01(\x0b\x32\x13.api_spec.PrimitiveH\x00\x12\"\n\x06struct\x18\x02 \x01(\x0b\x32\x10.api_spec.StructH\x00\x12\x1e\n\x04list\x18\x03 \x01(\x0b\x32\x0e.api_spec.ListH\x00\x12&\n\x08optional\x18\x04 \x01(\x0b\x32\x12.api_spec.OptionalH\x00\x12 \n\x05oneof\x18\x06 \x01(\x0b\x32\x0f.api_spec.OneOfH\x00\x12 \n\x04meta\x18\x05 \x01(\x0b\x32\x12.api_spec.DataMeta\x12\x10\n\x08nullable\x18\x07 \x01(\x08\x12\x39\n\x0e\x65xample_values\x18\x08 \x03(\x0b\x32!.api_spec.Data.ExampleValuesEntry\x1aL\n\x12\x45xampleValuesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12%\n\x05value\x18\x02 \x01(\x0b\x32\x16.api_spec.ExampleValue:\x02\x38\x01\x42\x07\n\x05value\"=\n\x08MethodID\x12\x0c\n\x04name\x18\x01 \x01(\t\x12#\n\x08\x61pi_type\x18\x02 \x01(\x0e\x32\x11.api_spec.ApiType\"\x10\n\x0eGRPCMethodMeta\"a\n\x0eHTTPMethodMeta\x12\x0e\n\x06method\x18\x01 \x01(\t\x12\x15\n\rpath_template\x18\x02 \x01(\t\x12\x0c\n\x04host\x18\x03 \x01(\t\x12\x1a\n\x12processing_latency\x18\x04 \x01(\x02\"h\n\nMethodMeta\x12(\n\x04grpc\x18\x01 \x01(\x0b\x32\x18.api_spec.GRPCMethodMetaH\x00\x12(\n\x04http\x18\x02 \x01(\x0b\x32\x18.api_spec.HTTPMethodMetaH\x00\x42\x06\n\x04meta\"\xa9\x02\n\x06Method\x12\x1e\n\x02id\x18\x01 \x01(\x0b\x32\x12.api_spec.MethodID\x12(\n\x04\x61rgs\x18\x02 \x03(\x0b\x32\x1a.api_spec.Method.ArgsEntry\x12\x32\n\tresponses\x18\x03 \x03(\x0b\x32\x1f.api_spec.Method.ResponsesEntry\x12\"\n\x04meta\x18\x04 \x01(\x0b\x32\x14.api_spec.MethodMeta\x1a;\n\tArgsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x1d\n\x05value\x18\x02 \x01(\x0b\x32\x0e.api_spec.Data:\x02\x38\x01\x1a@\n\x0eResponsesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x1d\n\x05value\x18\x02 \x01(\x0b\x32\x0e.api_spec.Data:\x02\x38\x01\x42,Z*akitasoftware.com/superstar/pb/go/api_specb\x06proto3') , dependencies=[api__type__pb2.DESCRIPTOR,types__pb2.DESCRIPTOR,]) @@ -75,14 +75,26 @@ serialized_options=None, type=None), _descriptor.EnumValueDescriptor( - name='PROPRIETARY_HEADER', index=10, number=10, + name='HOBA', index=10, number=10, + serialized_options=None, + type=None), + _descriptor.EnumValueDescriptor( + name='PROPRIETARY_HEADER', index=11, number=11, + serialized_options=None, + type=None), + _descriptor.EnumValueDescriptor( + name='AWS4_HMAC_SHA256', index=12, number=12, + serialized_options=None, + type=None), + _descriptor.EnumValueDescriptor( + name='NTLM', index=13, number=13, serialized_options=None, type=None), ], containing_type=None, serialized_options=None, serialized_start=1785, - serialized_end=1956, + serialized_end=1998, ) _sym_db.RegisterEnumDescriptor(_HTTPAUTH_HTTPAUTHTYPE) @@ -123,8 +135,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=2052, - serialized_end=2163, + serialized_start=2094, + serialized_end=2205, ) _sym_db.RegisterEnumDescriptor(_HTTPBODY_CONTENTTYPE) @@ -1024,7 +1036,7 @@ oneofs=[ ], serialized_start=1697, - serialized_end=1956, + serialized_end=1998, ) @@ -1054,8 +1066,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1958, - serialized_end=1983, + serialized_start=2000, + serialized_end=2025, ) @@ -1086,8 +1098,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1986, - serialized_end=2163, + serialized_start=2028, + serialized_end=2205, ) @@ -1117,8 +1129,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2165, - serialized_end=2194, + serialized_start=2207, + serialized_end=2236, ) @@ -1141,8 +1153,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2196, - serialized_end=2207, + serialized_start=2238, + serialized_end=2249, ) @@ -1231,8 +1243,8 @@ name='location', full_name='api_spec.HTTPMeta.location', index=0, containing_type=None, fields=[]), ], - serialized_start=2210, - serialized_end=2565, + serialized_start=2252, + serialized_end=2607, ) @@ -1272,8 +1284,8 @@ name='meta', full_name='api_spec.DataMeta.meta', index=0, containing_type=None, fields=[]), ], - serialized_start=2567, - serialized_end=2657, + serialized_start=2609, + serialized_end=2699, ) @@ -1296,8 +1308,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2659, - serialized_end=2673, + serialized_start=2701, + serialized_end=2715, ) @@ -1334,8 +1346,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2979, - serialized_end=3055, + serialized_start=3021, + serialized_end=3097, ) _DATA = _descriptor.Descriptor( @@ -1416,8 +1428,8 @@ name='value', full_name='api_spec.Data.value', index=0, containing_type=None, fields=[]), ], - serialized_start=2676, - serialized_end=3064, + serialized_start=2718, + serialized_end=3106, ) @@ -1454,8 +1466,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=3066, - serialized_end=3127, + serialized_start=3108, + serialized_end=3169, ) @@ -1478,8 +1490,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=3129, - serialized_end=3145, + serialized_start=3171, + serialized_end=3187, ) @@ -1530,8 +1542,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=3147, - serialized_end=3244, + serialized_start=3189, + serialized_end=3286, ) @@ -1571,8 +1583,8 @@ name='meta', full_name='api_spec.MethodMeta.meta', index=0, containing_type=None, fields=[]), ], - serialized_start=3246, - serialized_end=3350, + serialized_start=3288, + serialized_end=3392, ) @@ -1609,8 +1621,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=3525, - serialized_end=3584, + serialized_start=3567, + serialized_end=3626, ) _METHOD_RESPONSESENTRY = _descriptor.Descriptor( @@ -1646,8 +1658,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=3586, - serialized_end=3650, + serialized_start=3628, + serialized_end=3692, ) _METHOD = _descriptor.Descriptor( @@ -1697,8 +1709,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=3353, - serialized_end=3650, + serialized_start=3395, + serialized_end=3692, ) _BOOL.fields_by_name['type'].message_type = types__pb2._BOOLTYPE From 49595b52ffe5532a942981675333d933e2c2af16 Mon Sep 17 00:00:00 2001 From: Mark Gritter Date: Fri, 9 Jul 2021 14:27:38 -0500 Subject: [PATCH 3/5] Make the repository a go module. --- go.mod | 5 +++++ go.sum | 10 ++++++++++ 2 files changed, 15 insertions(+) create mode 100644 go.mod create mode 100644 go.sum diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..9c831a6 --- /dev/null +++ b/go.mod @@ -0,0 +1,5 @@ +module github.com/akitasoftware/akita-ir + +go 1.16 + +require github.com/golang/protobuf v1.5.2 diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..e987cde --- /dev/null +++ b/go.sum @@ -0,0 +1,10 @@ +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= From 12143082fbe1417da7e275ccd29d7907bfa0a7fc Mon Sep 17 00:00:00 2001 From: Mark Gritter Date: Fri, 9 Jul 2021 15:29:58 -0500 Subject: [PATCH 4/5] Downgrade protobuf to 1.3.4 --- go.mod | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 9c831a6..854101e 100644 --- a/go.mod +++ b/go.mod @@ -2,4 +2,6 @@ module github.com/akitasoftware/akita-ir go 1.16 -require github.com/golang/protobuf v1.5.2 +// new versions break unit tests +// "needed to compatibility with objecthash-proto"? +require github.com/golang/protobuf v1.3.4 From c04631cb2cbafb926d1e368bab94b1b54af3e3fa Mon Sep 17 00:00:00 2001 From: Mark Gritter Date: Fri, 6 Aug 2021 16:05:03 -0500 Subject: [PATCH 5/5] Clarify OAUTH. --- proto/api_spec/method.proto | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/proto/api_spec/method.proto b/proto/api_spec/method.proto index 3de7495..ffadaae 100644 --- a/proto/api_spec/method.proto +++ b/proto/api_spec/method.proto @@ -159,7 +159,9 @@ message HTTPAuth { BEARER = 2; DIGEST = 3; MUTUAL = 4; - OAUTH = 5; + OAUTH = 5; // This is OAuth v1, not used in v2 + // Oauth V2 also defines a MAC, but this does not appear in the list above. + // https://datatracker.ietf.org/doc/html/rfc6749#section-7.1 VAPID = 6; SCRAM_SHA_1 = 7; SCRAM_SHA_256 = 8;