From 26976376358edae9b9ef4131995a088e5dae8cf0 Mon Sep 17 00:00:00 2001 From: Oliver O'Mahony Date: Thu, 1 Aug 2024 16:56:05 +0100 Subject: [PATCH 1/4] added AllowedDirectories to agent details, added tests for allowed directories --- docs/proto/proto.md | 1 + sdk/config_helpers_test.go | 46 ++++ sdk/proto/agent.pb.go | 230 +++++++++++------- sdk/proto/agent.proto | 2 + src/core/config/types.go | 10 + src/core/environment_test.go | 15 ++ src/plugins/registration.go | 1 + .../nginx/agent/sdk/v2/proto/agent.pb.go | 230 +++++++++++------- .../nginx/agent/sdk/v2/proto/agent.proto | 2 + .../nginx/agent/v2/src/core/config/types.go | 10 + .../nginx/agent/sdk/v2/proto/agent.pb.go | 230 +++++++++++------- .../nginx/agent/sdk/v2/proto/agent.proto | 2 + .../nginx/agent/v2/src/core/config/types.go | 10 + .../agent/v2/src/plugins/registration.go | 1 + .../nginx/agent/sdk/v2/proto/agent.pb.go | 230 +++++++++++------- .../nginx/agent/sdk/v2/proto/agent.proto | 2 + 16 files changed, 678 insertions(+), 344 deletions(-) diff --git a/docs/proto/proto.md b/docs/proto/proto.md index f7d3717092..4059f97cd5 100644 --- a/docs/proto/proto.md +++ b/docs/proto/proto.md @@ -215,6 +215,7 @@ Represents agent details. This message is sent from the management server to the | tags | [string](#string) | repeated | List of tags | | alias | [string](#string) | | Alias name for the agent | | server | [Server](#f5-nginx-agent-sdk-Server) | | Server setting for the agent | +| allowed_directories | [string](#string) | repeated | List of allowed directories in the Agent Config | diff --git a/sdk/config_helpers_test.go b/sdk/config_helpers_test.go index 9b4cb585ab..9234d8a7f2 100644 --- a/sdk/config_helpers_test.go +++ b/sdk/config_helpers_test.go @@ -799,6 +799,52 @@ var tests = []struct { "/tmp/testdata/nginx/ca/ca.crt": {}, }, }, + { + fileName: "/tmp/testdata/nginx/nginx3.conf", + config: `daemon off; + worker_processes 2; + user www-data; + + events { + use epoll; + worker_connections 128; + } + + include /hello.html + + }`, + plusApi: "", + expected: &proto.NginxConfig{ + Action: proto.NginxConfigAction_APPLY, + DirectoryMap: &proto.DirectoryMap{ + Directories: []*proto.Directory{ + { + Name: "/", + Permissions: "0755", + Files: []*proto.File{ + { + Name: "test.html", + Permissions: "0644", + }, + }, + }, + }, + }, + // using RootDirectory for allowed in the tests, but the "root" directive is /tmp/testdata/foo, so + // should have an empty file list from the aux + Zaux: &proto.ZippedFile{ + Checksum: "51c05b653bc43deb5ec497988692fc5dec05ab8b6a0b78e908e4628b3d9e0d4c", + RootDirectory: "/test.html", + }, + Zconfig: &proto.ZippedFile{ + Contents: []uint8{31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 1, 0, 0, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0}, + Checksum: "cc6cee5366d87e85fbf1c05b9621df82996548e0e135f2b4a93e98f88c23d2b9", + RootDirectory: "/tmp/testdata/nginx", + }, + }, + // aux file not included after test runs + expectedAuxFiles: map[string]struct{}{}, + }, } func TestGetNginxConfigFiles(t *testing.T) { diff --git a/sdk/proto/agent.pb.go b/sdk/proto/agent.pb.go index e8ce7b1350..37d17c8290 100644 --- a/sdk/proto/agent.pb.go +++ b/sdk/proto/agent.pb.go @@ -423,7 +423,9 @@ type AgentDetails struct { // Alias name for the agent Alias string `protobuf:"bytes,4,opt,name=alias,proto3" json:"alias"` // Server setting for the agent - Server *Server `protobuf:"bytes,5,opt,name=server,proto3" json:"server"` + Server *Server `protobuf:"bytes,5,opt,name=server,proto3" json:"server"` + // List of allowed directories in the Agent Config + AllowedDirectories []string `protobuf:"bytes,6,rep,name=allowed_directories,json=allowedDirectories,proto3" json:"allowed_directories"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -497,6 +499,13 @@ func (m *AgentDetails) GetServer() *Server { return nil } +func (m *AgentDetails) GetAllowedDirectories() []string { + if m != nil { + return m.AllowedDirectories + } + return nil +} + type Server struct { // Host name or IP of the host to connect to Host string `protobuf:"bytes,1,opt,name=host,proto3" json:"host"` @@ -899,91 +908,93 @@ func init() { func init() { proto.RegisterFile("agent.proto", fileDescriptor_56ede974c0020f77) } var fileDescriptor_56ede974c0020f77 = []byte{ - // 1342 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0xcd, 0x6e, 0x1c, 0x45, - 0x10, 0xce, 0xec, 0x8f, 0x77, 0xb7, 0xd6, 0x76, 0x86, 0x8e, 0x05, 0x1b, 0x27, 0x78, 0xac, 0x15, - 0x04, 0x83, 0x60, 0x0d, 0x8e, 0x10, 0x82, 0xa0, 0x20, 0x8f, 0xbd, 0x71, 0x9c, 0x84, 0x75, 0xd4, - 0xb6, 0x15, 0xc4, 0x65, 0xd4, 0xde, 0xe9, 0x9d, 0x34, 0x9e, 0x99, 0x1e, 0x66, 0x7a, 0xcd, 0x26, - 0x77, 0x2e, 0x3c, 0x04, 0x4f, 0xc0, 0x03, 0x70, 0xe0, 0x01, 0x38, 0xf2, 0x04, 0x23, 0x94, 0x0b, - 0x68, 0xce, 0x5c, 0xb8, 0xa1, 0xfe, 0x19, 0xef, 0x3a, 0xb6, 0x43, 0x2e, 0xdd, 0xd5, 0x5f, 0x57, - 0x55, 0x57, 0x55, 0x57, 0x55, 0x37, 0xb4, 0x49, 0x40, 0x63, 0xd1, 0x4b, 0x52, 0x2e, 0x38, 0x42, - 0xa3, 0x4f, 0x7b, 0x71, 0xc0, 0xe2, 0x49, 0x4f, 0xa3, 0x99, 0x7f, 0xbc, 0x3c, 0x3f, 0xe4, 0xf1, - 0x88, 0x05, 0x9a, 0x63, 0xf9, 0xba, 0x9f, 0x78, 0x19, 0x1f, 0x89, 0x1f, 0x48, 0x4a, 0x3d, 0x9f, - 0x0a, 0xc2, 0xc2, 0xcc, 0x6c, 0x41, 0xc0, 0x03, 0x6e, 0x68, 0x27, 0xe0, 0x3c, 0x08, 0xe9, 0xba, - 0x5a, 0x1d, 0x8d, 0x47, 0xeb, 0x82, 0x45, 0x34, 0x13, 0x24, 0x4a, 0x4a, 0xe6, 0xa7, 0x3c, 0x33, - 0xa7, 0x2e, 0xb7, 0xf5, 0x91, 0x6a, 0xd1, 0xfd, 0xa7, 0x02, 0xd7, 0x36, 0xe5, 0xe1, 0x5b, 0x3c, - 0x8e, 0xe9, 0x50, 0x60, 0xfa, 0xfd, 0x98, 0x66, 0x02, 0xdd, 0x81, 0x5a, 0x44, 0x05, 0xe9, 0x54, - 0x56, 0xad, 0xb5, 0xf6, 0xc6, 0xdb, 0xbd, 0xf3, 0x96, 0xf6, 0x94, 0xd8, 0xd7, 0x54, 0x10, 0xb7, - 0x59, 0xe4, 0x8e, 0x62, 0xc7, 0x6a, 0x44, 0x3b, 0xd0, 0x30, 0xb6, 0x76, 0xaa, 0xab, 0xd5, 0xb5, - 0xf6, 0xc6, 0xea, 0x45, 0xf2, 0x03, 0xb9, 0xde, 0xd6, 0x7c, 0x6e, 0xbb, 0xc8, 0x9d, 0x52, 0x08, - 0x97, 0x04, 0xfa, 0x02, 0x6a, 0xd2, 0xf0, 0x4e, 0x4d, 0x59, 0x71, 0xf3, 0x22, 0x2d, 0xf7, 0x79, - 0x26, 0x76, 0xe3, 0x11, 0xd7, 0x46, 0x48, 0x6e, 0xac, 0x46, 0xf4, 0x93, 0x05, 0xcb, 0x3e, 0x11, - 0x24, 0x09, 0x49, 0x4c, 0xcf, 0x05, 0xb1, 0x53, 0x57, 0x86, 0x7d, 0x78, 0x91, 0xca, 0xed, 0x52, - 0x6a, 0xdf, 0x08, 0x95, 0x46, 0xae, 0x14, 0xb9, 0xf3, 0x0a, 0x9d, 0xb8, 0xe3, 0x5f, 0x22, 0xf9, - 0xa0, 0xd6, 0xb4, 0xec, 0x0a, 0x6e, 0x32, 0x9f, 0xc6, 0x82, 0x89, 0x67, 0xdd, 0x5f, 0x2a, 0x80, - 0x66, 0xc3, 0xbe, 0x2f, 0x88, 0x18, 0x67, 0xe8, 0x08, 0x20, 0x53, 0xd4, 0x16, 0xf7, 0x69, 0xc7, - 0x5a, 0xb5, 0xd6, 0x16, 0x37, 0x3e, 0xb9, 0x34, 0xf6, 0x67, 0x64, 0x7b, 0xfb, 0xa7, 0x82, 0xee, - 0xd5, 0x22, 0x77, 0xda, 0x5a, 0x91, 0x37, 0xe4, 0x3e, 0xc5, 0x33, 0x5a, 0xd1, 0xbb, 0xd0, 0x88, - 0x68, 0x96, 0x91, 0x80, 0xaa, 0xcb, 0x6d, 0xe9, 0xd0, 0x1b, 0x08, 0x97, 0x04, 0x72, 0xa0, 0x4e, - 0xd3, 0x94, 0xa7, 0x9d, 0xaa, 0x62, 0x6a, 0x15, 0xb9, 0xa3, 0x01, 0xac, 0xa7, 0xee, 0x77, 0x00, - 0xd3, 0x23, 0xd1, 0x35, 0xb8, 0xba, 0xb5, 0x37, 0x18, 0xf4, 0xb7, 0x0e, 0xbc, 0xc3, 0xc1, 0xc3, - 0xc1, 0xde, 0x93, 0x81, 0x7d, 0x05, 0x2d, 0x02, 0x94, 0xe0, 0xde, 0x43, 0xdb, 0x42, 0xcb, 0xf0, - 0x66, 0xb9, 0xc6, 0xfd, 0x07, 0xfd, 0xad, 0x83, 0xfe, 0xb6, 0xb7, 0x77, 0x70, 0xbf, 0x8f, 0xed, - 0x0a, 0xba, 0x01, 0x6f, 0x9d, 0xdb, 0xdb, 0x3e, 0x7c, 0xec, 0xed, 0x6e, 0xdb, 0xd5, 0xee, 0xaf, - 0x16, 0x2c, 0x9d, 0xcd, 0xd2, 0x2c, 0xe1, 0x71, 0x46, 0xd1, 0x01, 0xcc, 0xab, 0xa0, 0x78, 0xba, - 0x6a, 0x54, 0xc8, 0xda, 0x1b, 0xce, 0xab, 0x42, 0x36, 0x62, 0x81, 0x6b, 0x17, 0xb9, 0x73, 0x46, - 0x10, 0xeb, 0xba, 0xd4, 0xdb, 0xe8, 0x01, 0xcc, 0xe9, 0x80, 0x99, 0xf4, 0xbf, 0xf5, 0x7a, 0x57, - 0xe0, 0x42, 0x91, 0x3b, 0x46, 0x12, 0x9b, 0xb9, 0xbb, 0x34, 0xbd, 0x68, 0x79, 0x8e, 0x2e, 0xaf, - 0xee, 0xdf, 0x16, 0xb4, 0x67, 0xe0, 0xd9, 0x8a, 0xd1, 0x2e, 0xac, 0x5e, 0x7a, 0xe4, 0xab, 0x2b, - 0x66, 0x07, 0x1a, 0x21, 0x0f, 0x02, 0x9a, 0x96, 0xb6, 0x5f, 0xae, 0xe8, 0x11, 0x0f, 0x02, 0x16, - 0x07, 0x5a, 0x91, 0x11, 0xc2, 0x25, 0x21, 0x15, 0xe9, 0xd0, 0x64, 0x2a, 0x03, 0x2e, 0x51, 0x54, - 0x7a, 0x95, 0xf0, 0x54, 0x68, 0x45, 0x46, 0x08, 0x97, 0x44, 0xf7, 0x2f, 0x0b, 0xe6, 0x67, 0x0d, - 0x47, 0x6b, 0xd0, 0x1c, 0x51, 0x22, 0xc6, 0x29, 0x95, 0xce, 0x56, 0xd7, 0x5a, 0xee, 0x7c, 0x91, - 0x3b, 0xa7, 0x18, 0x3e, 0xa5, 0x50, 0x0f, 0x80, 0x4e, 0x04, 0x8d, 0x33, 0xc6, 0x63, 0xe9, 0x8f, - 0xe4, 0x5d, 0x2c, 0x72, 0x67, 0x06, 0xc5, 0x33, 0x34, 0xba, 0x09, 0x35, 0x41, 0x02, 0xdd, 0x74, - 0x5a, 0xba, 0x21, 0xc8, 0x35, 0x56, 0xa3, 0xcc, 0x68, 0x12, 0x32, 0x92, 0xa9, 0x6e, 0x62, 0x32, - 0x5a, 0x01, 0x58, 0x4f, 0xe8, 0x2e, 0xcc, 0x65, 0x34, 0x3d, 0xa1, 0x69, 0xa7, 0xae, 0x3c, 0x5e, - 0xbe, 0xc8, 0xe3, 0x7d, 0xc5, 0x61, 0xae, 0x5a, 0xd1, 0xd8, 0xcc, 0xdd, 0x1f, 0x2b, 0x30, 0xa7, - 0xb7, 0xa5, 0x25, 0xaa, 0x71, 0x59, 0xea, 0xa8, 0x97, 0x5b, 0xd3, 0x07, 0xd0, 0x0a, 0xd2, 0x64, - 0xe8, 0xc9, 0xa8, 0xa9, 0x6b, 0xaa, 0xbb, 0x0b, 0x45, 0xee, 0x4c, 0x41, 0xdc, 0x94, 0xe4, 0x63, - 0x9e, 0x0a, 0x69, 0xb5, 0xe0, 0xc7, 0x34, 0x9e, 0xad, 0x43, 0x05, 0x60, 0x3d, 0xe9, 0x7a, 0x16, - 0x29, 0x1b, 0x96, 0x8e, 0x99, 0x7a, 0x56, 0x10, 0x2e, 0x09, 0xc9, 0x36, 0xe4, 0x51, 0x44, 0x62, - 0x5f, 0x79, 0xd7, 0x2a, 0x6f, 0x4b, 0x41, 0xb8, 0x24, 0x90, 0x0b, 0x8d, 0x23, 0x32, 0x3c, 0xe6, - 0xa3, 0x51, 0x67, 0x4e, 0x05, 0xe1, 0xc6, 0x45, 0x41, 0x70, 0x35, 0x8b, 0xd6, 0x61, 0xf8, 0x71, - 0x49, 0x74, 0x7f, 0xab, 0x40, 0xc3, 0x70, 0xa0, 0xaf, 0xc0, 0x66, 0x31, 0x13, 0x8c, 0x84, 0x1e, - 0x8b, 0x05, 0x4d, 0x4f, 0x48, 0xa8, 0x82, 0x52, 0x75, 0x97, 0x8a, 0xdc, 0x39, 0xb7, 0x87, 0xaf, - 0x1a, 0x64, 0xd7, 0x00, 0xe8, 0x21, 0x2c, 0xa5, 0x24, 0xf6, 0x79, 0xc4, 0x9e, 0x13, 0xc1, 0x78, - 0xec, 0x8d, 0xc8, 0x50, 0xf0, 0x54, 0x85, 0xcd, 0x72, 0x3b, 0x45, 0xee, 0x5c, 0xb8, 0x8f, 0xaf, - 0x9d, 0x41, 0xef, 0x29, 0x50, 0x26, 0x54, 0x34, 0x0e, 0x05, 0x4b, 0x42, 0x46, 0x75, 0x67, 0xb3, - 0x74, 0x42, 0x4d, 0x51, 0x3c, 0x43, 0xa3, 0xdb, 0x30, 0x1f, 0x91, 0xc9, 0xd4, 0xf2, 0x9a, 0xb2, - 0x5c, 0x75, 0x8f, 0x59, 0x1c, 0xb7, 0x23, 0x32, 0x39, 0xb5, 0xf8, 0x2e, 0xd8, 0x72, 0x93, 0x86, - 0x24, 0xc9, 0xa8, 0xef, 0xc9, 0xa7, 0x58, 0x85, 0xdc, 0xb8, 0xfc, 0xf2, 0x1e, 0x5e, 0x8c, 0xc8, - 0xa4, 0xaf, 0x81, 0x03, 0x16, 0xd1, 0xee, 0xbf, 0x15, 0x53, 0x30, 0xa6, 0x40, 0xd1, 0x0e, 0xd4, - 0x43, 0x7a, 0x42, 0x43, 0xf3, 0x20, 0xdc, 0xfa, 0xbf, 0x8a, 0xee, 0x3d, 0x92, 0xdc, 0x3a, 0x55, - 0x94, 0x20, 0xd6, 0x13, 0xba, 0x0e, 0x55, 0x9f, 0xa5, 0xa6, 0xed, 0x37, 0x8a, 0xdc, 0x91, 0x4b, - 0x2c, 0x07, 0x99, 0xb0, 0x23, 0x16, 0x52, 0x93, 0x65, 0x2a, 0x61, 0xe5, 0x1a, 0xab, 0x11, 0xbd, - 0x07, 0x4d, 0x69, 0x76, 0xc6, 0x9e, 0x53, 0x15, 0x83, 0x05, 0x5d, 0xb2, 0x25, 0x86, 0x1b, 0x11, - 0x99, 0xec, 0xb3, 0xe7, 0x14, 0x7d, 0x0c, 0x32, 0x14, 0x9e, 0xcc, 0x84, 0x71, 0x92, 0x29, 0xb7, - 0x17, 0xf4, 0x73, 0x34, 0x03, 0x63, 0x88, 0xc8, 0xc4, 0xd5, 0x34, 0x7a, 0x07, 0xa4, 0xb0, 0x27, - 0x9f, 0xa3, 0x39, 0xc5, 0xad, 0xd3, 0x57, 0x43, 0x78, 0x2e, 0x22, 0x93, 0xcd, 0x80, 0xca, 0x9e, - 0x31, 0xe4, 0x51, 0x92, 0xd2, 0x2c, 0xeb, 0x34, 0x56, 0xad, 0xb5, 0xa6, 0x36, 0xa0, 0xc4, 0xf0, - 0x29, 0xd5, 0xfd, 0x12, 0xea, 0xca, 0x7d, 0xd4, 0x84, 0xda, 0xee, 0xe0, 0xde, 0x9e, 0x7d, 0x05, - 0xb5, 0xa0, 0xbe, 0xdd, 0x77, 0x0f, 0x77, 0x6c, 0x4b, 0x82, 0x4f, 0x36, 0xf1, 0xc0, 0xae, 0x48, - 0xb0, 0x8f, 0xf1, 0x1e, 0xb6, 0xab, 0x92, 0xbc, 0xb7, 0x79, 0xb0, 0xf9, 0xc8, 0xae, 0x75, 0x7f, - 0xae, 0x42, 0xeb, 0xf4, 0x5f, 0x23, 0x6b, 0xe6, 0x84, 0xa6, 0xb2, 0xb7, 0x98, 0x42, 0x56, 0xb6, - 0x19, 0x08, 0x97, 0x84, 0xcc, 0x12, 0x9f, 0x65, 0x49, 0x48, 0x9e, 0x79, 0x31, 0x89, 0xca, 0x67, - 0x55, 0x65, 0xc9, 0x2c, 0x8e, 0xdb, 0x66, 0x35, 0x20, 0x11, 0x95, 0x77, 0x21, 0x48, 0x60, 0x5a, - 0x95, 0xba, 0x0b, 0x41, 0x02, 0x2c, 0x07, 0xf4, 0x39, 0x2c, 0xb2, 0x38, 0x13, 0x24, 0x1e, 0x52, - 0x2f, 0x48, 0xf9, 0x38, 0x31, 0x15, 0x8b, 0x8a, 0xdc, 0x79, 0x69, 0x07, 0x2f, 0x94, 0xeb, 0x1d, - 0xb9, 0x44, 0x9b, 0xd0, 0x18, 0x27, 0x3e, 0x11, 0xd4, 0x37, 0xe5, 0xbb, 0xdc, 0xd3, 0x5f, 0xc3, - 0x5e, 0xf9, 0x35, 0xec, 0x1d, 0x94, 0x5f, 0x43, 0xed, 0x8d, 0x61, 0xc7, 0x25, 0x81, 0x3e, 0x02, - 0xc8, 0x9e, 0x65, 0x82, 0x46, 0xde, 0x98, 0xf9, 0x2a, 0xd8, 0xa6, 0xe9, 0x4e, 0x51, 0xdc, 0xd2, - 0xf4, 0x21, 0xf3, 0xd1, 0x37, 0xb0, 0xa0, 0x1f, 0xd2, 0xf2, 0xfd, 0x6a, 0xbe, 0xe6, 0xfb, 0xf5, - 0x46, 0x91, 0x3b, 0x67, 0x45, 0xb1, 0x7e, 0x92, 0xa7, 0x7f, 0xa6, 0x9a, 0x5d, 0x9f, 0x3a, 0xa8, - 0x62, 0xe8, 0x7e, 0xf6, 0xfb, 0x8b, 0x15, 0xeb, 0x8f, 0x17, 0x2b, 0xd6, 0x9f, 0x2f, 0x56, 0xac, - 0x6f, 0xdf, 0x0f, 0x98, 0x78, 0x3a, 0x3e, 0xea, 0x0d, 0x79, 0xb4, 0xae, 0x0e, 0x5b, 0x57, 0x1a, - 0xd6, 0x33, 0xff, 0x78, 0xfd, 0x64, 0x43, 0x7f, 0x87, 0xef, 0x68, 0xcf, 0xe7, 0xd4, 0x74, 0xfb, - 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd2, 0x4a, 0x40, 0x6e, 0x81, 0x0b, 0x00, 0x00, + // 1372 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0x4f, 0x6f, 0x1c, 0x35, + 0x14, 0xef, 0xec, 0xff, 0xf5, 0x26, 0xe9, 0xe0, 0x44, 0x74, 0x9b, 0x96, 0x4c, 0xb4, 0x82, 0x12, + 0x10, 0x6c, 0x20, 0x15, 0x42, 0x50, 0x54, 0x94, 0x49, 0xb6, 0x69, 0xda, 0xb2, 0xa9, 0x9c, 0x8d, + 0x8a, 0xb8, 0x8c, 0x9c, 0x1d, 0xef, 0xd4, 0x64, 0x66, 0x3c, 0x8c, 0xbd, 0xe9, 0xb6, 0x77, 0x2e, + 0x7c, 0x08, 0x3e, 0x01, 0x17, 0x6e, 0x1c, 0xf8, 0x00, 0x1c, 0xf9, 0x04, 0x23, 0xd4, 0x13, 0x9a, + 0x33, 0x17, 0x6e, 0xc8, 0x7f, 0x26, 0xbb, 0x69, 0x36, 0xa5, 0x17, 0xfb, 0xf9, 0xe7, 0xf7, 0x9e, + 0xdf, 0x7b, 0x7e, 0xef, 0xd9, 0xa0, 0x85, 0x03, 0x12, 0x8b, 0x6e, 0x92, 0x32, 0xc1, 0x20, 0x1c, + 0x7d, 0xd6, 0x8d, 0x03, 0x1a, 0x4f, 0xba, 0x1a, 0xe5, 0xfe, 0xc9, 0xea, 0xc2, 0x90, 0xc5, 0x23, + 0x1a, 0x68, 0x8e, 0xd5, 0xeb, 0x7e, 0xe2, 0x71, 0x36, 0x12, 0xcf, 0x70, 0x4a, 0x3c, 0x9f, 0x08, + 0x4c, 0x43, 0x6e, 0xb6, 0x40, 0xc0, 0x02, 0x66, 0x68, 0x27, 0x60, 0x2c, 0x08, 0xc9, 0xa6, 0x5a, + 0x1d, 0x8f, 0x47, 0x9b, 0x82, 0x46, 0x84, 0x0b, 0x1c, 0x25, 0x05, 0xf3, 0x53, 0xc6, 0xcd, 0xa9, + 0xab, 0x2d, 0x7d, 0xa4, 0x5a, 0x74, 0xfe, 0x29, 0x81, 0xe5, 0x6d, 0x79, 0xf8, 0x0e, 0x8b, 0x63, + 0x32, 0x14, 0x88, 0xfc, 0x30, 0x26, 0x5c, 0xc0, 0x3b, 0xa0, 0x12, 0x11, 0x81, 0xdb, 0xa5, 0x75, + 0x6b, 0xa3, 0xb5, 0xf5, 0x4e, 0xf7, 0xa2, 0xa5, 0x5d, 0x25, 0xf6, 0x0d, 0x11, 0xd8, 0x6d, 0xe4, + 0x99, 0xa3, 0xd8, 0x91, 0x1a, 0xe1, 0x1e, 0xa8, 0x1b, 0x5b, 0xdb, 0xe5, 0xf5, 0xf2, 0x46, 0x6b, + 0x6b, 0x7d, 0x9e, 0x7c, 0x5f, 0xae, 0x77, 0x35, 0x9f, 0xdb, 0xca, 0x33, 0xa7, 0x10, 0x42, 0x05, + 0x01, 0xbf, 0x04, 0x15, 0x69, 0x78, 0xbb, 0xa2, 0xac, 0xb8, 0x39, 0x4f, 0xcb, 0x7d, 0xc6, 0xc5, + 0x7e, 0x3c, 0x62, 0xda, 0x08, 0xc9, 0x8d, 0xd4, 0x08, 0x7f, 0xb2, 0xc0, 0xaa, 0x8f, 0x05, 0x4e, + 0x42, 0x1c, 0x93, 0x0b, 0x41, 0x6c, 0x57, 0x95, 0x61, 0x1f, 0xcd, 0x53, 0xb9, 0x5b, 0x48, 0x1d, + 0x1a, 0xa1, 0xc2, 0xc8, 0xb5, 0x3c, 0x73, 0x5e, 0xa3, 0x13, 0xb5, 0xfd, 0x4b, 0x24, 0x1f, 0x54, + 0x1a, 0x96, 0x5d, 0x42, 0x0d, 0xea, 0x93, 0x58, 0x50, 0xf1, 0xbc, 0xf3, 0x4b, 0x09, 0xc0, 0xd9, + 0xb0, 0x1f, 0x0a, 0x2c, 0xc6, 0x1c, 0x1e, 0x03, 0xc0, 0x15, 0xb5, 0xc3, 0x7c, 0xd2, 0xb6, 0xd6, + 0xad, 0x8d, 0xa5, 0xad, 0x4f, 0x2f, 0x8d, 0xfd, 0x39, 0xd9, 0xee, 0xe1, 0x99, 0xa0, 0x7b, 0x35, + 0xcf, 0x9c, 0x96, 0x56, 0xe4, 0x0d, 0x99, 0x4f, 0xd0, 0x8c, 0x56, 0xf8, 0x1e, 0xa8, 0x47, 0x84, + 0x73, 0x1c, 0x10, 0x75, 0xb9, 0x4d, 0x1d, 0x7a, 0x03, 0xa1, 0x82, 0x80, 0x0e, 0xa8, 0x92, 0x34, + 0x65, 0x69, 0xbb, 0xac, 0x98, 0x9a, 0x79, 0xe6, 0x68, 0x00, 0xe9, 0xa9, 0xf3, 0x3d, 0x00, 0xd3, + 0x23, 0xe1, 0x32, 0xb8, 0xba, 0x73, 0xd0, 0xef, 0xf7, 0x76, 0x06, 0xde, 0x51, 0xff, 0x61, 0xff, + 0xe0, 0x49, 0xdf, 0xbe, 0x02, 0x97, 0x00, 0x28, 0xc0, 0x83, 0x87, 0xb6, 0x05, 0x57, 0xc1, 0xdb, + 0xc5, 0x1a, 0xf5, 0x1e, 0xf4, 0x76, 0x06, 0xbd, 0x5d, 0xef, 0x60, 0x70, 0xbf, 0x87, 0xec, 0x12, + 0xbc, 0x01, 0xae, 0x5d, 0xd8, 0xdb, 0x3d, 0x7a, 0xec, 0xed, 0xef, 0xda, 0xe5, 0xce, 0x6f, 0x16, + 0x58, 0x39, 0x9f, 0xa5, 0x3c, 0x61, 0x31, 0x27, 0x70, 0x00, 0x16, 0x54, 0x50, 0x3c, 0x5d, 0x35, + 0x2a, 0x64, 0xad, 0x2d, 0xe7, 0x75, 0x21, 0x1b, 0xd1, 0xc0, 0xb5, 0xf3, 0xcc, 0x39, 0x27, 0x88, + 0x74, 0x5d, 0xea, 0x6d, 0xf8, 0x00, 0xd4, 0x74, 0xc0, 0x4c, 0xfa, 0xdf, 0x7a, 0xb3, 0x2b, 0x70, + 0x41, 0x9e, 0x39, 0x46, 0x12, 0x99, 0xb9, 0xb3, 0x32, 0xbd, 0x68, 0x79, 0x8e, 0x2e, 0xaf, 0xce, + 0xdf, 0x16, 0x68, 0xcd, 0xc0, 0xb3, 0x15, 0xa3, 0x5d, 0x58, 0xbf, 0xf4, 0xc8, 0xd7, 0x57, 0xcc, + 0x1e, 0xa8, 0x87, 0x2c, 0x08, 0x48, 0x5a, 0xd8, 0x7e, 0xb9, 0xa2, 0x47, 0x2c, 0x08, 0x68, 0x1c, + 0x68, 0x45, 0x46, 0x08, 0x15, 0x84, 0x54, 0xa4, 0x43, 0xc3, 0x55, 0x06, 0x5c, 0xa2, 0xa8, 0xf0, + 0x2a, 0x61, 0xa9, 0xd0, 0x8a, 0x8c, 0x10, 0x2a, 0x88, 0xce, 0xaf, 0x25, 0xb0, 0x30, 0x6b, 0x38, + 0xdc, 0x00, 0x8d, 0x11, 0xc1, 0x62, 0x9c, 0x12, 0xe9, 0x6c, 0x79, 0xa3, 0xe9, 0x2e, 0xe4, 0x99, + 0x73, 0x86, 0xa1, 0x33, 0x0a, 0x76, 0x01, 0x20, 0x13, 0x41, 0x62, 0x4e, 0x59, 0x2c, 0xfd, 0x91, + 0xbc, 0x4b, 0x79, 0xe6, 0xcc, 0xa0, 0x68, 0x86, 0x86, 0x37, 0x41, 0x45, 0xe0, 0x40, 0x37, 0x9d, + 0xa6, 0x6e, 0x08, 0x72, 0x8d, 0xd4, 0x28, 0x33, 0x1a, 0x87, 0x14, 0x73, 0xd5, 0x4d, 0x4c, 0x46, + 0x2b, 0x00, 0xe9, 0x09, 0xde, 0x05, 0x35, 0x4e, 0xd2, 0x53, 0x92, 0xb6, 0xab, 0xca, 0xe3, 0xd5, + 0x79, 0x1e, 0x1f, 0x2a, 0x0e, 0x73, 0xd5, 0x8a, 0x46, 0x66, 0x86, 0xf7, 0xc1, 0x32, 0x0e, 0x43, + 0xf6, 0x8c, 0xf8, 0x9e, 0x4f, 0x53, 0x32, 0x14, 0x2c, 0xa5, 0x84, 0xb7, 0x6b, 0xca, 0x9a, 0x6b, + 0x79, 0xe6, 0xcc, 0xdb, 0x46, 0xd0, 0x80, 0xbb, 0x53, 0xac, 0xf3, 0x63, 0x09, 0xd4, 0xf4, 0x41, + 0xd2, 0x27, 0xd5, 0x02, 0x2d, 0x65, 0xf4, 0xab, 0x4d, 0xee, 0x43, 0xd0, 0x0c, 0xd2, 0x64, 0xe8, + 0xc9, 0xf8, 0xab, 0x0b, 0xaf, 0xba, 0x8b, 0x79, 0xe6, 0x4c, 0x41, 0xd4, 0x90, 0xe4, 0x63, 0x96, + 0x0a, 0xe9, 0xbf, 0x60, 0x27, 0x24, 0x9e, 0xad, 0x68, 0x05, 0x20, 0x3d, 0xe9, 0xce, 0x20, 0x52, + 0x3a, 0x2c, 0x42, 0x64, 0x3a, 0x83, 0x82, 0x50, 0x41, 0x48, 0xb6, 0x21, 0x8b, 0x22, 0x1c, 0xfb, + 0x2a, 0x4e, 0xcd, 0xe2, 0xde, 0x15, 0x84, 0x0a, 0x02, 0xba, 0xa0, 0x7e, 0x8c, 0x87, 0x27, 0x6c, + 0x34, 0x6a, 0xd7, 0x54, 0x38, 0x6f, 0xcc, 0x0b, 0xa7, 0xab, 0x59, 0xb4, 0x0e, 0xc3, 0x8f, 0x0a, + 0xa2, 0xf3, 0x7b, 0x09, 0xd4, 0x0d, 0x07, 0xfc, 0x1a, 0xd8, 0x34, 0xa6, 0x82, 0xe2, 0xd0, 0xa3, + 0xb1, 0x20, 0xe9, 0x29, 0x0e, 0x55, 0x50, 0xca, 0xee, 0x4a, 0x9e, 0x39, 0x17, 0xf6, 0xd0, 0x55, + 0x83, 0xec, 0x1b, 0x00, 0x3e, 0x04, 0x2b, 0x29, 0x8e, 0x7d, 0x16, 0xd1, 0x17, 0x58, 0x50, 0x16, + 0x7b, 0x23, 0x2c, 0xe3, 0xad, 0xc2, 0x66, 0xb9, 0xed, 0x3c, 0x73, 0xe6, 0xee, 0xa3, 0xe5, 0x73, + 0xe8, 0x3d, 0x05, 0xca, 0xd4, 0x8c, 0xc6, 0xa1, 0xa0, 0x49, 0x48, 0x89, 0xee, 0x91, 0x96, 0x4e, + 0xcd, 0x29, 0x8a, 0x66, 0x68, 0x78, 0x1b, 0x2c, 0x44, 0x78, 0x32, 0xb5, 0xbc, 0xa2, 0x2c, 0x57, + 0x7d, 0x68, 0x16, 0x47, 0xad, 0x08, 0x4f, 0xce, 0x2c, 0xbe, 0x0b, 0x6c, 0xb9, 0x49, 0x42, 0x9c, + 0x70, 0xe2, 0x7b, 0xf2, 0x51, 0x57, 0x21, 0x37, 0x2e, 0xbf, 0xba, 0x87, 0x96, 0x22, 0x3c, 0xe9, + 0x69, 0x60, 0x40, 0x23, 0xd2, 0xf9, 0xb7, 0x28, 0x3d, 0x53, 0xea, 0x70, 0x0f, 0x54, 0x43, 0x72, + 0x4a, 0x42, 0xf3, 0xb4, 0xdc, 0xfa, 0xbf, 0xde, 0xd0, 0x7d, 0x24, 0xb9, 0x75, 0xaa, 0x28, 0x41, + 0xa4, 0x27, 0x78, 0x1d, 0x94, 0x7d, 0x9a, 0x9a, 0x07, 0xa4, 0x9e, 0x67, 0x8e, 0x5c, 0x22, 0x39, + 0xc8, 0x84, 0x1d, 0xd1, 0x90, 0x98, 0x2c, 0x53, 0x09, 0x2b, 0xd7, 0x48, 0x8d, 0xf0, 0x7d, 0xd0, + 0x90, 0x66, 0x73, 0xfa, 0x82, 0xa8, 0x18, 0x2c, 0xea, 0xe2, 0x2f, 0x30, 0x54, 0x8f, 0xf0, 0xe4, + 0x90, 0xbe, 0x20, 0xf0, 0x13, 0x20, 0x43, 0xe1, 0xc9, 0x4c, 0x18, 0x27, 0x5c, 0xb9, 0xbd, 0xa8, + 0x1f, 0xb6, 0x19, 0x18, 0x81, 0x08, 0x4f, 0x5c, 0x4d, 0xc3, 0x77, 0x81, 0x14, 0xf6, 0xe4, 0xc3, + 0x56, 0x53, 0xdc, 0x3a, 0x7d, 0x35, 0x84, 0x6a, 0x11, 0x9e, 0x6c, 0x07, 0x44, 0x76, 0x9f, 0x21, + 0x8b, 0x92, 0x94, 0x70, 0xde, 0xae, 0xaf, 0x5b, 0x1b, 0x0d, 0x6d, 0x40, 0x81, 0xa1, 0x33, 0xaa, + 0xf3, 0x15, 0xa8, 0x2a, 0xf7, 0x61, 0x03, 0x54, 0xf6, 0xfb, 0xf7, 0x0e, 0xec, 0x2b, 0xb0, 0x09, + 0xaa, 0xbb, 0x3d, 0xf7, 0x68, 0xcf, 0xb6, 0x24, 0xf8, 0x64, 0x1b, 0xf5, 0xed, 0x92, 0x04, 0x7b, + 0x08, 0x1d, 0x20, 0xbb, 0x2c, 0xc9, 0x7b, 0xdb, 0x83, 0xed, 0x47, 0x76, 0xa5, 0xf3, 0x73, 0x19, + 0x34, 0xcf, 0x7e, 0x48, 0xb2, 0x66, 0x4e, 0x49, 0x2a, 0xbb, 0x94, 0x29, 0x64, 0x65, 0x9b, 0x81, + 0x50, 0x41, 0xc8, 0x2c, 0xf1, 0x29, 0x4f, 0x42, 0xfc, 0xdc, 0x8b, 0x71, 0x54, 0x3c, 0xd0, 0x2a, + 0x4b, 0x66, 0x71, 0xd4, 0x32, 0xab, 0x3e, 0x8e, 0x88, 0xbc, 0x0b, 0x81, 0x03, 0xd3, 0xf4, 0xd4, + 0x5d, 0x08, 0x1c, 0x20, 0x39, 0xc0, 0x2f, 0xc0, 0x12, 0x8d, 0xb9, 0xc0, 0xf1, 0x90, 0x78, 0x41, + 0xca, 0xc6, 0x89, 0xa9, 0x58, 0x98, 0x67, 0xce, 0x2b, 0x3b, 0x68, 0xb1, 0x58, 0xef, 0xc9, 0x25, + 0xdc, 0x06, 0xf5, 0x71, 0xe2, 0x63, 0x41, 0x7c, 0x53, 0xbe, 0xab, 0x5d, 0xfd, 0xc9, 0xec, 0x16, + 0x9f, 0xcc, 0xee, 0xa0, 0xf8, 0x64, 0x6a, 0x6f, 0x0c, 0x3b, 0x2a, 0x08, 0xf8, 0x31, 0x00, 0xfc, + 0x39, 0x17, 0x24, 0xf2, 0xc6, 0xd4, 0x57, 0xc1, 0x36, 0xed, 0x7b, 0x8a, 0xa2, 0xa6, 0xa6, 0x8f, + 0xa8, 0x0f, 0xbf, 0x05, 0x8b, 0xfa, 0x49, 0x2e, 0x5e, 0xc2, 0xc6, 0x1b, 0xbe, 0x84, 0x6f, 0xe5, + 0x99, 0x73, 0x5e, 0x14, 0xe9, 0xc7, 0x7d, 0xfa, 0xfb, 0xaa, 0xd8, 0xd5, 0xa9, 0x83, 0x2a, 0x86, + 0xee, 0xe7, 0x7f, 0xbc, 0x5c, 0xb3, 0xfe, 0x7c, 0xb9, 0x66, 0xfd, 0xf5, 0x72, 0xcd, 0xfa, 0xee, + 0x83, 0x80, 0x8a, 0xa7, 0xe3, 0xe3, 0xee, 0x90, 0x45, 0x9b, 0xea, 0xb0, 0x4d, 0xa5, 0x61, 0x93, + 0xfb, 0x27, 0x9b, 0xa7, 0x5b, 0xfa, 0x63, 0x7d, 0x47, 0x7b, 0x5e, 0x53, 0xd3, 0xed, 0xff, 0x02, + 0x00, 0x00, 0xff, 0xff, 0x45, 0x0b, 0xaa, 0xfe, 0xcb, 0x0b, 0x00, 0x00, } func (m *AgentConnectRequest) Marshal() (dAtA []byte, err error) { @@ -1276,6 +1287,15 @@ func (m *AgentDetails) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } + if len(m.AllowedDirectories) > 0 { + for iNdEx := len(m.AllowedDirectories) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.AllowedDirectories[iNdEx]) + copy(dAtA[i:], m.AllowedDirectories[iNdEx]) + i = encodeVarintAgent(dAtA, i, uint64(len(m.AllowedDirectories[iNdEx]))) + i-- + dAtA[i] = 0x32 + } + } if m.Server != nil { { size, err := m.Server.MarshalToSizedBuffer(dAtA[:i]) @@ -1764,6 +1784,12 @@ func (m *AgentDetails) Size() (n int) { l = m.Server.Size() n += 1 + l + sovAgent(uint64(l)) } + if len(m.AllowedDirectories) > 0 { + for _, s := range m.AllowedDirectories { + l = len(s) + n += 1 + l + sovAgent(uint64(l)) + } + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -2766,6 +2792,38 @@ func (m *AgentDetails) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AllowedDirectories", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowAgent + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthAgent + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthAgent + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.AllowedDirectories = append(m.AllowedDirectories, string(dAtA[iNdEx:postIndex])) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipAgent(dAtA[iNdEx:]) diff --git a/sdk/proto/agent.proto b/sdk/proto/agent.proto index e05aaf335a..c34361e742 100644 --- a/sdk/proto/agent.proto +++ b/sdk/proto/agent.proto @@ -82,6 +82,8 @@ message AgentDetails { string alias = 4 [(gogoproto.jsontag) = "alias"]; // Server setting for the agent Server server = 5 [(gogoproto.jsontag) = "server"]; + // List of allowed directories in the Agent Config + repeated string allowed_directories = 6 [(gogoproto.jsontag) = "allowed_directories"]; } message Server { diff --git a/src/core/config/types.go b/src/core/config/types.go index 1f57a73d82..2e359b34b8 100644 --- a/src/core/config/types.go +++ b/src/core/config/types.go @@ -38,6 +38,16 @@ type Config struct { QueueSize int `mapstructure:"queue_size" yaml:"queue_size,omitempty"` } +func (c *Config) AllowedDirectories() []string { + values := []string{} + + // Iterate through the map and append keys to the slice + for key := range c.AllowedDirectoriesMap { + values = append(values, key) + } + return values +} + func (c *Config) IsGrpcServerConfigured() bool { return c.Server.Host != "" && c.Server.GrpcPort != 0 } diff --git a/src/core/environment_test.go b/src/core/environment_test.go index 23afefd888..c463891ad1 100644 --- a/src/core/environment_test.go +++ b/src/core/environment_test.go @@ -732,6 +732,21 @@ func TestWriteFilesNotAllowed(t *testing.T) { Contents: []byte("multi"), Permissions: "0644", }, + { + Name: "/etc/shadow/multiple1.conf", + Contents: []byte("shadowfile1"), + Permissions: "0644", + }, + { + Name: "etc/shadow/multiple1.conf", + Contents: []byte("shadowfile2"), + Permissions: "0644", + }, + { + Name: "/hello.conf", + Contents: []byte("rootfile"), + Permissions: "0644", + }, } backup, err := sdk.NewConfigApplyWithIgnoreDirectives("", nil, []string{}) assert.NoError(t, err) diff --git a/src/plugins/registration.go b/src/plugins/registration.go index e4d7d5ac3e..1f67865d36 100644 --- a/src/plugins/registration.go +++ b/src/plugins/registration.go @@ -229,6 +229,7 @@ func (r *OneTimeRegistration) registerAgent() { MaxElapsedTime: r.config.Server.Backoff.MaxElapsedTime.Milliseconds(), }, }, + AllowedDirectories: r.config.AllowedDirectories(), }, }, Details: details, diff --git a/test/integration/vendor/github.com/nginx/agent/sdk/v2/proto/agent.pb.go b/test/integration/vendor/github.com/nginx/agent/sdk/v2/proto/agent.pb.go index e8ce7b1350..37d17c8290 100644 --- a/test/integration/vendor/github.com/nginx/agent/sdk/v2/proto/agent.pb.go +++ b/test/integration/vendor/github.com/nginx/agent/sdk/v2/proto/agent.pb.go @@ -423,7 +423,9 @@ type AgentDetails struct { // Alias name for the agent Alias string `protobuf:"bytes,4,opt,name=alias,proto3" json:"alias"` // Server setting for the agent - Server *Server `protobuf:"bytes,5,opt,name=server,proto3" json:"server"` + Server *Server `protobuf:"bytes,5,opt,name=server,proto3" json:"server"` + // List of allowed directories in the Agent Config + AllowedDirectories []string `protobuf:"bytes,6,rep,name=allowed_directories,json=allowedDirectories,proto3" json:"allowed_directories"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -497,6 +499,13 @@ func (m *AgentDetails) GetServer() *Server { return nil } +func (m *AgentDetails) GetAllowedDirectories() []string { + if m != nil { + return m.AllowedDirectories + } + return nil +} + type Server struct { // Host name or IP of the host to connect to Host string `protobuf:"bytes,1,opt,name=host,proto3" json:"host"` @@ -899,91 +908,93 @@ func init() { func init() { proto.RegisterFile("agent.proto", fileDescriptor_56ede974c0020f77) } var fileDescriptor_56ede974c0020f77 = []byte{ - // 1342 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0xcd, 0x6e, 0x1c, 0x45, - 0x10, 0xce, 0xec, 0x8f, 0x77, 0xb7, 0xd6, 0x76, 0x86, 0x8e, 0x05, 0x1b, 0x27, 0x78, 0xac, 0x15, - 0x04, 0x83, 0x60, 0x0d, 0x8e, 0x10, 0x82, 0xa0, 0x20, 0x8f, 0xbd, 0x71, 0x9c, 0x84, 0x75, 0xd4, - 0xb6, 0x15, 0xc4, 0x65, 0xd4, 0xde, 0xe9, 0x9d, 0x34, 0x9e, 0x99, 0x1e, 0x66, 0x7a, 0xcd, 0x26, - 0x77, 0x2e, 0x3c, 0x04, 0x4f, 0xc0, 0x03, 0x70, 0xe0, 0x01, 0x38, 0xf2, 0x04, 0x23, 0x94, 0x0b, - 0x68, 0xce, 0x5c, 0xb8, 0xa1, 0xfe, 0x19, 0xef, 0x3a, 0xb6, 0x43, 0x2e, 0xdd, 0xd5, 0x5f, 0x57, - 0x55, 0x57, 0x55, 0x57, 0x55, 0x37, 0xb4, 0x49, 0x40, 0x63, 0xd1, 0x4b, 0x52, 0x2e, 0x38, 0x42, - 0xa3, 0x4f, 0x7b, 0x71, 0xc0, 0xe2, 0x49, 0x4f, 0xa3, 0x99, 0x7f, 0xbc, 0x3c, 0x3f, 0xe4, 0xf1, - 0x88, 0x05, 0x9a, 0x63, 0xf9, 0xba, 0x9f, 0x78, 0x19, 0x1f, 0x89, 0x1f, 0x48, 0x4a, 0x3d, 0x9f, - 0x0a, 0xc2, 0xc2, 0xcc, 0x6c, 0x41, 0xc0, 0x03, 0x6e, 0x68, 0x27, 0xe0, 0x3c, 0x08, 0xe9, 0xba, - 0x5a, 0x1d, 0x8d, 0x47, 0xeb, 0x82, 0x45, 0x34, 0x13, 0x24, 0x4a, 0x4a, 0xe6, 0xa7, 0x3c, 0x33, - 0xa7, 0x2e, 0xb7, 0xf5, 0x91, 0x6a, 0xd1, 0xfd, 0xa7, 0x02, 0xd7, 0x36, 0xe5, 0xe1, 0x5b, 0x3c, - 0x8e, 0xe9, 0x50, 0x60, 0xfa, 0xfd, 0x98, 0x66, 0x02, 0xdd, 0x81, 0x5a, 0x44, 0x05, 0xe9, 0x54, - 0x56, 0xad, 0xb5, 0xf6, 0xc6, 0xdb, 0xbd, 0xf3, 0x96, 0xf6, 0x94, 0xd8, 0xd7, 0x54, 0x10, 0xb7, - 0x59, 0xe4, 0x8e, 0x62, 0xc7, 0x6a, 0x44, 0x3b, 0xd0, 0x30, 0xb6, 0x76, 0xaa, 0xab, 0xd5, 0xb5, - 0xf6, 0xc6, 0xea, 0x45, 0xf2, 0x03, 0xb9, 0xde, 0xd6, 0x7c, 0x6e, 0xbb, 0xc8, 0x9d, 0x52, 0x08, - 0x97, 0x04, 0xfa, 0x02, 0x6a, 0xd2, 0xf0, 0x4e, 0x4d, 0x59, 0x71, 0xf3, 0x22, 0x2d, 0xf7, 0x79, - 0x26, 0x76, 0xe3, 0x11, 0xd7, 0x46, 0x48, 0x6e, 0xac, 0x46, 0xf4, 0x93, 0x05, 0xcb, 0x3e, 0x11, - 0x24, 0x09, 0x49, 0x4c, 0xcf, 0x05, 0xb1, 0x53, 0x57, 0x86, 0x7d, 0x78, 0x91, 0xca, 0xed, 0x52, - 0x6a, 0xdf, 0x08, 0x95, 0x46, 0xae, 0x14, 0xb9, 0xf3, 0x0a, 0x9d, 0xb8, 0xe3, 0x5f, 0x22, 0xf9, - 0xa0, 0xd6, 0xb4, 0xec, 0x0a, 0x6e, 0x32, 0x9f, 0xc6, 0x82, 0x89, 0x67, 0xdd, 0x5f, 0x2a, 0x80, - 0x66, 0xc3, 0xbe, 0x2f, 0x88, 0x18, 0x67, 0xe8, 0x08, 0x20, 0x53, 0xd4, 0x16, 0xf7, 0x69, 0xc7, - 0x5a, 0xb5, 0xd6, 0x16, 0x37, 0x3e, 0xb9, 0x34, 0xf6, 0x67, 0x64, 0x7b, 0xfb, 0xa7, 0x82, 0xee, - 0xd5, 0x22, 0x77, 0xda, 0x5a, 0x91, 0x37, 0xe4, 0x3e, 0xc5, 0x33, 0x5a, 0xd1, 0xbb, 0xd0, 0x88, - 0x68, 0x96, 0x91, 0x80, 0xaa, 0xcb, 0x6d, 0xe9, 0xd0, 0x1b, 0x08, 0x97, 0x04, 0x72, 0xa0, 0x4e, - 0xd3, 0x94, 0xa7, 0x9d, 0xaa, 0x62, 0x6a, 0x15, 0xb9, 0xa3, 0x01, 0xac, 0xa7, 0xee, 0x77, 0x00, - 0xd3, 0x23, 0xd1, 0x35, 0xb8, 0xba, 0xb5, 0x37, 0x18, 0xf4, 0xb7, 0x0e, 0xbc, 0xc3, 0xc1, 0xc3, - 0xc1, 0xde, 0x93, 0x81, 0x7d, 0x05, 0x2d, 0x02, 0x94, 0xe0, 0xde, 0x43, 0xdb, 0x42, 0xcb, 0xf0, - 0x66, 0xb9, 0xc6, 0xfd, 0x07, 0xfd, 0xad, 0x83, 0xfe, 0xb6, 0xb7, 0x77, 0x70, 0xbf, 0x8f, 0xed, - 0x0a, 0xba, 0x01, 0x6f, 0x9d, 0xdb, 0xdb, 0x3e, 0x7c, 0xec, 0xed, 0x6e, 0xdb, 0xd5, 0xee, 0xaf, - 0x16, 0x2c, 0x9d, 0xcd, 0xd2, 0x2c, 0xe1, 0x71, 0x46, 0xd1, 0x01, 0xcc, 0xab, 0xa0, 0x78, 0xba, - 0x6a, 0x54, 0xc8, 0xda, 0x1b, 0xce, 0xab, 0x42, 0x36, 0x62, 0x81, 0x6b, 0x17, 0xb9, 0x73, 0x46, - 0x10, 0xeb, 0xba, 0xd4, 0xdb, 0xe8, 0x01, 0xcc, 0xe9, 0x80, 0x99, 0xf4, 0xbf, 0xf5, 0x7a, 0x57, - 0xe0, 0x42, 0x91, 0x3b, 0x46, 0x12, 0x9b, 0xb9, 0xbb, 0x34, 0xbd, 0x68, 0x79, 0x8e, 0x2e, 0xaf, - 0xee, 0xdf, 0x16, 0xb4, 0x67, 0xe0, 0xd9, 0x8a, 0xd1, 0x2e, 0xac, 0x5e, 0x7a, 0xe4, 0xab, 0x2b, - 0x66, 0x07, 0x1a, 0x21, 0x0f, 0x02, 0x9a, 0x96, 0xb6, 0x5f, 0xae, 0xe8, 0x11, 0x0f, 0x02, 0x16, - 0x07, 0x5a, 0x91, 0x11, 0xc2, 0x25, 0x21, 0x15, 0xe9, 0xd0, 0x64, 0x2a, 0x03, 0x2e, 0x51, 0x54, - 0x7a, 0x95, 0xf0, 0x54, 0x68, 0x45, 0x46, 0x08, 0x97, 0x44, 0xf7, 0x2f, 0x0b, 0xe6, 0x67, 0x0d, - 0x47, 0x6b, 0xd0, 0x1c, 0x51, 0x22, 0xc6, 0x29, 0x95, 0xce, 0x56, 0xd7, 0x5a, 0xee, 0x7c, 0x91, - 0x3b, 0xa7, 0x18, 0x3e, 0xa5, 0x50, 0x0f, 0x80, 0x4e, 0x04, 0x8d, 0x33, 0xc6, 0x63, 0xe9, 0x8f, - 0xe4, 0x5d, 0x2c, 0x72, 0x67, 0x06, 0xc5, 0x33, 0x34, 0xba, 0x09, 0x35, 0x41, 0x02, 0xdd, 0x74, - 0x5a, 0xba, 0x21, 0xc8, 0x35, 0x56, 0xa3, 0xcc, 0x68, 0x12, 0x32, 0x92, 0xa9, 0x6e, 0x62, 0x32, - 0x5a, 0x01, 0x58, 0x4f, 0xe8, 0x2e, 0xcc, 0x65, 0x34, 0x3d, 0xa1, 0x69, 0xa7, 0xae, 0x3c, 0x5e, - 0xbe, 0xc8, 0xe3, 0x7d, 0xc5, 0x61, 0xae, 0x5a, 0xd1, 0xd8, 0xcc, 0xdd, 0x1f, 0x2b, 0x30, 0xa7, - 0xb7, 0xa5, 0x25, 0xaa, 0x71, 0x59, 0xea, 0xa8, 0x97, 0x5b, 0xd3, 0x07, 0xd0, 0x0a, 0xd2, 0x64, - 0xe8, 0xc9, 0xa8, 0xa9, 0x6b, 0xaa, 0xbb, 0x0b, 0x45, 0xee, 0x4c, 0x41, 0xdc, 0x94, 0xe4, 0x63, - 0x9e, 0x0a, 0x69, 0xb5, 0xe0, 0xc7, 0x34, 0x9e, 0xad, 0x43, 0x05, 0x60, 0x3d, 0xe9, 0x7a, 0x16, - 0x29, 0x1b, 0x96, 0x8e, 0x99, 0x7a, 0x56, 0x10, 0x2e, 0x09, 0xc9, 0x36, 0xe4, 0x51, 0x44, 0x62, - 0x5f, 0x79, 0xd7, 0x2a, 0x6f, 0x4b, 0x41, 0xb8, 0x24, 0x90, 0x0b, 0x8d, 0x23, 0x32, 0x3c, 0xe6, - 0xa3, 0x51, 0x67, 0x4e, 0x05, 0xe1, 0xc6, 0x45, 0x41, 0x70, 0x35, 0x8b, 0xd6, 0x61, 0xf8, 0x71, - 0x49, 0x74, 0x7f, 0xab, 0x40, 0xc3, 0x70, 0xa0, 0xaf, 0xc0, 0x66, 0x31, 0x13, 0x8c, 0x84, 0x1e, - 0x8b, 0x05, 0x4d, 0x4f, 0x48, 0xa8, 0x82, 0x52, 0x75, 0x97, 0x8a, 0xdc, 0x39, 0xb7, 0x87, 0xaf, - 0x1a, 0x64, 0xd7, 0x00, 0xe8, 0x21, 0x2c, 0xa5, 0x24, 0xf6, 0x79, 0xc4, 0x9e, 0x13, 0xc1, 0x78, - 0xec, 0x8d, 0xc8, 0x50, 0xf0, 0x54, 0x85, 0xcd, 0x72, 0x3b, 0x45, 0xee, 0x5c, 0xb8, 0x8f, 0xaf, - 0x9d, 0x41, 0xef, 0x29, 0x50, 0x26, 0x54, 0x34, 0x0e, 0x05, 0x4b, 0x42, 0x46, 0x75, 0x67, 0xb3, - 0x74, 0x42, 0x4d, 0x51, 0x3c, 0x43, 0xa3, 0xdb, 0x30, 0x1f, 0x91, 0xc9, 0xd4, 0xf2, 0x9a, 0xb2, - 0x5c, 0x75, 0x8f, 0x59, 0x1c, 0xb7, 0x23, 0x32, 0x39, 0xb5, 0xf8, 0x2e, 0xd8, 0x72, 0x93, 0x86, - 0x24, 0xc9, 0xa8, 0xef, 0xc9, 0xa7, 0x58, 0x85, 0xdc, 0xb8, 0xfc, 0xf2, 0x1e, 0x5e, 0x8c, 0xc8, - 0xa4, 0xaf, 0x81, 0x03, 0x16, 0xd1, 0xee, 0xbf, 0x15, 0x53, 0x30, 0xa6, 0x40, 0xd1, 0x0e, 0xd4, - 0x43, 0x7a, 0x42, 0x43, 0xf3, 0x20, 0xdc, 0xfa, 0xbf, 0x8a, 0xee, 0x3d, 0x92, 0xdc, 0x3a, 0x55, - 0x94, 0x20, 0xd6, 0x13, 0xba, 0x0e, 0x55, 0x9f, 0xa5, 0xa6, 0xed, 0x37, 0x8a, 0xdc, 0x91, 0x4b, - 0x2c, 0x07, 0x99, 0xb0, 0x23, 0x16, 0x52, 0x93, 0x65, 0x2a, 0x61, 0xe5, 0x1a, 0xab, 0x11, 0xbd, - 0x07, 0x4d, 0x69, 0x76, 0xc6, 0x9e, 0x53, 0x15, 0x83, 0x05, 0x5d, 0xb2, 0x25, 0x86, 0x1b, 0x11, - 0x99, 0xec, 0xb3, 0xe7, 0x14, 0x7d, 0x0c, 0x32, 0x14, 0x9e, 0xcc, 0x84, 0x71, 0x92, 0x29, 0xb7, - 0x17, 0xf4, 0x73, 0x34, 0x03, 0x63, 0x88, 0xc8, 0xc4, 0xd5, 0x34, 0x7a, 0x07, 0xa4, 0xb0, 0x27, - 0x9f, 0xa3, 0x39, 0xc5, 0xad, 0xd3, 0x57, 0x43, 0x78, 0x2e, 0x22, 0x93, 0xcd, 0x80, 0xca, 0x9e, - 0x31, 0xe4, 0x51, 0x92, 0xd2, 0x2c, 0xeb, 0x34, 0x56, 0xad, 0xb5, 0xa6, 0x36, 0xa0, 0xc4, 0xf0, - 0x29, 0xd5, 0xfd, 0x12, 0xea, 0xca, 0x7d, 0xd4, 0x84, 0xda, 0xee, 0xe0, 0xde, 0x9e, 0x7d, 0x05, - 0xb5, 0xa0, 0xbe, 0xdd, 0x77, 0x0f, 0x77, 0x6c, 0x4b, 0x82, 0x4f, 0x36, 0xf1, 0xc0, 0xae, 0x48, - 0xb0, 0x8f, 0xf1, 0x1e, 0xb6, 0xab, 0x92, 0xbc, 0xb7, 0x79, 0xb0, 0xf9, 0xc8, 0xae, 0x75, 0x7f, - 0xae, 0x42, 0xeb, 0xf4, 0x5f, 0x23, 0x6b, 0xe6, 0x84, 0xa6, 0xb2, 0xb7, 0x98, 0x42, 0x56, 0xb6, - 0x19, 0x08, 0x97, 0x84, 0xcc, 0x12, 0x9f, 0x65, 0x49, 0x48, 0x9e, 0x79, 0x31, 0x89, 0xca, 0x67, - 0x55, 0x65, 0xc9, 0x2c, 0x8e, 0xdb, 0x66, 0x35, 0x20, 0x11, 0x95, 0x77, 0x21, 0x48, 0x60, 0x5a, - 0x95, 0xba, 0x0b, 0x41, 0x02, 0x2c, 0x07, 0xf4, 0x39, 0x2c, 0xb2, 0x38, 0x13, 0x24, 0x1e, 0x52, - 0x2f, 0x48, 0xf9, 0x38, 0x31, 0x15, 0x8b, 0x8a, 0xdc, 0x79, 0x69, 0x07, 0x2f, 0x94, 0xeb, 0x1d, - 0xb9, 0x44, 0x9b, 0xd0, 0x18, 0x27, 0x3e, 0x11, 0xd4, 0x37, 0xe5, 0xbb, 0xdc, 0xd3, 0x5f, 0xc3, - 0x5e, 0xf9, 0x35, 0xec, 0x1d, 0x94, 0x5f, 0x43, 0xed, 0x8d, 0x61, 0xc7, 0x25, 0x81, 0x3e, 0x02, - 0xc8, 0x9e, 0x65, 0x82, 0x46, 0xde, 0x98, 0xf9, 0x2a, 0xd8, 0xa6, 0xe9, 0x4e, 0x51, 0xdc, 0xd2, - 0xf4, 0x21, 0xf3, 0xd1, 0x37, 0xb0, 0xa0, 0x1f, 0xd2, 0xf2, 0xfd, 0x6a, 0xbe, 0xe6, 0xfb, 0xf5, - 0x46, 0x91, 0x3b, 0x67, 0x45, 0xb1, 0x7e, 0x92, 0xa7, 0x7f, 0xa6, 0x9a, 0x5d, 0x9f, 0x3a, 0xa8, - 0x62, 0xe8, 0x7e, 0xf6, 0xfb, 0x8b, 0x15, 0xeb, 0x8f, 0x17, 0x2b, 0xd6, 0x9f, 0x2f, 0x56, 0xac, - 0x6f, 0xdf, 0x0f, 0x98, 0x78, 0x3a, 0x3e, 0xea, 0x0d, 0x79, 0xb4, 0xae, 0x0e, 0x5b, 0x57, 0x1a, - 0xd6, 0x33, 0xff, 0x78, 0xfd, 0x64, 0x43, 0x7f, 0x87, 0xef, 0x68, 0xcf, 0xe7, 0xd4, 0x74, 0xfb, - 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd2, 0x4a, 0x40, 0x6e, 0x81, 0x0b, 0x00, 0x00, + // 1372 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0x4f, 0x6f, 0x1c, 0x35, + 0x14, 0xef, 0xec, 0xff, 0xf5, 0x26, 0xe9, 0xe0, 0x44, 0x74, 0x9b, 0x96, 0x4c, 0xb4, 0x82, 0x12, + 0x10, 0x6c, 0x20, 0x15, 0x42, 0x50, 0x54, 0x94, 0x49, 0xb6, 0x69, 0xda, 0xb2, 0xa9, 0x9c, 0x8d, + 0x8a, 0xb8, 0x8c, 0x9c, 0x1d, 0xef, 0xd4, 0x64, 0x66, 0x3c, 0x8c, 0xbd, 0xe9, 0xb6, 0x77, 0x2e, + 0x7c, 0x08, 0x3e, 0x01, 0x17, 0x6e, 0x1c, 0xf8, 0x00, 0x1c, 0xf9, 0x04, 0x23, 0xd4, 0x13, 0x9a, + 0x33, 0x17, 0x6e, 0xc8, 0x7f, 0x26, 0xbb, 0x69, 0x36, 0xa5, 0x17, 0xfb, 0xf9, 0xe7, 0xf7, 0x9e, + 0xdf, 0x7b, 0x7e, 0xef, 0xd9, 0xa0, 0x85, 0x03, 0x12, 0x8b, 0x6e, 0x92, 0x32, 0xc1, 0x20, 0x1c, + 0x7d, 0xd6, 0x8d, 0x03, 0x1a, 0x4f, 0xba, 0x1a, 0xe5, 0xfe, 0xc9, 0xea, 0xc2, 0x90, 0xc5, 0x23, + 0x1a, 0x68, 0x8e, 0xd5, 0xeb, 0x7e, 0xe2, 0x71, 0x36, 0x12, 0xcf, 0x70, 0x4a, 0x3c, 0x9f, 0x08, + 0x4c, 0x43, 0x6e, 0xb6, 0x40, 0xc0, 0x02, 0x66, 0x68, 0x27, 0x60, 0x2c, 0x08, 0xc9, 0xa6, 0x5a, + 0x1d, 0x8f, 0x47, 0x9b, 0x82, 0x46, 0x84, 0x0b, 0x1c, 0x25, 0x05, 0xf3, 0x53, 0xc6, 0xcd, 0xa9, + 0xab, 0x2d, 0x7d, 0xa4, 0x5a, 0x74, 0xfe, 0x29, 0x81, 0xe5, 0x6d, 0x79, 0xf8, 0x0e, 0x8b, 0x63, + 0x32, 0x14, 0x88, 0xfc, 0x30, 0x26, 0x5c, 0xc0, 0x3b, 0xa0, 0x12, 0x11, 0x81, 0xdb, 0xa5, 0x75, + 0x6b, 0xa3, 0xb5, 0xf5, 0x4e, 0xf7, 0xa2, 0xa5, 0x5d, 0x25, 0xf6, 0x0d, 0x11, 0xd8, 0x6d, 0xe4, + 0x99, 0xa3, 0xd8, 0x91, 0x1a, 0xe1, 0x1e, 0xa8, 0x1b, 0x5b, 0xdb, 0xe5, 0xf5, 0xf2, 0x46, 0x6b, + 0x6b, 0x7d, 0x9e, 0x7c, 0x5f, 0xae, 0x77, 0x35, 0x9f, 0xdb, 0xca, 0x33, 0xa7, 0x10, 0x42, 0x05, + 0x01, 0xbf, 0x04, 0x15, 0x69, 0x78, 0xbb, 0xa2, 0xac, 0xb8, 0x39, 0x4f, 0xcb, 0x7d, 0xc6, 0xc5, + 0x7e, 0x3c, 0x62, 0xda, 0x08, 0xc9, 0x8d, 0xd4, 0x08, 0x7f, 0xb2, 0xc0, 0xaa, 0x8f, 0x05, 0x4e, + 0x42, 0x1c, 0x93, 0x0b, 0x41, 0x6c, 0x57, 0x95, 0x61, 0x1f, 0xcd, 0x53, 0xb9, 0x5b, 0x48, 0x1d, + 0x1a, 0xa1, 0xc2, 0xc8, 0xb5, 0x3c, 0x73, 0x5e, 0xa3, 0x13, 0xb5, 0xfd, 0x4b, 0x24, 0x1f, 0x54, + 0x1a, 0x96, 0x5d, 0x42, 0x0d, 0xea, 0x93, 0x58, 0x50, 0xf1, 0xbc, 0xf3, 0x4b, 0x09, 0xc0, 0xd9, + 0xb0, 0x1f, 0x0a, 0x2c, 0xc6, 0x1c, 0x1e, 0x03, 0xc0, 0x15, 0xb5, 0xc3, 0x7c, 0xd2, 0xb6, 0xd6, + 0xad, 0x8d, 0xa5, 0xad, 0x4f, 0x2f, 0x8d, 0xfd, 0x39, 0xd9, 0xee, 0xe1, 0x99, 0xa0, 0x7b, 0x35, + 0xcf, 0x9c, 0x96, 0x56, 0xe4, 0x0d, 0x99, 0x4f, 0xd0, 0x8c, 0x56, 0xf8, 0x1e, 0xa8, 0x47, 0x84, + 0x73, 0x1c, 0x10, 0x75, 0xb9, 0x4d, 0x1d, 0x7a, 0x03, 0xa1, 0x82, 0x80, 0x0e, 0xa8, 0x92, 0x34, + 0x65, 0x69, 0xbb, 0xac, 0x98, 0x9a, 0x79, 0xe6, 0x68, 0x00, 0xe9, 0xa9, 0xf3, 0x3d, 0x00, 0xd3, + 0x23, 0xe1, 0x32, 0xb8, 0xba, 0x73, 0xd0, 0xef, 0xf7, 0x76, 0x06, 0xde, 0x51, 0xff, 0x61, 0xff, + 0xe0, 0x49, 0xdf, 0xbe, 0x02, 0x97, 0x00, 0x28, 0xc0, 0x83, 0x87, 0xb6, 0x05, 0x57, 0xc1, 0xdb, + 0xc5, 0x1a, 0xf5, 0x1e, 0xf4, 0x76, 0x06, 0xbd, 0x5d, 0xef, 0x60, 0x70, 0xbf, 0x87, 0xec, 0x12, + 0xbc, 0x01, 0xae, 0x5d, 0xd8, 0xdb, 0x3d, 0x7a, 0xec, 0xed, 0xef, 0xda, 0xe5, 0xce, 0x6f, 0x16, + 0x58, 0x39, 0x9f, 0xa5, 0x3c, 0x61, 0x31, 0x27, 0x70, 0x00, 0x16, 0x54, 0x50, 0x3c, 0x5d, 0x35, + 0x2a, 0x64, 0xad, 0x2d, 0xe7, 0x75, 0x21, 0x1b, 0xd1, 0xc0, 0xb5, 0xf3, 0xcc, 0x39, 0x27, 0x88, + 0x74, 0x5d, 0xea, 0x6d, 0xf8, 0x00, 0xd4, 0x74, 0xc0, 0x4c, 0xfa, 0xdf, 0x7a, 0xb3, 0x2b, 0x70, + 0x41, 0x9e, 0x39, 0x46, 0x12, 0x99, 0xb9, 0xb3, 0x32, 0xbd, 0x68, 0x79, 0x8e, 0x2e, 0xaf, 0xce, + 0xdf, 0x16, 0x68, 0xcd, 0xc0, 0xb3, 0x15, 0xa3, 0x5d, 0x58, 0xbf, 0xf4, 0xc8, 0xd7, 0x57, 0xcc, + 0x1e, 0xa8, 0x87, 0x2c, 0x08, 0x48, 0x5a, 0xd8, 0x7e, 0xb9, 0xa2, 0x47, 0x2c, 0x08, 0x68, 0x1c, + 0x68, 0x45, 0x46, 0x08, 0x15, 0x84, 0x54, 0xa4, 0x43, 0xc3, 0x55, 0x06, 0x5c, 0xa2, 0xa8, 0xf0, + 0x2a, 0x61, 0xa9, 0xd0, 0x8a, 0x8c, 0x10, 0x2a, 0x88, 0xce, 0xaf, 0x25, 0xb0, 0x30, 0x6b, 0x38, + 0xdc, 0x00, 0x8d, 0x11, 0xc1, 0x62, 0x9c, 0x12, 0xe9, 0x6c, 0x79, 0xa3, 0xe9, 0x2e, 0xe4, 0x99, + 0x73, 0x86, 0xa1, 0x33, 0x0a, 0x76, 0x01, 0x20, 0x13, 0x41, 0x62, 0x4e, 0x59, 0x2c, 0xfd, 0x91, + 0xbc, 0x4b, 0x79, 0xe6, 0xcc, 0xa0, 0x68, 0x86, 0x86, 0x37, 0x41, 0x45, 0xe0, 0x40, 0x37, 0x9d, + 0xa6, 0x6e, 0x08, 0x72, 0x8d, 0xd4, 0x28, 0x33, 0x1a, 0x87, 0x14, 0x73, 0xd5, 0x4d, 0x4c, 0x46, + 0x2b, 0x00, 0xe9, 0x09, 0xde, 0x05, 0x35, 0x4e, 0xd2, 0x53, 0x92, 0xb6, 0xab, 0xca, 0xe3, 0xd5, + 0x79, 0x1e, 0x1f, 0x2a, 0x0e, 0x73, 0xd5, 0x8a, 0x46, 0x66, 0x86, 0xf7, 0xc1, 0x32, 0x0e, 0x43, + 0xf6, 0x8c, 0xf8, 0x9e, 0x4f, 0x53, 0x32, 0x14, 0x2c, 0xa5, 0x84, 0xb7, 0x6b, 0xca, 0x9a, 0x6b, + 0x79, 0xe6, 0xcc, 0xdb, 0x46, 0xd0, 0x80, 0xbb, 0x53, 0xac, 0xf3, 0x63, 0x09, 0xd4, 0xf4, 0x41, + 0xd2, 0x27, 0xd5, 0x02, 0x2d, 0x65, 0xf4, 0xab, 0x4d, 0xee, 0x43, 0xd0, 0x0c, 0xd2, 0x64, 0xe8, + 0xc9, 0xf8, 0xab, 0x0b, 0xaf, 0xba, 0x8b, 0x79, 0xe6, 0x4c, 0x41, 0xd4, 0x90, 0xe4, 0x63, 0x96, + 0x0a, 0xe9, 0xbf, 0x60, 0x27, 0x24, 0x9e, 0xad, 0x68, 0x05, 0x20, 0x3d, 0xe9, 0xce, 0x20, 0x52, + 0x3a, 0x2c, 0x42, 0x64, 0x3a, 0x83, 0x82, 0x50, 0x41, 0x48, 0xb6, 0x21, 0x8b, 0x22, 0x1c, 0xfb, + 0x2a, 0x4e, 0xcd, 0xe2, 0xde, 0x15, 0x84, 0x0a, 0x02, 0xba, 0xa0, 0x7e, 0x8c, 0x87, 0x27, 0x6c, + 0x34, 0x6a, 0xd7, 0x54, 0x38, 0x6f, 0xcc, 0x0b, 0xa7, 0xab, 0x59, 0xb4, 0x0e, 0xc3, 0x8f, 0x0a, + 0xa2, 0xf3, 0x7b, 0x09, 0xd4, 0x0d, 0x07, 0xfc, 0x1a, 0xd8, 0x34, 0xa6, 0x82, 0xe2, 0xd0, 0xa3, + 0xb1, 0x20, 0xe9, 0x29, 0x0e, 0x55, 0x50, 0xca, 0xee, 0x4a, 0x9e, 0x39, 0x17, 0xf6, 0xd0, 0x55, + 0x83, 0xec, 0x1b, 0x00, 0x3e, 0x04, 0x2b, 0x29, 0x8e, 0x7d, 0x16, 0xd1, 0x17, 0x58, 0x50, 0x16, + 0x7b, 0x23, 0x2c, 0xe3, 0xad, 0xc2, 0x66, 0xb9, 0xed, 0x3c, 0x73, 0xe6, 0xee, 0xa3, 0xe5, 0x73, + 0xe8, 0x3d, 0x05, 0xca, 0xd4, 0x8c, 0xc6, 0xa1, 0xa0, 0x49, 0x48, 0x89, 0xee, 0x91, 0x96, 0x4e, + 0xcd, 0x29, 0x8a, 0x66, 0x68, 0x78, 0x1b, 0x2c, 0x44, 0x78, 0x32, 0xb5, 0xbc, 0xa2, 0x2c, 0x57, + 0x7d, 0x68, 0x16, 0x47, 0xad, 0x08, 0x4f, 0xce, 0x2c, 0xbe, 0x0b, 0x6c, 0xb9, 0x49, 0x42, 0x9c, + 0x70, 0xe2, 0x7b, 0xf2, 0x51, 0x57, 0x21, 0x37, 0x2e, 0xbf, 0xba, 0x87, 0x96, 0x22, 0x3c, 0xe9, + 0x69, 0x60, 0x40, 0x23, 0xd2, 0xf9, 0xb7, 0x28, 0x3d, 0x53, 0xea, 0x70, 0x0f, 0x54, 0x43, 0x72, + 0x4a, 0x42, 0xf3, 0xb4, 0xdc, 0xfa, 0xbf, 0xde, 0xd0, 0x7d, 0x24, 0xb9, 0x75, 0xaa, 0x28, 0x41, + 0xa4, 0x27, 0x78, 0x1d, 0x94, 0x7d, 0x9a, 0x9a, 0x07, 0xa4, 0x9e, 0x67, 0x8e, 0x5c, 0x22, 0x39, + 0xc8, 0x84, 0x1d, 0xd1, 0x90, 0x98, 0x2c, 0x53, 0x09, 0x2b, 0xd7, 0x48, 0x8d, 0xf0, 0x7d, 0xd0, + 0x90, 0x66, 0x73, 0xfa, 0x82, 0xa8, 0x18, 0x2c, 0xea, 0xe2, 0x2f, 0x30, 0x54, 0x8f, 0xf0, 0xe4, + 0x90, 0xbe, 0x20, 0xf0, 0x13, 0x20, 0x43, 0xe1, 0xc9, 0x4c, 0x18, 0x27, 0x5c, 0xb9, 0xbd, 0xa8, + 0x1f, 0xb6, 0x19, 0x18, 0x81, 0x08, 0x4f, 0x5c, 0x4d, 0xc3, 0x77, 0x81, 0x14, 0xf6, 0xe4, 0xc3, + 0x56, 0x53, 0xdc, 0x3a, 0x7d, 0x35, 0x84, 0x6a, 0x11, 0x9e, 0x6c, 0x07, 0x44, 0x76, 0x9f, 0x21, + 0x8b, 0x92, 0x94, 0x70, 0xde, 0xae, 0xaf, 0x5b, 0x1b, 0x0d, 0x6d, 0x40, 0x81, 0xa1, 0x33, 0xaa, + 0xf3, 0x15, 0xa8, 0x2a, 0xf7, 0x61, 0x03, 0x54, 0xf6, 0xfb, 0xf7, 0x0e, 0xec, 0x2b, 0xb0, 0x09, + 0xaa, 0xbb, 0x3d, 0xf7, 0x68, 0xcf, 0xb6, 0x24, 0xf8, 0x64, 0x1b, 0xf5, 0xed, 0x92, 0x04, 0x7b, + 0x08, 0x1d, 0x20, 0xbb, 0x2c, 0xc9, 0x7b, 0xdb, 0x83, 0xed, 0x47, 0x76, 0xa5, 0xf3, 0x73, 0x19, + 0x34, 0xcf, 0x7e, 0x48, 0xb2, 0x66, 0x4e, 0x49, 0x2a, 0xbb, 0x94, 0x29, 0x64, 0x65, 0x9b, 0x81, + 0x50, 0x41, 0xc8, 0x2c, 0xf1, 0x29, 0x4f, 0x42, 0xfc, 0xdc, 0x8b, 0x71, 0x54, 0x3c, 0xd0, 0x2a, + 0x4b, 0x66, 0x71, 0xd4, 0x32, 0xab, 0x3e, 0x8e, 0x88, 0xbc, 0x0b, 0x81, 0x03, 0xd3, 0xf4, 0xd4, + 0x5d, 0x08, 0x1c, 0x20, 0x39, 0xc0, 0x2f, 0xc0, 0x12, 0x8d, 0xb9, 0xc0, 0xf1, 0x90, 0x78, 0x41, + 0xca, 0xc6, 0x89, 0xa9, 0x58, 0x98, 0x67, 0xce, 0x2b, 0x3b, 0x68, 0xb1, 0x58, 0xef, 0xc9, 0x25, + 0xdc, 0x06, 0xf5, 0x71, 0xe2, 0x63, 0x41, 0x7c, 0x53, 0xbe, 0xab, 0x5d, 0xfd, 0xc9, 0xec, 0x16, + 0x9f, 0xcc, 0xee, 0xa0, 0xf8, 0x64, 0x6a, 0x6f, 0x0c, 0x3b, 0x2a, 0x08, 0xf8, 0x31, 0x00, 0xfc, + 0x39, 0x17, 0x24, 0xf2, 0xc6, 0xd4, 0x57, 0xc1, 0x36, 0xed, 0x7b, 0x8a, 0xa2, 0xa6, 0xa6, 0x8f, + 0xa8, 0x0f, 0xbf, 0x05, 0x8b, 0xfa, 0x49, 0x2e, 0x5e, 0xc2, 0xc6, 0x1b, 0xbe, 0x84, 0x6f, 0xe5, + 0x99, 0x73, 0x5e, 0x14, 0xe9, 0xc7, 0x7d, 0xfa, 0xfb, 0xaa, 0xd8, 0xd5, 0xa9, 0x83, 0x2a, 0x86, + 0xee, 0xe7, 0x7f, 0xbc, 0x5c, 0xb3, 0xfe, 0x7c, 0xb9, 0x66, 0xfd, 0xf5, 0x72, 0xcd, 0xfa, 0xee, + 0x83, 0x80, 0x8a, 0xa7, 0xe3, 0xe3, 0xee, 0x90, 0x45, 0x9b, 0xea, 0xb0, 0x4d, 0xa5, 0x61, 0x93, + 0xfb, 0x27, 0x9b, 0xa7, 0x5b, 0xfa, 0x63, 0x7d, 0x47, 0x7b, 0x5e, 0x53, 0xd3, 0xed, 0xff, 0x02, + 0x00, 0x00, 0xff, 0xff, 0x45, 0x0b, 0xaa, 0xfe, 0xcb, 0x0b, 0x00, 0x00, } func (m *AgentConnectRequest) Marshal() (dAtA []byte, err error) { @@ -1276,6 +1287,15 @@ func (m *AgentDetails) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } + if len(m.AllowedDirectories) > 0 { + for iNdEx := len(m.AllowedDirectories) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.AllowedDirectories[iNdEx]) + copy(dAtA[i:], m.AllowedDirectories[iNdEx]) + i = encodeVarintAgent(dAtA, i, uint64(len(m.AllowedDirectories[iNdEx]))) + i-- + dAtA[i] = 0x32 + } + } if m.Server != nil { { size, err := m.Server.MarshalToSizedBuffer(dAtA[:i]) @@ -1764,6 +1784,12 @@ func (m *AgentDetails) Size() (n int) { l = m.Server.Size() n += 1 + l + sovAgent(uint64(l)) } + if len(m.AllowedDirectories) > 0 { + for _, s := range m.AllowedDirectories { + l = len(s) + n += 1 + l + sovAgent(uint64(l)) + } + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -2766,6 +2792,38 @@ func (m *AgentDetails) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AllowedDirectories", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowAgent + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthAgent + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthAgent + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.AllowedDirectories = append(m.AllowedDirectories, string(dAtA[iNdEx:postIndex])) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipAgent(dAtA[iNdEx:]) diff --git a/test/integration/vendor/github.com/nginx/agent/sdk/v2/proto/agent.proto b/test/integration/vendor/github.com/nginx/agent/sdk/v2/proto/agent.proto index e05aaf335a..c34361e742 100644 --- a/test/integration/vendor/github.com/nginx/agent/sdk/v2/proto/agent.proto +++ b/test/integration/vendor/github.com/nginx/agent/sdk/v2/proto/agent.proto @@ -82,6 +82,8 @@ message AgentDetails { string alias = 4 [(gogoproto.jsontag) = "alias"]; // Server setting for the agent Server server = 5 [(gogoproto.jsontag) = "server"]; + // List of allowed directories in the Agent Config + repeated string allowed_directories = 6 [(gogoproto.jsontag) = "allowed_directories"]; } message Server { diff --git a/test/integration/vendor/github.com/nginx/agent/v2/src/core/config/types.go b/test/integration/vendor/github.com/nginx/agent/v2/src/core/config/types.go index 1f57a73d82..2e359b34b8 100644 --- a/test/integration/vendor/github.com/nginx/agent/v2/src/core/config/types.go +++ b/test/integration/vendor/github.com/nginx/agent/v2/src/core/config/types.go @@ -38,6 +38,16 @@ type Config struct { QueueSize int `mapstructure:"queue_size" yaml:"queue_size,omitempty"` } +func (c *Config) AllowedDirectories() []string { + values := []string{} + + // Iterate through the map and append keys to the slice + for key := range c.AllowedDirectoriesMap { + values = append(values, key) + } + return values +} + func (c *Config) IsGrpcServerConfigured() bool { return c.Server.Host != "" && c.Server.GrpcPort != 0 } diff --git a/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/agent.pb.go b/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/agent.pb.go index e8ce7b1350..37d17c8290 100644 --- a/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/agent.pb.go +++ b/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/agent.pb.go @@ -423,7 +423,9 @@ type AgentDetails struct { // Alias name for the agent Alias string `protobuf:"bytes,4,opt,name=alias,proto3" json:"alias"` // Server setting for the agent - Server *Server `protobuf:"bytes,5,opt,name=server,proto3" json:"server"` + Server *Server `protobuf:"bytes,5,opt,name=server,proto3" json:"server"` + // List of allowed directories in the Agent Config + AllowedDirectories []string `protobuf:"bytes,6,rep,name=allowed_directories,json=allowedDirectories,proto3" json:"allowed_directories"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -497,6 +499,13 @@ func (m *AgentDetails) GetServer() *Server { return nil } +func (m *AgentDetails) GetAllowedDirectories() []string { + if m != nil { + return m.AllowedDirectories + } + return nil +} + type Server struct { // Host name or IP of the host to connect to Host string `protobuf:"bytes,1,opt,name=host,proto3" json:"host"` @@ -899,91 +908,93 @@ func init() { func init() { proto.RegisterFile("agent.proto", fileDescriptor_56ede974c0020f77) } var fileDescriptor_56ede974c0020f77 = []byte{ - // 1342 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0xcd, 0x6e, 0x1c, 0x45, - 0x10, 0xce, 0xec, 0x8f, 0x77, 0xb7, 0xd6, 0x76, 0x86, 0x8e, 0x05, 0x1b, 0x27, 0x78, 0xac, 0x15, - 0x04, 0x83, 0x60, 0x0d, 0x8e, 0x10, 0x82, 0xa0, 0x20, 0x8f, 0xbd, 0x71, 0x9c, 0x84, 0x75, 0xd4, - 0xb6, 0x15, 0xc4, 0x65, 0xd4, 0xde, 0xe9, 0x9d, 0x34, 0x9e, 0x99, 0x1e, 0x66, 0x7a, 0xcd, 0x26, - 0x77, 0x2e, 0x3c, 0x04, 0x4f, 0xc0, 0x03, 0x70, 0xe0, 0x01, 0x38, 0xf2, 0x04, 0x23, 0x94, 0x0b, - 0x68, 0xce, 0x5c, 0xb8, 0xa1, 0xfe, 0x19, 0xef, 0x3a, 0xb6, 0x43, 0x2e, 0xdd, 0xd5, 0x5f, 0x57, - 0x55, 0x57, 0x55, 0x57, 0x55, 0x37, 0xb4, 0x49, 0x40, 0x63, 0xd1, 0x4b, 0x52, 0x2e, 0x38, 0x42, - 0xa3, 0x4f, 0x7b, 0x71, 0xc0, 0xe2, 0x49, 0x4f, 0xa3, 0x99, 0x7f, 0xbc, 0x3c, 0x3f, 0xe4, 0xf1, - 0x88, 0x05, 0x9a, 0x63, 0xf9, 0xba, 0x9f, 0x78, 0x19, 0x1f, 0x89, 0x1f, 0x48, 0x4a, 0x3d, 0x9f, - 0x0a, 0xc2, 0xc2, 0xcc, 0x6c, 0x41, 0xc0, 0x03, 0x6e, 0x68, 0x27, 0xe0, 0x3c, 0x08, 0xe9, 0xba, - 0x5a, 0x1d, 0x8d, 0x47, 0xeb, 0x82, 0x45, 0x34, 0x13, 0x24, 0x4a, 0x4a, 0xe6, 0xa7, 0x3c, 0x33, - 0xa7, 0x2e, 0xb7, 0xf5, 0x91, 0x6a, 0xd1, 0xfd, 0xa7, 0x02, 0xd7, 0x36, 0xe5, 0xe1, 0x5b, 0x3c, - 0x8e, 0xe9, 0x50, 0x60, 0xfa, 0xfd, 0x98, 0x66, 0x02, 0xdd, 0x81, 0x5a, 0x44, 0x05, 0xe9, 0x54, - 0x56, 0xad, 0xb5, 0xf6, 0xc6, 0xdb, 0xbd, 0xf3, 0x96, 0xf6, 0x94, 0xd8, 0xd7, 0x54, 0x10, 0xb7, - 0x59, 0xe4, 0x8e, 0x62, 0xc7, 0x6a, 0x44, 0x3b, 0xd0, 0x30, 0xb6, 0x76, 0xaa, 0xab, 0xd5, 0xb5, - 0xf6, 0xc6, 0xea, 0x45, 0xf2, 0x03, 0xb9, 0xde, 0xd6, 0x7c, 0x6e, 0xbb, 0xc8, 0x9d, 0x52, 0x08, - 0x97, 0x04, 0xfa, 0x02, 0x6a, 0xd2, 0xf0, 0x4e, 0x4d, 0x59, 0x71, 0xf3, 0x22, 0x2d, 0xf7, 0x79, - 0x26, 0x76, 0xe3, 0x11, 0xd7, 0x46, 0x48, 0x6e, 0xac, 0x46, 0xf4, 0x93, 0x05, 0xcb, 0x3e, 0x11, - 0x24, 0x09, 0x49, 0x4c, 0xcf, 0x05, 0xb1, 0x53, 0x57, 0x86, 0x7d, 0x78, 0x91, 0xca, 0xed, 0x52, - 0x6a, 0xdf, 0x08, 0x95, 0x46, 0xae, 0x14, 0xb9, 0xf3, 0x0a, 0x9d, 0xb8, 0xe3, 0x5f, 0x22, 0xf9, - 0xa0, 0xd6, 0xb4, 0xec, 0x0a, 0x6e, 0x32, 0x9f, 0xc6, 0x82, 0x89, 0x67, 0xdd, 0x5f, 0x2a, 0x80, - 0x66, 0xc3, 0xbe, 0x2f, 0x88, 0x18, 0x67, 0xe8, 0x08, 0x20, 0x53, 0xd4, 0x16, 0xf7, 0x69, 0xc7, - 0x5a, 0xb5, 0xd6, 0x16, 0x37, 0x3e, 0xb9, 0x34, 0xf6, 0x67, 0x64, 0x7b, 0xfb, 0xa7, 0x82, 0xee, - 0xd5, 0x22, 0x77, 0xda, 0x5a, 0x91, 0x37, 0xe4, 0x3e, 0xc5, 0x33, 0x5a, 0xd1, 0xbb, 0xd0, 0x88, - 0x68, 0x96, 0x91, 0x80, 0xaa, 0xcb, 0x6d, 0xe9, 0xd0, 0x1b, 0x08, 0x97, 0x04, 0x72, 0xa0, 0x4e, - 0xd3, 0x94, 0xa7, 0x9d, 0xaa, 0x62, 0x6a, 0x15, 0xb9, 0xa3, 0x01, 0xac, 0xa7, 0xee, 0x77, 0x00, - 0xd3, 0x23, 0xd1, 0x35, 0xb8, 0xba, 0xb5, 0x37, 0x18, 0xf4, 0xb7, 0x0e, 0xbc, 0xc3, 0xc1, 0xc3, - 0xc1, 0xde, 0x93, 0x81, 0x7d, 0x05, 0x2d, 0x02, 0x94, 0xe0, 0xde, 0x43, 0xdb, 0x42, 0xcb, 0xf0, - 0x66, 0xb9, 0xc6, 0xfd, 0x07, 0xfd, 0xad, 0x83, 0xfe, 0xb6, 0xb7, 0x77, 0x70, 0xbf, 0x8f, 0xed, - 0x0a, 0xba, 0x01, 0x6f, 0x9d, 0xdb, 0xdb, 0x3e, 0x7c, 0xec, 0xed, 0x6e, 0xdb, 0xd5, 0xee, 0xaf, - 0x16, 0x2c, 0x9d, 0xcd, 0xd2, 0x2c, 0xe1, 0x71, 0x46, 0xd1, 0x01, 0xcc, 0xab, 0xa0, 0x78, 0xba, - 0x6a, 0x54, 0xc8, 0xda, 0x1b, 0xce, 0xab, 0x42, 0x36, 0x62, 0x81, 0x6b, 0x17, 0xb9, 0x73, 0x46, - 0x10, 0xeb, 0xba, 0xd4, 0xdb, 0xe8, 0x01, 0xcc, 0xe9, 0x80, 0x99, 0xf4, 0xbf, 0xf5, 0x7a, 0x57, - 0xe0, 0x42, 0x91, 0x3b, 0x46, 0x12, 0x9b, 0xb9, 0xbb, 0x34, 0xbd, 0x68, 0x79, 0x8e, 0x2e, 0xaf, - 0xee, 0xdf, 0x16, 0xb4, 0x67, 0xe0, 0xd9, 0x8a, 0xd1, 0x2e, 0xac, 0x5e, 0x7a, 0xe4, 0xab, 0x2b, - 0x66, 0x07, 0x1a, 0x21, 0x0f, 0x02, 0x9a, 0x96, 0xb6, 0x5f, 0xae, 0xe8, 0x11, 0x0f, 0x02, 0x16, - 0x07, 0x5a, 0x91, 0x11, 0xc2, 0x25, 0x21, 0x15, 0xe9, 0xd0, 0x64, 0x2a, 0x03, 0x2e, 0x51, 0x54, - 0x7a, 0x95, 0xf0, 0x54, 0x68, 0x45, 0x46, 0x08, 0x97, 0x44, 0xf7, 0x2f, 0x0b, 0xe6, 0x67, 0x0d, - 0x47, 0x6b, 0xd0, 0x1c, 0x51, 0x22, 0xc6, 0x29, 0x95, 0xce, 0x56, 0xd7, 0x5a, 0xee, 0x7c, 0x91, - 0x3b, 0xa7, 0x18, 0x3e, 0xa5, 0x50, 0x0f, 0x80, 0x4e, 0x04, 0x8d, 0x33, 0xc6, 0x63, 0xe9, 0x8f, - 0xe4, 0x5d, 0x2c, 0x72, 0x67, 0x06, 0xc5, 0x33, 0x34, 0xba, 0x09, 0x35, 0x41, 0x02, 0xdd, 0x74, - 0x5a, 0xba, 0x21, 0xc8, 0x35, 0x56, 0xa3, 0xcc, 0x68, 0x12, 0x32, 0x92, 0xa9, 0x6e, 0x62, 0x32, - 0x5a, 0x01, 0x58, 0x4f, 0xe8, 0x2e, 0xcc, 0x65, 0x34, 0x3d, 0xa1, 0x69, 0xa7, 0xae, 0x3c, 0x5e, - 0xbe, 0xc8, 0xe3, 0x7d, 0xc5, 0x61, 0xae, 0x5a, 0xd1, 0xd8, 0xcc, 0xdd, 0x1f, 0x2b, 0x30, 0xa7, - 0xb7, 0xa5, 0x25, 0xaa, 0x71, 0x59, 0xea, 0xa8, 0x97, 0x5b, 0xd3, 0x07, 0xd0, 0x0a, 0xd2, 0x64, - 0xe8, 0xc9, 0xa8, 0xa9, 0x6b, 0xaa, 0xbb, 0x0b, 0x45, 0xee, 0x4c, 0x41, 0xdc, 0x94, 0xe4, 0x63, - 0x9e, 0x0a, 0x69, 0xb5, 0xe0, 0xc7, 0x34, 0x9e, 0xad, 0x43, 0x05, 0x60, 0x3d, 0xe9, 0x7a, 0x16, - 0x29, 0x1b, 0x96, 0x8e, 0x99, 0x7a, 0x56, 0x10, 0x2e, 0x09, 0xc9, 0x36, 0xe4, 0x51, 0x44, 0x62, - 0x5f, 0x79, 0xd7, 0x2a, 0x6f, 0x4b, 0x41, 0xb8, 0x24, 0x90, 0x0b, 0x8d, 0x23, 0x32, 0x3c, 0xe6, - 0xa3, 0x51, 0x67, 0x4e, 0x05, 0xe1, 0xc6, 0x45, 0x41, 0x70, 0x35, 0x8b, 0xd6, 0x61, 0xf8, 0x71, - 0x49, 0x74, 0x7f, 0xab, 0x40, 0xc3, 0x70, 0xa0, 0xaf, 0xc0, 0x66, 0x31, 0x13, 0x8c, 0x84, 0x1e, - 0x8b, 0x05, 0x4d, 0x4f, 0x48, 0xa8, 0x82, 0x52, 0x75, 0x97, 0x8a, 0xdc, 0x39, 0xb7, 0x87, 0xaf, - 0x1a, 0x64, 0xd7, 0x00, 0xe8, 0x21, 0x2c, 0xa5, 0x24, 0xf6, 0x79, 0xc4, 0x9e, 0x13, 0xc1, 0x78, - 0xec, 0x8d, 0xc8, 0x50, 0xf0, 0x54, 0x85, 0xcd, 0x72, 0x3b, 0x45, 0xee, 0x5c, 0xb8, 0x8f, 0xaf, - 0x9d, 0x41, 0xef, 0x29, 0x50, 0x26, 0x54, 0x34, 0x0e, 0x05, 0x4b, 0x42, 0x46, 0x75, 0x67, 0xb3, - 0x74, 0x42, 0x4d, 0x51, 0x3c, 0x43, 0xa3, 0xdb, 0x30, 0x1f, 0x91, 0xc9, 0xd4, 0xf2, 0x9a, 0xb2, - 0x5c, 0x75, 0x8f, 0x59, 0x1c, 0xb7, 0x23, 0x32, 0x39, 0xb5, 0xf8, 0x2e, 0xd8, 0x72, 0x93, 0x86, - 0x24, 0xc9, 0xa8, 0xef, 0xc9, 0xa7, 0x58, 0x85, 0xdc, 0xb8, 0xfc, 0xf2, 0x1e, 0x5e, 0x8c, 0xc8, - 0xa4, 0xaf, 0x81, 0x03, 0x16, 0xd1, 0xee, 0xbf, 0x15, 0x53, 0x30, 0xa6, 0x40, 0xd1, 0x0e, 0xd4, - 0x43, 0x7a, 0x42, 0x43, 0xf3, 0x20, 0xdc, 0xfa, 0xbf, 0x8a, 0xee, 0x3d, 0x92, 0xdc, 0x3a, 0x55, - 0x94, 0x20, 0xd6, 0x13, 0xba, 0x0e, 0x55, 0x9f, 0xa5, 0xa6, 0xed, 0x37, 0x8a, 0xdc, 0x91, 0x4b, - 0x2c, 0x07, 0x99, 0xb0, 0x23, 0x16, 0x52, 0x93, 0x65, 0x2a, 0x61, 0xe5, 0x1a, 0xab, 0x11, 0xbd, - 0x07, 0x4d, 0x69, 0x76, 0xc6, 0x9e, 0x53, 0x15, 0x83, 0x05, 0x5d, 0xb2, 0x25, 0x86, 0x1b, 0x11, - 0x99, 0xec, 0xb3, 0xe7, 0x14, 0x7d, 0x0c, 0x32, 0x14, 0x9e, 0xcc, 0x84, 0x71, 0x92, 0x29, 0xb7, - 0x17, 0xf4, 0x73, 0x34, 0x03, 0x63, 0x88, 0xc8, 0xc4, 0xd5, 0x34, 0x7a, 0x07, 0xa4, 0xb0, 0x27, - 0x9f, 0xa3, 0x39, 0xc5, 0xad, 0xd3, 0x57, 0x43, 0x78, 0x2e, 0x22, 0x93, 0xcd, 0x80, 0xca, 0x9e, - 0x31, 0xe4, 0x51, 0x92, 0xd2, 0x2c, 0xeb, 0x34, 0x56, 0xad, 0xb5, 0xa6, 0x36, 0xa0, 0xc4, 0xf0, - 0x29, 0xd5, 0xfd, 0x12, 0xea, 0xca, 0x7d, 0xd4, 0x84, 0xda, 0xee, 0xe0, 0xde, 0x9e, 0x7d, 0x05, - 0xb5, 0xa0, 0xbe, 0xdd, 0x77, 0x0f, 0x77, 0x6c, 0x4b, 0x82, 0x4f, 0x36, 0xf1, 0xc0, 0xae, 0x48, - 0xb0, 0x8f, 0xf1, 0x1e, 0xb6, 0xab, 0x92, 0xbc, 0xb7, 0x79, 0xb0, 0xf9, 0xc8, 0xae, 0x75, 0x7f, - 0xae, 0x42, 0xeb, 0xf4, 0x5f, 0x23, 0x6b, 0xe6, 0x84, 0xa6, 0xb2, 0xb7, 0x98, 0x42, 0x56, 0xb6, - 0x19, 0x08, 0x97, 0x84, 0xcc, 0x12, 0x9f, 0x65, 0x49, 0x48, 0x9e, 0x79, 0x31, 0x89, 0xca, 0x67, - 0x55, 0x65, 0xc9, 0x2c, 0x8e, 0xdb, 0x66, 0x35, 0x20, 0x11, 0x95, 0x77, 0x21, 0x48, 0x60, 0x5a, - 0x95, 0xba, 0x0b, 0x41, 0x02, 0x2c, 0x07, 0xf4, 0x39, 0x2c, 0xb2, 0x38, 0x13, 0x24, 0x1e, 0x52, - 0x2f, 0x48, 0xf9, 0x38, 0x31, 0x15, 0x8b, 0x8a, 0xdc, 0x79, 0x69, 0x07, 0x2f, 0x94, 0xeb, 0x1d, - 0xb9, 0x44, 0x9b, 0xd0, 0x18, 0x27, 0x3e, 0x11, 0xd4, 0x37, 0xe5, 0xbb, 0xdc, 0xd3, 0x5f, 0xc3, - 0x5e, 0xf9, 0x35, 0xec, 0x1d, 0x94, 0x5f, 0x43, 0xed, 0x8d, 0x61, 0xc7, 0x25, 0x81, 0x3e, 0x02, - 0xc8, 0x9e, 0x65, 0x82, 0x46, 0xde, 0x98, 0xf9, 0x2a, 0xd8, 0xa6, 0xe9, 0x4e, 0x51, 0xdc, 0xd2, - 0xf4, 0x21, 0xf3, 0xd1, 0x37, 0xb0, 0xa0, 0x1f, 0xd2, 0xf2, 0xfd, 0x6a, 0xbe, 0xe6, 0xfb, 0xf5, - 0x46, 0x91, 0x3b, 0x67, 0x45, 0xb1, 0x7e, 0x92, 0xa7, 0x7f, 0xa6, 0x9a, 0x5d, 0x9f, 0x3a, 0xa8, - 0x62, 0xe8, 0x7e, 0xf6, 0xfb, 0x8b, 0x15, 0xeb, 0x8f, 0x17, 0x2b, 0xd6, 0x9f, 0x2f, 0x56, 0xac, - 0x6f, 0xdf, 0x0f, 0x98, 0x78, 0x3a, 0x3e, 0xea, 0x0d, 0x79, 0xb4, 0xae, 0x0e, 0x5b, 0x57, 0x1a, - 0xd6, 0x33, 0xff, 0x78, 0xfd, 0x64, 0x43, 0x7f, 0x87, 0xef, 0x68, 0xcf, 0xe7, 0xd4, 0x74, 0xfb, - 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd2, 0x4a, 0x40, 0x6e, 0x81, 0x0b, 0x00, 0x00, + // 1372 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0x4f, 0x6f, 0x1c, 0x35, + 0x14, 0xef, 0xec, 0xff, 0xf5, 0x26, 0xe9, 0xe0, 0x44, 0x74, 0x9b, 0x96, 0x4c, 0xb4, 0x82, 0x12, + 0x10, 0x6c, 0x20, 0x15, 0x42, 0x50, 0x54, 0x94, 0x49, 0xb6, 0x69, 0xda, 0xb2, 0xa9, 0x9c, 0x8d, + 0x8a, 0xb8, 0x8c, 0x9c, 0x1d, 0xef, 0xd4, 0x64, 0x66, 0x3c, 0x8c, 0xbd, 0xe9, 0xb6, 0x77, 0x2e, + 0x7c, 0x08, 0x3e, 0x01, 0x17, 0x6e, 0x1c, 0xf8, 0x00, 0x1c, 0xf9, 0x04, 0x23, 0xd4, 0x13, 0x9a, + 0x33, 0x17, 0x6e, 0xc8, 0x7f, 0x26, 0xbb, 0x69, 0x36, 0xa5, 0x17, 0xfb, 0xf9, 0xe7, 0xf7, 0x9e, + 0xdf, 0x7b, 0x7e, 0xef, 0xd9, 0xa0, 0x85, 0x03, 0x12, 0x8b, 0x6e, 0x92, 0x32, 0xc1, 0x20, 0x1c, + 0x7d, 0xd6, 0x8d, 0x03, 0x1a, 0x4f, 0xba, 0x1a, 0xe5, 0xfe, 0xc9, 0xea, 0xc2, 0x90, 0xc5, 0x23, + 0x1a, 0x68, 0x8e, 0xd5, 0xeb, 0x7e, 0xe2, 0x71, 0x36, 0x12, 0xcf, 0x70, 0x4a, 0x3c, 0x9f, 0x08, + 0x4c, 0x43, 0x6e, 0xb6, 0x40, 0xc0, 0x02, 0x66, 0x68, 0x27, 0x60, 0x2c, 0x08, 0xc9, 0xa6, 0x5a, + 0x1d, 0x8f, 0x47, 0x9b, 0x82, 0x46, 0x84, 0x0b, 0x1c, 0x25, 0x05, 0xf3, 0x53, 0xc6, 0xcd, 0xa9, + 0xab, 0x2d, 0x7d, 0xa4, 0x5a, 0x74, 0xfe, 0x29, 0x81, 0xe5, 0x6d, 0x79, 0xf8, 0x0e, 0x8b, 0x63, + 0x32, 0x14, 0x88, 0xfc, 0x30, 0x26, 0x5c, 0xc0, 0x3b, 0xa0, 0x12, 0x11, 0x81, 0xdb, 0xa5, 0x75, + 0x6b, 0xa3, 0xb5, 0xf5, 0x4e, 0xf7, 0xa2, 0xa5, 0x5d, 0x25, 0xf6, 0x0d, 0x11, 0xd8, 0x6d, 0xe4, + 0x99, 0xa3, 0xd8, 0x91, 0x1a, 0xe1, 0x1e, 0xa8, 0x1b, 0x5b, 0xdb, 0xe5, 0xf5, 0xf2, 0x46, 0x6b, + 0x6b, 0x7d, 0x9e, 0x7c, 0x5f, 0xae, 0x77, 0x35, 0x9f, 0xdb, 0xca, 0x33, 0xa7, 0x10, 0x42, 0x05, + 0x01, 0xbf, 0x04, 0x15, 0x69, 0x78, 0xbb, 0xa2, 0xac, 0xb8, 0x39, 0x4f, 0xcb, 0x7d, 0xc6, 0xc5, + 0x7e, 0x3c, 0x62, 0xda, 0x08, 0xc9, 0x8d, 0xd4, 0x08, 0x7f, 0xb2, 0xc0, 0xaa, 0x8f, 0x05, 0x4e, + 0x42, 0x1c, 0x93, 0x0b, 0x41, 0x6c, 0x57, 0x95, 0x61, 0x1f, 0xcd, 0x53, 0xb9, 0x5b, 0x48, 0x1d, + 0x1a, 0xa1, 0xc2, 0xc8, 0xb5, 0x3c, 0x73, 0x5e, 0xa3, 0x13, 0xb5, 0xfd, 0x4b, 0x24, 0x1f, 0x54, + 0x1a, 0x96, 0x5d, 0x42, 0x0d, 0xea, 0x93, 0x58, 0x50, 0xf1, 0xbc, 0xf3, 0x4b, 0x09, 0xc0, 0xd9, + 0xb0, 0x1f, 0x0a, 0x2c, 0xc6, 0x1c, 0x1e, 0x03, 0xc0, 0x15, 0xb5, 0xc3, 0x7c, 0xd2, 0xb6, 0xd6, + 0xad, 0x8d, 0xa5, 0xad, 0x4f, 0x2f, 0x8d, 0xfd, 0x39, 0xd9, 0xee, 0xe1, 0x99, 0xa0, 0x7b, 0x35, + 0xcf, 0x9c, 0x96, 0x56, 0xe4, 0x0d, 0x99, 0x4f, 0xd0, 0x8c, 0x56, 0xf8, 0x1e, 0xa8, 0x47, 0x84, + 0x73, 0x1c, 0x10, 0x75, 0xb9, 0x4d, 0x1d, 0x7a, 0x03, 0xa1, 0x82, 0x80, 0x0e, 0xa8, 0x92, 0x34, + 0x65, 0x69, 0xbb, 0xac, 0x98, 0x9a, 0x79, 0xe6, 0x68, 0x00, 0xe9, 0xa9, 0xf3, 0x3d, 0x00, 0xd3, + 0x23, 0xe1, 0x32, 0xb8, 0xba, 0x73, 0xd0, 0xef, 0xf7, 0x76, 0x06, 0xde, 0x51, 0xff, 0x61, 0xff, + 0xe0, 0x49, 0xdf, 0xbe, 0x02, 0x97, 0x00, 0x28, 0xc0, 0x83, 0x87, 0xb6, 0x05, 0x57, 0xc1, 0xdb, + 0xc5, 0x1a, 0xf5, 0x1e, 0xf4, 0x76, 0x06, 0xbd, 0x5d, 0xef, 0x60, 0x70, 0xbf, 0x87, 0xec, 0x12, + 0xbc, 0x01, 0xae, 0x5d, 0xd8, 0xdb, 0x3d, 0x7a, 0xec, 0xed, 0xef, 0xda, 0xe5, 0xce, 0x6f, 0x16, + 0x58, 0x39, 0x9f, 0xa5, 0x3c, 0x61, 0x31, 0x27, 0x70, 0x00, 0x16, 0x54, 0x50, 0x3c, 0x5d, 0x35, + 0x2a, 0x64, 0xad, 0x2d, 0xe7, 0x75, 0x21, 0x1b, 0xd1, 0xc0, 0xb5, 0xf3, 0xcc, 0x39, 0x27, 0x88, + 0x74, 0x5d, 0xea, 0x6d, 0xf8, 0x00, 0xd4, 0x74, 0xc0, 0x4c, 0xfa, 0xdf, 0x7a, 0xb3, 0x2b, 0x70, + 0x41, 0x9e, 0x39, 0x46, 0x12, 0x99, 0xb9, 0xb3, 0x32, 0xbd, 0x68, 0x79, 0x8e, 0x2e, 0xaf, 0xce, + 0xdf, 0x16, 0x68, 0xcd, 0xc0, 0xb3, 0x15, 0xa3, 0x5d, 0x58, 0xbf, 0xf4, 0xc8, 0xd7, 0x57, 0xcc, + 0x1e, 0xa8, 0x87, 0x2c, 0x08, 0x48, 0x5a, 0xd8, 0x7e, 0xb9, 0xa2, 0x47, 0x2c, 0x08, 0x68, 0x1c, + 0x68, 0x45, 0x46, 0x08, 0x15, 0x84, 0x54, 0xa4, 0x43, 0xc3, 0x55, 0x06, 0x5c, 0xa2, 0xa8, 0xf0, + 0x2a, 0x61, 0xa9, 0xd0, 0x8a, 0x8c, 0x10, 0x2a, 0x88, 0xce, 0xaf, 0x25, 0xb0, 0x30, 0x6b, 0x38, + 0xdc, 0x00, 0x8d, 0x11, 0xc1, 0x62, 0x9c, 0x12, 0xe9, 0x6c, 0x79, 0xa3, 0xe9, 0x2e, 0xe4, 0x99, + 0x73, 0x86, 0xa1, 0x33, 0x0a, 0x76, 0x01, 0x20, 0x13, 0x41, 0x62, 0x4e, 0x59, 0x2c, 0xfd, 0x91, + 0xbc, 0x4b, 0x79, 0xe6, 0xcc, 0xa0, 0x68, 0x86, 0x86, 0x37, 0x41, 0x45, 0xe0, 0x40, 0x37, 0x9d, + 0xa6, 0x6e, 0x08, 0x72, 0x8d, 0xd4, 0x28, 0x33, 0x1a, 0x87, 0x14, 0x73, 0xd5, 0x4d, 0x4c, 0x46, + 0x2b, 0x00, 0xe9, 0x09, 0xde, 0x05, 0x35, 0x4e, 0xd2, 0x53, 0x92, 0xb6, 0xab, 0xca, 0xe3, 0xd5, + 0x79, 0x1e, 0x1f, 0x2a, 0x0e, 0x73, 0xd5, 0x8a, 0x46, 0x66, 0x86, 0xf7, 0xc1, 0x32, 0x0e, 0x43, + 0xf6, 0x8c, 0xf8, 0x9e, 0x4f, 0x53, 0x32, 0x14, 0x2c, 0xa5, 0x84, 0xb7, 0x6b, 0xca, 0x9a, 0x6b, + 0x79, 0xe6, 0xcc, 0xdb, 0x46, 0xd0, 0x80, 0xbb, 0x53, 0xac, 0xf3, 0x63, 0x09, 0xd4, 0xf4, 0x41, + 0xd2, 0x27, 0xd5, 0x02, 0x2d, 0x65, 0xf4, 0xab, 0x4d, 0xee, 0x43, 0xd0, 0x0c, 0xd2, 0x64, 0xe8, + 0xc9, 0xf8, 0xab, 0x0b, 0xaf, 0xba, 0x8b, 0x79, 0xe6, 0x4c, 0x41, 0xd4, 0x90, 0xe4, 0x63, 0x96, + 0x0a, 0xe9, 0xbf, 0x60, 0x27, 0x24, 0x9e, 0xad, 0x68, 0x05, 0x20, 0x3d, 0xe9, 0xce, 0x20, 0x52, + 0x3a, 0x2c, 0x42, 0x64, 0x3a, 0x83, 0x82, 0x50, 0x41, 0x48, 0xb6, 0x21, 0x8b, 0x22, 0x1c, 0xfb, + 0x2a, 0x4e, 0xcd, 0xe2, 0xde, 0x15, 0x84, 0x0a, 0x02, 0xba, 0xa0, 0x7e, 0x8c, 0x87, 0x27, 0x6c, + 0x34, 0x6a, 0xd7, 0x54, 0x38, 0x6f, 0xcc, 0x0b, 0xa7, 0xab, 0x59, 0xb4, 0x0e, 0xc3, 0x8f, 0x0a, + 0xa2, 0xf3, 0x7b, 0x09, 0xd4, 0x0d, 0x07, 0xfc, 0x1a, 0xd8, 0x34, 0xa6, 0x82, 0xe2, 0xd0, 0xa3, + 0xb1, 0x20, 0xe9, 0x29, 0x0e, 0x55, 0x50, 0xca, 0xee, 0x4a, 0x9e, 0x39, 0x17, 0xf6, 0xd0, 0x55, + 0x83, 0xec, 0x1b, 0x00, 0x3e, 0x04, 0x2b, 0x29, 0x8e, 0x7d, 0x16, 0xd1, 0x17, 0x58, 0x50, 0x16, + 0x7b, 0x23, 0x2c, 0xe3, 0xad, 0xc2, 0x66, 0xb9, 0xed, 0x3c, 0x73, 0xe6, 0xee, 0xa3, 0xe5, 0x73, + 0xe8, 0x3d, 0x05, 0xca, 0xd4, 0x8c, 0xc6, 0xa1, 0xa0, 0x49, 0x48, 0x89, 0xee, 0x91, 0x96, 0x4e, + 0xcd, 0x29, 0x8a, 0x66, 0x68, 0x78, 0x1b, 0x2c, 0x44, 0x78, 0x32, 0xb5, 0xbc, 0xa2, 0x2c, 0x57, + 0x7d, 0x68, 0x16, 0x47, 0xad, 0x08, 0x4f, 0xce, 0x2c, 0xbe, 0x0b, 0x6c, 0xb9, 0x49, 0x42, 0x9c, + 0x70, 0xe2, 0x7b, 0xf2, 0x51, 0x57, 0x21, 0x37, 0x2e, 0xbf, 0xba, 0x87, 0x96, 0x22, 0x3c, 0xe9, + 0x69, 0x60, 0x40, 0x23, 0xd2, 0xf9, 0xb7, 0x28, 0x3d, 0x53, 0xea, 0x70, 0x0f, 0x54, 0x43, 0x72, + 0x4a, 0x42, 0xf3, 0xb4, 0xdc, 0xfa, 0xbf, 0xde, 0xd0, 0x7d, 0x24, 0xb9, 0x75, 0xaa, 0x28, 0x41, + 0xa4, 0x27, 0x78, 0x1d, 0x94, 0x7d, 0x9a, 0x9a, 0x07, 0xa4, 0x9e, 0x67, 0x8e, 0x5c, 0x22, 0x39, + 0xc8, 0x84, 0x1d, 0xd1, 0x90, 0x98, 0x2c, 0x53, 0x09, 0x2b, 0xd7, 0x48, 0x8d, 0xf0, 0x7d, 0xd0, + 0x90, 0x66, 0x73, 0xfa, 0x82, 0xa8, 0x18, 0x2c, 0xea, 0xe2, 0x2f, 0x30, 0x54, 0x8f, 0xf0, 0xe4, + 0x90, 0xbe, 0x20, 0xf0, 0x13, 0x20, 0x43, 0xe1, 0xc9, 0x4c, 0x18, 0x27, 0x5c, 0xb9, 0xbd, 0xa8, + 0x1f, 0xb6, 0x19, 0x18, 0x81, 0x08, 0x4f, 0x5c, 0x4d, 0xc3, 0x77, 0x81, 0x14, 0xf6, 0xe4, 0xc3, + 0x56, 0x53, 0xdc, 0x3a, 0x7d, 0x35, 0x84, 0x6a, 0x11, 0x9e, 0x6c, 0x07, 0x44, 0x76, 0x9f, 0x21, + 0x8b, 0x92, 0x94, 0x70, 0xde, 0xae, 0xaf, 0x5b, 0x1b, 0x0d, 0x6d, 0x40, 0x81, 0xa1, 0x33, 0xaa, + 0xf3, 0x15, 0xa8, 0x2a, 0xf7, 0x61, 0x03, 0x54, 0xf6, 0xfb, 0xf7, 0x0e, 0xec, 0x2b, 0xb0, 0x09, + 0xaa, 0xbb, 0x3d, 0xf7, 0x68, 0xcf, 0xb6, 0x24, 0xf8, 0x64, 0x1b, 0xf5, 0xed, 0x92, 0x04, 0x7b, + 0x08, 0x1d, 0x20, 0xbb, 0x2c, 0xc9, 0x7b, 0xdb, 0x83, 0xed, 0x47, 0x76, 0xa5, 0xf3, 0x73, 0x19, + 0x34, 0xcf, 0x7e, 0x48, 0xb2, 0x66, 0x4e, 0x49, 0x2a, 0xbb, 0x94, 0x29, 0x64, 0x65, 0x9b, 0x81, + 0x50, 0x41, 0xc8, 0x2c, 0xf1, 0x29, 0x4f, 0x42, 0xfc, 0xdc, 0x8b, 0x71, 0x54, 0x3c, 0xd0, 0x2a, + 0x4b, 0x66, 0x71, 0xd4, 0x32, 0xab, 0x3e, 0x8e, 0x88, 0xbc, 0x0b, 0x81, 0x03, 0xd3, 0xf4, 0xd4, + 0x5d, 0x08, 0x1c, 0x20, 0x39, 0xc0, 0x2f, 0xc0, 0x12, 0x8d, 0xb9, 0xc0, 0xf1, 0x90, 0x78, 0x41, + 0xca, 0xc6, 0x89, 0xa9, 0x58, 0x98, 0x67, 0xce, 0x2b, 0x3b, 0x68, 0xb1, 0x58, 0xef, 0xc9, 0x25, + 0xdc, 0x06, 0xf5, 0x71, 0xe2, 0x63, 0x41, 0x7c, 0x53, 0xbe, 0xab, 0x5d, 0xfd, 0xc9, 0xec, 0x16, + 0x9f, 0xcc, 0xee, 0xa0, 0xf8, 0x64, 0x6a, 0x6f, 0x0c, 0x3b, 0x2a, 0x08, 0xf8, 0x31, 0x00, 0xfc, + 0x39, 0x17, 0x24, 0xf2, 0xc6, 0xd4, 0x57, 0xc1, 0x36, 0xed, 0x7b, 0x8a, 0xa2, 0xa6, 0xa6, 0x8f, + 0xa8, 0x0f, 0xbf, 0x05, 0x8b, 0xfa, 0x49, 0x2e, 0x5e, 0xc2, 0xc6, 0x1b, 0xbe, 0x84, 0x6f, 0xe5, + 0x99, 0x73, 0x5e, 0x14, 0xe9, 0xc7, 0x7d, 0xfa, 0xfb, 0xaa, 0xd8, 0xd5, 0xa9, 0x83, 0x2a, 0x86, + 0xee, 0xe7, 0x7f, 0xbc, 0x5c, 0xb3, 0xfe, 0x7c, 0xb9, 0x66, 0xfd, 0xf5, 0x72, 0xcd, 0xfa, 0xee, + 0x83, 0x80, 0x8a, 0xa7, 0xe3, 0xe3, 0xee, 0x90, 0x45, 0x9b, 0xea, 0xb0, 0x4d, 0xa5, 0x61, 0x93, + 0xfb, 0x27, 0x9b, 0xa7, 0x5b, 0xfa, 0x63, 0x7d, 0x47, 0x7b, 0x5e, 0x53, 0xd3, 0xed, 0xff, 0x02, + 0x00, 0x00, 0xff, 0xff, 0x45, 0x0b, 0xaa, 0xfe, 0xcb, 0x0b, 0x00, 0x00, } func (m *AgentConnectRequest) Marshal() (dAtA []byte, err error) { @@ -1276,6 +1287,15 @@ func (m *AgentDetails) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } + if len(m.AllowedDirectories) > 0 { + for iNdEx := len(m.AllowedDirectories) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.AllowedDirectories[iNdEx]) + copy(dAtA[i:], m.AllowedDirectories[iNdEx]) + i = encodeVarintAgent(dAtA, i, uint64(len(m.AllowedDirectories[iNdEx]))) + i-- + dAtA[i] = 0x32 + } + } if m.Server != nil { { size, err := m.Server.MarshalToSizedBuffer(dAtA[:i]) @@ -1764,6 +1784,12 @@ func (m *AgentDetails) Size() (n int) { l = m.Server.Size() n += 1 + l + sovAgent(uint64(l)) } + if len(m.AllowedDirectories) > 0 { + for _, s := range m.AllowedDirectories { + l = len(s) + n += 1 + l + sovAgent(uint64(l)) + } + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -2766,6 +2792,38 @@ func (m *AgentDetails) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AllowedDirectories", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowAgent + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthAgent + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthAgent + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.AllowedDirectories = append(m.AllowedDirectories, string(dAtA[iNdEx:postIndex])) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipAgent(dAtA[iNdEx:]) diff --git a/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/agent.proto b/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/agent.proto index e05aaf335a..c34361e742 100644 --- a/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/agent.proto +++ b/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/agent.proto @@ -82,6 +82,8 @@ message AgentDetails { string alias = 4 [(gogoproto.jsontag) = "alias"]; // Server setting for the agent Server server = 5 [(gogoproto.jsontag) = "server"]; + // List of allowed directories in the Agent Config + repeated string allowed_directories = 6 [(gogoproto.jsontag) = "allowed_directories"]; } message Server { diff --git a/test/performance/vendor/github.com/nginx/agent/v2/src/core/config/types.go b/test/performance/vendor/github.com/nginx/agent/v2/src/core/config/types.go index 1f57a73d82..2e359b34b8 100644 --- a/test/performance/vendor/github.com/nginx/agent/v2/src/core/config/types.go +++ b/test/performance/vendor/github.com/nginx/agent/v2/src/core/config/types.go @@ -38,6 +38,16 @@ type Config struct { QueueSize int `mapstructure:"queue_size" yaml:"queue_size,omitempty"` } +func (c *Config) AllowedDirectories() []string { + values := []string{} + + // Iterate through the map and append keys to the slice + for key := range c.AllowedDirectoriesMap { + values = append(values, key) + } + return values +} + func (c *Config) IsGrpcServerConfigured() bool { return c.Server.Host != "" && c.Server.GrpcPort != 0 } diff --git a/test/performance/vendor/github.com/nginx/agent/v2/src/plugins/registration.go b/test/performance/vendor/github.com/nginx/agent/v2/src/plugins/registration.go index e4d7d5ac3e..1f67865d36 100644 --- a/test/performance/vendor/github.com/nginx/agent/v2/src/plugins/registration.go +++ b/test/performance/vendor/github.com/nginx/agent/v2/src/plugins/registration.go @@ -229,6 +229,7 @@ func (r *OneTimeRegistration) registerAgent() { MaxElapsedTime: r.config.Server.Backoff.MaxElapsedTime.Milliseconds(), }, }, + AllowedDirectories: r.config.AllowedDirectories(), }, }, Details: details, diff --git a/vendor/github.com/nginx/agent/sdk/v2/proto/agent.pb.go b/vendor/github.com/nginx/agent/sdk/v2/proto/agent.pb.go index e8ce7b1350..37d17c8290 100644 --- a/vendor/github.com/nginx/agent/sdk/v2/proto/agent.pb.go +++ b/vendor/github.com/nginx/agent/sdk/v2/proto/agent.pb.go @@ -423,7 +423,9 @@ type AgentDetails struct { // Alias name for the agent Alias string `protobuf:"bytes,4,opt,name=alias,proto3" json:"alias"` // Server setting for the agent - Server *Server `protobuf:"bytes,5,opt,name=server,proto3" json:"server"` + Server *Server `protobuf:"bytes,5,opt,name=server,proto3" json:"server"` + // List of allowed directories in the Agent Config + AllowedDirectories []string `protobuf:"bytes,6,rep,name=allowed_directories,json=allowedDirectories,proto3" json:"allowed_directories"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -497,6 +499,13 @@ func (m *AgentDetails) GetServer() *Server { return nil } +func (m *AgentDetails) GetAllowedDirectories() []string { + if m != nil { + return m.AllowedDirectories + } + return nil +} + type Server struct { // Host name or IP of the host to connect to Host string `protobuf:"bytes,1,opt,name=host,proto3" json:"host"` @@ -899,91 +908,93 @@ func init() { func init() { proto.RegisterFile("agent.proto", fileDescriptor_56ede974c0020f77) } var fileDescriptor_56ede974c0020f77 = []byte{ - // 1342 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0xcd, 0x6e, 0x1c, 0x45, - 0x10, 0xce, 0xec, 0x8f, 0x77, 0xb7, 0xd6, 0x76, 0x86, 0x8e, 0x05, 0x1b, 0x27, 0x78, 0xac, 0x15, - 0x04, 0x83, 0x60, 0x0d, 0x8e, 0x10, 0x82, 0xa0, 0x20, 0x8f, 0xbd, 0x71, 0x9c, 0x84, 0x75, 0xd4, - 0xb6, 0x15, 0xc4, 0x65, 0xd4, 0xde, 0xe9, 0x9d, 0x34, 0x9e, 0x99, 0x1e, 0x66, 0x7a, 0xcd, 0x26, - 0x77, 0x2e, 0x3c, 0x04, 0x4f, 0xc0, 0x03, 0x70, 0xe0, 0x01, 0x38, 0xf2, 0x04, 0x23, 0x94, 0x0b, - 0x68, 0xce, 0x5c, 0xb8, 0xa1, 0xfe, 0x19, 0xef, 0x3a, 0xb6, 0x43, 0x2e, 0xdd, 0xd5, 0x5f, 0x57, - 0x55, 0x57, 0x55, 0x57, 0x55, 0x37, 0xb4, 0x49, 0x40, 0x63, 0xd1, 0x4b, 0x52, 0x2e, 0x38, 0x42, - 0xa3, 0x4f, 0x7b, 0x71, 0xc0, 0xe2, 0x49, 0x4f, 0xa3, 0x99, 0x7f, 0xbc, 0x3c, 0x3f, 0xe4, 0xf1, - 0x88, 0x05, 0x9a, 0x63, 0xf9, 0xba, 0x9f, 0x78, 0x19, 0x1f, 0x89, 0x1f, 0x48, 0x4a, 0x3d, 0x9f, - 0x0a, 0xc2, 0xc2, 0xcc, 0x6c, 0x41, 0xc0, 0x03, 0x6e, 0x68, 0x27, 0xe0, 0x3c, 0x08, 0xe9, 0xba, - 0x5a, 0x1d, 0x8d, 0x47, 0xeb, 0x82, 0x45, 0x34, 0x13, 0x24, 0x4a, 0x4a, 0xe6, 0xa7, 0x3c, 0x33, - 0xa7, 0x2e, 0xb7, 0xf5, 0x91, 0x6a, 0xd1, 0xfd, 0xa7, 0x02, 0xd7, 0x36, 0xe5, 0xe1, 0x5b, 0x3c, - 0x8e, 0xe9, 0x50, 0x60, 0xfa, 0xfd, 0x98, 0x66, 0x02, 0xdd, 0x81, 0x5a, 0x44, 0x05, 0xe9, 0x54, - 0x56, 0xad, 0xb5, 0xf6, 0xc6, 0xdb, 0xbd, 0xf3, 0x96, 0xf6, 0x94, 0xd8, 0xd7, 0x54, 0x10, 0xb7, - 0x59, 0xe4, 0x8e, 0x62, 0xc7, 0x6a, 0x44, 0x3b, 0xd0, 0x30, 0xb6, 0x76, 0xaa, 0xab, 0xd5, 0xb5, - 0xf6, 0xc6, 0xea, 0x45, 0xf2, 0x03, 0xb9, 0xde, 0xd6, 0x7c, 0x6e, 0xbb, 0xc8, 0x9d, 0x52, 0x08, - 0x97, 0x04, 0xfa, 0x02, 0x6a, 0xd2, 0xf0, 0x4e, 0x4d, 0x59, 0x71, 0xf3, 0x22, 0x2d, 0xf7, 0x79, - 0x26, 0x76, 0xe3, 0x11, 0xd7, 0x46, 0x48, 0x6e, 0xac, 0x46, 0xf4, 0x93, 0x05, 0xcb, 0x3e, 0x11, - 0x24, 0x09, 0x49, 0x4c, 0xcf, 0x05, 0xb1, 0x53, 0x57, 0x86, 0x7d, 0x78, 0x91, 0xca, 0xed, 0x52, - 0x6a, 0xdf, 0x08, 0x95, 0x46, 0xae, 0x14, 0xb9, 0xf3, 0x0a, 0x9d, 0xb8, 0xe3, 0x5f, 0x22, 0xf9, - 0xa0, 0xd6, 0xb4, 0xec, 0x0a, 0x6e, 0x32, 0x9f, 0xc6, 0x82, 0x89, 0x67, 0xdd, 0x5f, 0x2a, 0x80, - 0x66, 0xc3, 0xbe, 0x2f, 0x88, 0x18, 0x67, 0xe8, 0x08, 0x20, 0x53, 0xd4, 0x16, 0xf7, 0x69, 0xc7, - 0x5a, 0xb5, 0xd6, 0x16, 0x37, 0x3e, 0xb9, 0x34, 0xf6, 0x67, 0x64, 0x7b, 0xfb, 0xa7, 0x82, 0xee, - 0xd5, 0x22, 0x77, 0xda, 0x5a, 0x91, 0x37, 0xe4, 0x3e, 0xc5, 0x33, 0x5a, 0xd1, 0xbb, 0xd0, 0x88, - 0x68, 0x96, 0x91, 0x80, 0xaa, 0xcb, 0x6d, 0xe9, 0xd0, 0x1b, 0x08, 0x97, 0x04, 0x72, 0xa0, 0x4e, - 0xd3, 0x94, 0xa7, 0x9d, 0xaa, 0x62, 0x6a, 0x15, 0xb9, 0xa3, 0x01, 0xac, 0xa7, 0xee, 0x77, 0x00, - 0xd3, 0x23, 0xd1, 0x35, 0xb8, 0xba, 0xb5, 0x37, 0x18, 0xf4, 0xb7, 0x0e, 0xbc, 0xc3, 0xc1, 0xc3, - 0xc1, 0xde, 0x93, 0x81, 0x7d, 0x05, 0x2d, 0x02, 0x94, 0xe0, 0xde, 0x43, 0xdb, 0x42, 0xcb, 0xf0, - 0x66, 0xb9, 0xc6, 0xfd, 0x07, 0xfd, 0xad, 0x83, 0xfe, 0xb6, 0xb7, 0x77, 0x70, 0xbf, 0x8f, 0xed, - 0x0a, 0xba, 0x01, 0x6f, 0x9d, 0xdb, 0xdb, 0x3e, 0x7c, 0xec, 0xed, 0x6e, 0xdb, 0xd5, 0xee, 0xaf, - 0x16, 0x2c, 0x9d, 0xcd, 0xd2, 0x2c, 0xe1, 0x71, 0x46, 0xd1, 0x01, 0xcc, 0xab, 0xa0, 0x78, 0xba, - 0x6a, 0x54, 0xc8, 0xda, 0x1b, 0xce, 0xab, 0x42, 0x36, 0x62, 0x81, 0x6b, 0x17, 0xb9, 0x73, 0x46, - 0x10, 0xeb, 0xba, 0xd4, 0xdb, 0xe8, 0x01, 0xcc, 0xe9, 0x80, 0x99, 0xf4, 0xbf, 0xf5, 0x7a, 0x57, - 0xe0, 0x42, 0x91, 0x3b, 0x46, 0x12, 0x9b, 0xb9, 0xbb, 0x34, 0xbd, 0x68, 0x79, 0x8e, 0x2e, 0xaf, - 0xee, 0xdf, 0x16, 0xb4, 0x67, 0xe0, 0xd9, 0x8a, 0xd1, 0x2e, 0xac, 0x5e, 0x7a, 0xe4, 0xab, 0x2b, - 0x66, 0x07, 0x1a, 0x21, 0x0f, 0x02, 0x9a, 0x96, 0xb6, 0x5f, 0xae, 0xe8, 0x11, 0x0f, 0x02, 0x16, - 0x07, 0x5a, 0x91, 0x11, 0xc2, 0x25, 0x21, 0x15, 0xe9, 0xd0, 0x64, 0x2a, 0x03, 0x2e, 0x51, 0x54, - 0x7a, 0x95, 0xf0, 0x54, 0x68, 0x45, 0x46, 0x08, 0x97, 0x44, 0xf7, 0x2f, 0x0b, 0xe6, 0x67, 0x0d, - 0x47, 0x6b, 0xd0, 0x1c, 0x51, 0x22, 0xc6, 0x29, 0x95, 0xce, 0x56, 0xd7, 0x5a, 0xee, 0x7c, 0x91, - 0x3b, 0xa7, 0x18, 0x3e, 0xa5, 0x50, 0x0f, 0x80, 0x4e, 0x04, 0x8d, 0x33, 0xc6, 0x63, 0xe9, 0x8f, - 0xe4, 0x5d, 0x2c, 0x72, 0x67, 0x06, 0xc5, 0x33, 0x34, 0xba, 0x09, 0x35, 0x41, 0x02, 0xdd, 0x74, - 0x5a, 0xba, 0x21, 0xc8, 0x35, 0x56, 0xa3, 0xcc, 0x68, 0x12, 0x32, 0x92, 0xa9, 0x6e, 0x62, 0x32, - 0x5a, 0x01, 0x58, 0x4f, 0xe8, 0x2e, 0xcc, 0x65, 0x34, 0x3d, 0xa1, 0x69, 0xa7, 0xae, 0x3c, 0x5e, - 0xbe, 0xc8, 0xe3, 0x7d, 0xc5, 0x61, 0xae, 0x5a, 0xd1, 0xd8, 0xcc, 0xdd, 0x1f, 0x2b, 0x30, 0xa7, - 0xb7, 0xa5, 0x25, 0xaa, 0x71, 0x59, 0xea, 0xa8, 0x97, 0x5b, 0xd3, 0x07, 0xd0, 0x0a, 0xd2, 0x64, - 0xe8, 0xc9, 0xa8, 0xa9, 0x6b, 0xaa, 0xbb, 0x0b, 0x45, 0xee, 0x4c, 0x41, 0xdc, 0x94, 0xe4, 0x63, - 0x9e, 0x0a, 0x69, 0xb5, 0xe0, 0xc7, 0x34, 0x9e, 0xad, 0x43, 0x05, 0x60, 0x3d, 0xe9, 0x7a, 0x16, - 0x29, 0x1b, 0x96, 0x8e, 0x99, 0x7a, 0x56, 0x10, 0x2e, 0x09, 0xc9, 0x36, 0xe4, 0x51, 0x44, 0x62, - 0x5f, 0x79, 0xd7, 0x2a, 0x6f, 0x4b, 0x41, 0xb8, 0x24, 0x90, 0x0b, 0x8d, 0x23, 0x32, 0x3c, 0xe6, - 0xa3, 0x51, 0x67, 0x4e, 0x05, 0xe1, 0xc6, 0x45, 0x41, 0x70, 0x35, 0x8b, 0xd6, 0x61, 0xf8, 0x71, - 0x49, 0x74, 0x7f, 0xab, 0x40, 0xc3, 0x70, 0xa0, 0xaf, 0xc0, 0x66, 0x31, 0x13, 0x8c, 0x84, 0x1e, - 0x8b, 0x05, 0x4d, 0x4f, 0x48, 0xa8, 0x82, 0x52, 0x75, 0x97, 0x8a, 0xdc, 0x39, 0xb7, 0x87, 0xaf, - 0x1a, 0x64, 0xd7, 0x00, 0xe8, 0x21, 0x2c, 0xa5, 0x24, 0xf6, 0x79, 0xc4, 0x9e, 0x13, 0xc1, 0x78, - 0xec, 0x8d, 0xc8, 0x50, 0xf0, 0x54, 0x85, 0xcd, 0x72, 0x3b, 0x45, 0xee, 0x5c, 0xb8, 0x8f, 0xaf, - 0x9d, 0x41, 0xef, 0x29, 0x50, 0x26, 0x54, 0x34, 0x0e, 0x05, 0x4b, 0x42, 0x46, 0x75, 0x67, 0xb3, - 0x74, 0x42, 0x4d, 0x51, 0x3c, 0x43, 0xa3, 0xdb, 0x30, 0x1f, 0x91, 0xc9, 0xd4, 0xf2, 0x9a, 0xb2, - 0x5c, 0x75, 0x8f, 0x59, 0x1c, 0xb7, 0x23, 0x32, 0x39, 0xb5, 0xf8, 0x2e, 0xd8, 0x72, 0x93, 0x86, - 0x24, 0xc9, 0xa8, 0xef, 0xc9, 0xa7, 0x58, 0x85, 0xdc, 0xb8, 0xfc, 0xf2, 0x1e, 0x5e, 0x8c, 0xc8, - 0xa4, 0xaf, 0x81, 0x03, 0x16, 0xd1, 0xee, 0xbf, 0x15, 0x53, 0x30, 0xa6, 0x40, 0xd1, 0x0e, 0xd4, - 0x43, 0x7a, 0x42, 0x43, 0xf3, 0x20, 0xdc, 0xfa, 0xbf, 0x8a, 0xee, 0x3d, 0x92, 0xdc, 0x3a, 0x55, - 0x94, 0x20, 0xd6, 0x13, 0xba, 0x0e, 0x55, 0x9f, 0xa5, 0xa6, 0xed, 0x37, 0x8a, 0xdc, 0x91, 0x4b, - 0x2c, 0x07, 0x99, 0xb0, 0x23, 0x16, 0x52, 0x93, 0x65, 0x2a, 0x61, 0xe5, 0x1a, 0xab, 0x11, 0xbd, - 0x07, 0x4d, 0x69, 0x76, 0xc6, 0x9e, 0x53, 0x15, 0x83, 0x05, 0x5d, 0xb2, 0x25, 0x86, 0x1b, 0x11, - 0x99, 0xec, 0xb3, 0xe7, 0x14, 0x7d, 0x0c, 0x32, 0x14, 0x9e, 0xcc, 0x84, 0x71, 0x92, 0x29, 0xb7, - 0x17, 0xf4, 0x73, 0x34, 0x03, 0x63, 0x88, 0xc8, 0xc4, 0xd5, 0x34, 0x7a, 0x07, 0xa4, 0xb0, 0x27, - 0x9f, 0xa3, 0x39, 0xc5, 0xad, 0xd3, 0x57, 0x43, 0x78, 0x2e, 0x22, 0x93, 0xcd, 0x80, 0xca, 0x9e, - 0x31, 0xe4, 0x51, 0x92, 0xd2, 0x2c, 0xeb, 0x34, 0x56, 0xad, 0xb5, 0xa6, 0x36, 0xa0, 0xc4, 0xf0, - 0x29, 0xd5, 0xfd, 0x12, 0xea, 0xca, 0x7d, 0xd4, 0x84, 0xda, 0xee, 0xe0, 0xde, 0x9e, 0x7d, 0x05, - 0xb5, 0xa0, 0xbe, 0xdd, 0x77, 0x0f, 0x77, 0x6c, 0x4b, 0x82, 0x4f, 0x36, 0xf1, 0xc0, 0xae, 0x48, - 0xb0, 0x8f, 0xf1, 0x1e, 0xb6, 0xab, 0x92, 0xbc, 0xb7, 0x79, 0xb0, 0xf9, 0xc8, 0xae, 0x75, 0x7f, - 0xae, 0x42, 0xeb, 0xf4, 0x5f, 0x23, 0x6b, 0xe6, 0x84, 0xa6, 0xb2, 0xb7, 0x98, 0x42, 0x56, 0xb6, - 0x19, 0x08, 0x97, 0x84, 0xcc, 0x12, 0x9f, 0x65, 0x49, 0x48, 0x9e, 0x79, 0x31, 0x89, 0xca, 0x67, - 0x55, 0x65, 0xc9, 0x2c, 0x8e, 0xdb, 0x66, 0x35, 0x20, 0x11, 0x95, 0x77, 0x21, 0x48, 0x60, 0x5a, - 0x95, 0xba, 0x0b, 0x41, 0x02, 0x2c, 0x07, 0xf4, 0x39, 0x2c, 0xb2, 0x38, 0x13, 0x24, 0x1e, 0x52, - 0x2f, 0x48, 0xf9, 0x38, 0x31, 0x15, 0x8b, 0x8a, 0xdc, 0x79, 0x69, 0x07, 0x2f, 0x94, 0xeb, 0x1d, - 0xb9, 0x44, 0x9b, 0xd0, 0x18, 0x27, 0x3e, 0x11, 0xd4, 0x37, 0xe5, 0xbb, 0xdc, 0xd3, 0x5f, 0xc3, - 0x5e, 0xf9, 0x35, 0xec, 0x1d, 0x94, 0x5f, 0x43, 0xed, 0x8d, 0x61, 0xc7, 0x25, 0x81, 0x3e, 0x02, - 0xc8, 0x9e, 0x65, 0x82, 0x46, 0xde, 0x98, 0xf9, 0x2a, 0xd8, 0xa6, 0xe9, 0x4e, 0x51, 0xdc, 0xd2, - 0xf4, 0x21, 0xf3, 0xd1, 0x37, 0xb0, 0xa0, 0x1f, 0xd2, 0xf2, 0xfd, 0x6a, 0xbe, 0xe6, 0xfb, 0xf5, - 0x46, 0x91, 0x3b, 0x67, 0x45, 0xb1, 0x7e, 0x92, 0xa7, 0x7f, 0xa6, 0x9a, 0x5d, 0x9f, 0x3a, 0xa8, - 0x62, 0xe8, 0x7e, 0xf6, 0xfb, 0x8b, 0x15, 0xeb, 0x8f, 0x17, 0x2b, 0xd6, 0x9f, 0x2f, 0x56, 0xac, - 0x6f, 0xdf, 0x0f, 0x98, 0x78, 0x3a, 0x3e, 0xea, 0x0d, 0x79, 0xb4, 0xae, 0x0e, 0x5b, 0x57, 0x1a, - 0xd6, 0x33, 0xff, 0x78, 0xfd, 0x64, 0x43, 0x7f, 0x87, 0xef, 0x68, 0xcf, 0xe7, 0xd4, 0x74, 0xfb, - 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd2, 0x4a, 0x40, 0x6e, 0x81, 0x0b, 0x00, 0x00, + // 1372 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0x4f, 0x6f, 0x1c, 0x35, + 0x14, 0xef, 0xec, 0xff, 0xf5, 0x26, 0xe9, 0xe0, 0x44, 0x74, 0x9b, 0x96, 0x4c, 0xb4, 0x82, 0x12, + 0x10, 0x6c, 0x20, 0x15, 0x42, 0x50, 0x54, 0x94, 0x49, 0xb6, 0x69, 0xda, 0xb2, 0xa9, 0x9c, 0x8d, + 0x8a, 0xb8, 0x8c, 0x9c, 0x1d, 0xef, 0xd4, 0x64, 0x66, 0x3c, 0x8c, 0xbd, 0xe9, 0xb6, 0x77, 0x2e, + 0x7c, 0x08, 0x3e, 0x01, 0x17, 0x6e, 0x1c, 0xf8, 0x00, 0x1c, 0xf9, 0x04, 0x23, 0xd4, 0x13, 0x9a, + 0x33, 0x17, 0x6e, 0xc8, 0x7f, 0x26, 0xbb, 0x69, 0x36, 0xa5, 0x17, 0xfb, 0xf9, 0xe7, 0xf7, 0x9e, + 0xdf, 0x7b, 0x7e, 0xef, 0xd9, 0xa0, 0x85, 0x03, 0x12, 0x8b, 0x6e, 0x92, 0x32, 0xc1, 0x20, 0x1c, + 0x7d, 0xd6, 0x8d, 0x03, 0x1a, 0x4f, 0xba, 0x1a, 0xe5, 0xfe, 0xc9, 0xea, 0xc2, 0x90, 0xc5, 0x23, + 0x1a, 0x68, 0x8e, 0xd5, 0xeb, 0x7e, 0xe2, 0x71, 0x36, 0x12, 0xcf, 0x70, 0x4a, 0x3c, 0x9f, 0x08, + 0x4c, 0x43, 0x6e, 0xb6, 0x40, 0xc0, 0x02, 0x66, 0x68, 0x27, 0x60, 0x2c, 0x08, 0xc9, 0xa6, 0x5a, + 0x1d, 0x8f, 0x47, 0x9b, 0x82, 0x46, 0x84, 0x0b, 0x1c, 0x25, 0x05, 0xf3, 0x53, 0xc6, 0xcd, 0xa9, + 0xab, 0x2d, 0x7d, 0xa4, 0x5a, 0x74, 0xfe, 0x29, 0x81, 0xe5, 0x6d, 0x79, 0xf8, 0x0e, 0x8b, 0x63, + 0x32, 0x14, 0x88, 0xfc, 0x30, 0x26, 0x5c, 0xc0, 0x3b, 0xa0, 0x12, 0x11, 0x81, 0xdb, 0xa5, 0x75, + 0x6b, 0xa3, 0xb5, 0xf5, 0x4e, 0xf7, 0xa2, 0xa5, 0x5d, 0x25, 0xf6, 0x0d, 0x11, 0xd8, 0x6d, 0xe4, + 0x99, 0xa3, 0xd8, 0x91, 0x1a, 0xe1, 0x1e, 0xa8, 0x1b, 0x5b, 0xdb, 0xe5, 0xf5, 0xf2, 0x46, 0x6b, + 0x6b, 0x7d, 0x9e, 0x7c, 0x5f, 0xae, 0x77, 0x35, 0x9f, 0xdb, 0xca, 0x33, 0xa7, 0x10, 0x42, 0x05, + 0x01, 0xbf, 0x04, 0x15, 0x69, 0x78, 0xbb, 0xa2, 0xac, 0xb8, 0x39, 0x4f, 0xcb, 0x7d, 0xc6, 0xc5, + 0x7e, 0x3c, 0x62, 0xda, 0x08, 0xc9, 0x8d, 0xd4, 0x08, 0x7f, 0xb2, 0xc0, 0xaa, 0x8f, 0x05, 0x4e, + 0x42, 0x1c, 0x93, 0x0b, 0x41, 0x6c, 0x57, 0x95, 0x61, 0x1f, 0xcd, 0x53, 0xb9, 0x5b, 0x48, 0x1d, + 0x1a, 0xa1, 0xc2, 0xc8, 0xb5, 0x3c, 0x73, 0x5e, 0xa3, 0x13, 0xb5, 0xfd, 0x4b, 0x24, 0x1f, 0x54, + 0x1a, 0x96, 0x5d, 0x42, 0x0d, 0xea, 0x93, 0x58, 0x50, 0xf1, 0xbc, 0xf3, 0x4b, 0x09, 0xc0, 0xd9, + 0xb0, 0x1f, 0x0a, 0x2c, 0xc6, 0x1c, 0x1e, 0x03, 0xc0, 0x15, 0xb5, 0xc3, 0x7c, 0xd2, 0xb6, 0xd6, + 0xad, 0x8d, 0xa5, 0xad, 0x4f, 0x2f, 0x8d, 0xfd, 0x39, 0xd9, 0xee, 0xe1, 0x99, 0xa0, 0x7b, 0x35, + 0xcf, 0x9c, 0x96, 0x56, 0xe4, 0x0d, 0x99, 0x4f, 0xd0, 0x8c, 0x56, 0xf8, 0x1e, 0xa8, 0x47, 0x84, + 0x73, 0x1c, 0x10, 0x75, 0xb9, 0x4d, 0x1d, 0x7a, 0x03, 0xa1, 0x82, 0x80, 0x0e, 0xa8, 0x92, 0x34, + 0x65, 0x69, 0xbb, 0xac, 0x98, 0x9a, 0x79, 0xe6, 0x68, 0x00, 0xe9, 0xa9, 0xf3, 0x3d, 0x00, 0xd3, + 0x23, 0xe1, 0x32, 0xb8, 0xba, 0x73, 0xd0, 0xef, 0xf7, 0x76, 0x06, 0xde, 0x51, 0xff, 0x61, 0xff, + 0xe0, 0x49, 0xdf, 0xbe, 0x02, 0x97, 0x00, 0x28, 0xc0, 0x83, 0x87, 0xb6, 0x05, 0x57, 0xc1, 0xdb, + 0xc5, 0x1a, 0xf5, 0x1e, 0xf4, 0x76, 0x06, 0xbd, 0x5d, 0xef, 0x60, 0x70, 0xbf, 0x87, 0xec, 0x12, + 0xbc, 0x01, 0xae, 0x5d, 0xd8, 0xdb, 0x3d, 0x7a, 0xec, 0xed, 0xef, 0xda, 0xe5, 0xce, 0x6f, 0x16, + 0x58, 0x39, 0x9f, 0xa5, 0x3c, 0x61, 0x31, 0x27, 0x70, 0x00, 0x16, 0x54, 0x50, 0x3c, 0x5d, 0x35, + 0x2a, 0x64, 0xad, 0x2d, 0xe7, 0x75, 0x21, 0x1b, 0xd1, 0xc0, 0xb5, 0xf3, 0xcc, 0x39, 0x27, 0x88, + 0x74, 0x5d, 0xea, 0x6d, 0xf8, 0x00, 0xd4, 0x74, 0xc0, 0x4c, 0xfa, 0xdf, 0x7a, 0xb3, 0x2b, 0x70, + 0x41, 0x9e, 0x39, 0x46, 0x12, 0x99, 0xb9, 0xb3, 0x32, 0xbd, 0x68, 0x79, 0x8e, 0x2e, 0xaf, 0xce, + 0xdf, 0x16, 0x68, 0xcd, 0xc0, 0xb3, 0x15, 0xa3, 0x5d, 0x58, 0xbf, 0xf4, 0xc8, 0xd7, 0x57, 0xcc, + 0x1e, 0xa8, 0x87, 0x2c, 0x08, 0x48, 0x5a, 0xd8, 0x7e, 0xb9, 0xa2, 0x47, 0x2c, 0x08, 0x68, 0x1c, + 0x68, 0x45, 0x46, 0x08, 0x15, 0x84, 0x54, 0xa4, 0x43, 0xc3, 0x55, 0x06, 0x5c, 0xa2, 0xa8, 0xf0, + 0x2a, 0x61, 0xa9, 0xd0, 0x8a, 0x8c, 0x10, 0x2a, 0x88, 0xce, 0xaf, 0x25, 0xb0, 0x30, 0x6b, 0x38, + 0xdc, 0x00, 0x8d, 0x11, 0xc1, 0x62, 0x9c, 0x12, 0xe9, 0x6c, 0x79, 0xa3, 0xe9, 0x2e, 0xe4, 0x99, + 0x73, 0x86, 0xa1, 0x33, 0x0a, 0x76, 0x01, 0x20, 0x13, 0x41, 0x62, 0x4e, 0x59, 0x2c, 0xfd, 0x91, + 0xbc, 0x4b, 0x79, 0xe6, 0xcc, 0xa0, 0x68, 0x86, 0x86, 0x37, 0x41, 0x45, 0xe0, 0x40, 0x37, 0x9d, + 0xa6, 0x6e, 0x08, 0x72, 0x8d, 0xd4, 0x28, 0x33, 0x1a, 0x87, 0x14, 0x73, 0xd5, 0x4d, 0x4c, 0x46, + 0x2b, 0x00, 0xe9, 0x09, 0xde, 0x05, 0x35, 0x4e, 0xd2, 0x53, 0x92, 0xb6, 0xab, 0xca, 0xe3, 0xd5, + 0x79, 0x1e, 0x1f, 0x2a, 0x0e, 0x73, 0xd5, 0x8a, 0x46, 0x66, 0x86, 0xf7, 0xc1, 0x32, 0x0e, 0x43, + 0xf6, 0x8c, 0xf8, 0x9e, 0x4f, 0x53, 0x32, 0x14, 0x2c, 0xa5, 0x84, 0xb7, 0x6b, 0xca, 0x9a, 0x6b, + 0x79, 0xe6, 0xcc, 0xdb, 0x46, 0xd0, 0x80, 0xbb, 0x53, 0xac, 0xf3, 0x63, 0x09, 0xd4, 0xf4, 0x41, + 0xd2, 0x27, 0xd5, 0x02, 0x2d, 0x65, 0xf4, 0xab, 0x4d, 0xee, 0x43, 0xd0, 0x0c, 0xd2, 0x64, 0xe8, + 0xc9, 0xf8, 0xab, 0x0b, 0xaf, 0xba, 0x8b, 0x79, 0xe6, 0x4c, 0x41, 0xd4, 0x90, 0xe4, 0x63, 0x96, + 0x0a, 0xe9, 0xbf, 0x60, 0x27, 0x24, 0x9e, 0xad, 0x68, 0x05, 0x20, 0x3d, 0xe9, 0xce, 0x20, 0x52, + 0x3a, 0x2c, 0x42, 0x64, 0x3a, 0x83, 0x82, 0x50, 0x41, 0x48, 0xb6, 0x21, 0x8b, 0x22, 0x1c, 0xfb, + 0x2a, 0x4e, 0xcd, 0xe2, 0xde, 0x15, 0x84, 0x0a, 0x02, 0xba, 0xa0, 0x7e, 0x8c, 0x87, 0x27, 0x6c, + 0x34, 0x6a, 0xd7, 0x54, 0x38, 0x6f, 0xcc, 0x0b, 0xa7, 0xab, 0x59, 0xb4, 0x0e, 0xc3, 0x8f, 0x0a, + 0xa2, 0xf3, 0x7b, 0x09, 0xd4, 0x0d, 0x07, 0xfc, 0x1a, 0xd8, 0x34, 0xa6, 0x82, 0xe2, 0xd0, 0xa3, + 0xb1, 0x20, 0xe9, 0x29, 0x0e, 0x55, 0x50, 0xca, 0xee, 0x4a, 0x9e, 0x39, 0x17, 0xf6, 0xd0, 0x55, + 0x83, 0xec, 0x1b, 0x00, 0x3e, 0x04, 0x2b, 0x29, 0x8e, 0x7d, 0x16, 0xd1, 0x17, 0x58, 0x50, 0x16, + 0x7b, 0x23, 0x2c, 0xe3, 0xad, 0xc2, 0x66, 0xb9, 0xed, 0x3c, 0x73, 0xe6, 0xee, 0xa3, 0xe5, 0x73, + 0xe8, 0x3d, 0x05, 0xca, 0xd4, 0x8c, 0xc6, 0xa1, 0xa0, 0x49, 0x48, 0x89, 0xee, 0x91, 0x96, 0x4e, + 0xcd, 0x29, 0x8a, 0x66, 0x68, 0x78, 0x1b, 0x2c, 0x44, 0x78, 0x32, 0xb5, 0xbc, 0xa2, 0x2c, 0x57, + 0x7d, 0x68, 0x16, 0x47, 0xad, 0x08, 0x4f, 0xce, 0x2c, 0xbe, 0x0b, 0x6c, 0xb9, 0x49, 0x42, 0x9c, + 0x70, 0xe2, 0x7b, 0xf2, 0x51, 0x57, 0x21, 0x37, 0x2e, 0xbf, 0xba, 0x87, 0x96, 0x22, 0x3c, 0xe9, + 0x69, 0x60, 0x40, 0x23, 0xd2, 0xf9, 0xb7, 0x28, 0x3d, 0x53, 0xea, 0x70, 0x0f, 0x54, 0x43, 0x72, + 0x4a, 0x42, 0xf3, 0xb4, 0xdc, 0xfa, 0xbf, 0xde, 0xd0, 0x7d, 0x24, 0xb9, 0x75, 0xaa, 0x28, 0x41, + 0xa4, 0x27, 0x78, 0x1d, 0x94, 0x7d, 0x9a, 0x9a, 0x07, 0xa4, 0x9e, 0x67, 0x8e, 0x5c, 0x22, 0x39, + 0xc8, 0x84, 0x1d, 0xd1, 0x90, 0x98, 0x2c, 0x53, 0x09, 0x2b, 0xd7, 0x48, 0x8d, 0xf0, 0x7d, 0xd0, + 0x90, 0x66, 0x73, 0xfa, 0x82, 0xa8, 0x18, 0x2c, 0xea, 0xe2, 0x2f, 0x30, 0x54, 0x8f, 0xf0, 0xe4, + 0x90, 0xbe, 0x20, 0xf0, 0x13, 0x20, 0x43, 0xe1, 0xc9, 0x4c, 0x18, 0x27, 0x5c, 0xb9, 0xbd, 0xa8, + 0x1f, 0xb6, 0x19, 0x18, 0x81, 0x08, 0x4f, 0x5c, 0x4d, 0xc3, 0x77, 0x81, 0x14, 0xf6, 0xe4, 0xc3, + 0x56, 0x53, 0xdc, 0x3a, 0x7d, 0x35, 0x84, 0x6a, 0x11, 0x9e, 0x6c, 0x07, 0x44, 0x76, 0x9f, 0x21, + 0x8b, 0x92, 0x94, 0x70, 0xde, 0xae, 0xaf, 0x5b, 0x1b, 0x0d, 0x6d, 0x40, 0x81, 0xa1, 0x33, 0xaa, + 0xf3, 0x15, 0xa8, 0x2a, 0xf7, 0x61, 0x03, 0x54, 0xf6, 0xfb, 0xf7, 0x0e, 0xec, 0x2b, 0xb0, 0x09, + 0xaa, 0xbb, 0x3d, 0xf7, 0x68, 0xcf, 0xb6, 0x24, 0xf8, 0x64, 0x1b, 0xf5, 0xed, 0x92, 0x04, 0x7b, + 0x08, 0x1d, 0x20, 0xbb, 0x2c, 0xc9, 0x7b, 0xdb, 0x83, 0xed, 0x47, 0x76, 0xa5, 0xf3, 0x73, 0x19, + 0x34, 0xcf, 0x7e, 0x48, 0xb2, 0x66, 0x4e, 0x49, 0x2a, 0xbb, 0x94, 0x29, 0x64, 0x65, 0x9b, 0x81, + 0x50, 0x41, 0xc8, 0x2c, 0xf1, 0x29, 0x4f, 0x42, 0xfc, 0xdc, 0x8b, 0x71, 0x54, 0x3c, 0xd0, 0x2a, + 0x4b, 0x66, 0x71, 0xd4, 0x32, 0xab, 0x3e, 0x8e, 0x88, 0xbc, 0x0b, 0x81, 0x03, 0xd3, 0xf4, 0xd4, + 0x5d, 0x08, 0x1c, 0x20, 0x39, 0xc0, 0x2f, 0xc0, 0x12, 0x8d, 0xb9, 0xc0, 0xf1, 0x90, 0x78, 0x41, + 0xca, 0xc6, 0x89, 0xa9, 0x58, 0x98, 0x67, 0xce, 0x2b, 0x3b, 0x68, 0xb1, 0x58, 0xef, 0xc9, 0x25, + 0xdc, 0x06, 0xf5, 0x71, 0xe2, 0x63, 0x41, 0x7c, 0x53, 0xbe, 0xab, 0x5d, 0xfd, 0xc9, 0xec, 0x16, + 0x9f, 0xcc, 0xee, 0xa0, 0xf8, 0x64, 0x6a, 0x6f, 0x0c, 0x3b, 0x2a, 0x08, 0xf8, 0x31, 0x00, 0xfc, + 0x39, 0x17, 0x24, 0xf2, 0xc6, 0xd4, 0x57, 0xc1, 0x36, 0xed, 0x7b, 0x8a, 0xa2, 0xa6, 0xa6, 0x8f, + 0xa8, 0x0f, 0xbf, 0x05, 0x8b, 0xfa, 0x49, 0x2e, 0x5e, 0xc2, 0xc6, 0x1b, 0xbe, 0x84, 0x6f, 0xe5, + 0x99, 0x73, 0x5e, 0x14, 0xe9, 0xc7, 0x7d, 0xfa, 0xfb, 0xaa, 0xd8, 0xd5, 0xa9, 0x83, 0x2a, 0x86, + 0xee, 0xe7, 0x7f, 0xbc, 0x5c, 0xb3, 0xfe, 0x7c, 0xb9, 0x66, 0xfd, 0xf5, 0x72, 0xcd, 0xfa, 0xee, + 0x83, 0x80, 0x8a, 0xa7, 0xe3, 0xe3, 0xee, 0x90, 0x45, 0x9b, 0xea, 0xb0, 0x4d, 0xa5, 0x61, 0x93, + 0xfb, 0x27, 0x9b, 0xa7, 0x5b, 0xfa, 0x63, 0x7d, 0x47, 0x7b, 0x5e, 0x53, 0xd3, 0xed, 0xff, 0x02, + 0x00, 0x00, 0xff, 0xff, 0x45, 0x0b, 0xaa, 0xfe, 0xcb, 0x0b, 0x00, 0x00, } func (m *AgentConnectRequest) Marshal() (dAtA []byte, err error) { @@ -1276,6 +1287,15 @@ func (m *AgentDetails) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } + if len(m.AllowedDirectories) > 0 { + for iNdEx := len(m.AllowedDirectories) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.AllowedDirectories[iNdEx]) + copy(dAtA[i:], m.AllowedDirectories[iNdEx]) + i = encodeVarintAgent(dAtA, i, uint64(len(m.AllowedDirectories[iNdEx]))) + i-- + dAtA[i] = 0x32 + } + } if m.Server != nil { { size, err := m.Server.MarshalToSizedBuffer(dAtA[:i]) @@ -1764,6 +1784,12 @@ func (m *AgentDetails) Size() (n int) { l = m.Server.Size() n += 1 + l + sovAgent(uint64(l)) } + if len(m.AllowedDirectories) > 0 { + for _, s := range m.AllowedDirectories { + l = len(s) + n += 1 + l + sovAgent(uint64(l)) + } + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -2766,6 +2792,38 @@ func (m *AgentDetails) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AllowedDirectories", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowAgent + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthAgent + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthAgent + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.AllowedDirectories = append(m.AllowedDirectories, string(dAtA[iNdEx:postIndex])) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipAgent(dAtA[iNdEx:]) diff --git a/vendor/github.com/nginx/agent/sdk/v2/proto/agent.proto b/vendor/github.com/nginx/agent/sdk/v2/proto/agent.proto index e05aaf335a..c34361e742 100644 --- a/vendor/github.com/nginx/agent/sdk/v2/proto/agent.proto +++ b/vendor/github.com/nginx/agent/sdk/v2/proto/agent.proto @@ -82,6 +82,8 @@ message AgentDetails { string alias = 4 [(gogoproto.jsontag) = "alias"]; // Server setting for the agent Server server = 5 [(gogoproto.jsontag) = "server"]; + // List of allowed directories in the Agent Config + repeated string allowed_directories = 6 [(gogoproto.jsontag) = "allowed_directories"]; } message Server { From fcb23e30c06e22af11d0076c324f0439b2ed5da1 Mon Sep 17 00:00:00 2001 From: Oliver O'Mahony Date: Thu, 1 Aug 2024 18:19:28 +0100 Subject: [PATCH 2/4] update tests --- sdk/config_helpers_test.go | 46 ------------------------------------ src/core/environment_test.go | 2 +- 2 files changed, 1 insertion(+), 47 deletions(-) diff --git a/sdk/config_helpers_test.go b/sdk/config_helpers_test.go index 9234d8a7f2..9b4cb585ab 100644 --- a/sdk/config_helpers_test.go +++ b/sdk/config_helpers_test.go @@ -799,52 +799,6 @@ var tests = []struct { "/tmp/testdata/nginx/ca/ca.crt": {}, }, }, - { - fileName: "/tmp/testdata/nginx/nginx3.conf", - config: `daemon off; - worker_processes 2; - user www-data; - - events { - use epoll; - worker_connections 128; - } - - include /hello.html - - }`, - plusApi: "", - expected: &proto.NginxConfig{ - Action: proto.NginxConfigAction_APPLY, - DirectoryMap: &proto.DirectoryMap{ - Directories: []*proto.Directory{ - { - Name: "/", - Permissions: "0755", - Files: []*proto.File{ - { - Name: "test.html", - Permissions: "0644", - }, - }, - }, - }, - }, - // using RootDirectory for allowed in the tests, but the "root" directive is /tmp/testdata/foo, so - // should have an empty file list from the aux - Zaux: &proto.ZippedFile{ - Checksum: "51c05b653bc43deb5ec497988692fc5dec05ab8b6a0b78e908e4628b3d9e0d4c", - RootDirectory: "/test.html", - }, - Zconfig: &proto.ZippedFile{ - Contents: []uint8{31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 1, 0, 0, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0}, - Checksum: "cc6cee5366d87e85fbf1c05b9621df82996548e0e135f2b4a93e98f88c23d2b9", - RootDirectory: "/tmp/testdata/nginx", - }, - }, - // aux file not included after test runs - expectedAuxFiles: map[string]struct{}{}, - }, } func TestGetNginxConfigFiles(t *testing.T) { diff --git a/src/core/environment_test.go b/src/core/environment_test.go index c463891ad1..064aa11db9 100644 --- a/src/core/environment_test.go +++ b/src/core/environment_test.go @@ -733,7 +733,7 @@ func TestWriteFilesNotAllowed(t *testing.T) { Permissions: "0644", }, { - Name: "/etc/shadow/multiple1.conf", + Name: "/etc/shadow", Contents: []byte("shadowfile1"), Permissions: "0644", }, From 94018a762e4b8a8a36607c6abd7706f8b7ed7b58 Mon Sep 17 00:00:00 2001 From: Oliver O'Mahony Date: Wed, 7 Aug 2024 13:44:29 +0100 Subject: [PATCH 3/4] added validations --- Makefile | 9 +++++---- src/core/environment_test.go | 5 ----- src/core/nginx.go | 9 +++++++++ .../vendor/github.com/nginx/agent/v2/src/core/nginx.go | 9 +++++++++ .../vendor/github.com/nginx/agent/v2/src/core/nginx.go | 9 +++++++++ 5 files changed, 32 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 391caa93e3..6247d5bc81 100644 --- a/Makefile +++ b/Makefile @@ -176,10 +176,11 @@ $(TEST_BUILD_DIR): # Unit tests unit-test: $(TEST_BUILD_DIR) test-core test-plugins test-sdk test-extensions ## Run unit tests - echo 'mode: atomic' > $(TEST_BUILD_DIR)/coverage.out - tail -q -n +2 $(TEST_BUILD_DIR)/*_coverage.out >> $(TEST_BUILD_DIR)/coverage.out - go tool cover -html=$(TEST_BUILD_DIR)/coverage.out -o $(TEST_BUILD_DIR)/coverage.html - @printf "\nTotal code coverage: " && go tool cover -func=$(TEST_BUILD_DIR)/coverage.out | grep 'total:' | awk '{print $$3}' + @tail -q -n +2 $(TEST_BUILD_DIR)/*_coverage.out >> $(TEST_BUILD_DIR)/tmp_coverage.out + @echo 'mode: atomic' > $(TEST_BUILD_DIR)/coverage.out + @cat $(TEST_BUILD_DIR)/tmp_coverage.out | grep -v ".pb.go" | grep -v ".gen.go" | grep -v ".pb.validate.go" | grep -v "fake_" | grep -v "_mock.go" | grep -v "_stub.go" >> $(TEST_BUILD_DIR)/coverage.out + @go tool cover -html=$(TEST_BUILD_DIR)/coverage.out -o $(TEST_BUILD_DIR)/coverage.html + @printf "\nTotal code coverage: " && $(GOTOOL) cover -func=$(TEST_BUILD_DIR)/coverage.out | grep 'total:' | awk '{print $$3}' test-core: $(TEST_BUILD_DIR) ## Run core unit tests GOWORK=off CGO_ENABLED=0 go test -count=1 -coverprofile=$(TEST_BUILD_DIR)/core_coverage.out -covermode count ./src/core/... diff --git a/src/core/environment_test.go b/src/core/environment_test.go index 064aa11db9..5093c1e5a6 100644 --- a/src/core/environment_test.go +++ b/src/core/environment_test.go @@ -732,11 +732,6 @@ func TestWriteFilesNotAllowed(t *testing.T) { Contents: []byte("multi"), Permissions: "0644", }, - { - Name: "/etc/shadow", - Contents: []byte("shadowfile1"), - Permissions: "0644", - }, { Name: "etc/shadow/multiple1.conf", Contents: []byte("shadowfile2"), diff --git a/src/core/nginx.go b/src/core/nginx.go index f29f410ee1..7439cc9d43 100644 --- a/src/core/nginx.go +++ b/src/core/nginx.go @@ -502,6 +502,11 @@ func (n *NginxBinaryType) writeConfigWithWithFileActions( return nil, err } + confDir := filepath.Dir(details.ConfPath) + if err := ensureFilesAllowed(confFiles, n.config.AllowedDirectoriesMap, confDir); err != nil { + return configApply, err + } + for _, file := range confFiles { rootDirectoryPath := filepath.Dir(details.ConfPath) fileFullPath := file.Name @@ -519,6 +524,10 @@ func (n *NginxBinaryType) writeConfigWithWithFileActions( } } + if err := ensureFilesAllowed(auxFiles, n.config.AllowedDirectoriesMap, confDir); err != nil { + return configApply, err + } + for _, file := range auxFiles { rootDirectoryPath := config.GetZaux().GetRootDirectory() fileFullPath := file.Name diff --git a/test/integration/vendor/github.com/nginx/agent/v2/src/core/nginx.go b/test/integration/vendor/github.com/nginx/agent/v2/src/core/nginx.go index f29f410ee1..7439cc9d43 100644 --- a/test/integration/vendor/github.com/nginx/agent/v2/src/core/nginx.go +++ b/test/integration/vendor/github.com/nginx/agent/v2/src/core/nginx.go @@ -502,6 +502,11 @@ func (n *NginxBinaryType) writeConfigWithWithFileActions( return nil, err } + confDir := filepath.Dir(details.ConfPath) + if err := ensureFilesAllowed(confFiles, n.config.AllowedDirectoriesMap, confDir); err != nil { + return configApply, err + } + for _, file := range confFiles { rootDirectoryPath := filepath.Dir(details.ConfPath) fileFullPath := file.Name @@ -519,6 +524,10 @@ func (n *NginxBinaryType) writeConfigWithWithFileActions( } } + if err := ensureFilesAllowed(auxFiles, n.config.AllowedDirectoriesMap, confDir); err != nil { + return configApply, err + } + for _, file := range auxFiles { rootDirectoryPath := config.GetZaux().GetRootDirectory() fileFullPath := file.Name diff --git a/test/performance/vendor/github.com/nginx/agent/v2/src/core/nginx.go b/test/performance/vendor/github.com/nginx/agent/v2/src/core/nginx.go index f29f410ee1..7439cc9d43 100644 --- a/test/performance/vendor/github.com/nginx/agent/v2/src/core/nginx.go +++ b/test/performance/vendor/github.com/nginx/agent/v2/src/core/nginx.go @@ -502,6 +502,11 @@ func (n *NginxBinaryType) writeConfigWithWithFileActions( return nil, err } + confDir := filepath.Dir(details.ConfPath) + if err := ensureFilesAllowed(confFiles, n.config.AllowedDirectoriesMap, confDir); err != nil { + return configApply, err + } + for _, file := range confFiles { rootDirectoryPath := filepath.Dir(details.ConfPath) fileFullPath := file.Name @@ -519,6 +524,10 @@ func (n *NginxBinaryType) writeConfigWithWithFileActions( } } + if err := ensureFilesAllowed(auxFiles, n.config.AllowedDirectoriesMap, confDir); err != nil { + return configApply, err + } + for _, file := range auxFiles { rootDirectoryPath := config.GetZaux().GetRootDirectory() fileFullPath := file.Name From 9059306006d34eea9091532880bd4c53c30c3469 Mon Sep 17 00:00:00 2001 From: Oliver O'Mahony Date: Wed, 7 Aug 2024 14:16:10 +0100 Subject: [PATCH 4/4] updated the description --- docs/proto/proto.md | 2 +- sdk/proto/agent.pb.go | 2 +- sdk/proto/agent.proto | 2 +- .../vendor/github.com/nginx/agent/sdk/v2/proto/agent.pb.go | 2 +- .../vendor/github.com/nginx/agent/sdk/v2/proto/agent.proto | 2 +- .../vendor/github.com/nginx/agent/sdk/v2/proto/agent.pb.go | 2 +- .../vendor/github.com/nginx/agent/sdk/v2/proto/agent.proto | 2 +- vendor/github.com/nginx/agent/sdk/v2/proto/agent.pb.go | 2 +- vendor/github.com/nginx/agent/sdk/v2/proto/agent.proto | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/proto/proto.md b/docs/proto/proto.md index 4059f97cd5..5a7ca0c106 100644 --- a/docs/proto/proto.md +++ b/docs/proto/proto.md @@ -215,7 +215,7 @@ Represents agent details. This message is sent from the management server to the | tags | [string](#string) | repeated | List of tags | | alias | [string](#string) | | Alias name for the agent | | server | [Server](#f5-nginx-agent-sdk-Server) | | Server setting for the agent | -| allowed_directories | [string](#string) | repeated | List of allowed directories in the Agent Config | +| allowed_directories | [string](#string) | repeated | List of allowed directories that the Agent can write to | diff --git a/sdk/proto/agent.pb.go b/sdk/proto/agent.pb.go index 37d17c8290..716b89b0ac 100644 --- a/sdk/proto/agent.pb.go +++ b/sdk/proto/agent.pb.go @@ -424,7 +424,7 @@ type AgentDetails struct { Alias string `protobuf:"bytes,4,opt,name=alias,proto3" json:"alias"` // Server setting for the agent Server *Server `protobuf:"bytes,5,opt,name=server,proto3" json:"server"` - // List of allowed directories in the Agent Config + // List of allowed directories that the Agent can write to AllowedDirectories []string `protobuf:"bytes,6,rep,name=allowed_directories,json=allowedDirectories,proto3" json:"allowed_directories"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` diff --git a/sdk/proto/agent.proto b/sdk/proto/agent.proto index c34361e742..5ffb196595 100644 --- a/sdk/proto/agent.proto +++ b/sdk/proto/agent.proto @@ -82,7 +82,7 @@ message AgentDetails { string alias = 4 [(gogoproto.jsontag) = "alias"]; // Server setting for the agent Server server = 5 [(gogoproto.jsontag) = "server"]; - // List of allowed directories in the Agent Config + // List of allowed directories that the Agent can write to repeated string allowed_directories = 6 [(gogoproto.jsontag) = "allowed_directories"]; } diff --git a/test/integration/vendor/github.com/nginx/agent/sdk/v2/proto/agent.pb.go b/test/integration/vendor/github.com/nginx/agent/sdk/v2/proto/agent.pb.go index 37d17c8290..716b89b0ac 100644 --- a/test/integration/vendor/github.com/nginx/agent/sdk/v2/proto/agent.pb.go +++ b/test/integration/vendor/github.com/nginx/agent/sdk/v2/proto/agent.pb.go @@ -424,7 +424,7 @@ type AgentDetails struct { Alias string `protobuf:"bytes,4,opt,name=alias,proto3" json:"alias"` // Server setting for the agent Server *Server `protobuf:"bytes,5,opt,name=server,proto3" json:"server"` - // List of allowed directories in the Agent Config + // List of allowed directories that the Agent can write to AllowedDirectories []string `protobuf:"bytes,6,rep,name=allowed_directories,json=allowedDirectories,proto3" json:"allowed_directories"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` diff --git a/test/integration/vendor/github.com/nginx/agent/sdk/v2/proto/agent.proto b/test/integration/vendor/github.com/nginx/agent/sdk/v2/proto/agent.proto index c34361e742..5ffb196595 100644 --- a/test/integration/vendor/github.com/nginx/agent/sdk/v2/proto/agent.proto +++ b/test/integration/vendor/github.com/nginx/agent/sdk/v2/proto/agent.proto @@ -82,7 +82,7 @@ message AgentDetails { string alias = 4 [(gogoproto.jsontag) = "alias"]; // Server setting for the agent Server server = 5 [(gogoproto.jsontag) = "server"]; - // List of allowed directories in the Agent Config + // List of allowed directories that the Agent can write to repeated string allowed_directories = 6 [(gogoproto.jsontag) = "allowed_directories"]; } diff --git a/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/agent.pb.go b/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/agent.pb.go index 37d17c8290..716b89b0ac 100644 --- a/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/agent.pb.go +++ b/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/agent.pb.go @@ -424,7 +424,7 @@ type AgentDetails struct { Alias string `protobuf:"bytes,4,opt,name=alias,proto3" json:"alias"` // Server setting for the agent Server *Server `protobuf:"bytes,5,opt,name=server,proto3" json:"server"` - // List of allowed directories in the Agent Config + // List of allowed directories that the Agent can write to AllowedDirectories []string `protobuf:"bytes,6,rep,name=allowed_directories,json=allowedDirectories,proto3" json:"allowed_directories"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` diff --git a/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/agent.proto b/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/agent.proto index c34361e742..5ffb196595 100644 --- a/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/agent.proto +++ b/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/agent.proto @@ -82,7 +82,7 @@ message AgentDetails { string alias = 4 [(gogoproto.jsontag) = "alias"]; // Server setting for the agent Server server = 5 [(gogoproto.jsontag) = "server"]; - // List of allowed directories in the Agent Config + // List of allowed directories that the Agent can write to repeated string allowed_directories = 6 [(gogoproto.jsontag) = "allowed_directories"]; } diff --git a/vendor/github.com/nginx/agent/sdk/v2/proto/agent.pb.go b/vendor/github.com/nginx/agent/sdk/v2/proto/agent.pb.go index 37d17c8290..716b89b0ac 100644 --- a/vendor/github.com/nginx/agent/sdk/v2/proto/agent.pb.go +++ b/vendor/github.com/nginx/agent/sdk/v2/proto/agent.pb.go @@ -424,7 +424,7 @@ type AgentDetails struct { Alias string `protobuf:"bytes,4,opt,name=alias,proto3" json:"alias"` // Server setting for the agent Server *Server `protobuf:"bytes,5,opt,name=server,proto3" json:"server"` - // List of allowed directories in the Agent Config + // List of allowed directories that the Agent can write to AllowedDirectories []string `protobuf:"bytes,6,rep,name=allowed_directories,json=allowedDirectories,proto3" json:"allowed_directories"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` diff --git a/vendor/github.com/nginx/agent/sdk/v2/proto/agent.proto b/vendor/github.com/nginx/agent/sdk/v2/proto/agent.proto index c34361e742..5ffb196595 100644 --- a/vendor/github.com/nginx/agent/sdk/v2/proto/agent.proto +++ b/vendor/github.com/nginx/agent/sdk/v2/proto/agent.proto @@ -82,7 +82,7 @@ message AgentDetails { string alias = 4 [(gogoproto.jsontag) = "alias"]; // Server setting for the agent Server server = 5 [(gogoproto.jsontag) = "server"]; - // List of allowed directories in the Agent Config + // List of allowed directories that the Agent can write to repeated string allowed_directories = 6 [(gogoproto.jsontag) = "allowed_directories"]; }