diff --git a/coprocess.go b/coprocess.go index 75116bee095..f19391827f3 100644 --- a/coprocess.go +++ b/coprocess.go @@ -89,6 +89,7 @@ func (c *CoProcessor) ObjectFromRequest(r *http.Request) *coprocess.Object { ReturnOverrides: &coprocess.ReturnOverrides{ ResponseCode: -1, }, + Method: r.Method, } object := &coprocess.Object{ diff --git a/coprocess/bindings/python/coprocess_common_pb2.py b/coprocess/bindings/python/coprocess_common_pb2.py index 8826b633145..72b9f86a05e 100644 --- a/coprocess/bindings/python/coprocess_common_pb2.py +++ b/coprocess/bindings/python/coprocess_common_pb2.py @@ -79,7 +79,7 @@ has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), ], extensions=[ ], diff --git a/coprocess/bindings/python/coprocess_mini_request_object_pb2.py b/coprocess/bindings/python/coprocess_mini_request_object_pb2.py index f35caf1ace3..752f2847843 100644 --- a/coprocess/bindings/python/coprocess_mini_request_object_pb2.py +++ b/coprocess/bindings/python/coprocess_mini_request_object_pb2.py @@ -20,7 +20,7 @@ name='coprocess_mini_request_object.proto', package='coprocess', syntax='proto3', - serialized_pb=_b('\n#coprocess_mini_request_object.proto\x12\tcoprocess\x1a coprocess_return_overrides.proto\"\xd3\x05\n\x11MiniRequestObject\x12:\n\x07headers\x18\x01 \x03(\x0b\x32).coprocess.MiniRequestObject.HeadersEntry\x12\x41\n\x0bset_headers\x18\x02 \x03(\x0b\x32,.coprocess.MiniRequestObject.SetHeadersEntry\x12\x16\n\x0e\x64\x65lete_headers\x18\x03 \x03(\t\x12\x0c\n\x04\x62ody\x18\x04 \x01(\t\x12\x0b\n\x03url\x18\x05 \x01(\t\x12\x38\n\x06params\x18\x06 \x03(\x0b\x32(.coprocess.MiniRequestObject.ParamsEntry\x12?\n\nadd_params\x18\x07 \x03(\x0b\x32+.coprocess.MiniRequestObject.AddParamsEntry\x12I\n\x0f\x65xtended_params\x18\x08 \x03(\x0b\x32\x30.coprocess.MiniRequestObject.ExtendedParamsEntry\x12\x15\n\rdelete_params\x18\t \x03(\t\x12\x34\n\x10return_overrides\x18\n \x01(\x0b\x32\x1a.coprocess.ReturnOverrides\x1a.\n\x0cHeadersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a\x31\n\x0fSetHeadersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a-\n\x0bParamsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a\x30\n\x0e\x41\x64\x64ParamsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a\x35\n\x13\x45xtendedParamsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x62\x06proto3') + serialized_pb=_b('\n#coprocess_mini_request_object.proto\x12\tcoprocess\x1a coprocess_return_overrides.proto\"\xe3\x05\n\x11MiniRequestObject\x12:\n\x07headers\x18\x01 \x03(\x0b\x32).coprocess.MiniRequestObject.HeadersEntry\x12\x41\n\x0bset_headers\x18\x02 \x03(\x0b\x32,.coprocess.MiniRequestObject.SetHeadersEntry\x12\x16\n\x0e\x64\x65lete_headers\x18\x03 \x03(\t\x12\x0c\n\x04\x62ody\x18\x04 \x01(\t\x12\x0b\n\x03url\x18\x05 \x01(\t\x12\x38\n\x06params\x18\x06 \x03(\x0b\x32(.coprocess.MiniRequestObject.ParamsEntry\x12?\n\nadd_params\x18\x07 \x03(\x0b\x32+.coprocess.MiniRequestObject.AddParamsEntry\x12I\n\x0f\x65xtended_params\x18\x08 \x03(\x0b\x32\x30.coprocess.MiniRequestObject.ExtendedParamsEntry\x12\x15\n\rdelete_params\x18\t \x03(\t\x12\x34\n\x10return_overrides\x18\n \x01(\x0b\x32\x1a.coprocess.ReturnOverrides\x12\x0e\n\x06method\x18\x0b \x01(\t\x1a.\n\x0cHeadersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a\x31\n\x0fSetHeadersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a-\n\x0bParamsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a\x30\n\x0e\x41\x64\x64ParamsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a\x35\n\x13\x45xtendedParamsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x62\x06proto3') , dependencies=[coprocess__return__overrides__pb2.DESCRIPTOR,]) @@ -40,14 +40,14 @@ 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='value', full_name='coprocess.MiniRequestObject.HeadersEntry.value', 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, - options=None), + options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -60,8 +60,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=559, - serialized_end=605, + serialized_start=575, + serialized_end=621, ) _MINIREQUESTOBJECT_SETHEADERSENTRY = _descriptor.Descriptor( @@ -77,14 +77,14 @@ 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='value', full_name='coprocess.MiniRequestObject.SetHeadersEntry.value', 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, - options=None), + options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -97,8 +97,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=607, - serialized_end=656, + serialized_start=623, + serialized_end=672, ) _MINIREQUESTOBJECT_PARAMSENTRY = _descriptor.Descriptor( @@ -114,14 +114,14 @@ 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='value', full_name='coprocess.MiniRequestObject.ParamsEntry.value', 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, - options=None), + options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -134,8 +134,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=658, - serialized_end=703, + serialized_start=674, + serialized_end=719, ) _MINIREQUESTOBJECT_ADDPARAMSENTRY = _descriptor.Descriptor( @@ -151,14 +151,14 @@ 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='value', full_name='coprocess.MiniRequestObject.AddParamsEntry.value', 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, - options=None), + options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -171,8 +171,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=705, - serialized_end=753, + serialized_start=721, + serialized_end=769, ) _MINIREQUESTOBJECT_EXTENDEDPARAMSENTRY = _descriptor.Descriptor( @@ -188,14 +188,14 @@ 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='value', full_name='coprocess.MiniRequestObject.ExtendedParamsEntry.value', 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, - options=None), + options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -208,8 +208,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=755, - serialized_end=808, + serialized_start=771, + serialized_end=824, ) _MINIREQUESTOBJECT = _descriptor.Descriptor( @@ -225,70 +225,77 @@ has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='set_headers', full_name='coprocess.MiniRequestObject.set_headers', index=1, number=2, 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='delete_headers', full_name='coprocess.MiniRequestObject.delete_headers', index=2, number=3, type=9, cpp_type=9, 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='body', full_name='coprocess.MiniRequestObject.body', index=3, number=4, 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, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='url', full_name='coprocess.MiniRequestObject.url', index=4, number=5, 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, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='params', full_name='coprocess.MiniRequestObject.params', index=5, number=6, 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='add_params', full_name='coprocess.MiniRequestObject.add_params', index=6, number=7, 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='extended_params', full_name='coprocess.MiniRequestObject.extended_params', 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='delete_params', full_name='coprocess.MiniRequestObject.delete_params', index=8, number=9, type=9, cpp_type=9, 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='return_overrides', full_name='coprocess.MiniRequestObject.return_overrides', index=9, number=10, 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), + options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='method', full_name='coprocess.MiniRequestObject.method', index=10, + number=11, 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, + options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -302,7 +309,7 @@ oneofs=[ ], serialized_start=85, - serialized_end=808, + serialized_end=824, ) _MINIREQUESTOBJECT_HEADERSENTRY.containing_type = _MINIREQUESTOBJECT diff --git a/coprocess/bindings/python/coprocess_object_pb2.py b/coprocess/bindings/python/coprocess_object_pb2.py index 496874e0dc7..39aaca93546 100644 --- a/coprocess/bindings/python/coprocess_object_pb2.py +++ b/coprocess/bindings/python/coprocess_object_pb2.py @@ -42,14 +42,14 @@ 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='value', full_name='coprocess.Object.MetadataEntry.value', 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, - options=None), + options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -79,14 +79,14 @@ 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='value', full_name='coprocess.Object.SpecEntry.value', 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, - options=None), + options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -116,42 +116,42 @@ has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='hook_name', full_name='coprocess.Object.hook_name', 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, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='request', full_name='coprocess.Object.request', 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='session', full_name='coprocess.Object.session', 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='metadata', full_name='coprocess.Object.metadata', index=4, number=5, 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='spec', full_name='coprocess.Object.spec', index=5, number=6, 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), + options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -182,7 +182,7 @@ 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), + options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -277,155 +277,37 @@ _OBJECT_METADATAENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')) _OBJECT_SPECENTRY.has_options = True _OBJECT_SPECENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')) -try: - # THESE ELEMENTS WILL BE DEPRECATED. - # Please use the generated *_pb2_grpc.py files instead. - import grpc - from grpc.beta import implementations as beta_implementations - from grpc.beta import interfaces as beta_interfaces - from grpc.framework.common import cardinality - from grpc.framework.interfaces.face import utilities as face_utilities +_DISPATCHER = _descriptor.ServiceDescriptor( + name='Dispatcher', + full_name='coprocess.Dispatcher', + file=DESCRIPTOR, + index=0, + options=None, + serialized_start=516, + serialized_end=640, + methods=[ + _descriptor.MethodDescriptor( + name='Dispatch', + full_name='coprocess.Dispatcher.Dispatch', + index=0, + containing_service=None, + input_type=_OBJECT, + output_type=_OBJECT, + options=None, + ), + _descriptor.MethodDescriptor( + name='DispatchEvent', + full_name='coprocess.Dispatcher.DispatchEvent', + index=1, + containing_service=None, + input_type=_EVENT, + output_type=_EVENTREPLY, + options=None, + ), +]) +_sym_db.RegisterServiceDescriptor(_DISPATCHER) + +DESCRIPTOR.services_by_name['Dispatcher'] = _DISPATCHER - class DispatcherStub(object): - # missing associated documentation comment in .proto file - pass - - def __init__(self, channel): - """Constructor. - - Args: - channel: A grpc.Channel. - """ - self.Dispatch = channel.unary_unary( - '/coprocess.Dispatcher/Dispatch', - request_serializer=Object.SerializeToString, - response_deserializer=Object.FromString, - ) - self.DispatchEvent = channel.unary_unary( - '/coprocess.Dispatcher/DispatchEvent', - request_serializer=Event.SerializeToString, - response_deserializer=EventReply.FromString, - ) - - - class DispatcherServicer(object): - # missing associated documentation comment in .proto file - pass - - def Dispatch(self, request, context): - # missing associated documentation comment in .proto file - pass - context.set_code(grpc.StatusCode.UNIMPLEMENTED) - context.set_details('Method not implemented!') - raise NotImplementedError('Method not implemented!') - - def DispatchEvent(self, request, context): - # missing associated documentation comment in .proto file - pass - context.set_code(grpc.StatusCode.UNIMPLEMENTED) - context.set_details('Method not implemented!') - raise NotImplementedError('Method not implemented!') - - - def add_DispatcherServicer_to_server(servicer, server): - rpc_method_handlers = { - 'Dispatch': grpc.unary_unary_rpc_method_handler( - servicer.Dispatch, - request_deserializer=Object.FromString, - response_serializer=Object.SerializeToString, - ), - 'DispatchEvent': grpc.unary_unary_rpc_method_handler( - servicer.DispatchEvent, - request_deserializer=Event.FromString, - response_serializer=EventReply.SerializeToString, - ), - } - generic_handler = grpc.method_handlers_generic_handler( - 'coprocess.Dispatcher', rpc_method_handlers) - server.add_generic_rpc_handlers((generic_handler,)) - - - class BetaDispatcherServicer(object): - """The Beta API is deprecated for 0.15.0 and later. - - It is recommended to use the GA API (classes and functions in this - file not marked beta) for all further purposes. This class was generated - only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0.""" - # missing associated documentation comment in .proto file - pass - def Dispatch(self, request, context): - # missing associated documentation comment in .proto file - pass - context.code(beta_interfaces.StatusCode.UNIMPLEMENTED) - def DispatchEvent(self, request, context): - # missing associated documentation comment in .proto file - pass - context.code(beta_interfaces.StatusCode.UNIMPLEMENTED) - - - class BetaDispatcherStub(object): - """The Beta API is deprecated for 0.15.0 and later. - - It is recommended to use the GA API (classes and functions in this - file not marked beta) for all further purposes. This class was generated - only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0.""" - # missing associated documentation comment in .proto file - pass - def Dispatch(self, request, timeout, metadata=None, with_call=False, protocol_options=None): - # missing associated documentation comment in .proto file - pass - raise NotImplementedError() - Dispatch.future = None - def DispatchEvent(self, request, timeout, metadata=None, with_call=False, protocol_options=None): - # missing associated documentation comment in .proto file - pass - raise NotImplementedError() - DispatchEvent.future = None - - - def beta_create_Dispatcher_server(servicer, pool=None, pool_size=None, default_timeout=None, maximum_timeout=None): - """The Beta API is deprecated for 0.15.0 and later. - - It is recommended to use the GA API (classes and functions in this - file not marked beta) for all further purposes. This function was - generated only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0""" - request_deserializers = { - ('coprocess.Dispatcher', 'Dispatch'): Object.FromString, - ('coprocess.Dispatcher', 'DispatchEvent'): Event.FromString, - } - response_serializers = { - ('coprocess.Dispatcher', 'Dispatch'): Object.SerializeToString, - ('coprocess.Dispatcher', 'DispatchEvent'): EventReply.SerializeToString, - } - method_implementations = { - ('coprocess.Dispatcher', 'Dispatch'): face_utilities.unary_unary_inline(servicer.Dispatch), - ('coprocess.Dispatcher', 'DispatchEvent'): face_utilities.unary_unary_inline(servicer.DispatchEvent), - } - server_options = beta_implementations.server_options(request_deserializers=request_deserializers, response_serializers=response_serializers, thread_pool=pool, thread_pool_size=pool_size, default_timeout=default_timeout, maximum_timeout=maximum_timeout) - return beta_implementations.server(method_implementations, options=server_options) - - - def beta_create_Dispatcher_stub(channel, host=None, metadata_transformer=None, pool=None, pool_size=None): - """The Beta API is deprecated for 0.15.0 and later. - - It is recommended to use the GA API (classes and functions in this - file not marked beta) for all further purposes. This function was - generated only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0""" - request_serializers = { - ('coprocess.Dispatcher', 'Dispatch'): Object.SerializeToString, - ('coprocess.Dispatcher', 'DispatchEvent'): Event.SerializeToString, - } - response_deserializers = { - ('coprocess.Dispatcher', 'Dispatch'): Object.FromString, - ('coprocess.Dispatcher', 'DispatchEvent'): EventReply.FromString, - } - cardinalities = { - 'Dispatch': cardinality.Cardinality.UNARY_UNARY, - 'DispatchEvent': cardinality.Cardinality.UNARY_UNARY, - } - stub_options = beta_implementations.stub_options(host=host, metadata_transformer=metadata_transformer, request_serializers=request_serializers, response_deserializers=response_deserializers, thread_pool=pool, thread_pool_size=pool_size) - return beta_implementations.dynamic_stub(channel, 'coprocess.Dispatcher', cardinalities, options=stub_options) -except ImportError: - pass # @@protoc_insertion_point(module_scope) diff --git a/coprocess/bindings/python/coprocess_return_overrides_pb2.py b/coprocess/bindings/python/coprocess_return_overrides_pb2.py index 7777ae0ac0f..bf24e73ad80 100644 --- a/coprocess/bindings/python/coprocess_return_overrides_pb2.py +++ b/coprocess/bindings/python/coprocess_return_overrides_pb2.py @@ -38,14 +38,14 @@ 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='value', full_name='coprocess.ReturnOverrides.HeadersEntry.value', 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, - options=None), + options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -75,21 +75,21 @@ has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='response_error', full_name='coprocess.ReturnOverrides.response_error', 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, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='headers', full_name='coprocess.ReturnOverrides.headers', index=2, number=3, 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), + options=None, file=DESCRIPTOR), ], extensions=[ ], diff --git a/coprocess/bindings/python/coprocess_session_state_pb2.py b/coprocess/bindings/python/coprocess_session_state_pb2.py index 2577284263c..b313d51753c 100644 --- a/coprocess/bindings/python/coprocess_session_state_pb2.py +++ b/coprocess/bindings/python/coprocess_session_state_pb2.py @@ -19,7 +19,7 @@ name='coprocess_session_state.proto', package='coprocess', syntax='proto3', - serialized_pb=_b('\n\x1d\x63oprocess_session_state.proto\x12\tcoprocess\"*\n\nAccessSpec\x12\x0b\n\x03url\x18\x01 \x01(\t\x12\x0f\n\x07methods\x18\x02 \x03(\t\"s\n\x10\x41\x63\x63\x65ssDefinition\x12\x10\n\x08\x61pi_name\x18\x01 \x01(\t\x12\x0e\n\x06\x61pi_id\x18\x02 \x01(\t\x12\x10\n\x08versions\x18\x03 \x03(\t\x12+\n\x0c\x61llowed_urls\x18\x04 \x03(\x0b\x32\x15.coprocess.AccessSpec\"/\n\rBasicAuthData\x12\x10\n\x08password\x18\x01 \x01(\t\x12\x0c\n\x04hash\x18\x02 \x01(\t\"\x19\n\x07JWTData\x12\x0e\n\x06secret\x18\x01 \x01(\t\"!\n\x07Monitor\x12\x16\n\x0etrigger_limits\x18\x01 \x03(\x01\"\x90\x07\n\x0cSessionState\x12\x12\n\nlast_check\x18\x01 \x01(\x03\x12\x11\n\tallowance\x18\x02 \x01(\x01\x12\x0c\n\x04rate\x18\x03 \x01(\x01\x12\x0b\n\x03per\x18\x04 \x01(\x01\x12\x0f\n\x07\x65xpires\x18\x05 \x01(\x03\x12\x11\n\tquota_max\x18\x06 \x01(\x03\x12\x14\n\x0cquota_renews\x18\x07 \x01(\x03\x12\x17\n\x0fquota_remaining\x18\x08 \x01(\x03\x12\x1a\n\x12quota_renewal_rate\x18\t \x01(\x03\x12@\n\raccess_rights\x18\n \x03(\x0b\x32).coprocess.SessionState.AccessRightsEntry\x12\x0e\n\x06org_id\x18\x0b \x01(\t\x12\x17\n\x0foauth_client_id\x18\x0c \x01(\t\x12:\n\noauth_keys\x18\r \x03(\x0b\x32&.coprocess.SessionState.OauthKeysEntry\x12\x31\n\x0f\x62\x61sic_auth_data\x18\x0e \x01(\x0b\x32\x18.coprocess.BasicAuthData\x12$\n\x08jwt_data\x18\x0f \x01(\x0b\x32\x12.coprocess.JWTData\x12\x14\n\x0chmac_enabled\x18\x10 \x01(\x08\x12\x13\n\x0bhmac_secret\x18\x11 \x01(\t\x12\x13\n\x0bis_inactive\x18\x12 \x01(\x08\x12\x17\n\x0f\x61pply_policy_id\x18\x13 \x01(\t\x12\x14\n\x0c\x64\x61ta_expires\x18\x14 \x01(\x03\x12#\n\x07monitor\x18\x15 \x01(\x0b\x32\x12.coprocess.Monitor\x12!\n\x19\x65nable_detailed_recording\x18\x16 \x01(\x08\x12\x10\n\x08metadata\x18\x17 \x01(\t\x12\x0c\n\x04tags\x18\x18 \x03(\t\x12\r\n\x05\x61lias\x18\x19 \x01(\t\x12\x14\n\x0clast_updated\x18\x1a \x01(\t\x12\x1d\n\x15id_extractor_deadline\x18\x1b \x01(\x03\x12\x18\n\x10session_lifetime\x18\x1c \x01(\x03\x12\x16\n\x0e\x61pply_policies\x18\x1d \x03(\t\x1aP\n\x11\x41\x63\x63\x65ssRightsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12*\n\x05value\x18\x02 \x01(\x0b\x32\x1b.coprocess.AccessDefinition:\x02\x38\x01\x1a\x30\n\x0eOauthKeysEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x62\x06proto3') + serialized_pb=_b('\n\x1d\x63oprocess_session_state.proto\x12\tcoprocess\"*\n\nAccessSpec\x12\x0b\n\x03url\x18\x01 \x01(\t\x12\x0f\n\x07methods\x18\x02 \x03(\t\"s\n\x10\x41\x63\x63\x65ssDefinition\x12\x10\n\x08\x61pi_name\x18\x01 \x01(\t\x12\x0e\n\x06\x61pi_id\x18\x02 \x01(\t\x12\x10\n\x08versions\x18\x03 \x03(\t\x12+\n\x0c\x61llowed_urls\x18\x04 \x03(\x0b\x32\x15.coprocess.AccessSpec\"/\n\rBasicAuthData\x12\x10\n\x08password\x18\x01 \x01(\t\x12\x0c\n\x04hash\x18\x02 \x01(\t\"\x19\n\x07JWTData\x12\x0e\n\x06secret\x18\x01 \x01(\t\"!\n\x07Monitor\x12\x16\n\x0etrigger_limits\x18\x01 \x03(\x01\"\xa5\x07\n\x0cSessionState\x12\x12\n\nlast_check\x18\x01 \x01(\x03\x12\x11\n\tallowance\x18\x02 \x01(\x01\x12\x0c\n\x04rate\x18\x03 \x01(\x01\x12\x0b\n\x03per\x18\x04 \x01(\x01\x12\x0f\n\x07\x65xpires\x18\x05 \x01(\x03\x12\x11\n\tquota_max\x18\x06 \x01(\x03\x12\x14\n\x0cquota_renews\x18\x07 \x01(\x03\x12\x17\n\x0fquota_remaining\x18\x08 \x01(\x03\x12\x1a\n\x12quota_renewal_rate\x18\t \x01(\x03\x12@\n\raccess_rights\x18\n \x03(\x0b\x32).coprocess.SessionState.AccessRightsEntry\x12\x0e\n\x06org_id\x18\x0b \x01(\t\x12\x17\n\x0foauth_client_id\x18\x0c \x01(\t\x12:\n\noauth_keys\x18\r \x03(\x0b\x32&.coprocess.SessionState.OauthKeysEntry\x12\x31\n\x0f\x62\x61sic_auth_data\x18\x0e \x01(\x0b\x32\x18.coprocess.BasicAuthData\x12$\n\x08jwt_data\x18\x0f \x01(\x0b\x32\x12.coprocess.JWTData\x12\x14\n\x0chmac_enabled\x18\x10 \x01(\x08\x12\x13\n\x0bhmac_secret\x18\x11 \x01(\t\x12\x13\n\x0bis_inactive\x18\x12 \x01(\x08\x12\x17\n\x0f\x61pply_policy_id\x18\x13 \x01(\t\x12\x14\n\x0c\x64\x61ta_expires\x18\x14 \x01(\x03\x12#\n\x07monitor\x18\x15 \x01(\x0b\x32\x12.coprocess.Monitor\x12!\n\x19\x65nable_detailed_recording\x18\x16 \x01(\x08\x12\x10\n\x08metadata\x18\x17 \x01(\t\x12\x0c\n\x04tags\x18\x18 \x03(\t\x12\r\n\x05\x61lias\x18\x19 \x01(\t\x12\x14\n\x0clast_updated\x18\x1a \x01(\t\x12\x1d\n\x15id_extractor_deadline\x18\x1b \x01(\x03\x12\x18\n\x10session_lifetime\x18\x1c \x01(\x03\x12\x16\n\x0e\x61pply_policies\x18\x1d \x03(\t\x12\x13\n\x0b\x63\x65rtificate\x18\x1e \x01(\t\x1aP\n\x11\x41\x63\x63\x65ssRightsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12*\n\x05value\x18\x02 \x01(\x0b\x32\x1b.coprocess.AccessDefinition:\x02\x38\x01\x1a\x30\n\x0eOauthKeysEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x62\x06proto3') ) @@ -38,14 +38,14 @@ 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='methods', full_name='coprocess.AccessSpec.methods', index=1, number=2, type=9, cpp_type=9, 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), + options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -76,28 +76,28 @@ 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='api_id', full_name='coprocess.AccessDefinition.api_id', 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, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='versions', full_name='coprocess.AccessDefinition.versions', index=2, number=3, type=9, cpp_type=9, 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='allowed_urls', full_name='coprocess.AccessDefinition.allowed_urls', 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), + options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -128,14 +128,14 @@ 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='hash', full_name='coprocess.BasicAuthData.hash', 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, - options=None), + options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -166,7 +166,7 @@ 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), + options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -197,7 +197,7 @@ has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -228,14 +228,14 @@ 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='value', full_name='coprocess.SessionState.AccessRightsEntry.value', 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), + options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -248,8 +248,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1099, - serialized_end=1179, + serialized_start=1120, + serialized_end=1200, ) _SESSIONSTATE_OAUTHKEYSENTRY = _descriptor.Descriptor( @@ -265,14 +265,14 @@ 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='value', full_name='coprocess.SessionState.OauthKeysEntry.value', 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, - options=None), + options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -285,8 +285,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1181, - serialized_end=1229, + serialized_start=1202, + serialized_end=1250, ) _SESSIONSTATE = _descriptor.Descriptor( @@ -302,203 +302,210 @@ has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='allowance', full_name='coprocess.SessionState.allowance', 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='rate', full_name='coprocess.SessionState.rate', index=2, number=3, 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='per', full_name='coprocess.SessionState.per', index=3, number=4, 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='expires', full_name='coprocess.SessionState.expires', index=4, number=5, type=3, cpp_type=2, 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='quota_max', full_name='coprocess.SessionState.quota_max', index=5, number=6, type=3, cpp_type=2, 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='quota_renews', full_name='coprocess.SessionState.quota_renews', index=6, number=7, type=3, cpp_type=2, 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='quota_remaining', full_name='coprocess.SessionState.quota_remaining', index=7, number=8, type=3, cpp_type=2, 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='quota_renewal_rate', full_name='coprocess.SessionState.quota_renewal_rate', index=8, number=9, type=3, cpp_type=2, 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='access_rights', full_name='coprocess.SessionState.access_rights', index=9, number=10, 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='org_id', full_name='coprocess.SessionState.org_id', index=10, number=11, 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, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='oauth_client_id', full_name='coprocess.SessionState.oauth_client_id', index=11, number=12, 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, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='oauth_keys', full_name='coprocess.SessionState.oauth_keys', 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='basic_auth_data', full_name='coprocess.SessionState.basic_auth_data', 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='jwt_data', full_name='coprocess.SessionState.jwt_data', index=14, number=15, 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='hmac_enabled', full_name='coprocess.SessionState.hmac_enabled', index=15, number=16, 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='hmac_secret', full_name='coprocess.SessionState.hmac_secret', index=16, number=17, 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, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='is_inactive', full_name='coprocess.SessionState.is_inactive', index=17, number=18, 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='apply_policy_id', full_name='coprocess.SessionState.apply_policy_id', index=18, number=19, 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, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='data_expires', full_name='coprocess.SessionState.data_expires', index=19, number=20, type=3, cpp_type=2, 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='monitor', full_name='coprocess.SessionState.monitor', index=20, number=21, 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='enable_detailed_recording', full_name='coprocess.SessionState.enable_detailed_recording', index=21, number=22, 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='metadata', full_name='coprocess.SessionState.metadata', index=22, number=23, 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, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='tags', full_name='coprocess.SessionState.tags', index=23, number=24, type=9, cpp_type=9, 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='alias', full_name='coprocess.SessionState.alias', index=24, number=25, 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, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='last_updated', full_name='coprocess.SessionState.last_updated', index=25, number=26, 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, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='id_extractor_deadline', full_name='coprocess.SessionState.id_extractor_deadline', index=26, number=27, type=3, cpp_type=2, 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='session_lifetime', full_name='coprocess.SessionState.session_lifetime', index=27, number=28, type=3, cpp_type=2, 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='apply_policies', full_name='coprocess.SessionState.apply_policies', index=28, number=29, type=9, cpp_type=9, 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), + options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='certificate', full_name='coprocess.SessionState.certificate', index=29, + number=30, 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, + options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -512,7 +519,7 @@ oneofs=[ ], serialized_start=317, - serialized_end=1229, + serialized_end=1250, ) _ACCESSDEFINITION.fields_by_name['allowed_urls'].message_type = _ACCESSSPEC diff --git a/coprocess/bindings/ruby/coprocess_mini_request_object_pb.rb b/coprocess/bindings/ruby/coprocess_mini_request_object_pb.rb index f5cc3ad8198..3611b3855ca 100644 --- a/coprocess/bindings/ruby/coprocess_mini_request_object_pb.rb +++ b/coprocess/bindings/ruby/coprocess_mini_request_object_pb.rb @@ -16,6 +16,7 @@ map :extended_params, :string, :string, 8 repeated :delete_params, :string, 9 optional :return_overrides, :message, 10, "coprocess.ReturnOverrides" + optional :method, :string, 11 end end diff --git a/coprocess/bindings/ruby/coprocess_session_state_pb.rb b/coprocess/bindings/ruby/coprocess_session_state_pb.rb index 77316438a0b..d9a611c4c29 100644 --- a/coprocess/bindings/ruby/coprocess_session_state_pb.rb +++ b/coprocess/bindings/ruby/coprocess_session_state_pb.rb @@ -54,6 +54,7 @@ optional :id_extractor_deadline, :int64, 27 optional :session_lifetime, :int64, 28 repeated :apply_policies, :string, 29 + optional :certificate, :string, 30 end end diff --git a/coprocess/coprocess_mini_request_object.pb.go b/coprocess/coprocess_mini_request_object.pb.go index cad55bf1254..47b2f2d918c 100644 --- a/coprocess/coprocess_mini_request_object.pb.go +++ b/coprocess/coprocess_mini_request_object.pb.go @@ -23,6 +23,7 @@ type MiniRequestObject struct { ExtendedParams map[string]string `protobuf:"bytes,8,rep,name=extended_params,json=extendedParams" json:"extended_params,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` DeleteParams []string `protobuf:"bytes,9,rep,name=delete_params,json=deleteParams" json:"delete_params,omitempty"` ReturnOverrides *ReturnOverrides `protobuf:"bytes,10,opt,name=return_overrides,json=returnOverrides" json:"return_overrides,omitempty"` + Method string `protobuf:"bytes,11,opt,name=method" json:"method,omitempty"` } func (m *MiniRequestObject) Reset() { *m = MiniRequestObject{} } @@ -100,6 +101,13 @@ func (m *MiniRequestObject) GetReturnOverrides() *ReturnOverrides { return nil } +func (m *MiniRequestObject) GetMethod() string { + if m != nil { + return m.Method + } + return "" +} + func init() { proto.RegisterType((*MiniRequestObject)(nil), "coprocess.MiniRequestObject") } @@ -107,30 +115,31 @@ func init() { func init() { proto.RegisterFile("coprocess_mini_request_object.proto", fileDescriptor1) } var fileDescriptor1 = []byte{ - // 391 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0x5f, 0x8b, 0x9b, 0x40, - 0x14, 0xc5, 0x31, 0xe6, 0x4f, 0xbd, 0xa6, 0x49, 0x3a, 0xed, 0x83, 0xf8, 0x24, 0x0d, 0x05, 0x4b, - 0x8b, 0x94, 0xf4, 0xa5, 0x0d, 0x2d, 0x34, 0x94, 0x40, 0x29, 0x84, 0x2c, 0xee, 0xd3, 0x3e, 0x89, - 0xc9, 0x5c, 0x58, 0x37, 0x89, 0x66, 0x67, 0xc6, 0xb0, 0xbe, 0xed, 0x47, 0x5f, 0x32, 0xa3, 0xae, - 0x66, 0x17, 0xc1, 0xb7, 0xb9, 0x87, 0x73, 0x7e, 0x5c, 0xce, 0x55, 0x98, 0x6e, 0x93, 0x23, 0x4b, - 0xb6, 0xc8, 0x79, 0x70, 0x88, 0xe2, 0x28, 0x60, 0x78, 0x9f, 0x22, 0x17, 0x41, 0xb2, 0xb9, 0xc3, - 0xad, 0xf0, 0x8e, 0x2c, 0x11, 0x09, 0x31, 0x4a, 0x93, 0xed, 0x3c, 0xfb, 0x19, 0x8a, 0x94, 0xc5, - 0x41, 0x72, 0x42, 0xc6, 0x22, 0x8a, 0x5c, 0x99, 0x3f, 0x3e, 0x0e, 0xe0, 0xdd, 0x2a, 0x8a, 0x23, - 0x5f, 0x91, 0xd6, 0x12, 0x44, 0xfe, 0xc2, 0xe0, 0x16, 0x43, 0x8a, 0x8c, 0x5b, 0x9a, 0xa3, 0xbb, - 0xe6, 0xec, 0xb3, 0x57, 0x92, 0xbc, 0x17, 0x76, 0xef, 0x9f, 0xf2, 0x2e, 0x63, 0xc1, 0x32, 0xbf, - 0x48, 0x92, 0x15, 0x98, 0x1c, 0x45, 0x50, 0x80, 0x3a, 0x12, 0xf4, 0xb5, 0x11, 0x74, 0x8d, 0xa2, - 0xc6, 0x02, 0x5e, 0x0a, 0xe4, 0x13, 0x8c, 0x28, 0xee, 0x51, 0x60, 0x49, 0xd4, 0x1d, 0xdd, 0x35, - 0xfc, 0xb7, 0x4a, 0x2d, 0x6c, 0x04, 0xba, 0x9b, 0x84, 0x66, 0x56, 0xd7, 0xd1, 0x5c, 0xc3, 0x97, - 0x6f, 0x32, 0x01, 0x3d, 0x65, 0x7b, 0xab, 0x27, 0xa5, 0xf3, 0x93, 0xfc, 0x81, 0xfe, 0x31, 0x64, - 0xe1, 0x81, 0x5b, 0x7d, 0xb9, 0x96, 0xdb, 0xb8, 0xd6, 0x95, 0xb4, 0xaa, 0x95, 0xf2, 0x1c, 0xf9, - 0x0f, 0x10, 0x52, 0x1a, 0xe4, 0x94, 0x81, 0xa4, 0x7c, 0x69, 0xa4, 0x2c, 0x28, 0xad, 0x82, 0x8c, - 0xb0, 0x98, 0xc9, 0x0d, 0x8c, 0xf1, 0x41, 0x60, 0x4c, 0xb1, 0x04, 0xbe, 0x91, 0xc0, 0x6f, 0x8d, - 0xc0, 0x65, 0x9e, 0xa9, 0x52, 0x47, 0x58, 0x13, 0xc9, 0x14, 0xf2, 0x7e, 0x0a, 0xb0, 0x21, 0x4b, - 0x1b, 0x2a, 0x31, 0x37, 0x2d, 0x61, 0x72, 0xf9, 0x79, 0x58, 0xe0, 0x68, 0xae, 0x39, 0xb3, 0x2b, - 0x0b, 0xf8, 0xd2, 0xb2, 0x2e, 0x1c, 0xfe, 0x98, 0xd5, 0x05, 0x7b, 0x0e, 0xc3, 0xea, 0xf5, 0xce, - 0xb5, 0xef, 0x30, 0xb3, 0x34, 0x55, 0xfb, 0x0e, 0x33, 0xf2, 0x01, 0x7a, 0xa7, 0x70, 0x9f, 0xa2, - 0xd5, 0x91, 0x9a, 0x1a, 0xe6, 0x9d, 0x1f, 0x9a, 0xfd, 0x1b, 0xc6, 0x17, 0xc7, 0x6f, 0x15, 0xff, - 0x09, 0x66, 0xa5, 0x85, 0x56, 0xd1, 0x5f, 0x30, 0xaa, 0x5f, 0xa6, 0x55, 0x7a, 0x01, 0xef, 0x5f, - 0x39, 0x43, 0x1b, 0xc4, 0xa6, 0x2f, 0xff, 0xc4, 0xef, 0x4f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xc2, - 0xe6, 0x4b, 0xc7, 0xdd, 0x03, 0x00, 0x00, + // 403 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0x51, 0x8b, 0xd3, 0x40, + 0x14, 0x85, 0x49, 0xb3, 0x9b, 0x9a, 0x9b, 0xb5, 0x5d, 0x47, 0x91, 0x21, 0x4f, 0xc1, 0x45, 0x88, + 0x28, 0x41, 0xd6, 0x17, 0x2d, 0x0a, 0x16, 0x29, 0x88, 0x50, 0x2a, 0xf1, 0xc9, 0xa7, 0x90, 0x76, + 0x2e, 0x34, 0xb6, 0xcd, 0xd4, 0x99, 0x49, 0x31, 0xff, 0xc4, 0x9f, 0x2b, 0x9d, 0x49, 0x62, 0x52, + 0x25, 0x90, 0xb7, 0xdc, 0xc3, 0x39, 0x1f, 0x97, 0x7b, 0x26, 0x70, 0xb7, 0xe1, 0x47, 0xc1, 0x37, + 0x28, 0x65, 0x72, 0xc8, 0xf2, 0x2c, 0x11, 0xf8, 0xb3, 0x40, 0xa9, 0x12, 0xbe, 0xfe, 0x81, 0x1b, + 0x15, 0x1d, 0x05, 0x57, 0x9c, 0xb8, 0x8d, 0xc9, 0x0f, 0xfe, 0xfa, 0x05, 0xaa, 0x42, 0xe4, 0x09, + 0x3f, 0xa1, 0x10, 0x19, 0x43, 0x69, 0xcc, 0xcf, 0x7e, 0x8f, 0xe1, 0xd1, 0x32, 0xcb, 0xb3, 0xd8, + 0x90, 0x56, 0x1a, 0x44, 0x3e, 0xc1, 0x78, 0x8b, 0x29, 0x43, 0x21, 0xa9, 0x15, 0xd8, 0xa1, 0x77, + 0xff, 0x22, 0x6a, 0x48, 0xd1, 0x3f, 0xf6, 0xe8, 0xb3, 0xf1, 0x2e, 0x72, 0x25, 0xca, 0xb8, 0x4e, + 0x92, 0x25, 0x78, 0x12, 0x55, 0x52, 0x83, 0x46, 0x1a, 0xf4, 0xaa, 0x17, 0xf4, 0x0d, 0x55, 0x87, + 0x05, 0xb2, 0x11, 0xc8, 0x73, 0x98, 0x30, 0xdc, 0xa3, 0xc2, 0x86, 0x68, 0x07, 0x76, 0xe8, 0xc6, + 0x0f, 0x8d, 0x5a, 0xdb, 0x08, 0x5c, 0xad, 0x39, 0x2b, 0xe9, 0x55, 0x60, 0x85, 0x6e, 0xac, 0xbf, + 0xc9, 0x2d, 0xd8, 0x85, 0xd8, 0xd3, 0x6b, 0x2d, 0x9d, 0x3f, 0xc9, 0x47, 0x70, 0x8e, 0xa9, 0x48, + 0x0f, 0x92, 0x3a, 0x7a, 0xad, 0xb0, 0x77, 0xad, 0xaf, 0xda, 0x6a, 0x56, 0xaa, 0x72, 0xe4, 0x0b, + 0x40, 0xca, 0x58, 0x52, 0x51, 0xc6, 0x9a, 0xf2, 0xb2, 0x97, 0x32, 0x67, 0xac, 0x0d, 0x72, 0xd3, + 0x7a, 0x26, 0xdf, 0x61, 0x8a, 0xbf, 0x14, 0xe6, 0x0c, 0x1b, 0xe0, 0x03, 0x0d, 0x7c, 0xdd, 0x0b, + 0x5c, 0x54, 0x99, 0x36, 0x75, 0x82, 0x1d, 0x91, 0xdc, 0x41, 0x75, 0x9f, 0x1a, 0xec, 0xea, 0xa3, + 0xdd, 0x18, 0xb1, 0x32, 0x2d, 0xe0, 0xf6, 0xf2, 0x79, 0x50, 0x08, 0xac, 0xd0, 0xbb, 0xf7, 0x5b, + 0x0b, 0xc4, 0xda, 0xb2, 0xaa, 0x1d, 0xf1, 0x54, 0x74, 0x05, 0xf2, 0x14, 0x9c, 0x03, 0xaa, 0x2d, + 0x67, 0xd4, 0xd3, 0x97, 0xae, 0x26, 0x7f, 0x06, 0x37, 0xed, 0x56, 0xcf, 0x75, 0xec, 0xb0, 0xa4, + 0x96, 0xa9, 0x63, 0x87, 0x25, 0x79, 0x02, 0xd7, 0xa7, 0x74, 0x5f, 0x20, 0x1d, 0x69, 0xcd, 0x0c, + 0xb3, 0xd1, 0x5b, 0xcb, 0xff, 0x00, 0xd3, 0x8b, 0x47, 0x31, 0x28, 0xfe, 0x0e, 0xbc, 0xd6, 0x75, + 0x06, 0x45, 0xdf, 0xc3, 0xa4, 0xdb, 0xd8, 0xa0, 0xf4, 0x1c, 0x1e, 0xff, 0xa7, 0x9e, 0x21, 0x88, + 0xb5, 0xa3, 0xff, 0xd0, 0x37, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x06, 0x47, 0xf6, 0xd8, 0xf5, + 0x03, 0x00, 0x00, } diff --git a/coprocess/coprocess_session_state.pb.go b/coprocess/coprocess_session_state.pb.go index 6865d2b304f..c69efce4210 100644 --- a/coprocess/coprocess_session_state.pb.go +++ b/coprocess/coprocess_session_state.pb.go @@ -162,7 +162,7 @@ type SessionState struct { IdExtractorDeadline int64 `protobuf:"varint,27,opt,name=id_extractor_deadline,json=idExtractorDeadline" json:"id_extractor_deadline,omitempty"` SessionLifetime int64 `protobuf:"varint,28,opt,name=session_lifetime,json=sessionLifetime" json:"session_lifetime,omitempty"` ApplyPolicies []string `protobuf:"bytes,29,rep,name=apply_policies,json=applyPolicies" json:"apply_policies,omitempty"` - Certificate string `protobuf:"bytes,30,opt,name=certificate,json=certificate" json:"certificate,omitempty"` + Certificate string `protobuf:"bytes,30,opt,name=certificate" json:"certificate,omitempty"` } func (m *SessionState) Reset() { *m = SessionState{} } @@ -373,6 +373,13 @@ func (m *SessionState) GetApplyPolicies() []string { return nil } +func (m *SessionState) GetCertificate() string { + if m != nil { + return m.Certificate + } + return "" +} + func init() { proto.RegisterType((*AccessSpec)(nil), "coprocess.AccessSpec") proto.RegisterType((*AccessDefinition)(nil), "coprocess.AccessDefinition") @@ -385,62 +392,63 @@ func init() { func init() { proto.RegisterFile("coprocess_session_state.proto", fileDescriptor4) } var fileDescriptor4 = []byte{ - // 897 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x55, 0xdf, 0x4f, 0x1b, 0x47, - 0x10, 0x96, 0x63, 0xc0, 0xf6, 0xd8, 0x06, 0xb2, 0x81, 0x64, 0x81, 0xa0, 0x1a, 0x4b, 0x4d, 0x1d, - 0x29, 0x45, 0x2d, 0x7d, 0x41, 0x51, 0xa5, 0x36, 0x0d, 0x3c, 0xb8, 0x4d, 0xd2, 0xea, 0x68, 0xd4, - 0x97, 0x4a, 0xab, 0xe1, 0x6e, 0x62, 0x6f, 0xb8, 0x5f, 0xdd, 0x5d, 0x63, 0xfc, 0x4f, 0xf4, 0x0f, - 0xe8, 0x5f, 0x5b, 0xed, 0xdc, 0x1e, 0x1c, 0xa2, 0x7d, 0xdb, 0xf9, 0xe6, 0xdb, 0xb9, 0x6f, 0x77, - 0xbe, 0x9d, 0x83, 0xc3, 0xb8, 0x28, 0x4d, 0x11, 0x93, 0xb5, 0xca, 0x92, 0xb5, 0xba, 0xc8, 0x95, - 0x75, 0xe8, 0xe8, 0xb8, 0x34, 0x85, 0x2b, 0x44, 0xef, 0x36, 0x3d, 0x3e, 0x05, 0x78, 0x13, 0xfb, - 0xd5, 0x45, 0x49, 0xb1, 0xd8, 0x86, 0xf6, 0xc2, 0xa4, 0xb2, 0x35, 0x6a, 0x4d, 0x7a, 0x91, 0x5f, - 0x0a, 0x09, 0x9d, 0x8c, 0xdc, 0xbc, 0x48, 0xac, 0x7c, 0x34, 0x6a, 0x4f, 0x7a, 0x51, 0x1d, 0x8e, - 0xff, 0x69, 0xc1, 0x76, 0xb5, 0xf5, 0x8c, 0x3e, 0xe9, 0x5c, 0x3b, 0x5d, 0xe4, 0x62, 0x0f, 0xba, - 0x58, 0x6a, 0x95, 0x63, 0x46, 0xa1, 0x4a, 0x07, 0x4b, 0xfd, 0x01, 0x33, 0x12, 0xbb, 0xb0, 0xe1, - 0x53, 0x3a, 0x91, 0x8f, 0x38, 0xb1, 0x8e, 0xa5, 0x9e, 0x26, 0x62, 0x1f, 0xba, 0xd7, 0x64, 0xbc, - 0x44, 0x2b, 0xdb, 0xfc, 0x85, 0xdb, 0x58, 0x9c, 0xc2, 0x00, 0xd3, 0xb4, 0x58, 0x52, 0xa2, 0x16, - 0x26, 0xb5, 0x72, 0x6d, 0xd4, 0x9e, 0xf4, 0x4f, 0x76, 0x8f, 0x6f, 0xe5, 0x1f, 0xdf, 0x69, 0x8f, - 0xfa, 0x81, 0xfa, 0xd1, 0xa4, 0x76, 0xfc, 0x03, 0x0c, 0x7f, 0x42, 0xab, 0xe3, 0x37, 0x0b, 0x37, - 0x3f, 0x43, 0x87, 0xfe, 0x33, 0x25, 0x5a, 0xbb, 0x2c, 0x4c, 0x12, 0x84, 0xdd, 0xc6, 0x42, 0xc0, - 0xda, 0x1c, 0xed, 0x3c, 0xe8, 0xe2, 0xf5, 0xf8, 0x08, 0x3a, 0x3f, 0xff, 0xf1, 0x3b, 0x6f, 0x7d, - 0x0a, 0x1b, 0x96, 0x62, 0x43, 0x2e, 0x6c, 0x0c, 0xd1, 0xf8, 0x1b, 0xe8, 0xbc, 0x2f, 0x72, 0xed, - 0x0a, 0x23, 0xbe, 0x84, 0x4d, 0x67, 0xf4, 0x6c, 0x46, 0x46, 0xa5, 0x3a, 0xd3, 0xce, 0xca, 0xd6, - 0xa8, 0x3d, 0x69, 0x45, 0xc3, 0x80, 0xbe, 0x63, 0x70, 0xfc, 0x37, 0xc0, 0xe0, 0xa2, 0xea, 0xc7, - 0x85, 0x6f, 0x87, 0x38, 0x04, 0x48, 0xd1, 0x3a, 0x15, 0xcf, 0x29, 0xbe, 0xe2, 0xf2, 0xed, 0xa8, - 0xe7, 0x91, 0xb7, 0x1e, 0x10, 0xcf, 0xa1, 0xc7, 0x87, 0xc2, 0x3c, 0x26, 0x56, 0xd7, 0x8a, 0xee, - 0x00, 0x2f, 0xdb, 0xa0, 0x23, 0xd9, 0xe6, 0x04, 0xaf, 0x7d, 0x03, 0x4b, 0x32, 0x72, 0x8d, 0x21, - 0xbf, 0xf4, 0x0d, 0xa4, 0x9b, 0x52, 0x1b, 0xb2, 0x72, 0x9d, 0xeb, 0xd7, 0xa1, 0x38, 0x80, 0xde, - 0x5f, 0x8b, 0xc2, 0xa1, 0xca, 0xf0, 0x46, 0x6e, 0x70, 0xae, 0xcb, 0xc0, 0x7b, 0xbc, 0x11, 0x47, - 0x30, 0xa8, 0x92, 0x86, 0x72, 0x5a, 0x5a, 0xd9, 0xe1, 0x7c, 0x9f, 0xb1, 0x88, 0x21, 0xf1, 0x15, - 0x6c, 0xd5, 0x94, 0x0c, 0x75, 0xae, 0xf3, 0x99, 0xec, 0x32, 0x6b, 0x33, 0xb0, 0x02, 0x2a, 0x5e, - 0x81, 0x68, 0xd4, 0xc2, 0x54, 0xb1, 0xec, 0x1e, 0x73, 0xb7, 0xef, 0x2a, 0x62, 0x1a, 0xf9, 0x23, - 0x7c, 0x80, 0x21, 0x72, 0x57, 0x95, 0xd1, 0xb3, 0xb9, 0xb3, 0x12, 0xb8, 0xeb, 0x2f, 0x1b, 0x5d, - 0x6f, 0xde, 0x61, 0xb0, 0x40, 0xc4, 0xdc, 0xf3, 0xdc, 0x99, 0x55, 0x34, 0xc0, 0x06, 0xe4, 0x7d, - 0x57, 0x98, 0x99, 0xf7, 0x5d, 0xbf, 0xf2, 0x5d, 0x61, 0x66, 0xd3, 0x44, 0xbc, 0x80, 0xad, 0x02, - 0x17, 0x6e, 0xae, 0xe2, 0x54, 0x53, 0xee, 0x7c, 0x7e, 0xc0, 0xf9, 0x21, 0xc3, 0x6f, 0x19, 0x9d, - 0x26, 0xe2, 0x1c, 0xa0, 0xe2, 0x5d, 0xd1, 0xca, 0xca, 0x21, 0x6b, 0x79, 0xf1, 0x7f, 0x5a, 0x7e, - 0xf5, 0xcc, 0x5f, 0x68, 0x15, 0x84, 0xf4, 0x8a, 0x3a, 0x16, 0x3f, 0xc2, 0xd6, 0xa5, 0x37, 0xa4, - 0xe2, 0x5a, 0x09, 0x3a, 0x94, 0x9b, 0xa3, 0xd6, 0xa4, 0x7f, 0x22, 0x1b, 0xb5, 0xee, 0x59, 0x36, - 0x1a, 0x5e, 0xde, 0x73, 0xf0, 0xd7, 0xd0, 0xfd, 0xbc, 0x74, 0xd5, 0xd6, 0x2d, 0xde, 0x2a, 0x1a, - 0x5b, 0x83, 0x59, 0xa3, 0xce, 0xe7, 0xa5, 0x63, 0xfa, 0x11, 0x0c, 0xe6, 0x19, 0xc6, 0x8a, 0x72, - 0xbc, 0x4c, 0x29, 0x91, 0xdb, 0xa3, 0xd6, 0xa4, 0x1b, 0xf5, 0x3d, 0x76, 0x5e, 0x41, 0xe2, 0x0b, - 0xe0, 0x50, 0x05, 0x77, 0x3f, 0xe6, 0xe3, 0x83, 0x87, 0x2e, 0x18, 0xf1, 0x04, 0x6d, 0x95, 0xce, - 0x31, 0x76, 0xfa, 0x9a, 0xa4, 0xe0, 0x12, 0xa0, 0xed, 0x34, 0x20, 0xfe, 0x12, 0xb1, 0x2c, 0xd3, - 0x95, 0x2a, 0x8b, 0x54, 0xc7, 0x2b, 0x7f, 0x89, 0x4f, 0xaa, 0x4b, 0x64, 0xf8, 0x37, 0x46, 0xa7, - 0x89, 0x17, 0xe3, 0x75, 0xab, 0xda, 0x89, 0x3b, 0x95, 0x9b, 0x3c, 0x76, 0x1e, 0xdc, 0xf8, 0x0a, - 0x3a, 0x59, 0xf5, 0x9a, 0xe4, 0xee, 0x83, 0xd3, 0x85, 0x77, 0x16, 0xd5, 0x14, 0xf1, 0x1a, 0xf6, - 0xaa, 0x83, 0xa9, 0x84, 0x1c, 0xea, 0x94, 0x12, 0x65, 0x28, 0x2e, 0x4c, 0xe2, 0x5d, 0xf8, 0x94, - 0x75, 0x3e, 0xab, 0x08, 0x67, 0x21, 0x1f, 0xd5, 0x69, 0x3f, 0x0a, 0x32, 0x72, 0xc8, 0x17, 0xf9, - 0xac, 0x1a, 0x05, 0x75, 0xec, 0xdf, 0x94, 0xc3, 0x99, 0x95, 0x92, 0x27, 0x11, 0xaf, 0xc5, 0x0e, - 0xac, 0x63, 0xaa, 0xd1, 0xca, 0xbd, 0x30, 0xb7, 0x7c, 0xe0, 0x8f, 0xc4, 0x4f, 0x77, 0x51, 0x26, - 0xe8, 0x28, 0x91, 0xfb, 0x9c, 0xec, 0x7b, 0xec, 0x63, 0x05, 0x89, 0x13, 0xd8, 0xd5, 0x89, 0xa2, - 0x1b, 0x67, 0x30, 0x76, 0x85, 0x51, 0x09, 0x61, 0x92, 0xea, 0x9c, 0xe4, 0x01, 0x1f, 0xff, 0x89, - 0x4e, 0xce, 0xeb, 0xdc, 0x59, 0x48, 0x89, 0x97, 0xb0, 0x5d, 0x4f, 0xec, 0x54, 0x7f, 0x22, 0xa7, - 0x33, 0x92, 0xcf, 0x99, 0xbe, 0x15, 0xf0, 0x77, 0x01, 0xf6, 0x43, 0xa7, 0x71, 0xf9, 0x9a, 0xac, - 0x3c, 0x64, 0xd5, 0x8d, 0xbb, 0xd7, 0x64, 0xf7, 0xff, 0x84, 0xc7, 0x0f, 0x9e, 0x88, 0x9f, 0x13, - 0x57, 0xb4, 0xaa, 0x07, 0xfd, 0x15, 0xad, 0xc4, 0xb7, 0xb0, 0x7e, 0x8d, 0xe9, 0xa2, 0x9a, 0x33, - 0xfd, 0x93, 0x83, 0x07, 0x43, 0xf6, 0x6e, 0xca, 0x47, 0x15, 0xf3, 0xf5, 0xa3, 0xd3, 0xd6, 0xfe, - 0xf7, 0xb0, 0x79, 0xdf, 0xf4, 0xff, 0x51, 0x7a, 0xa7, 0x59, 0xba, 0xd7, 0xd8, 0x7d, 0xb9, 0xc1, - 0xff, 0xa3, 0xef, 0xfe, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x91, 0x66, 0x8d, 0x6d, 0xb0, 0x06, 0x00, - 0x00, + // 914 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x55, 0x6f, 0x4f, 0x1b, 0xc7, + 0x13, 0x96, 0x31, 0x60, 0x7b, 0x6c, 0x03, 0xd9, 0x40, 0xb2, 0x40, 0xf8, 0xfd, 0x8c, 0xa5, 0xa6, + 0x8e, 0x94, 0xa2, 0x96, 0xbe, 0x41, 0x51, 0xa5, 0x36, 0x0d, 0xbc, 0xa0, 0x4d, 0xd2, 0xea, 0x68, + 0xd4, 0x37, 0x95, 0x56, 0xc3, 0xdd, 0x60, 0x6f, 0xb8, 0x7f, 0xdd, 0x5d, 0x63, 0xfc, 0x55, 0xfa, + 0x29, 0xfa, 0x11, 0xab, 0x9d, 0xdb, 0x83, 0x43, 0xb4, 0xef, 0x76, 0x9e, 0xe7, 0xd9, 0xb9, 0x67, + 0x77, 0x67, 0xe6, 0xe0, 0x20, 0x2e, 0x4a, 0x53, 0xc4, 0x64, 0xad, 0xb2, 0x64, 0xad, 0x2e, 0x72, + 0x65, 0x1d, 0x3a, 0x3a, 0x2a, 0x4d, 0xe1, 0x0a, 0xd1, 0xbb, 0xa3, 0xc7, 0x27, 0x00, 0x6f, 0x63, + 0xbf, 0xba, 0x28, 0x29, 0x16, 0x5b, 0xd0, 0x9e, 0x9b, 0x54, 0xb6, 0x46, 0xad, 0x49, 0x2f, 0xf2, + 0x4b, 0x21, 0xa1, 0x93, 0x91, 0x9b, 0x15, 0x89, 0x95, 0x2b, 0xa3, 0xf6, 0xa4, 0x17, 0xd5, 0xe1, + 0xf8, 0xaf, 0x16, 0x6c, 0x55, 0x5b, 0x4f, 0xe9, 0x4a, 0xe7, 0xda, 0xe9, 0x22, 0x17, 0xbb, 0xd0, + 0xc5, 0x52, 0xab, 0x1c, 0x33, 0x0a, 0x59, 0x3a, 0x58, 0xea, 0x8f, 0x98, 0x91, 0xd8, 0x81, 0x75, + 0x4f, 0xe9, 0x44, 0xae, 0x30, 0xb1, 0x86, 0xa5, 0x3e, 0x4f, 0xc4, 0x1e, 0x74, 0x6f, 0xc8, 0x78, + 0x8b, 0x56, 0xb6, 0xf9, 0x0b, 0x77, 0xb1, 0x38, 0x81, 0x01, 0xa6, 0x69, 0xb1, 0xa0, 0x44, 0xcd, + 0x4d, 0x6a, 0xe5, 0xea, 0xa8, 0x3d, 0xe9, 0x1f, 0xef, 0x1c, 0xdd, 0xd9, 0x3f, 0xba, 0xf7, 0x1e, + 0xf5, 0x83, 0xf4, 0x93, 0x49, 0xed, 0xf8, 0x7b, 0x18, 0xfe, 0x88, 0x56, 0xc7, 0x6f, 0xe7, 0x6e, + 0x76, 0x8a, 0x0e, 0xfd, 0x67, 0x4a, 0xb4, 0x76, 0x51, 0x98, 0x24, 0x18, 0xbb, 0x8b, 0x85, 0x80, + 0xd5, 0x19, 0xda, 0x59, 0xf0, 0xc5, 0xeb, 0xf1, 0x21, 0x74, 0x7e, 0xfa, 0xfd, 0x37, 0xde, 0xfa, + 0x0c, 0xd6, 0x2d, 0xc5, 0x86, 0x5c, 0xd8, 0x18, 0xa2, 0xf1, 0xd7, 0xd0, 0xf9, 0x50, 0xe4, 0xda, + 0x15, 0x46, 0x7c, 0x01, 0x1b, 0xce, 0xe8, 0xe9, 0x94, 0x8c, 0x4a, 0x75, 0xa6, 0x9d, 0x95, 0xad, + 0x51, 0x7b, 0xd2, 0x8a, 0x86, 0x01, 0x7d, 0xcf, 0xe0, 0xf8, 0x6f, 0x80, 0xc1, 0x45, 0xf5, 0x1e, + 0x17, 0xfe, 0x39, 0xc4, 0x01, 0x40, 0x8a, 0xd6, 0xa9, 0x78, 0x46, 0xf1, 0x35, 0xa7, 0x6f, 0x47, + 0x3d, 0x8f, 0xbc, 0xf3, 0x80, 0x78, 0x01, 0x3d, 0x3e, 0x14, 0xe6, 0x31, 0xb1, 0xbb, 0x56, 0x74, + 0x0f, 0x78, 0xdb, 0x06, 0x1d, 0xc9, 0x36, 0x13, 0xbc, 0xf6, 0x0f, 0x58, 0x92, 0x91, 0xab, 0x0c, + 0xf9, 0xa5, 0x7f, 0x40, 0xba, 0x2d, 0xb5, 0x21, 0x2b, 0xd7, 0x38, 0x7f, 0x1d, 0x8a, 0x7d, 0xe8, + 0xfd, 0x39, 0x2f, 0x1c, 0xaa, 0x0c, 0x6f, 0xe5, 0x3a, 0x73, 0x5d, 0x06, 0x3e, 0xe0, 0xad, 0x38, + 0x84, 0x41, 0x45, 0x1a, 0xca, 0x69, 0x61, 0x65, 0x87, 0xf9, 0x3e, 0x63, 0x11, 0x43, 0xe2, 0x4b, + 0xd8, 0xac, 0x25, 0x19, 0xea, 0x5c, 0xe7, 0x53, 0xd9, 0x65, 0xd5, 0x46, 0x50, 0x05, 0x54, 0xbc, + 0x06, 0xd1, 0xc8, 0x85, 0xa9, 0x62, 0xdb, 0x3d, 0xd6, 0x6e, 0xdd, 0x67, 0xc4, 0x34, 0xf2, 0x47, + 0xf8, 0x08, 0x43, 0xe4, 0x57, 0x55, 0x46, 0x4f, 0x67, 0xce, 0x4a, 0xe0, 0x57, 0x7f, 0xd5, 0x78, + 0xf5, 0xe6, 0x1d, 0x86, 0x12, 0x88, 0x58, 0x7b, 0x96, 0x3b, 0xb3, 0x8c, 0x06, 0xd8, 0x80, 0x7c, + 0xdd, 0x15, 0x66, 0xea, 0xeb, 0xae, 0x5f, 0xd5, 0x5d, 0x61, 0xa6, 0xe7, 0x89, 0x78, 0x09, 0x9b, + 0x05, 0xce, 0xdd, 0x4c, 0xc5, 0xa9, 0xa6, 0xdc, 0x79, 0x7e, 0xc0, 0xfc, 0x90, 0xe1, 0x77, 0x8c, + 0x9e, 0x27, 0xe2, 0x0c, 0xa0, 0xd2, 0x5d, 0xd3, 0xd2, 0xca, 0x21, 0x7b, 0x79, 0xf9, 0x5f, 0x5e, + 0x7e, 0xf1, 0xca, 0x9f, 0x69, 0x19, 0x8c, 0xf4, 0x8a, 0x3a, 0x16, 0x3f, 0xc0, 0xe6, 0xa5, 0x2f, + 0x48, 0xc5, 0xb9, 0x12, 0x74, 0x28, 0x37, 0x46, 0xad, 0x49, 0xff, 0x58, 0x36, 0x72, 0x3d, 0x28, + 0xd9, 0x68, 0x78, 0xf9, 0xa0, 0x82, 0xbf, 0x82, 0xee, 0xe7, 0x85, 0xab, 0xb6, 0x6e, 0xf2, 0x56, + 0xd1, 0xd8, 0x1a, 0x8a, 0x35, 0xea, 0x7c, 0x5e, 0x38, 0x96, 0x1f, 0xc2, 0x60, 0x96, 0x61, 0xac, + 0x28, 0xc7, 0xcb, 0x94, 0x12, 0xb9, 0x35, 0x6a, 0x4d, 0xba, 0x51, 0xdf, 0x63, 0x67, 0x15, 0x24, + 0xfe, 0x0f, 0x1c, 0xaa, 0x50, 0xdd, 0x4f, 0xf8, 0xf8, 0xe0, 0xa1, 0x0b, 0x46, 0xbc, 0x40, 0x5b, + 0xa5, 0x73, 0x8c, 0x9d, 0xbe, 0x21, 0x29, 0x38, 0x05, 0x68, 0x7b, 0x1e, 0x10, 0x7f, 0x89, 0x58, + 0x96, 0xe9, 0x52, 0x95, 0x45, 0xaa, 0xe3, 0xa5, 0xbf, 0xc4, 0xa7, 0xd5, 0x25, 0x32, 0xfc, 0x2b, + 0xa3, 0xe7, 0x89, 0x37, 0xe3, 0x7d, 0xab, 0xba, 0x12, 0xb7, 0xab, 0x6a, 0xf2, 0xd8, 0x59, 0xa8, + 0xc6, 0xd7, 0xd0, 0xc9, 0xaa, 0x6e, 0x92, 0x3b, 0x8f, 0x4e, 0x17, 0xfa, 0x2c, 0xaa, 0x25, 0xe2, + 0x0d, 0xec, 0x56, 0x07, 0x53, 0x09, 0x39, 0xd4, 0x29, 0x25, 0xca, 0x50, 0x5c, 0x98, 0xc4, 0x57, + 0xe1, 0x33, 0xf6, 0xf9, 0xbc, 0x12, 0x9c, 0x06, 0x3e, 0xaa, 0x69, 0x3f, 0x0a, 0x32, 0x72, 0xc8, + 0x17, 0xf9, 0xbc, 0x1a, 0x05, 0x75, 0xec, 0x7b, 0xca, 0xe1, 0xd4, 0x4a, 0xc9, 0x93, 0x88, 0xd7, + 0x62, 0x1b, 0xd6, 0x30, 0xd5, 0x68, 0xe5, 0x6e, 0x98, 0x5b, 0x3e, 0xf0, 0x47, 0xe2, 0xd6, 0x9d, + 0x97, 0x09, 0x3a, 0x4a, 0xe4, 0x1e, 0x93, 0x7d, 0x8f, 0x7d, 0xaa, 0x20, 0x71, 0x0c, 0x3b, 0x3a, + 0x51, 0x74, 0xeb, 0x0c, 0xc6, 0xae, 0x30, 0x2a, 0x21, 0x4c, 0x52, 0x9d, 0x93, 0xdc, 0xe7, 0xe3, + 0x3f, 0xd5, 0xc9, 0x59, 0xcd, 0x9d, 0x06, 0x4a, 0xbc, 0x82, 0xad, 0x7a, 0x62, 0xa7, 0xfa, 0x8a, + 0x9c, 0xce, 0x48, 0xbe, 0x60, 0xf9, 0x66, 0xc0, 0xdf, 0x07, 0xd8, 0x0f, 0x9d, 0xc6, 0xe5, 0x6b, + 0xb2, 0xf2, 0x80, 0x5d, 0x37, 0xee, 0x5e, 0x93, 0x15, 0x23, 0xe8, 0xc7, 0x64, 0x9c, 0xbe, 0xd2, + 0xb1, 0x6f, 0xbb, 0xff, 0x55, 0x3e, 0x1b, 0xd0, 0xde, 0x1f, 0xf0, 0xe4, 0x51, 0x13, 0xf9, 0x49, + 0x72, 0x4d, 0xcb, 0xfa, 0x57, 0x70, 0x4d, 0x4b, 0xf1, 0x0d, 0xac, 0xdd, 0x60, 0x3a, 0xaf, 0x26, + 0x51, 0xff, 0x78, 0xff, 0xd1, 0x18, 0xbe, 0xff, 0x0f, 0x44, 0x95, 0xf2, 0xcd, 0xca, 0x49, 0x6b, + 0xef, 0x3b, 0xd8, 0x78, 0xd8, 0x16, 0xff, 0x92, 0x7a, 0xbb, 0x99, 0xba, 0xd7, 0xd8, 0x7d, 0xb9, + 0xce, 0x7f, 0xac, 0x6f, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, 0x93, 0xd4, 0x16, 0x3a, 0xd2, 0x06, + 0x00, 0x00, } diff --git a/coprocess/proto/coprocess_mini_request_object.proto b/coprocess/proto/coprocess_mini_request_object.proto index edb621f3d44..e849974f481 100644 --- a/coprocess/proto/coprocess_mini_request_object.proto +++ b/coprocess/proto/coprocess_mini_request_object.proto @@ -16,4 +16,5 @@ message MiniRequestObject { map extended_params = 8; repeated string delete_params = 9; ReturnOverrides return_overrides = 10; + string method = 11; } diff --git a/coprocess/proto/coprocess_session_state.proto b/coprocess/proto/coprocess_session_state.proto index 70df5186e5e..36f080127e9 100644 --- a/coprocess/proto/coprocess_session_state.proto +++ b/coprocess/proto/coprocess_session_state.proto @@ -69,4 +69,6 @@ message SessionState { int64 id_extractor_deadline = 27; int64 session_lifetime = 28; repeated string apply_policies = 29; + + string certificate = 30; } diff --git a/coprocess/proto/update_bindings.sh b/coprocess/proto/update_bindings.sh index 9d7f0ac3685..6fdbf471691 100755 --- a/coprocess/proto/update_bindings.sh +++ b/coprocess/proto/update_bindings.sh @@ -11,7 +11,7 @@ protoc -I. --go_out=plugins=grpc:../ *.proto echo "Generating bindings for Python." mkdir -p ../bindings/python protoc -I. --python_out=../bindings/python *.proto -python codegen.py +python3 codegen.py echo "Generating bindings for Ruby." mkdir -p ../bindings/ruby diff --git a/mw_js_plugin.go b/mw_js_plugin.go index 62142065f63..a0e1c5e9ffb 100644 --- a/mw_js_plugin.go +++ b/mw_js_plugin.go @@ -43,6 +43,7 @@ type MiniRequestObject struct { DeleteParams []string ReturnOverrides ReturnOverrides IgnoreBody bool + Method string } type VMReturnObject struct { @@ -106,6 +107,7 @@ func (d *DynamicMiddleware) ProcessRequest(w http.ResponseWriter, r *http.Reques AddParams: map[string]string{}, ExtendedParams: map[string][]string{}, DeleteParams: []string{}, + Method: r.Method, } requestAsJson, err := json.Marshal(requestData) diff --git a/user/session.go b/user/session.go index 7f7d2fd75fd..48724100a59 100644 --- a/user/session.go +++ b/user/session.go @@ -34,6 +34,7 @@ type AccessDefinition struct { } // SessionState objects represent a current API session, mainly used for rate limiting. +// There's a data structure that's based on this and it's used for Protocol Buffer support, make sure to update "coprocess/proto/coprocess_session_state.proto" and generate the bindings using: cd coprocess/proto && ./update_bindings.sh type SessionState struct { LastCheck int64 `json:"last_check" msg:"last_check"` Allowance float64 `json:"allowance" msg:"allowance"`