diff options
author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2019-10-18 16:20:40 +0300 |
---|---|---|
committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2019-10-30 13:52:48 +0300 |
commit | c5a32067ea894de136e0fa35ddbaa5232231242d (patch) | |
tree | c76188cca396272fddd3366f82d39dc2cb1057ab | |
parent | f0ca42f38c3cd484dc54faf0fbf66fb6496d6623 (diff) |
Remove unused ExtractCommitSignature RPC
This RPC was introduced in 0.70.0, but gone unused in favour of the
GetCommitSignatures RPC. Given there's no active callsight, it's being
removed in GitLab-Rails too: https://gitlab.com/gitlab-org/gitlab/merge_requests/18804
Closes: https://gitlab.com/gitlab-org/gitlab/issues/31079
-rw-r--r-- | internal/service/commit/extractsignature.go | 35 | ||||
-rw-r--r-- | internal/service/commit/extractsignature_test.go | 165 | ||||
-rw-r--r-- | proto/commit.proto | 10 | ||||
-rw-r--r-- | proto/go/gitalypb/commit.pb.go | 330 | ||||
-rw-r--r-- | ruby/lib/gitaly_server/commit_service.rb | 47 | ||||
-rw-r--r-- | ruby/proto/gitaly/commit_services_pb.rb | 4 |
6 files changed, 130 insertions, 461 deletions
diff --git a/internal/service/commit/extractsignature.go b/internal/service/commit/extractsignature.go deleted file mode 100644 index 8cf7d6e02..000000000 --- a/internal/service/commit/extractsignature.go +++ /dev/null @@ -1,35 +0,0 @@ -package commit - -import ( - "gitlab.com/gitlab-org/gitaly/internal/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" -) - -func (s *server) ExtractCommitSignature(request *gitalypb.ExtractCommitSignatureRequest, stream gitalypb.CommitService_ExtractCommitSignatureServer) error { - ctx := stream.Context() - - client, err := s.ruby.CommitServiceClient(ctx) - if err != nil { - return err - } - - clientCtx, err := rubyserver.SetHeaders(ctx, request.GetRepository()) - if err != nil { - return err - } - - rubyStream, err := client.ExtractCommitSignature(clientCtx, request) - if err != nil { - return err - } - - return rubyserver.Proxy(func() error { - resp, err := rubyStream.Recv() - if err != nil { - md := rubyStream.Trailer() - stream.SetTrailer(md) - return err - } - return stream.Send(resp) - }) -} diff --git a/internal/service/commit/extractsignature_test.go b/internal/service/commit/extractsignature_test.go deleted file mode 100644 index 76d90940c..000000000 --- a/internal/service/commit/extractsignature_test.go +++ /dev/null @@ -1,165 +0,0 @@ -package commit - -import ( - "context" - "io" - "io/ioutil" - "testing" - - "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "google.golang.org/grpc/codes" -) - -func TestExtractCommitSignatureSuccess(t *testing.T) { - exampleSignature, err := ioutil.ReadFile("testdata/commit-5937ac0a7beb003549fc5fd26fc247adbce4a52e-signature") - require.NoError(t, err) - - exampleSignedText, err := ioutil.ReadFile("testdata/commit-5937ac0a7beb003549fc5fd26fc247adbce4a52e-signed-text") - require.NoError(t, err) - - ctx, cancel := testhelper.Context() - defer cancel() - - server, serverSocketPath := startTestServices(t) - defer server.Stop() - - client, conn := newCommitServiceClient(t, serverSocketPath) - defer conn.Close() - - testRepo, _, cleanupFn := testhelper.NewTestRepo(t) - defer cleanupFn() - - testCases := []struct { - desc string - req *gitalypb.ExtractCommitSignatureRequest - signature []byte - signedText []byte - }{ - { - desc: "commit with signature", - req: &gitalypb.ExtractCommitSignatureRequest{ - Repository: testRepo, - CommitId: "5937ac0a7beb003549fc5fd26fc247adbce4a52e", - }, - signature: exampleSignature, - signedText: exampleSignedText, - }, - { - desc: "commit without signature", - req: &gitalypb.ExtractCommitSignatureRequest{ - Repository: testRepo, - CommitId: "e63f41fe459e62e1228fcef60d7189127aeba95a", - }, - signature: nil, - signedText: nil, - }, - } - - for _, tc := range testCases { - t.Run(tc.desc, func(t *testing.T) { - signature, signedText, err := getSignatureAndText(ctx, client, tc.req) - require.NoError(t, err) - - require.Equal(t, string(tc.signature), string(signature)) - require.Equal(t, string(tc.signedText), string(signedText)) - }) - } -} - -func getSignatureAndText(ctx context.Context, client gitalypb.CommitServiceClient, req *gitalypb.ExtractCommitSignatureRequest) ([]byte, []byte, error) { - stream, err := client.ExtractCommitSignature(ctx, req) - if err != nil { - return nil, nil, err - } - - var signature, signedText []byte - var resp *gitalypb.ExtractCommitSignatureResponse - for err == nil { - resp, err = stream.Recv() - if err != nil && err != io.EOF { - return nil, nil, err - } - - signature = append(signature, resp.GetSignature()...) - signedText = append(signedText, resp.GetSignedText()...) - } - - return signature, signedText, nil -} - -func TestExtractCommitSignatureFail(t *testing.T) { - ctx, cancel := testhelper.Context() - defer cancel() - - server, serverSocketPath := startTestServices(t) - defer server.Stop() - - client, conn := newCommitServiceClient(t, serverSocketPath) - defer conn.Close() - - testRepo, _, cleanupFn := testhelper.NewTestRepo(t) - defer cleanupFn() - - testCases := []struct { - desc string - req *gitalypb.ExtractCommitSignatureRequest - code codes.Code - }{ - { - desc: "truncated commit ID", - req: &gitalypb.ExtractCommitSignatureRequest{ - Repository: testRepo, - CommitId: "5937ac0a7beb003549fc5fd26", - }, - code: codes.InvalidArgument, - }, - { - desc: "empty commit ID", - req: &gitalypb.ExtractCommitSignatureRequest{ - Repository: testRepo, - CommitId: "", - }, - code: codes.InvalidArgument, - }, - { - desc: "empty repo field", - req: &gitalypb.ExtractCommitSignatureRequest{ - Repository: nil, - CommitId: "e63f41fe459e62e1228fcef60d7189127aeba95a", - }, - code: codes.InvalidArgument, - }, - { - desc: "commit ID unknown", - req: &gitalypb.ExtractCommitSignatureRequest{ - Repository: testRepo, - CommitId: "0000000000000000000000000000000000000000", - }, - code: codes.OK, - }, - } - - for _, tc := range testCases { - t.Run(tc.desc, func(t *testing.T) { - stream, err := client.ExtractCommitSignature(ctx, tc.req) - require.NoError(t, err) - - var resp *gitalypb.ExtractCommitSignatureResponse - for err == nil { - resp, err = stream.Recv() - if resp != nil { - require.Empty(t, resp.Signature, "signature must be empty") - require.Empty(t, resp.SignedText, "signed text must be empty") - } - } - - if tc.code == codes.OK { - require.Equal(t, io.EOF, err, "expect EOF when there is no error") - } else { - testhelper.RequireGrpcError(t, err, tc.code) - } - }) - } -} diff --git a/proto/commit.proto b/proto/commit.proto index 8eca1dd75..2f33b325f 100644 --- a/proto/commit.proto +++ b/proto/commit.proto @@ -123,16 +123,6 @@ service CommitService { target_repository_field: "1" }; } - - // ExtractCommitSignature returns a stream because the signed text may be - // arbitrarily large and signature verification is impossible without the - // full text. - rpc ExtractCommitSignature(ExtractCommitSignatureRequest) returns (stream ExtractCommitSignatureResponse) { - option (op_type) = { - op: ACCESSOR - target_repository_field: "1" - }; - } rpc GetCommitSignatures(GetCommitSignaturesRequest) returns (stream GetCommitSignaturesResponse) { option (op_type) = { op: ACCESSOR diff --git a/proto/go/gitalypb/commit.pb.go b/proto/go/gitalypb/commit.pb.go index c83afcbf6..22f4626b2 100644 --- a/proto/go/gitalypb/commit.pb.go +++ b/proto/go/gitalypb/commit.pb.go @@ -2675,135 +2675,134 @@ func init() { func init() { proto.RegisterFile("commit.proto", fileDescriptor_db7163399a465f48) } var fileDescriptor_db7163399a465f48 = []byte{ - // 2044 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x59, 0xdb, 0x6e, 0xe3, 0xc6, - 0x19, 0x0e, 0x75, 0x32, 0xf9, 0x4b, 0x71, 0xe4, 0x59, 0xef, 0xae, 0x4c, 0xdb, 0x6b, 0x87, 0xbb, - 0x9b, 0x3a, 0x48, 0x2b, 0xbb, 0xee, 0x01, 0xed, 0x55, 0xb1, 0x4e, 0x6c, 0xc3, 0xee, 0xda, 0xda, - 0xd2, 0x02, 0x02, 0x14, 0x29, 0x54, 0x4a, 0x1c, 0x49, 0xd3, 0xa5, 0x44, 0x85, 0x1c, 0x79, 0xad, - 0xa2, 0x68, 0xaf, 0x0b, 0xf4, 0xbe, 0xe8, 0x55, 0xaf, 0xfa, 0x00, 0x79, 0x84, 0xbe, 0x42, 0x6f, - 0x7a, 0xdf, 0x07, 0xe8, 0x03, 0xec, 0x55, 0x30, 0x07, 0x9e, 0x44, 0xd2, 0xde, 0xb5, 0xa2, 0xdc, - 0x08, 0x9c, 0x7f, 0x0e, 0xff, 0x61, 0xe6, 0xff, 0xe6, 0x9b, 0x5f, 0x50, 0xeb, 0xb9, 0xa3, 0x11, - 0xa1, 0xcd, 0x89, 0xe7, 0x52, 0x17, 0x55, 0x06, 0x84, 0x5a, 0xce, 0x4c, 0xaf, 0xf9, 0x43, 0xcb, - 0xc3, 0xb6, 0x90, 0xea, 0x3b, 0x03, 0xd7, 0x1d, 0x38, 0x78, 0x9f, 0xb7, 0xba, 0xd3, 0xfe, 0x3e, - 0x25, 0x23, 0xec, 0x53, 0x6b, 0x34, 0x11, 0x03, 0x0c, 0x1b, 0xd0, 0xe7, 0x7c, 0x99, 0x2b, 0x6a, - 0x51, 0xdf, 0xc4, 0x5f, 0x4f, 0xb1, 0x4f, 0xd1, 0x21, 0x80, 0x87, 0x27, 0xae, 0x4f, 0xa8, 0xeb, - 0xcd, 0x1a, 0xca, 0xae, 0xb2, 0x57, 0x3d, 0x44, 0x4d, 0xa1, 0xa1, 0x69, 0x86, 0x3d, 0x66, 0x6c, - 0x14, 0xd2, 0x41, 0xf5, 0xf0, 0x35, 0xf1, 0x89, 0x3b, 0x6e, 0x14, 0x76, 0x95, 0xbd, 0x9a, 0x19, - 0xb6, 0x8d, 0x1e, 0x3c, 0x48, 0x68, 0xf1, 0x27, 0xee, 0xd8, 0xc7, 0xa8, 0x0e, 0x45, 0x97, 0xd8, - 0x7c, 0x7d, 0xcd, 0x64, 0x9f, 0x68, 0x0b, 0x34, 0xcb, 0xb6, 0x09, 0x25, 0xee, 0xd8, 0xe7, 0xab, - 0x94, 0xcd, 0x48, 0xc0, 0x7a, 0x6d, 0xec, 0x60, 0xd1, 0x5b, 0x14, 0xbd, 0xa1, 0xc0, 0xf8, 0xab, - 0x02, 0x8f, 0x85, 0x96, 0x33, 0xff, 0xc5, 0xb8, 0x87, 0x7d, 0xea, 0x7a, 0x8b, 0x38, 0xb4, 0x03, - 0x55, 0x4b, 0x2e, 0xd3, 0x21, 0x36, 0xb7, 0x46, 0x33, 0x21, 0x10, 0x9d, 0xd9, 0x68, 0x03, 0xd4, - 0xde, 0x90, 0x38, 0x36, 0xeb, 0x2d, 0xf2, 0xde, 0x15, 0xde, 0x3e, 0xb3, 0x8d, 0x03, 0x68, 0xa4, - 0x4d, 0x91, 0x5e, 0xaf, 0x43, 0xf9, 0xda, 0x72, 0xa6, 0x98, 0x9b, 0xa1, 0x9a, 0xa2, 0x61, 0xfc, - 0x4d, 0x81, 0x7a, 0xdb, 0xc3, 0xf8, 0x78, 0x4c, 0xbd, 0xd9, 0x92, 0xf6, 0x01, 0x21, 0x28, 0x4d, - 0x2c, 0x3a, 0xe4, 0xd6, 0xd6, 0x4c, 0xfe, 0xcd, 0xcc, 0x71, 0xc8, 0x88, 0xd0, 0x46, 0x69, 0x57, - 0xd9, 0x2b, 0x9a, 0xa2, 0x61, 0xfc, 0x47, 0x81, 0xb5, 0x98, 0x39, 0xd2, 0xf4, 0x5f, 0x40, 0x89, - 0xce, 0x26, 0xc2, 0xf2, 0xd5, 0xc3, 0x67, 0x81, 0x25, 0xa9, 0x81, 0xcd, 0x56, 0xf7, 0x0f, 0xb8, - 0x47, 0xdb, 0xb3, 0x09, 0x36, 0xf9, 0x8c, 0x60, 0xab, 0x0b, 0xd1, 0x56, 0x23, 0x28, 0xf9, 0xe4, - 0x8f, 0x98, 0xdb, 0x52, 0x34, 0xf9, 0x37, 0x93, 0x8d, 0x5c, 0x1b, 0x73, 0x53, 0xca, 0x26, 0xff, - 0x66, 0x32, 0xdb, 0xa2, 0x56, 0xa3, 0x2c, 0x6c, 0x66, 0xdf, 0xc6, 0xcf, 0x00, 0x22, 0x0d, 0x08, - 0xa0, 0xf2, 0x79, 0xeb, 0xe2, 0xe2, 0xac, 0x5d, 0xff, 0x00, 0xa9, 0x50, 0x3a, 0x7a, 0xd9, 0x3a, - 0xaa, 0x2b, 0xec, 0xab, 0x6d, 0x1e, 0x1f, 0xd7, 0x0b, 0x68, 0x05, 0x8a, 0xed, 0x17, 0xa7, 0xf5, - 0xa2, 0xe1, 0xc2, 0x43, 0xb1, 0x2b, 0xfe, 0x11, 0xa6, 0x6f, 0x30, 0x1e, 0x2f, 0x12, 0x67, 0x04, - 0xa5, 0xbe, 0xe7, 0x8e, 0x64, 0x8c, 0xf9, 0x37, 0x5a, 0x85, 0x02, 0x75, 0x65, 0x74, 0x0b, 0xd4, - 0x35, 0x8e, 0xe1, 0xd1, 0xbc, 0x42, 0x19, 0xc9, 0xcf, 0x60, 0x45, 0xa4, 0xaf, 0xdf, 0x50, 0x76, - 0x8b, 0x7b, 0xd5, 0xc3, 0xb5, 0x40, 0xdd, 0x29, 0xa1, 0x62, 0x8e, 0x19, 0x8c, 0x30, 0xbe, 0x29, - 0xb0, 0xfc, 0x99, 0x8e, 0x65, 0xc7, 0xb2, 0xd2, 0x14, 0x1d, 0x40, 0xd9, 0xea, 0x53, 0xec, 0x71, - 0x0f, 0xaa, 0x87, 0x7a, 0x53, 0xa0, 0x47, 0x33, 0x40, 0x8f, 0x66, 0x3b, 0x40, 0x0f, 0x53, 0x0c, - 0x44, 0x87, 0x50, 0xe9, 0xe2, 0xbe, 0xeb, 0x89, 0x2d, 0xbb, 0x7d, 0x8a, 0x1c, 0x19, 0x1e, 0xc2, - 0x72, 0xec, 0x10, 0x6e, 0x82, 0x36, 0xb2, 0x6e, 0x3a, 0x3d, 0xe6, 0x64, 0xa3, 0xc2, 0x77, 0x5f, - 0x1d, 0x59, 0x37, 0xdc, 0x69, 0x76, 0x76, 0x2c, 0xc7, 0x69, 0xac, 0xf0, 0x74, 0x61, 0x9f, 0xe8, - 0x63, 0xa8, 0xf5, 0x89, 0xe7, 0xd3, 0xce, 0xc4, 0xf2, 0xf0, 0x98, 0x36, 0x54, 0xde, 0x55, 0xe5, - 0xb2, 0x57, 0x5c, 0x64, 0xfc, 0x10, 0xd6, 0x93, 0x21, 0x8b, 0xb2, 0x4f, 0x68, 0x51, 0xb8, 0x16, - 0xd1, 0x30, 0xfe, 0xa5, 0xc0, 0x16, 0x1f, 0xfe, 0x05, 0xb9, 0xc6, 0xde, 0x80, 0x8c, 0x07, 0xdf, - 0x41, 0xa8, 0xdf, 0xe1, 0x84, 0x24, 0x1d, 0x5f, 0x49, 0x3a, 0x7e, 0x5e, 0x52, 0x4b, 0xf5, 0xf2, - 0x79, 0x49, 0x2d, 0xd7, 0x2b, 0xe7, 0x25, 0xb5, 0x52, 0x5f, 0x31, 0x3a, 0xb0, 0x9d, 0x63, 0xa6, - 0x74, 0x6f, 0x1b, 0xc0, 0xc1, 0x7d, 0xda, 0x89, 0xfb, 0xa8, 0x31, 0x89, 0x08, 0xe5, 0x0e, 0x54, - 0x3d, 0x32, 0x18, 0x06, 0xfd, 0x02, 0x61, 0x81, 0x8b, 0xf8, 0x00, 0xe3, 0xad, 0x02, 0x5a, 0x98, - 0xce, 0x19, 0x00, 0xbd, 0x01, 0xaa, 0xe7, 0xba, 0xb4, 0x13, 0x25, 0xf3, 0x0a, 0x6b, 0xb7, 0x44, - 0x42, 0xa7, 0xc0, 0x65, 0x5f, 0x02, 0x46, 0x89, 0x03, 0xc6, 0x66, 0x0a, 0x30, 0x9a, 0xfc, 0x37, - 0x86, 0x13, 0x01, 0x02, 0x94, 0x63, 0x08, 0xb0, 0x0d, 0x20, 0x32, 0x81, 0x6b, 0xad, 0x70, 0xad, - 0x9a, 0x90, 0x30, 0xbd, 0x9b, 0xa0, 0xf5, 0x1d, 0x8b, 0x9d, 0x05, 0x3a, 0xe4, 0x21, 0xac, 0x99, - 0x2a, 0x13, 0xbc, 0xb2, 0xe8, 0xd0, 0xf8, 0x0c, 0xb4, 0x50, 0x45, 0x08, 0x0e, 0x1f, 0x84, 0xe0, - 0xa0, 0xc4, 0xc0, 0xa3, 0x68, 0xfc, 0x43, 0x81, 0x87, 0xa7, 0x98, 0x06, 0xd6, 0x11, 0xec, 0x7f, - 0x9f, 0x40, 0xbc, 0x05, 0x9a, 0x87, 0x7b, 0x53, 0xcf, 0x27, 0xd7, 0x22, 0x60, 0xaa, 0x19, 0x09, - 0x18, 0x94, 0xcc, 0x9b, 0x16, 0x41, 0x09, 0x16, 0xa2, 0x79, 0x28, 0x89, 0x70, 0x39, 0x18, 0x61, - 0x74, 0xa1, 0xfe, 0x92, 0xf8, 0xf4, 0x84, 0x38, 0x4b, 0x73, 0xce, 0xf8, 0x14, 0xd6, 0x62, 0x3a, - 0xa2, 0xbc, 0x63, 0x5e, 0x0a, 0x1b, 0x6b, 0xa6, 0x68, 0x18, 0x3d, 0x58, 0x3b, 0x21, 0x63, 0x5b, - 0x02, 0xde, 0x92, 0xec, 0xf9, 0x15, 0xa0, 0xb8, 0x12, 0x69, 0xd0, 0xa7, 0x50, 0x11, 0x67, 0x48, - 0x6a, 0xc8, 0x00, 0x60, 0x39, 0xc0, 0xe8, 0xc0, 0x63, 0xe6, 0x50, 0x00, 0xe5, 0xb3, 0x16, 0xb1, - 0x17, 0xb1, 0x35, 0xbc, 0x0b, 0x8b, 0x32, 0xab, 0x8c, 0x53, 0x68, 0xa4, 0x15, 0xdc, 0xe7, 0xa6, - 0x18, 0xc3, 0x66, 0x62, 0x21, 0x13, 0xf7, 0x2f, 0xad, 0x11, 0x5e, 0xc4, 0xda, 0x4d, 0x76, 0x2c, - 0xfb, 0x9d, 0xb1, 0x35, 0xc2, 0x3e, 0xb7, 0x99, 0x87, 0x96, 0x2f, 0xeb, 0x1b, 0xbf, 0x86, 0xad, - 0x6c, 0x7d, 0xf7, 0x31, 0xfe, 0xad, 0x02, 0x0f, 0xd9, 0x46, 0xbd, 0x70, 0x9c, 0x25, 0x5f, 0x74, - 0x09, 0xd4, 0x2d, 0xce, 0x5d, 0x37, 0x8c, 0x98, 0xbc, 0x26, 0x93, 0x80, 0x84, 0xb0, 0x6f, 0xf4, - 0x4b, 0x28, 0xbb, 0x9e, 0x8d, 0x3d, 0x8e, 0x4b, 0xab, 0x87, 0x4f, 0x03, 0xdd, 0x99, 0xe6, 0x36, - 0x5b, 0x6c, 0xa8, 0x29, 0x66, 0x18, 0xcf, 0xa1, 0xcc, 0xdb, 0x0c, 0x73, 0x2e, 0x5b, 0x97, 0xc7, - 0x12, 0x7d, 0x5a, 0xaf, 0x5a, 0x82, 0xa4, 0x7c, 0xf1, 0xa2, 0x7d, 0x5c, 0x2f, 0xb0, 0xfc, 0x9e, - 0x5f, 0xec, 0x3e, 0x31, 0xfc, 0x67, 0x31, 0x7e, 0xd8, 0x97, 0x16, 0xc0, 0x90, 0x34, 0x8a, 0xe0, - 0x89, 0x06, 0x7a, 0x04, 0x15, 0xb7, 0xdf, 0xf7, 0x31, 0x95, 0xb1, 0x93, 0xad, 0x28, 0xf7, 0xcb, - 0xb1, 0xdc, 0x67, 0xa3, 0xfb, 0xae, 0xe3, 0xb8, 0x6f, 0x38, 0xa4, 0xab, 0xa6, 0x6c, 0xb1, 0x3b, - 0x8a, 0xc5, 0xbc, 0x33, 0xc2, 0xde, 0x00, 0xfb, 0xf2, 0xda, 0x07, 0x26, 0xba, 0xe0, 0x12, 0x76, - 0xfb, 0xdb, 0xc4, 0xb7, 0xba, 0x0e, 0xee, 0xbc, 0xb1, 0x9c, 0xd7, 0xc1, 0xed, 0x2f, 0x65, 0x5f, - 0x5a, 0xce, 0xeb, 0x88, 0xc9, 0x68, 0xef, 0xcf, 0x64, 0xe0, 0x9d, 0x99, 0x8c, 0x24, 0x26, 0xd5, - 0x7c, 0x62, 0x52, 0x4b, 0x13, 0x93, 0x23, 0x78, 0x90, 0xd8, 0xa0, 0xfb, 0xec, 0xf2, 0x30, 0xe0, - 0x95, 0x2f, 0xad, 0xf1, 0x60, 0x6a, 0x0d, 0x96, 0x87, 0xe5, 0xff, 0x0b, 0x1f, 0x55, 0x31, 0x55, - 0xd2, 0xe4, 0x13, 0xd0, 0x9c, 0x40, 0x28, 0x8d, 0xde, 0x0b, 0x54, 0xe5, 0xcc, 0x69, 0x06, 0x12, - 0x33, 0x9a, 0xaa, 0xff, 0x05, 0xd4, 0x40, 0xcc, 0x92, 0x8f, 0x21, 0x8d, 0xa4, 0x1c, 0xfc, 0x9b, - 0x1d, 0x1f, 0xfe, 0xa8, 0xe5, 0xc6, 0x15, 0x4c, 0xd1, 0x10, 0x44, 0xce, 0x71, 0x3d, 0xf9, 0xf4, - 0x12, 0x0d, 0xc6, 0x15, 0xfa, 0xc4, 0xc1, 0x32, 0xb5, 0xd9, 0x31, 0xfc, 0xd0, 0xd4, 0x98, 0x44, - 0xe4, 0xf6, 0x3a, 0x94, 0xbb, 0x33, 0x8a, 0x7d, 0x9e, 0xc7, 0x25, 0x53, 0x34, 0x8c, 0x29, 0x7c, - 0x64, 0x5a, 0x6f, 0x8e, 0x9c, 0x05, 0x91, 0xf2, 0x3d, 0x2f, 0x7c, 0xe3, 0x13, 0xa8, 0x47, 0x6a, - 0x65, 0x4c, 0x83, 0xd7, 0x8e, 0x12, 0x7b, 0xed, 0xfc, 0x19, 0x1a, 0x2f, 0xad, 0x00, 0x64, 0x4f, - 0x5c, 0x8f, 0x11, 0x9b, 0xef, 0xd3, 0xce, 0x13, 0xd8, 0xc8, 0xd0, 0xff, 0xfe, 0xd7, 0xe8, 0x37, - 0x0a, 0x6c, 0xb3, 0xdb, 0x22, 0x5a, 0xcc, 0x3f, 0x71, 0x3d, 0x46, 0x52, 0xbe, 0x4b, 0x6f, 0xb4, - 0xf7, 0x79, 0xef, 0x66, 0x40, 0x57, 0x39, 0x0e, 0x5d, 0xc6, 0x7f, 0x15, 0x78, 0x92, 0x67, 0xb3, - 0x8c, 0xc0, 0xe5, 0x7c, 0xe6, 0xfe, 0x34, 0xb0, 0xf8, 0xf6, 0x89, 0xcd, 0x30, 0xa0, 0x5c, 0x1a, - 0x2c, 0xa2, 0x63, 0xf8, 0x30, 0xd1, 0x13, 0x0b, 0x71, 0xe1, 0x8e, 0x10, 0xb3, 0xe3, 0xcf, 0x9c, - 0xec, 0x88, 0x43, 0x5e, 0xe2, 0x6e, 0x6b, 0x4c, 0x72, 0xc4, 0x04, 0xe7, 0x25, 0x55, 0xa9, 0x17, - 0xce, 0x4b, 0x6a, 0xb1, 0x5e, 0x32, 0xfe, 0x1d, 0x66, 0xb6, 0x7f, 0x34, 0xbb, 0xc0, 0xbe, 0xcf, - 0xb2, 0x72, 0x49, 0xa7, 0x2a, 0x8a, 0x6e, 0x71, 0xfe, 0x62, 0xc8, 0xd8, 0x8b, 0xac, 0x07, 0xe2, - 0x3a, 0x94, 0xbf, 0x9e, 0x62, 0x6f, 0x26, 0xe9, 0xbf, 0x68, 0x30, 0xde, 0x94, 0x76, 0xe1, 0x3e, - 0x80, 0x4a, 0x60, 0xe7, 0x84, 0x38, 0x14, 0x7b, 0x57, 0x43, 0xcb, 0xff, 0x92, 0xd0, 0xe1, 0x15, - 0x19, 0x8c, 0x2d, 0x3a, 0xf5, 0xf0, 0xa2, 0x2f, 0x40, 0x7f, 0x68, 0x05, 0xb4, 0x89, 0x7f, 0x1b, - 0x3f, 0x87, 0xdd, 0x7c, 0x55, 0x11, 0x0a, 0xf0, 0x79, 0x4a, 0x6c, 0xde, 0x04, 0xb6, 0x8f, 0x6f, - 0xa8, 0x67, 0xf5, 0xa4, 0xf1, 0xe1, 0xb4, 0x05, 0xc9, 0x9d, 0x7c, 0x5a, 0x85, 0xef, 0x39, 0x55, - 0x08, 0xce, 0x6c, 0xa3, 0x03, 0x4f, 0xf2, 0x34, 0x4a, 0x3b, 0xb7, 0x40, 0xf3, 0x03, 0xa1, 0x84, - 0xac, 0x48, 0xc0, 0x2f, 0x72, 0x32, 0x18, 0x63, 0xbb, 0x43, 0xf1, 0x0d, 0x95, 0x87, 0x02, 0x84, - 0xa8, 0x8d, 0x6f, 0xa8, 0xe1, 0x82, 0x7e, 0x8a, 0xe7, 0x17, 0x5f, 0x28, 0xe0, 0xd1, 0x53, 0x91, - 0xd8, 0xbe, 0x64, 0xd8, 0x5a, 0xe0, 0x90, 0x6f, 0xcc, 0x60, 0x33, 0x53, 0xa1, 0x74, 0x27, 0x11, - 0x0d, 0x25, 0x19, 0x8d, 0xa4, 0xaf, 0x85, 0x3b, 0x7c, 0x2d, 0xa6, 0x7c, 0x1d, 0x41, 0x23, 0x54, - 0x2d, 0x8f, 0xea, 0x32, 0x3d, 0x35, 0x61, 0x23, 0x43, 0xdd, 0xbb, 0xf8, 0xd9, 0x80, 0x95, 0x91, - 0x98, 0x20, 0xbd, 0x0c, 0x9a, 0x87, 0xff, 0xaf, 0x07, 0xc8, 0x74, 0x85, 0xbd, 0x6b, 0xd2, 0xc3, - 0xe8, 0xf7, 0x50, 0x9f, 0x2f, 0x73, 0xa2, 0x9d, 0x24, 0x05, 0x48, 0xd5, 0x62, 0xf5, 0xdd, 0xfc, - 0x01, 0xc2, 0x3e, 0x43, 0x7b, 0xfb, 0xf7, 0xbd, 0xb2, 0x5a, 0xd0, 0x95, 0x1f, 0xa3, 0x8b, 0x78, - 0x39, 0xa2, 0x91, 0x51, 0x70, 0x14, 0x6b, 0x6e, 0xe4, 0x96, 0x22, 0x63, 0x8b, 0x1d, 0x28, 0xe8, - 0x2b, 0x58, 0x4d, 0x16, 0xe4, 0xd0, 0x76, 0xd2, 0x9a, 0xb9, 0xca, 0xa0, 0xfe, 0x24, 0xaf, 0x3b, - 0x6b, 0xf5, 0x36, 0xd4, 0xe2, 0x35, 0x27, 0xb4, 0x19, 0x4d, 0x4e, 0x15, 0xef, 0xf4, 0xad, 0xec, - 0xce, 0x74, 0x08, 0x78, 0xd5, 0x32, 0xa3, 0xe6, 0x83, 0x9e, 0x25, 0x56, 0xc8, 0xa9, 0x5c, 0xe9, - 0xcf, 0xef, 0x18, 0x95, 0x56, 0xf8, 0x15, 0xac, 0x26, 0x4b, 0x0d, 0x51, 0x90, 0x32, 0xab, 0x23, - 0x51, 0x90, 0xb2, 0x2b, 0x14, 0xc9, 0x20, 0x5d, 0x80, 0x16, 0x56, 0x07, 0xa2, 0x1d, 0x9d, 0x2f, - 0x4a, 0x44, 0x3b, 0x9a, 0x2a, 0x25, 0x24, 0x97, 0xbb, 0x04, 0x88, 0xe8, 0x34, 0xda, 0x88, 0x3f, - 0xcc, 0x12, 0x55, 0x05, 0x5d, 0xcf, 0xea, 0x4a, 0x3b, 0xff, 0x1b, 0xa8, 0xc6, 0xfe, 0xaa, 0x40, - 0x7a, 0x72, 0xff, 0xe3, 0xff, 0x92, 0xe8, 0x9b, 0x99, 0x7d, 0x99, 0xf1, 0x4c, 0x3e, 0xed, 0xa2, - 0x78, 0x66, 0xbe, 0x1f, 0xa3, 0x78, 0x66, 0xbf, 0x08, 0x93, 0x01, 0xb8, 0x82, 0x6a, 0xec, 0x3d, - 0x81, 0x32, 0xdc, 0x4c, 0x1b, 0x9c, 0xf1, 0x00, 0x49, 0x2e, 0xfa, 0x3b, 0xf8, 0x68, 0x8e, 0xc1, - 0xa3, 0x27, 0xb9, 0xd4, 0x5e, 0x2c, 0xbe, 0x73, 0x07, 0xf5, 0x8f, 0x47, 0xe4, 0x1c, 0xd4, 0x80, - 0xf9, 0xa2, 0xc7, 0x21, 0xd0, 0x25, 0x29, 0xb8, 0xde, 0x48, 0x77, 0x64, 0x99, 0xda, 0x83, 0xb5, - 0x14, 0x3b, 0x45, 0x21, 0xc6, 0xe4, 0x11, 0x67, 0xfd, 0xe3, 0x5b, 0x46, 0xa4, 0x0d, 0xa6, 0xf0, - 0x28, 0x9b, 0xcc, 0xa1, 0xe7, 0x77, 0x91, 0x3d, 0xa1, 0xee, 0x93, 0x77, 0xe3, 0x84, 0x49, 0xd7, - 0xba, 0x01, 0xbc, 0x46, 0xf4, 0x66, 0x1e, 0x5e, 0x53, 0xdc, 0x6d, 0x1e, 0x5e, 0xd3, 0xcc, 0x28, - 0xa5, 0x63, 0xbe, 0xf4, 0x14, 0xe9, 0xc8, 0xa9, 0x7a, 0x45, 0x3a, 0xf2, 0xaa, 0x56, 0x49, 0x1d, - 0x63, 0x58, 0xcf, 0xaa, 0x12, 0xa1, 0xa7, 0x99, 0xcb, 0x24, 0x6b, 0x56, 0xfa, 0xb3, 0xdb, 0x07, - 0x65, 0xe9, 0xfb, 0x13, 0x34, 0xf2, 0x28, 0x16, 0xfa, 0x41, 0x94, 0x03, 0xb7, 0xf2, 0x3d, 0x7d, - 0xef, 0xee, 0x81, 0x29, 0xdd, 0x7b, 0xca, 0x81, 0xc2, 0xce, 0x4a, 0x36, 0x6d, 0x8a, 0xce, 0xca, - 0xad, 0x44, 0x2e, 0x3a, 0x2b, 0xb7, 0xb3, 0xaf, 0xa4, 0xcf, 0xaf, 0xe1, 0x41, 0x06, 0xb5, 0x41, - 0x46, 0x0c, 0x9a, 0x73, 0x88, 0x96, 0xfe, 0xf4, 0xd6, 0x31, 0x59, 0xca, 0x30, 0xac, 0xa5, 0xd8, - 0x45, 0x94, 0x73, 0x79, 0x3c, 0x27, 0xca, 0xb9, 0x5c, 0x6a, 0x92, 0x50, 0x73, 0x74, 0xf0, 0x5b, - 0x36, 0xc1, 0xb1, 0xba, 0xcd, 0x9e, 0x3b, 0xda, 0x17, 0x9f, 0x3f, 0x72, 0xbd, 0xc1, 0xbe, 0x58, - 0x46, 0xfc, 0xab, 0xbd, 0x3f, 0x70, 0x65, 0x7b, 0xd2, 0xed, 0x56, 0xb8, 0xe8, 0x27, 0xdf, 0x06, - 0x00, 0x00, 0xff, 0xff, 0x0f, 0xcf, 0xec, 0x70, 0x1c, 0x1f, 0x00, 0x00, + // 2026 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x59, 0x5b, 0x6f, 0xdb, 0xc8, + 0x15, 0x5e, 0xea, 0x66, 0xf2, 0x48, 0xeb, 0xc8, 0x13, 0x27, 0x91, 0x69, 0x3b, 0xf6, 0x32, 0xc9, + 0xd6, 0x8b, 0x6d, 0x65, 0xd7, 0xbd, 0xa0, 0x7d, 0x2a, 0xe2, 0x5d, 0xdb, 0xb0, 0x1b, 0x5b, 0x29, + 0x2d, 0x60, 0x81, 0x62, 0x0b, 0x95, 0x12, 0x47, 0xd2, 0x34, 0x94, 0xa8, 0x25, 0x47, 0x8e, 0x55, + 0x14, 0xed, 0x73, 0x81, 0xbe, 0x17, 0x7d, 0xea, 0x53, 0x7f, 0xc0, 0xfe, 0x84, 0xfe, 0x85, 0xbe, + 0xf4, 0xbd, 0xbf, 0xa2, 0xc8, 0xd3, 0x62, 0x2e, 0xbc, 0x89, 0xa4, 0x1d, 0xdb, 0xab, 0xbc, 0x08, + 0x9c, 0x33, 0x97, 0x73, 0x99, 0x39, 0xdf, 0x7c, 0x73, 0x04, 0xb5, 0x9e, 0x3b, 0x1a, 0x11, 0xda, + 0x9c, 0x78, 0x2e, 0x75, 0x51, 0x65, 0x40, 0xa8, 0xe5, 0xcc, 0xf4, 0x9a, 0x3f, 0xb4, 0x3c, 0x6c, + 0x0b, 0xa9, 0xbe, 0x35, 0x70, 0xdd, 0x81, 0x83, 0x77, 0x79, 0xab, 0x3b, 0xed, 0xef, 0x52, 0x32, + 0xc2, 0x3e, 0xb5, 0x46, 0x13, 0x31, 0xc0, 0xb0, 0x01, 0x7d, 0xc1, 0x97, 0xb9, 0xa0, 0x16, 0xf5, + 0x4d, 0xfc, 0xcd, 0x14, 0xfb, 0x14, 0xed, 0x03, 0x78, 0x78, 0xe2, 0xfa, 0x84, 0xba, 0xde, 0xac, + 0xa1, 0x6c, 0x2b, 0x3b, 0xd5, 0x7d, 0xd4, 0x14, 0x1a, 0x9a, 0x66, 0xd8, 0x63, 0xc6, 0x46, 0x21, + 0x1d, 0x54, 0x0f, 0x5f, 0x12, 0x9f, 0xb8, 0xe3, 0x46, 0x61, 0x5b, 0xd9, 0xa9, 0x99, 0x61, 0xdb, + 0xe8, 0xc1, 0xc3, 0x84, 0x16, 0x7f, 0xe2, 0x8e, 0x7d, 0x8c, 0xea, 0x50, 0x74, 0x89, 0xcd, 0xd7, + 0xd7, 0x4c, 0xf6, 0x89, 0x36, 0x40, 0xb3, 0x6c, 0x9b, 0x50, 0xe2, 0x8e, 0x7d, 0xbe, 0x4a, 0xd9, + 0x8c, 0x04, 0xac, 0xd7, 0xc6, 0x0e, 0x16, 0xbd, 0x45, 0xd1, 0x1b, 0x0a, 0x8c, 0xbf, 0x2a, 0xf0, + 0x44, 0x68, 0x39, 0xf1, 0x5f, 0x8e, 0x7b, 0xd8, 0xa7, 0xae, 0x77, 0x1f, 0x87, 0xb6, 0xa0, 0x6a, + 0xc9, 0x65, 0x3a, 0xc4, 0xe6, 0xd6, 0x68, 0x26, 0x04, 0xa2, 0x13, 0x1b, 0xad, 0x81, 0xda, 0x1b, + 0x12, 0xc7, 0x66, 0xbd, 0x45, 0xde, 0xbb, 0xc4, 0xdb, 0x27, 0xb6, 0xb1, 0x07, 0x8d, 0xb4, 0x29, + 0xd2, 0xeb, 0x55, 0x28, 0x5f, 0x5a, 0xce, 0x14, 0x73, 0x33, 0x54, 0x53, 0x34, 0x8c, 0xbf, 0x29, + 0x50, 0x6f, 0x7b, 0x18, 0x1f, 0x8e, 0xa9, 0x37, 0x5b, 0xd0, 0x3e, 0x20, 0x04, 0xa5, 0x89, 0x45, + 0x87, 0xdc, 0xda, 0x9a, 0xc9, 0xbf, 0x99, 0x39, 0x0e, 0x19, 0x11, 0xda, 0x28, 0x6d, 0x2b, 0x3b, + 0x45, 0x53, 0x34, 0x8c, 0xff, 0x28, 0xb0, 0x12, 0x33, 0x47, 0x9a, 0xfe, 0x0b, 0x28, 0xd1, 0xd9, + 0x44, 0x58, 0xbe, 0xbc, 0xff, 0x3c, 0xb0, 0x24, 0x35, 0xb0, 0xd9, 0xea, 0xfe, 0x01, 0xf7, 0x68, + 0x7b, 0x36, 0xc1, 0x26, 0x9f, 0x11, 0x6c, 0x75, 0x21, 0xda, 0x6a, 0x04, 0x25, 0x9f, 0xfc, 0x11, + 0x73, 0x5b, 0x8a, 0x26, 0xff, 0x66, 0xb2, 0x91, 0x6b, 0x63, 0x6e, 0x4a, 0xd9, 0xe4, 0xdf, 0x4c, + 0x66, 0x5b, 0xd4, 0x6a, 0x94, 0x85, 0xcd, 0xec, 0xdb, 0xf8, 0x19, 0x40, 0xa4, 0x01, 0x01, 0x54, + 0xbe, 0x68, 0x9d, 0x9d, 0x9d, 0xb4, 0xeb, 0x1f, 0x21, 0x15, 0x4a, 0x07, 0xaf, 0x5a, 0x07, 0x75, + 0x85, 0x7d, 0xb5, 0xcd, 0xc3, 0xc3, 0x7a, 0x01, 0x2d, 0x41, 0xb1, 0xfd, 0xf2, 0xb8, 0x5e, 0x34, + 0x5c, 0x78, 0x24, 0x76, 0xc5, 0x3f, 0xc0, 0xf4, 0x2d, 0xc6, 0xe3, 0xfb, 0xc4, 0x19, 0x41, 0xa9, + 0xef, 0xb9, 0x23, 0x19, 0x63, 0xfe, 0x8d, 0x96, 0xa1, 0x40, 0x5d, 0x19, 0xdd, 0x02, 0x75, 0x8d, + 0x43, 0x78, 0x3c, 0xaf, 0x50, 0x46, 0xf2, 0x73, 0x58, 0x12, 0xe9, 0xeb, 0x37, 0x94, 0xed, 0xe2, + 0x4e, 0x75, 0x7f, 0x25, 0x50, 0x77, 0x4c, 0xa8, 0x98, 0x63, 0x06, 0x23, 0x8c, 0x6f, 0x0b, 0x2c, + 0x7f, 0xa6, 0x63, 0xd9, 0xb1, 0xa8, 0x34, 0x45, 0x7b, 0x50, 0xb6, 0xfa, 0x14, 0x7b, 0xdc, 0x83, + 0xea, 0xbe, 0xde, 0x14, 0xe8, 0xd1, 0x0c, 0xd0, 0xa3, 0xd9, 0x0e, 0xd0, 0xc3, 0x14, 0x03, 0xd1, + 0x3e, 0x54, 0xba, 0xb8, 0xef, 0x7a, 0x62, 0xcb, 0xae, 0x9f, 0x22, 0x47, 0x86, 0x87, 0xb0, 0x1c, + 0x3b, 0x84, 0xeb, 0xa0, 0x8d, 0xac, 0xab, 0x4e, 0x8f, 0x39, 0xd9, 0xa8, 0xf0, 0xdd, 0x57, 0x47, + 0xd6, 0x15, 0x77, 0x9a, 0x9d, 0x1d, 0xcb, 0x71, 0x1a, 0x4b, 0x3c, 0x5d, 0xd8, 0x27, 0xfa, 0x04, + 0x6a, 0x7d, 0xe2, 0xf9, 0xb4, 0x33, 0xb1, 0x3c, 0x3c, 0xa6, 0x0d, 0x95, 0x77, 0x55, 0xb9, 0xec, + 0x35, 0x17, 0x19, 0x3f, 0x84, 0xd5, 0x64, 0xc8, 0xa2, 0xec, 0x13, 0x5a, 0x14, 0xae, 0x45, 0x34, + 0x8c, 0x7f, 0x29, 0xb0, 0xc1, 0x87, 0x7f, 0x49, 0x2e, 0xb1, 0x37, 0x20, 0xe3, 0xc1, 0xf7, 0x10, + 0xea, 0xf7, 0x38, 0x21, 0x49, 0xc7, 0x97, 0x92, 0x8e, 0x9f, 0x96, 0xd4, 0x52, 0xbd, 0x7c, 0x5a, + 0x52, 0xcb, 0xf5, 0xca, 0x69, 0x49, 0xad, 0xd4, 0x97, 0x8c, 0x0e, 0x6c, 0xe6, 0x98, 0x29, 0xdd, + 0xdb, 0x04, 0x70, 0x70, 0x9f, 0x76, 0xe2, 0x3e, 0x6a, 0x4c, 0x22, 0x42, 0xb9, 0x05, 0x55, 0x8f, + 0x0c, 0x86, 0x41, 0xbf, 0x40, 0x58, 0xe0, 0x22, 0x3e, 0xc0, 0x78, 0xa7, 0x80, 0x16, 0xa6, 0x73, + 0x06, 0x40, 0xaf, 0x81, 0xea, 0xb9, 0x2e, 0xed, 0x44, 0xc9, 0xbc, 0xc4, 0xda, 0x2d, 0x91, 0xd0, + 0x29, 0x70, 0xd9, 0x95, 0x80, 0x51, 0xe2, 0x80, 0xb1, 0x9e, 0x02, 0x8c, 0x26, 0xff, 0x8d, 0xe1, + 0x44, 0x80, 0x00, 0xe5, 0x18, 0x02, 0x6c, 0x02, 0x88, 0x4c, 0xe0, 0x5a, 0x2b, 0x5c, 0xab, 0x26, + 0x24, 0x4c, 0xef, 0x3a, 0x68, 0x7d, 0xc7, 0x62, 0x67, 0x81, 0x0e, 0x79, 0x08, 0x6b, 0xa6, 0xca, + 0x04, 0xaf, 0x2d, 0x3a, 0x34, 0x3e, 0x07, 0x2d, 0x54, 0x11, 0x82, 0xc3, 0x47, 0x21, 0x38, 0x28, + 0x31, 0xf0, 0x28, 0x1a, 0xff, 0x50, 0xe0, 0xd1, 0x31, 0xa6, 0x81, 0x75, 0x04, 0xfb, 0x1f, 0x12, + 0x88, 0x37, 0x40, 0xf3, 0x70, 0x6f, 0xea, 0xf9, 0xe4, 0x52, 0x04, 0x4c, 0x35, 0x23, 0x01, 0x83, + 0x92, 0x79, 0xd3, 0x22, 0x28, 0xc1, 0x42, 0x34, 0x0f, 0x25, 0x11, 0x2e, 0x07, 0x23, 0x8c, 0x2e, + 0xd4, 0x5f, 0x11, 0x9f, 0x1e, 0x11, 0x67, 0x61, 0xce, 0x19, 0x9f, 0xc1, 0x4a, 0x4c, 0x47, 0x94, + 0x77, 0xcc, 0x4b, 0x61, 0x63, 0xcd, 0x14, 0x0d, 0xa3, 0x07, 0x2b, 0x47, 0x64, 0x6c, 0x4b, 0xc0, + 0x5b, 0x90, 0x3d, 0xbf, 0x02, 0x14, 0x57, 0x22, 0x0d, 0xfa, 0x0c, 0x2a, 0xe2, 0x0c, 0x49, 0x0d, + 0x19, 0x00, 0x2c, 0x07, 0x18, 0x1d, 0x78, 0xc2, 0x1c, 0x0a, 0xa0, 0x7c, 0xd6, 0x22, 0xf6, 0x7d, + 0x6c, 0x0d, 0xef, 0xc2, 0xa2, 0xcc, 0x2a, 0xe3, 0x18, 0x1a, 0x69, 0x05, 0x77, 0xb9, 0x29, 0xc6, + 0xb0, 0x9e, 0x58, 0xc8, 0xc4, 0xfd, 0x73, 0x6b, 0x84, 0xef, 0x63, 0xed, 0x3a, 0x3b, 0x96, 0xfd, + 0xce, 0xd8, 0x1a, 0x61, 0x9f, 0xdb, 0xcc, 0x43, 0xcb, 0x97, 0xf5, 0x8d, 0x5f, 0xc3, 0x46, 0xb6, + 0xbe, 0xbb, 0x18, 0xff, 0x4e, 0x81, 0x47, 0x6c, 0xa3, 0x5e, 0x3a, 0xce, 0x82, 0x2f, 0xba, 0x04, + 0xea, 0x16, 0xe7, 0xae, 0x1b, 0x46, 0x4c, 0xde, 0x90, 0x49, 0x40, 0x42, 0xd8, 0x37, 0xfa, 0x25, + 0x94, 0x5d, 0xcf, 0xc6, 0x1e, 0xc7, 0xa5, 0xe5, 0xfd, 0x67, 0x81, 0xee, 0x4c, 0x73, 0x9b, 0x2d, + 0x36, 0xd4, 0x14, 0x33, 0x8c, 0x17, 0x50, 0xe6, 0x6d, 0x86, 0x39, 0xe7, 0xad, 0xf3, 0x43, 0x89, + 0x3e, 0xad, 0xd7, 0x2d, 0x41, 0x52, 0xbe, 0x7c, 0xd9, 0x3e, 0xac, 0x17, 0x58, 0x7e, 0xcf, 0x2f, + 0x76, 0x97, 0x18, 0xfe, 0xb3, 0x18, 0x3f, 0xec, 0x0b, 0x0b, 0x60, 0x48, 0x1a, 0x45, 0xf0, 0x44, + 0x03, 0x3d, 0x86, 0x8a, 0xdb, 0xef, 0xfb, 0x98, 0xca, 0xd8, 0xc9, 0x56, 0x94, 0xfb, 0xe5, 0x58, + 0xee, 0xb3, 0xd1, 0x7d, 0xd7, 0x71, 0xdc, 0xb7, 0x1c, 0xd2, 0x55, 0x53, 0xb6, 0xd8, 0x1d, 0xc5, + 0x62, 0xde, 0x19, 0x61, 0x6f, 0x80, 0x7d, 0x79, 0xed, 0x03, 0x13, 0x9d, 0x71, 0x09, 0xbb, 0xfd, + 0x6d, 0xe2, 0x5b, 0x5d, 0x07, 0x77, 0xde, 0x5a, 0xce, 0x9b, 0xe0, 0xf6, 0x97, 0xb2, 0xaf, 0x2c, + 0xe7, 0x4d, 0xc4, 0x64, 0xb4, 0xdb, 0x33, 0x19, 0x78, 0x6f, 0x26, 0x23, 0x89, 0x49, 0x35, 0x9f, + 0x98, 0xd4, 0xd2, 0xc4, 0xe4, 0x00, 0x1e, 0x26, 0x36, 0xe8, 0x2e, 0xbb, 0x3c, 0x0c, 0x78, 0xe5, + 0x2b, 0x6b, 0x3c, 0x98, 0x5a, 0x83, 0xc5, 0x61, 0xf9, 0xff, 0xc2, 0x47, 0x55, 0x4c, 0x95, 0x34, + 0xf9, 0x08, 0x34, 0x27, 0x10, 0x4a, 0xa3, 0x77, 0x02, 0x55, 0x39, 0x73, 0x9a, 0x81, 0xc4, 0x8c, + 0xa6, 0xea, 0x7f, 0x01, 0x35, 0x10, 0xb3, 0xe4, 0x63, 0x48, 0x23, 0x29, 0x07, 0xff, 0x66, 0xc7, + 0x87, 0x3f, 0x6a, 0xb9, 0x71, 0x05, 0x53, 0x34, 0x04, 0x91, 0x73, 0x5c, 0x4f, 0x3e, 0xbd, 0x44, + 0x83, 0x71, 0x85, 0x3e, 0x71, 0xb0, 0x4c, 0x6d, 0x76, 0x0c, 0x3f, 0x36, 0x35, 0x26, 0x11, 0xb9, + 0xbd, 0x0a, 0xe5, 0xee, 0x8c, 0x62, 0x9f, 0xe7, 0x71, 0xc9, 0x14, 0x0d, 0x63, 0x0a, 0x0f, 0x4c, + 0xeb, 0xed, 0x81, 0x73, 0x4f, 0xa4, 0xbc, 0xe5, 0x85, 0x6f, 0x7c, 0x0a, 0xf5, 0x48, 0xad, 0x8c, + 0x69, 0xf0, 0xda, 0x51, 0x62, 0xaf, 0x9d, 0x3f, 0x43, 0xe3, 0x95, 0x15, 0x80, 0xec, 0x91, 0xeb, + 0x31, 0x62, 0xf3, 0x21, 0xed, 0x3c, 0x82, 0xb5, 0x0c, 0xfd, 0xb7, 0xbf, 0x46, 0xbf, 0x55, 0x60, + 0x93, 0xdd, 0x16, 0xd1, 0x62, 0xfe, 0x91, 0xeb, 0x31, 0x92, 0xf2, 0x7d, 0x7a, 0xa3, 0xdd, 0xe6, + 0xbd, 0x9b, 0x01, 0x5d, 0xe5, 0x38, 0x74, 0x19, 0xff, 0x55, 0xe0, 0x69, 0x9e, 0xcd, 0x32, 0x02, + 0xe7, 0xf3, 0x99, 0xfb, 0xd3, 0xc0, 0xe2, 0xeb, 0x27, 0x36, 0xc3, 0x80, 0x72, 0x69, 0xb0, 0x88, + 0x8e, 0xe1, 0xe3, 0x44, 0x4f, 0x2c, 0xc4, 0x85, 0x1b, 0x42, 0xcc, 0x8e, 0x3f, 0x73, 0xb2, 0x23, + 0x0e, 0x79, 0x89, 0xbb, 0xad, 0x31, 0xc9, 0x01, 0x13, 0x9c, 0x96, 0x54, 0xa5, 0x5e, 0x38, 0x2d, + 0xa9, 0xc5, 0x7a, 0xc9, 0xf8, 0x77, 0x98, 0xd9, 0xfe, 0xc1, 0xec, 0x0c, 0xfb, 0x3e, 0xcb, 0xca, + 0x05, 0x9d, 0xaa, 0x28, 0xba, 0xc5, 0xf9, 0x8b, 0x21, 0x63, 0x2f, 0xb2, 0x1e, 0x88, 0xab, 0x50, + 0xfe, 0x66, 0x8a, 0xbd, 0x99, 0xa4, 0xff, 0xa2, 0xc1, 0x78, 0x53, 0xda, 0x85, 0xbb, 0x00, 0x2a, + 0x81, 0xad, 0x23, 0xe2, 0x50, 0xec, 0x5d, 0x0c, 0x2d, 0xff, 0x2b, 0x42, 0x87, 0x17, 0x64, 0x30, + 0xb6, 0xe8, 0xd4, 0xc3, 0xf7, 0x7d, 0x01, 0xfa, 0x43, 0x2b, 0xa0, 0x4d, 0xfc, 0xdb, 0xf8, 0x39, + 0x6c, 0xe7, 0xab, 0x8a, 0x50, 0x80, 0xcf, 0x53, 0x62, 0xf3, 0x26, 0xb0, 0x79, 0x78, 0x45, 0x3d, + 0xab, 0x27, 0x8d, 0x0f, 0xa7, 0xdd, 0x93, 0xdc, 0xc9, 0xa7, 0x55, 0xf8, 0x9e, 0x53, 0x85, 0xe0, + 0xc4, 0x36, 0x3a, 0xf0, 0x34, 0x4f, 0xa3, 0xb4, 0x73, 0x03, 0x34, 0x3f, 0x10, 0x4a, 0xc8, 0x8a, + 0x04, 0xfc, 0x22, 0x27, 0x83, 0x31, 0xb6, 0x3b, 0x14, 0x5f, 0x51, 0x79, 0x28, 0x40, 0x88, 0xda, + 0xf8, 0x8a, 0x1a, 0x2e, 0xe8, 0xc7, 0x78, 0x7e, 0xf1, 0x7b, 0x05, 0x3c, 0x7a, 0x2a, 0x12, 0xdb, + 0x97, 0x0c, 0x5b, 0x0b, 0x1c, 0xf2, 0x8d, 0x19, 0xac, 0x67, 0x2a, 0x94, 0xee, 0x24, 0xa2, 0xa1, + 0x24, 0xa3, 0x91, 0xf4, 0xb5, 0x70, 0x83, 0xaf, 0xc5, 0x94, 0xaf, 0x23, 0x68, 0x84, 0xaa, 0xe5, + 0x51, 0x5d, 0xa4, 0xa7, 0x26, 0xac, 0x65, 0xa8, 0x7b, 0x1f, 0x3f, 0x1b, 0xb0, 0x34, 0x12, 0x13, + 0xa4, 0x97, 0x41, 0x73, 0xff, 0xff, 0x0f, 0x02, 0x64, 0xba, 0xc0, 0xde, 0x25, 0xe9, 0x61, 0xf4, + 0x7b, 0xa8, 0xcf, 0x97, 0x39, 0xd1, 0x56, 0x92, 0x02, 0xa4, 0x6a, 0xb1, 0xfa, 0x76, 0xfe, 0x00, + 0x61, 0x9f, 0xa1, 0xbd, 0xfb, 0xfb, 0x4e, 0x59, 0x2d, 0xe8, 0xca, 0x8f, 0xd1, 0x59, 0xbc, 0x1c, + 0xd1, 0xc8, 0x28, 0x38, 0x8a, 0x35, 0xd7, 0x72, 0x4b, 0x91, 0xb1, 0xc5, 0xf6, 0x14, 0xf4, 0x35, + 0x2c, 0x27, 0x0b, 0x72, 0x68, 0x33, 0x69, 0xcd, 0x5c, 0x65, 0x50, 0x7f, 0x9a, 0xd7, 0x9d, 0xb5, + 0x7a, 0x1b, 0x6a, 0xf1, 0x9a, 0x13, 0x5a, 0x8f, 0x26, 0xa7, 0x8a, 0x77, 0xfa, 0x46, 0x76, 0x67, + 0x3a, 0x04, 0xbc, 0x6a, 0x99, 0x51, 0xf3, 0x41, 0xcf, 0x13, 0x2b, 0xe4, 0x54, 0xae, 0xf4, 0x17, + 0x37, 0x8c, 0x4a, 0x2b, 0xfc, 0x1a, 0x96, 0x93, 0xa5, 0x86, 0x28, 0x48, 0x99, 0xd5, 0x91, 0x28, + 0x48, 0xd9, 0x15, 0x8a, 0x64, 0x90, 0xce, 0x40, 0x0b, 0xab, 0x03, 0xd1, 0x8e, 0xce, 0x17, 0x25, + 0xa2, 0x1d, 0x4d, 0x95, 0x12, 0x92, 0xcb, 0x9d, 0x03, 0x44, 0x74, 0x1a, 0xad, 0xc5, 0x1f, 0x66, + 0x89, 0xaa, 0x82, 0xae, 0x67, 0x75, 0xa5, 0x9d, 0xff, 0x0d, 0x54, 0x63, 0x7f, 0x55, 0x20, 0x3d, + 0xb9, 0xff, 0xf1, 0x7f, 0x49, 0xf4, 0xf5, 0xcc, 0xbe, 0xcc, 0x78, 0x26, 0x9f, 0x76, 0x51, 0x3c, + 0x33, 0xdf, 0x8f, 0x51, 0x3c, 0xb3, 0x5f, 0x84, 0xc9, 0x00, 0x5c, 0x40, 0x35, 0xf6, 0x9e, 0x40, + 0x19, 0x6e, 0xa6, 0x0d, 0xce, 0x78, 0x80, 0x24, 0x17, 0xfd, 0x1d, 0x3c, 0x98, 0x63, 0xf0, 0xe8, + 0x69, 0x2e, 0xb5, 0x17, 0x8b, 0x6f, 0xdd, 0x40, 0xfd, 0xe3, 0x11, 0x39, 0x05, 0x35, 0x60, 0xbe, + 0xe8, 0x49, 0x08, 0x74, 0x49, 0x0a, 0xae, 0x37, 0xd2, 0x1d, 0x59, 0xa6, 0xf6, 0x60, 0x25, 0xc5, + 0x4e, 0x51, 0x88, 0x31, 0x79, 0xc4, 0x59, 0xff, 0xe4, 0x9a, 0x11, 0x69, 0x83, 0x29, 0x3c, 0xce, + 0x26, 0x73, 0xe8, 0xc5, 0x4d, 0x64, 0x4f, 0xa8, 0xfb, 0xf4, 0xfd, 0x38, 0x61, 0xd2, 0xb5, 0x6e, + 0x00, 0xaf, 0x11, 0xbd, 0x99, 0x87, 0xd7, 0x14, 0x77, 0x9b, 0x87, 0xd7, 0x34, 0x33, 0x4a, 0xe9, + 0x98, 0x2f, 0x3d, 0x45, 0x3a, 0x72, 0xaa, 0x5e, 0x91, 0x8e, 0xbc, 0xaa, 0x55, 0x52, 0xc7, 0x18, + 0x56, 0xb3, 0xaa, 0x44, 0xe8, 0x59, 0xe6, 0x32, 0xc9, 0x9a, 0x95, 0xfe, 0xfc, 0xfa, 0x41, 0x59, + 0xfa, 0xfe, 0x04, 0x8d, 0x3c, 0x8a, 0x85, 0x7e, 0x10, 0xe5, 0xc0, 0xb5, 0x7c, 0x4f, 0xdf, 0xb9, + 0x79, 0x60, 0x4a, 0xf7, 0x8e, 0xb2, 0xa7, 0xa0, 0x37, 0xf0, 0x30, 0x83, 0x64, 0x20, 0x23, 0x06, + 0x92, 0x39, 0x94, 0x47, 0x7f, 0x76, 0xed, 0x98, 0x2c, 0x57, 0x31, 0xac, 0xa4, 0xee, 0xf9, 0xe8, + 0xf4, 0xe7, 0x31, 0x8e, 0xe8, 0xf4, 0xe7, 0x92, 0x84, 0x84, 0x9a, 0x83, 0xbd, 0xdf, 0xb2, 0x09, + 0x8e, 0xd5, 0x6d, 0xf6, 0xdc, 0xd1, 0xae, 0xf8, 0xfc, 0x91, 0xeb, 0x0d, 0x76, 0xc5, 0x32, 0xe2, + 0xff, 0xe5, 0xdd, 0x81, 0x2b, 0xdb, 0x93, 0x6e, 0xb7, 0xc2, 0x45, 0x3f, 0xf9, 0x2e, 0x00, 0x00, + 0xff, 0xff, 0x40, 0xb0, 0x08, 0x31, 0xa6, 0x1e, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2838,10 +2837,6 @@ type CommitServiceClient interface { ListCommitsByOid(ctx context.Context, in *ListCommitsByOidRequest, opts ...grpc.CallOption) (CommitService_ListCommitsByOidClient, error) ListCommitsByRefName(ctx context.Context, in *ListCommitsByRefNameRequest, opts ...grpc.CallOption) (CommitService_ListCommitsByRefNameClient, error) FilterShasWithSignatures(ctx context.Context, opts ...grpc.CallOption) (CommitService_FilterShasWithSignaturesClient, error) - // ExtractCommitSignature returns a stream because the signed text may be - // arbitrarily large and signature verification is impossible without the - // full text. - ExtractCommitSignature(ctx context.Context, in *ExtractCommitSignatureRequest, opts ...grpc.CallOption) (CommitService_ExtractCommitSignatureClient, error) GetCommitSignatures(ctx context.Context, in *GetCommitSignaturesRequest, opts ...grpc.CallOption) (CommitService_GetCommitSignaturesClient, error) GetCommitMessages(ctx context.Context, in *GetCommitMessagesRequest, opts ...grpc.CallOption) (CommitService_GetCommitMessagesClient, error) } @@ -3300,40 +3295,8 @@ func (x *commitServiceFilterShasWithSignaturesClient) Recv() (*FilterShasWithSig return m, nil } -func (c *commitServiceClient) ExtractCommitSignature(ctx context.Context, in *ExtractCommitSignatureRequest, opts ...grpc.CallOption) (CommitService_ExtractCommitSignatureClient, error) { - stream, err := c.cc.NewStream(ctx, &_CommitService_serviceDesc.Streams[12], "/gitaly.CommitService/ExtractCommitSignature", opts...) - if err != nil { - return nil, err - } - x := &commitServiceExtractCommitSignatureClient{stream} - if err := x.ClientStream.SendMsg(in); err != nil { - return nil, err - } - if err := x.ClientStream.CloseSend(); err != nil { - return nil, err - } - return x, nil -} - -type CommitService_ExtractCommitSignatureClient interface { - Recv() (*ExtractCommitSignatureResponse, error) - grpc.ClientStream -} - -type commitServiceExtractCommitSignatureClient struct { - grpc.ClientStream -} - -func (x *commitServiceExtractCommitSignatureClient) Recv() (*ExtractCommitSignatureResponse, error) { - m := new(ExtractCommitSignatureResponse) - if err := x.ClientStream.RecvMsg(m); err != nil { - return nil, err - } - return m, nil -} - func (c *commitServiceClient) GetCommitSignatures(ctx context.Context, in *GetCommitSignaturesRequest, opts ...grpc.CallOption) (CommitService_GetCommitSignaturesClient, error) { - stream, err := c.cc.NewStream(ctx, &_CommitService_serviceDesc.Streams[13], "/gitaly.CommitService/GetCommitSignatures", opts...) + stream, err := c.cc.NewStream(ctx, &_CommitService_serviceDesc.Streams[12], "/gitaly.CommitService/GetCommitSignatures", opts...) if err != nil { return nil, err } @@ -3365,7 +3328,7 @@ func (x *commitServiceGetCommitSignaturesClient) Recv() (*GetCommitSignaturesRes } func (c *commitServiceClient) GetCommitMessages(ctx context.Context, in *GetCommitMessagesRequest, opts ...grpc.CallOption) (CommitService_GetCommitMessagesClient, error) { - stream, err := c.cc.NewStream(ctx, &_CommitService_serviceDesc.Streams[14], "/gitaly.CommitService/GetCommitMessages", opts...) + stream, err := c.cc.NewStream(ctx, &_CommitService_serviceDesc.Streams[13], "/gitaly.CommitService/GetCommitMessages", opts...) if err != nil { return nil, err } @@ -3418,10 +3381,6 @@ type CommitServiceServer interface { ListCommitsByOid(*ListCommitsByOidRequest, CommitService_ListCommitsByOidServer) error ListCommitsByRefName(*ListCommitsByRefNameRequest, CommitService_ListCommitsByRefNameServer) error FilterShasWithSignatures(CommitService_FilterShasWithSignaturesServer) error - // ExtractCommitSignature returns a stream because the signed text may be - // arbitrarily large and signature verification is impossible without the - // full text. - ExtractCommitSignature(*ExtractCommitSignatureRequest, CommitService_ExtractCommitSignatureServer) error GetCommitSignatures(*GetCommitSignaturesRequest, CommitService_GetCommitSignaturesServer) error GetCommitMessages(*GetCommitMessagesRequest, CommitService_GetCommitMessagesServer) error } @@ -3487,9 +3446,6 @@ func (*UnimplementedCommitServiceServer) ListCommitsByRefName(req *ListCommitsBy func (*UnimplementedCommitServiceServer) FilterShasWithSignatures(srv CommitService_FilterShasWithSignaturesServer) error { return status.Errorf(codes.Unimplemented, "method FilterShasWithSignatures not implemented") } -func (*UnimplementedCommitServiceServer) ExtractCommitSignature(req *ExtractCommitSignatureRequest, srv CommitService_ExtractCommitSignatureServer) error { - return status.Errorf(codes.Unimplemented, "method ExtractCommitSignature not implemented") -} func (*UnimplementedCommitServiceServer) GetCommitSignatures(req *GetCommitSignaturesRequest, srv CommitService_GetCommitSignaturesServer) error { return status.Errorf(codes.Unimplemented, "method GetCommitSignatures not implemented") } @@ -3884,27 +3840,6 @@ func (x *commitServiceFilterShasWithSignaturesServer) Recv() (*FilterShasWithSig return m, nil } -func _CommitService_ExtractCommitSignature_Handler(srv interface{}, stream grpc.ServerStream) error { - m := new(ExtractCommitSignatureRequest) - if err := stream.RecvMsg(m); err != nil { - return err - } - return srv.(CommitServiceServer).ExtractCommitSignature(m, &commitServiceExtractCommitSignatureServer{stream}) -} - -type CommitService_ExtractCommitSignatureServer interface { - Send(*ExtractCommitSignatureResponse) error - grpc.ServerStream -} - -type commitServiceExtractCommitSignatureServer struct { - grpc.ServerStream -} - -func (x *commitServiceExtractCommitSignatureServer) Send(m *ExtractCommitSignatureResponse) error { - return x.ServerStream.SendMsg(m) -} - func _CommitService_GetCommitSignatures_Handler(srv interface{}, stream grpc.ServerStream) error { m := new(GetCommitSignaturesRequest) if err := stream.RecvMsg(m); err != nil { @@ -4043,11 +3978,6 @@ var _CommitService_serviceDesc = grpc.ServiceDesc{ ClientStreams: true, }, { - StreamName: "ExtractCommitSignature", - Handler: _CommitService_ExtractCommitSignature_Handler, - ServerStreams: true, - }, - { StreamName: "GetCommitSignatures", Handler: _CommitService_GetCommitSignatures_Handler, ServerStreams: true, diff --git a/ruby/lib/gitaly_server/commit_service.rb b/ruby/lib/gitaly_server/commit_service.rb index efd89124c..6f37e1ffb 100644 --- a/ruby/lib/gitaly_server/commit_service.rb +++ b/ruby/lib/gitaly_server/commit_service.rb @@ -1,8 +1,5 @@ module GitalyServer class CommitService < Gitaly::CommitService::Service - include Utils - include Gitlab::EncodingHelper - def filter_shas_with_signatures(_session, call) Enumerator.new do |y| repository = nil @@ -14,49 +11,5 @@ module GitalyServer end end end - - def extract_commit_signature(request, call) - repository = Gitlab::Git::Repository.from_gitaly(request.repository, call) - - Enumerator.new do |y| - each_commit_signature_chunk(repository, request.commit_id) do |signature_chunk, signed_text_chunk| - y.yield Gitaly::ExtractCommitSignatureResponse.new(signature: signature_chunk) if signature_chunk.present? - - y.yield Gitaly::ExtractCommitSignatureResponse.new(signed_text: signed_text_chunk) if signed_text_chunk.present? - end - end - end - - private - - # yields either signature chunks or signed_text chunks to the passed block - def each_commit_signature_chunk(repository, commit_id) - raise ArgumentError.new("expected a block") unless block_given? - - begin - signature_text, signed_text = Rugged::Commit.extract_signature(repository.rugged, commit_id) - rescue Rugged::InvalidError - raise GRPC::InvalidArgument.new("commit lookup failed for #{commit_id.inspect}") - rescue Rugged::OdbError - # The client does not care if the commit does not exist - return - end - - signature_text_io = binary_stringio(signature_text) - loop do - chunk = signature_text_io.read(Gitlab.config.git.write_buffer_size) - break if chunk.nil? - - yield chunk, nil - end - - signed_text_io = binary_stringio(signed_text) - loop do - chunk = signed_text_io.read(Gitlab.config.git.write_buffer_size) - break if chunk.nil? - - yield nil, chunk - end - end end end diff --git a/ruby/proto/gitaly/commit_services_pb.rb b/ruby/proto/gitaly/commit_services_pb.rb index a2ece6609..f6dd140b7 100644 --- a/ruby/proto/gitaly/commit_services_pb.rb +++ b/ruby/proto/gitaly/commit_services_pb.rb @@ -34,10 +34,6 @@ module Gitaly rpc :ListCommitsByOid, ListCommitsByOidRequest, stream(ListCommitsByOidResponse) rpc :ListCommitsByRefName, ListCommitsByRefNameRequest, stream(ListCommitsByRefNameResponse) rpc :FilterShasWithSignatures, stream(FilterShasWithSignaturesRequest), stream(FilterShasWithSignaturesResponse) - # ExtractCommitSignature returns a stream because the signed text may be - # arbitrarily large and signature verification is impossible without the - # full text. - rpc :ExtractCommitSignature, ExtractCommitSignatureRequest, stream(ExtractCommitSignatureResponse) rpc :GetCommitSignatures, GetCommitSignaturesRequest, stream(GetCommitSignaturesResponse) rpc :GetCommitMessages, GetCommitMessagesRequest, stream(GetCommitMessagesResponse) end |