From c25bd49141b30905b6862d12a95410398350b84d Mon Sep 17 00:00:00 2001 From: Justinas Stankevicius Date: Mon, 22 May 2023 15:42:57 +0300 Subject: [PATCH] Stop using TokenPath for API key in Assist --- api/proto/teleport/legacy/types/types.proto | 9 +- api/types/plugin.go | 8 +- api/types/plugin_test.go | 31 -- api/types/types.pb.go | 327 +++++++++----------- lib/assist/assist.go | 9 - 5 files changed, 144 insertions(+), 240 deletions(-) diff --git a/api/proto/teleport/legacy/types/types.proto b/api/proto/teleport/legacy/types/types.proto index 73d5b8b1796fb..902aa3a51d74b 100644 --- a/api/proto/teleport/legacy/types/types.proto +++ b/api/proto/teleport/legacy/types/types.proto @@ -5190,13 +5190,8 @@ message PluginBearerTokenCredentials { // Token is the literal bearer token to be submitted to the 3rd-party API provider. string token = 1; - // TokenFile is a path to the local file containing a bearer token. - // This takes precedence over Token, and is currently only used by - // OpenAI plugin in Cloud, where by default a Teleport-owned key is used. - // This avoids exposing the token itself to the cluster. - // The file must exist and be readable on whatever runs the plugin - // (in the OpenAI case, it is the Proxy). - string token_file = 2; + reserved 2; // token_file + reserved "token_file"; } // PluginList represents a list of plugin resources diff --git a/api/types/plugin.go b/api/types/plugin.go index 8cf5c386e61e6..28b46617a18a5 100644 --- a/api/types/plugin.go +++ b/api/types/plugin.go @@ -124,8 +124,8 @@ func (p *PluginV1) CheckAndSetDefaults() error { if bearer == nil { return trace.BadParameter("openai plugin must be used with the bearer token credential type") } - if (bearer.Token == "") == (bearer.TokenFile == "") { - return trace.BadParameter("exactly one of Token and TokenFile must be specified") + if bearer.Token == "" { + return trace.BadParameter("Token must be specified") } case *PluginSpecV1_Jamf: if settings.Jamf.JamfSpec.ApiEndpoint == "" { @@ -153,8 +153,8 @@ func (p *PluginV1) CheckAndSetDefaults() error { if bearer == nil { return trace.BadParameter("okta plugin must be used with the bearer token credential type") } - if (bearer.Token == "") == (bearer.TokenFile == "") { - return trace.BadParameter("exactly one of Token and TokenFile must be specified") + if bearer.Token == "" { + return trace.BadParameter("Token must be specified") } default: return trace.BadParameter("settings are not set or have an unknown type") diff --git a/api/types/plugin_test.go b/api/types/plugin_test.go index 0dbc78ade5132..bf010b5d692bf 100644 --- a/api/types/plugin_test.go +++ b/api/types/plugin_test.go @@ -99,19 +99,6 @@ func TestPluginOpenAIValidation(t *testing.T) { require.NoError(t, err) }, }, - { - name: "valid credentials (token file)", - creds: &PluginCredentialsV1{ - Credentials: &PluginCredentialsV1_BearerToken{ - BearerToken: &PluginBearerTokenCredentials{ - TokenFile: "/var/lib/secrets/openai_token", - }, - }, - }, - assertErr: func(t require.TestingT, err error, args ...any) { - require.NoError(t, err) - }, - }, } for _, tc := range testCases { @@ -201,24 +188,6 @@ func TestPluginOktaValidation(t *testing.T) { require.NoError(t, err) }, }, - { - name: "valid credentials (token file)", - settings: &PluginSpecV1_Okta{ - Okta: &PluginOktaSettings{ - OrgUrl: "https://test.okta.com", - }, - }, - creds: &PluginCredentialsV1{ - Credentials: &PluginCredentialsV1_BearerToken{ - BearerToken: &PluginBearerTokenCredentials{ - TokenFile: "/var/lib/secrets/okta_token", - }, - }, - }, - assertErr: func(t require.TestingT, err error, args ...any) { - require.NoError(t, err) - }, - }, } for _, tc := range testCases { diff --git a/api/types/types.pb.go b/api/types/types.pb.go index 69b588d3c2f23..2b7f29f9ae968 100644 --- a/api/types/types.pb.go +++ b/api/types/types.pb.go @@ -13678,14 +13678,7 @@ var xxx_messageInfo_PluginOAuth2AccessTokenCredentials proto.InternalMessageInfo type PluginBearerTokenCredentials struct { // Token is the literal bearer token to be submitted to the 3rd-party API provider. - Token string `protobuf:"bytes,1,opt,name=token,proto3" json:"token,omitempty"` - // TokenFile is a path to the local file containing a bearer token. - // This takes precedence over Token, and is currently only used by - // OpenAI plugin in Cloud, where by default a Teleport-owned key is used. - // This avoids exposing the token itself to the cluster. - // The file must exist and be readable on whatever runs the plugin - // (in the OpenAI case, it is the Proxy). - TokenFile string `protobuf:"bytes,2,opt,name=token_file,json=tokenFile,proto3" json:"token_file,omitempty"` + Token string `protobuf:"bytes,1,opt,name=token,proto3" json:"token,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -15573,7 +15566,7 @@ func init() { func init() { proto.RegisterFile("teleport/legacy/types/types.proto", fileDescriptor_9198ee693835762e) } var fileDescriptor_9198ee693835762e = []byte{ - // 20739 bytes of a gzipped FileDescriptorProto + // 20736 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0xfd, 0x6b, 0x90, 0x5c, 0x49, 0x76, 0x18, 0x06, 0xa3, 0xaa, 0xfa, 0x51, 0x7d, 0xfa, 0x55, 0x9d, 0xdd, 0x00, 0x1a, 0x98, 0x47, 0x63, 0xee, 0xcc, 0x60, 0x01, 0xcc, 0x0c, 0xb0, 0x68, 0xec, 0x60, 0x77, 0x76, 0x9e, 0xd5, 0x55, @@ -16734,143 +16727,142 @@ var fileDescriptor_9198ee693835762e = []byte{ 0x86, 0x6f, 0x4e, 0x08, 0x45, 0x5c, 0xfe, 0xe7, 0x57, 0x1c, 0xfe, 0x7e, 0x06, 0x8c, 0x93, 0x3f, 0x8a, 0x0d, 0x4b, 0x4f, 0xaf, 0x4c, 0x98, 0x93, 0xb6, 0xf2, 0x89, 0x2f, 0xc3, 0xb4, 0x4f, 0xf7, 0x7d, 0x1a, 0x1c, 0x2a, 0xdf, 0x38, 0x61, 0x4e, 0x09, 0xa0, 0x6c, 0xbd, 0xbc, 0x10, 0x31, 0xc4, - 0x36, 0x46, 0x79, 0x79, 0x5f, 0x10, 0x19, 0xf5, 0x68, 0x96, 0xa7, 0x76, 0x16, 0x33, 0xc4, 0xd5, - 0x06, 0xf2, 0x1f, 0x4c, 0x1b, 0xf2, 0x2b, 0x1b, 0xfb, 0x4e, 0x2b, 0x4a, 0x2d, 0x8d, 0x90, 0x3b, - 0x4e, 0x8b, 0x1a, 0x6f, 0xc9, 0xd5, 0x71, 0xcd, 0x09, 0xc2, 0x9d, 0x9b, 0xe4, 0x2a, 0x8c, 0xf3, - 0x05, 0x51, 0x6e, 0x91, 0x67, 0xb5, 0x0e, 0xde, 0xb9, 0x69, 0xca, 0x72, 0xe3, 0xb7, 0xc4, 0xad, - 0xc2, 0x6a, 0xb3, 0x96, 0xc8, 0xc8, 0xf6, 0xa4, 0x9e, 0x80, 0x8a, 0xb6, 0x4f, 0x7d, 0x59, 0x49, - 0x30, 0xd4, 0x5b, 0x57, 0x7f, 0x87, 0x80, 0x12, 0xe8, 0xf8, 0xf3, 0x19, 0x78, 0x7e, 0x10, 0x79, - 0x6a, 0xf2, 0xb8, 0xcc, 0xe9, 0x92, 0xc7, 0x5d, 0x85, 0x3c, 0x87, 0xe9, 0x29, 0x9c, 0x05, 0xa9, - 0xd3, 0x34, 0xa3, 0x62, 0xa3, 0x08, 0x50, 0x6d, 0xd6, 0x36, 0x3b, 0xfc, 0x6e, 0xe3, 0x2d, 0x18, - 0x61, 0x6d, 0x4b, 0x74, 0x14, 0x6b, 0x6a, 0x71, 0x7d, 0x4d, 0x20, 0x71, 0xf3, 0x37, 0xb0, 0xdb, - 0x2d, 0x13, 0x91, 0x8d, 0x5d, 0x98, 0xd1, 0x31, 0x48, 0x45, 0x8f, 0x86, 0x8f, 0x5f, 0x9d, 0x59, - 0xf1, 0x3c, 0xee, 0x6c, 0x58, 0xb9, 0xf0, 0x83, 0xe3, 0x25, 0x60, 0x3f, 0x39, 0x4d, 0x5a, 0xb4, - 0xbc, 0xf1, 0xbd, 0x2c, 0x2c, 0xc4, 0x27, 0x6e, 0x72, 0xb8, 0x9e, 0x59, 0x07, 0x7a, 0x51, 0x73, - 0xf0, 0x2e, 0xf5, 0x3c, 0xec, 0x20, 0x3f, 0x70, 0x80, 0x5f, 0xe9, 0x2e, 0x2c, 0xf6, 0xc3, 0x27, - 0xaf, 0xf5, 0xa4, 0x5e, 0x17, 0x91, 0x61, 0x51, 0x8e, 0x76, 0x25, 0x13, 0xfb, 0xbf, 0xce, 0xc0, - 0x45, 0xb1, 0xe7, 0x5f, 0xb7, 0x1d, 0x17, 0x9f, 0x9b, 0x69, 0xd0, 0xa7, 0x73, 0xf2, 0x72, 0x57, - 0x9b, 0x32, 0xaf, 0xea, 0xae, 0x9d, 0x9e, 0xda, 0xfa, 0x7f, 0x2d, 0xb9, 0x8a, 0xe1, 0x74, 0x0d, - 0xbe, 0xed, 0x1a, 0xe1, 0xc7, 0xc5, 0x2e, 0x03, 0xa8, 0xc7, 0xc5, 0x88, 0x61, 0xfc, 0x04, 0xbc, - 0x38, 0xb8, 0x02, 0xf2, 0x0d, 0x98, 0x2e, 0x1e, 0x50, 0x37, 0xdc, 0xee, 0x1c, 0xf8, 0x76, 0x93, - 0x4a, 0x57, 0x98, 0xb4, 0x3a, 0xd5, 0x32, 0x1e, 0x42, 0x28, 0x8e, 0x2f, 0x19, 0xdc, 0xea, 0x0a, - 0x22, 0x2d, 0xee, 0x59, 0xe5, 0x66, 0xfc, 0x64, 0x06, 0x48, 0x2f, 0x0f, 0x72, 0x1b, 0xa6, 0xb6, - 0xb7, 0x4a, 0xf5, 0xd0, 0xf6, 0xc3, 0x55, 0xaf, 0xcb, 0xbb, 0x73, 0x5a, 0x1c, 0xc4, 0x85, 0x0d, - 0x2b, 0x60, 0x05, 0xd6, 0xa1, 0xd7, 0xf5, 0x4d, 0x0d, 0x0f, 0x13, 0x56, 0x50, 0x7a, 0xbf, 0x69, - 0x1f, 0xe9, 0x09, 0x2b, 0x04, 0x4c, 0x4b, 0x58, 0x21, 0x60, 0xc6, 0xdf, 0xcc, 0xc0, 0x73, 0xd2, - 0x5c, 0x6c, 0xa6, 0xb4, 0xa5, 0x84, 0x31, 0x1b, 0xbe, 0xbc, 0x63, 0x30, 0x48, 0xe5, 0xcf, 0xc9, - 0xb0, 0x26, 0x6c, 0x20, 0xea, 0x7e, 0x4e, 0x8b, 0x6f, 0x6d, 0x85, 0x5e, 0x67, 0x88, 0xb8, 0xa6, - 0x42, 0x34, 0xa2, 0xa1, 0xd7, 0x41, 0x16, 0x48, 0x69, 0x50, 0x58, 0x50, 0x1b, 0x27, 0x5b, 0x4c, - 0xd6, 0x61, 0x5c, 0xc4, 0x6e, 0x0a, 0x75, 0x2f, 0xc3, 0x79, 0x07, 0x7c, 0xd3, 0xca, 0xac, 0x0c, - 0x9e, 0x12, 0x51, 0xee, 0xa6, 0xe4, 0x61, 0x6c, 0xf1, 0x57, 0x3e, 0xf1, 0xd6, 0xd7, 0x13, 0x4a, - 0xb4, 0xa2, 0xbd, 0xff, 0xff, 0x19, 0x58, 0x60, 0xf6, 0x70, 0xb5, 0xdd, 0xf1, 0xfc, 0xd0, 0xec, - 0xb6, 0xe4, 0xec, 0xbb, 0x02, 0xf9, 0x9a, 0xdc, 0x05, 0xf0, 0xc3, 0x41, 0xf4, 0xbb, 0xc8, 0x9d, - 0x80, 0x19, 0x95, 0x92, 0x55, 0xc8, 0x8b, 0x0b, 0x32, 0xf2, 0xcd, 0x3b, 0xe9, 0xfa, 0xd5, 0x19, - 0x0b, 0x24, 0x36, 0x37, 0x50, 0xa1, 0x08, 0x1a, 0x33, 0xa2, 0x36, 0xfe, 0x24, 0x03, 0xe7, 0xfb, - 0xd0, 0x90, 0x77, 0x61, 0x14, 0xbd, 0xbf, 0xa2, 0x2f, 0x9f, 0xef, 0x53, 0x45, 0xd8, 0x38, 0xdc, - 0xb9, 0xc9, 0xcf, 0x24, 0xda, 0xec, 0x87, 0xc9, 0xa9, 0xc8, 0xd7, 0x60, 0xa2, 0xd8, 0x6c, 0x6a, - 0x2f, 0xf3, 0xbd, 0x31, 0xb8, 0x95, 0xd7, 0x23, 0x7c, 0xfe, 0xc4, 0x19, 0xf7, 0x62, 0x34, 0x9b, - 0xe2, 0x69, 0x33, 0x33, 0xe6, 0x77, 0xf1, 0x1d, 0x98, 0xd1, 0x91, 0x4f, 0xe5, 0xca, 0xfb, 0xf5, - 0x0c, 0x14, 0xf4, 0x36, 0x7c, 0x3a, 0x41, 0x58, 0x69, 0xc3, 0x7c, 0xc2, 0xda, 0xfe, 0xa3, 0x70, - 0x36, 0xb5, 0x83, 0xc9, 0x1b, 0x30, 0x56, 0xec, 0x74, 0xaa, 0x65, 0x2e, 0xda, 0x62, 0x25, 0xb7, - 0x3b, 0x9d, 0x44, 0xd4, 0xb6, 0x40, 0x22, 0xb7, 0x20, 0x8f, 0x72, 0xcb, 0x08, 0xb2, 0x71, 0xa0, - 0x37, 0xde, 0x6b, 0x4c, 0x06, 0x7a, 0x4b, 0xc4, 0xa8, 0x5f, 0x8a, 0x41, 0xe0, 0x1c, 0xb8, 0x6d, - 0xea, 0x86, 0x9f, 0x5e, 0xbf, 0xc4, 0x75, 0x0c, 0xd5, 0x2f, 0xdf, 0x1f, 0xe1, 0xb3, 0x26, 0x49, - 0x76, 0xc2, 0x23, 0x2f, 0x65, 0x18, 0xe7, 0x77, 0x77, 0xa4, 0x08, 0xbe, 0x90, 0xda, 0x04, 0x8e, - 0xb3, 0x73, 0x93, 0xaf, 0xda, 0xdc, 0x5b, 0x1c, 0x98, 0x92, 0x94, 0xec, 0xc0, 0x64, 0xa9, 0x45, - 0x6d, 0xb7, 0xdb, 0x19, 0xf2, 0xad, 0xe6, 0x45, 0xf1, 0x2d, 0x53, 0x0d, 0x4e, 0x16, 0x3f, 0xd6, - 0xac, 0x32, 0x22, 0x5b, 0x91, 0x03, 0x69, 0x04, 0xf7, 0x3b, 0x9f, 0x1f, 0xd0, 0x3f, 0x49, 0x20, - 0xd2, 0xe9, 0xde, 0x51, 0xe1, 0x61, 0xb2, 0x60, 0x66, 0xcd, 0x0e, 0xc2, 0x2d, 0xdf, 0x76, 0x03, - 0x8c, 0x9a, 0x1e, 0x22, 0x94, 0x4d, 0xa6, 0xea, 0x9d, 0xc5, 0x28, 0x8b, 0x30, 0x22, 0xc5, 0x36, - 0x27, 0xd8, 0x31, 0x33, 0xe1, 0x8e, 0xe3, 0xda, 0x2d, 0xe7, 0x3b, 0xd2, 0xcf, 0xce, 0xcd, 0x84, - 0x7d, 0x09, 0x34, 0xe3, 0x72, 0xe3, 0xeb, 0x3d, 0xe3, 0xc6, 0x5b, 0x39, 0x09, 0xe3, 0xe2, 0x20, - 0x92, 0x1f, 0xcc, 0xd5, 0x2a, 0x1b, 0xe5, 0xea, 0xc6, 0xdd, 0x42, 0x86, 0xcc, 0x00, 0xd4, 0xcc, - 0xcd, 0x52, 0xa5, 0x5e, 0x67, 0xbf, 0xb3, 0xec, 0xb7, 0x38, 0xb5, 0xbb, 0xb3, 0xbd, 0x56, 0xc8, - 0x29, 0x07, 0x77, 0x23, 0xc6, 0xbf, 0xca, 0xc0, 0xb9, 0xf4, 0xa1, 0x24, 0x5b, 0x80, 0x47, 0xb7, - 0x62, 0x2b, 0x79, 0x7b, 0xe0, 0xb8, 0xa7, 0x82, 0x93, 0x47, 0xc0, 0x21, 0x3f, 0x5a, 0x64, 0x1b, - 0xeb, 0xac, 0x9e, 0x32, 0xd7, 0x69, 0x1a, 0x25, 0x58, 0xec, 0xc7, 0x43, 0xff, 0xd4, 0x59, 0x98, - 0x2c, 0xd6, 0x6a, 0x6b, 0xd5, 0x52, 0x71, 0xab, 0xba, 0xb9, 0x51, 0xc8, 0x90, 0x09, 0x18, 0xbd, - 0x6b, 0x6e, 0x6e, 0xd7, 0x0a, 0x59, 0xe3, 0x2f, 0x67, 0x60, 0xba, 0xea, 0x86, 0xf4, 0x80, 0xa7, - 0x08, 0x7a, 0xd2, 0xc9, 0xf7, 0x65, 0x6d, 0xf2, 0x2d, 0x46, 0x41, 0x0e, 0x51, 0x05, 0x43, 0xcd, - 0xbc, 0x87, 0x30, 0xd7, 0x43, 0x42, 0xea, 0x30, 0x5e, 0xdc, 0xad, 0x6f, 0x56, 0xcb, 0x25, 0xd1, - 0x30, 0x69, 0x8b, 0x0a, 0x68, 0x6f, 0x25, 0xfc, 0x50, 0xe4, 0x61, 0x60, 0x79, 0x4e, 0x53, 0xc9, - 0x3a, 0xb6, 0x7a, 0xc6, 0x94, 0x9c, 0xd8, 0x86, 0x56, 0x98, 0xd3, 0x68, 0xa9, 0xae, 0xc1, 0x62, - 0x3f, 0x6e, 0xcc, 0x40, 0x37, 0xbd, 0x16, 0x2d, 0x9a, 0x1b, 0xea, 0x99, 0x0b, 0x5e, 0x12, 0xb5, - 0x7d, 0x37, 0x79, 0x49, 0xb4, 0x68, 0x6e, 0x18, 0x7f, 0x35, 0x0b, 0xe7, 0x58, 0xbf, 0xb4, 0x68, - 0x10, 0xb0, 0xfd, 0x31, 0xdb, 0xc9, 0x88, 0xa7, 0xfe, 0xbe, 0x08, 0x63, 0x87, 0x43, 0x74, 0x72, - 0x5e, 0x76, 0xb2, 0x29, 0xd0, 0x09, 0x01, 0xd4, 0x35, 0x62, 0x81, 0xc1, 0xbf, 0xd9, 0x0e, 0x35, - 0x4e, 0x07, 0x88, 0xaa, 0x62, 0xca, 0x9c, 0xe8, 0x44, 0x49, 0x01, 0xbf, 0x04, 0xa3, 0x18, 0xcf, - 0x2a, 0x66, 0xbc, 0x34, 0x50, 0xd2, 0x5b, 0x86, 0x81, 0xae, 0x26, 0x27, 0x20, 0x37, 0x00, 0xe2, - 0x4b, 0x7c, 0x62, 0x4a, 0xcb, 0x4d, 0x51, 0x74, 0x8f, 0xcf, 0x9c, 0x68, 0xef, 0xdb, 0xe2, 0x4a, - 0xdf, 0x35, 0x98, 0x93, 0x79, 0x33, 0x3b, 0x32, 0x20, 0x93, 0xc7, 0x9e, 0x9a, 0xb3, 0xbc, 0xa0, - 0xda, 0x11, 0x41, 0x99, 0xc6, 0xff, 0x94, 0x85, 0x89, 0x5d, 0xb6, 0xd2, 0xe0, 0x66, 0x66, 0xf0, - 0xe6, 0x68, 0x19, 0x26, 0xd7, 0x3c, 0xbb, 0xa9, 0x3f, 0x55, 0x85, 0x27, 0x08, 0x2d, 0xcf, 0x96, - 0x0e, 0x8d, 0xc0, 0x54, 0x91, 0x4e, 0x38, 0xfd, 0xf8, 0x10, 0xc6, 0x78, 0x40, 0xb7, 0x48, 0xac, - 0x29, 0x4d, 0x8d, 0xa8, 0x45, 0xd7, 0x79, 0x31, 0x37, 0x0b, 0xf0, 0xb4, 0x6c, 0x1f, 0x01, 0xea, - 0xc2, 0x27, 0x42, 0xc2, 0x95, 0xad, 0xdb, 0xe8, 0x70, 0x5b, 0x37, 0x25, 0x6a, 0x6f, 0x6c, 0x98, - 0xa8, 0xbd, 0x8b, 0x6f, 0xc1, 0xa4, 0xd2, 0x9e, 0x53, 0x59, 0x1e, 0x3f, 0x95, 0x85, 0x69, 0xfc, - 0xaa, 0xc8, 0xe3, 0xf5, 0x6c, 0x6e, 0x44, 0xbf, 0xac, 0x6d, 0x44, 0x17, 0xd5, 0xf1, 0xe2, 0x5f, - 0x36, 0x60, 0x07, 0xfa, 0x21, 0xcc, 0xf5, 0x20, 0x92, 0x37, 0x61, 0x94, 0x35, 0x5f, 0x1a, 0xee, - 0x85, 0xa4, 0x04, 0xc4, 0xd7, 0x24, 0xd8, 0x87, 0x07, 0x26, 0xc7, 0x36, 0xfe, 0xef, 0x0c, 0x4c, - 0xf1, 0xc7, 0x1b, 0xab, 0xee, 0xbe, 0xf7, 0xcc, 0x76, 0xe7, 0x5b, 0x5a, 0x77, 0x9e, 0x8f, 0x22, - 0x3f, 0xe5, 0x87, 0x0d, 0xe8, 0xcd, 0x7f, 0x86, 0x17, 0x0a, 0x74, 0x44, 0x52, 0xe6, 0x0f, 0xee, - 0xea, 0xaa, 0x39, 0x89, 0xc5, 0x74, 0x35, 0xe6, 0x6c, 0x99, 0x4b, 0x7f, 0x7d, 0xf7, 0xe2, 0x21, - 0x2a, 0x79, 0x99, 0x3f, 0x25, 0x7e, 0xad, 0x55, 0xc9, 0x9f, 0x12, 0xbf, 0xd6, 0xaa, 0xbe, 0xd1, - 0x7a, 0x03, 0x00, 0x43, 0xe9, 0xdc, 0x06, 0x8d, 0xdc, 0x47, 0x78, 0x5e, 0xe8, 0x08, 0x28, 0xc3, - 0x57, 0x50, 0x8c, 0xbf, 0x93, 0x03, 0x88, 0xcf, 0x11, 0xd8, 0x8c, 0xa4, 0x5a, 0x2a, 0x04, 0xe1, - 0xb6, 0x42, 0x90, 0x3a, 0x4a, 0x02, 0x44, 0x2e, 0xc3, 0x88, 0x92, 0x0b, 0x31, 0x35, 0x40, 0x17, - 0x63, 0xd6, 0x4b, 0x00, 0xc1, 0x91, 0xdb, 0xb0, 0x9a, 0xb4, 0x65, 0x73, 0xe5, 0x9c, 0xc3, 0x57, - 0x94, 0x16, 0x62, 0x68, 0x9f, 0x6c, 0x7d, 0x13, 0x0c, 0xa3, 0xcc, 0x10, 0xc8, 0xbb, 0x30, 0xa5, - 0x26, 0xbc, 0x15, 0xa7, 0xb6, 0x18, 0x68, 0xac, 0xc2, 0xd5, 0x40, 0x63, 0xbb, 0xe3, 0xc8, 0x74, - 0xb8, 0x6c, 0x5f, 0x2e, 0xf3, 0xbd, 0xa8, 0x1a, 0x2a, 0x2d, 0x77, 0xa3, 0x84, 0x31, 0x9a, 0x8e, - 0x1d, 0x04, 0x0f, 0x3d, 0xbf, 0xa9, 0x3d, 0x61, 0x26, 0x60, 0x2a, 0x8d, 0x84, 0x91, 0x1a, 0x4c, - 0x38, 0xee, 0x03, 0xea, 0x86, 0x9e, 0x7f, 0xb4, 0x38, 0x8e, 0xb3, 0xea, 0x82, 0x72, 0x64, 0x53, - 0x95, 0x65, 0x5c, 0xa9, 0xe2, 0xee, 0x20, 0xc2, 0x57, 0x6f, 0x76, 0x44, 0x40, 0x71, 0x3e, 0xf3, - 0xcf, 0xb3, 0x40, 0x7a, 0x19, 0x90, 0x2f, 0xc3, 0x24, 0xd7, 0xc9, 0x96, 0x1f, 0x7c, 0x5b, 0x9c, - 0xec, 0xf0, 0x3b, 0x7d, 0x0a, 0x58, 0x4d, 0xa8, 0xc2, 0xc1, 0x66, 0xf0, 0xed, 0x16, 0xf9, 0x06, - 0xcc, 0xe3, 0x00, 0x74, 0xa8, 0xef, 0x78, 0x4d, 0x0b, 0xa3, 0xf0, 0xed, 0x96, 0xc8, 0xbd, 0xf3, - 0x06, 0x26, 0x89, 0xeb, 0x2d, 0xee, 0x33, 0x50, 0x73, 0x0c, 0xb5, 0x86, 0x98, 0x35, 0x8e, 0x48, - 0xb6, 0xa0, 0xa0, 0xd2, 0xef, 0x77, 0x5b, 0x2d, 0x31, 0xf6, 0xd7, 0xf0, 0xed, 0x88, 0x44, 0x59, - 0x1f, 0xc6, 0x33, 0x31, 0xe3, 0x3b, 0xdd, 0x56, 0x8b, 0x7c, 0x11, 0xc0, 0x73, 0xad, 0xb6, 0x13, - 0x04, 0x8e, 0x7b, 0x20, 0x84, 0x00, 0xe3, 0xeb, 0x63, 0xa8, 0xda, 0x8d, 0x9e, 0xbb, 0xce, 0x81, - 0xbc, 0x1b, 0xaf, 0xbd, 0x0f, 0xb3, 0x32, 0xd6, 0x6a, 0x6b, 0xad, 0x8e, 0xa1, 0xd1, 0xb3, 0x30, - 0xb9, 0x53, 0x31, 0xab, 0x77, 0x3e, 0xb6, 0xee, 0x6c, 0xaf, 0xad, 0x15, 0xce, 0x90, 0x69, 0x98, - 0x10, 0x80, 0x52, 0xb1, 0x90, 0x21, 0x53, 0x90, 0xaf, 0x6e, 0xd4, 0x2b, 0xa5, 0x6d, 0xb3, 0x52, - 0xc8, 0x5e, 0x5b, 0x86, 0x99, 0x38, 0xb7, 0x39, 0xda, 0x99, 0xe3, 0x90, 0x33, 0x8b, 0xbb, 0x85, - 0x33, 0xcc, 0x42, 0xae, 0xdd, 0x2b, 0xd5, 0x6f, 0xde, 0x2c, 0x64, 0x98, 0xf1, 0x79, 0xb7, 0x54, - 0xb3, 0xee, 0xad, 0xd7, 0x0b, 0xd9, 0x6b, 0x9f, 0x87, 0x39, 0xbc, 0xd5, 0xbb, 0xe6, 0x04, 0x21, - 0x75, 0xa9, 0x8f, 0xd5, 0x4e, 0x41, 0xbe, 0x4e, 0x3b, 0xb6, 0x6f, 0x87, 0x94, 0xd7, 0xb9, 0xde, - 0x6d, 0x85, 0x4e, 0xa7, 0x45, 0x1f, 0x15, 0x32, 0xd7, 0xde, 0x82, 0x59, 0xd3, 0xeb, 0x86, 0x8e, - 0x7b, 0x50, 0x0f, 0x19, 0xc6, 0xc1, 0x11, 0x39, 0x0b, 0x73, 0xdb, 0x1b, 0xc5, 0xf5, 0x95, 0xea, - 0xdd, 0xed, 0xcd, 0xed, 0xba, 0xb5, 0x5e, 0xdc, 0x2a, 0xad, 0x72, 0xc3, 0x76, 0x7d, 0xb3, 0xbe, - 0x65, 0x99, 0x95, 0x52, 0x65, 0x63, 0xab, 0x90, 0xb9, 0xf6, 0x73, 0x19, 0x98, 0x61, 0x9b, 0x30, - 0x74, 0xed, 0x6f, 0x63, 0xec, 0xd3, 0x25, 0x78, 0x7e, 0xbb, 0x5e, 0x31, 0xad, 0xad, 0xcd, 0x7b, - 0x95, 0x0d, 0x6b, 0xbb, 0x5e, 0xbc, 0x9b, 0x8c, 0x4f, 0x5c, 0x82, 0xe7, 0x14, 0x0c, 0xb3, 0x52, - 0xda, 0xdc, 0xa9, 0x98, 0x56, 0xad, 0x58, 0xaf, 0xef, 0x6e, 0x9a, 0xe5, 0x42, 0x86, 0x5c, 0x84, - 0x73, 0x29, 0x08, 0xeb, 0x77, 0x8a, 0x85, 0x6c, 0x4f, 0xd9, 0x46, 0x65, 0xb7, 0xb8, 0x66, 0xad, - 0x6c, 0x6e, 0x15, 0x72, 0xd7, 0xf0, 0xa9, 0x6e, 0x0c, 0x4a, 0xe2, 0xd7, 0x87, 0xf2, 0x30, 0xb2, - 0xb1, 0xb9, 0x51, 0x49, 0x6e, 0x3e, 0xa6, 0x20, 0x5f, 0xac, 0xd5, 0xcc, 0xcd, 0x9d, 0x4a, 0xb9, - 0x90, 0x65, 0x1d, 0x59, 0xae, 0x6c, 0xb0, 0x96, 0xe5, 0xae, 0x19, 0x30, 0x57, 0xa2, 0x7e, 0x58, - 0x79, 0x14, 0x52, 0x97, 0xe9, 0x7c, 0xec, 0xbb, 0x69, 0x98, 0xa8, 0x7c, 0x65, 0xab, 0xb2, 0x51, - 0x67, 0xb6, 0xfc, 0x99, 0x6b, 0xcf, 0x27, 0x70, 0xe4, 0xb0, 0xd4, 0xeb, 0xab, 0x85, 0x33, 0xd7, - 0xbe, 0xce, 0xd6, 0x2a, 0xe5, 0x6a, 0xdc, 0x79, 0x98, 0x57, 0x7f, 0xd7, 0xa8, 0xdb, 0x74, 0xdc, - 0x83, 0xc2, 0x99, 0x64, 0x81, 0xd9, 0x75, 0x5d, 0x56, 0x80, 0x1f, 0xaf, 0x16, 0x6c, 0x51, 0xbf, - 0xed, 0xb8, 0x76, 0x48, 0x9b, 0x85, 0xec, 0xb5, 0xeb, 0x30, 0xad, 0xc5, 0x73, 0xb1, 0x7a, 0xd7, - 0x36, 0x85, 0x38, 0xac, 0x57, 0xca, 0xd5, 0xed, 0xf5, 0xc2, 0x28, 0xfb, 0xec, 0xd5, 0xea, 0xdd, - 0xd5, 0x02, 0x5c, 0xfb, 0x3a, 0xcc, 0x88, 0x0b, 0x02, 0xeb, 0x77, 0x8a, 0xb2, 0xa1, 0x9b, 0x77, - 0xee, 0x88, 0x38, 0x49, 0xb6, 0xfd, 0xc2, 0xfd, 0xc9, 0xf3, 0xb0, 0x28, 0x7e, 0x58, 0xc5, 0x8d, - 0xb2, 0xb5, 0x5a, 0x34, 0xcb, 0xbb, 0x45, 0xb3, 0x62, 0xdd, 0xab, 0x7c, 0x5c, 0xc8, 0x92, 0x73, - 0x40, 0x54, 0x88, 0xb5, 0xb5, 0xb9, 0x5d, 0x5a, 0x2d, 0xe4, 0xae, 0x39, 0x50, 0x48, 0x9e, 0xda, - 0xf5, 0x6c, 0xf9, 0xcc, 0xed, 0x8d, 0x0d, 0xde, 0xeb, 0xb3, 0x30, 0xb9, 0xb9, 0xb5, 0x5a, 0x31, - 0x45, 0x4c, 0x2a, 0x06, 0xa1, 0x6e, 0x6f, 0x14, 0xb7, 0xb7, 0x56, 0x37, 0xcd, 0xea, 0x57, 0x59, - 0xf7, 0x93, 0x45, 0x58, 0xa8, 0xaf, 0x15, 0x4b, 0xf7, 0xac, 0x8d, 0xcd, 0x2d, 0xab, 0xba, 0x61, - 0x95, 0x56, 0x8b, 0x1b, 0x1b, 0x95, 0xb5, 0x02, 0x5c, 0xfb, 0xd7, 0x19, 0x78, 0x6e, 0x80, 0xfd, - 0x4c, 0xde, 0x80, 0xab, 0xab, 0x95, 0x62, 0x79, 0xad, 0x52, 0xaf, 0x5b, 0x8c, 0x65, 0x65, 0x63, - 0x4b, 0xec, 0xbe, 0xac, 0xfa, 0x56, 0x71, 0x2b, 0x29, 0x81, 0x57, 0xe1, 0xd5, 0xc1, 0xe8, 0xb1, - 0xb0, 0x5c, 0x81, 0x57, 0x06, 0xa3, 0x0a, 0xe1, 0xc9, 0x92, 0x6b, 0x70, 0x79, 0x30, 0x66, 0x24, - 0x74, 0xb9, 0x95, 0x77, 0x7f, 0xff, 0x0f, 0x5f, 0x3c, 0xf3, 0xfb, 0x7f, 0xf4, 0x62, 0xe6, 0x0f, - 0xfe, 0xe8, 0xc5, 0xcc, 0xbf, 0xfd, 0xa3, 0x17, 0x33, 0x5f, 0x7d, 0xed, 0x14, 0xf9, 0xbc, 0xf6, - 0xc6, 0x70, 0x7b, 0x7f, 0xeb, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, 0x92, 0xa4, 0x30, 0x7e, 0x10, - 0x3c, 0x01, 0x00, + 0x36, 0x46, 0x79, 0x79, 0x5f, 0x10, 0x19, 0x77, 0xa2, 0x59, 0x9e, 0xda, 0x59, 0xcc, 0x10, 0x57, + 0x1b, 0xc8, 0x7f, 0x7c, 0x38, 0x92, 0xcf, 0x16, 0x72, 0xa6, 0xb8, 0xb6, 0xb1, 0xef, 0xb4, 0xa8, + 0xf1, 0x96, 0x5c, 0x10, 0xd7, 0x9c, 0x20, 0xdc, 0xb9, 0x49, 0xae, 0xc2, 0x38, 0x5f, 0x03, 0xe5, + 0xae, 0x78, 0x56, 0xeb, 0xd3, 0x9d, 0x9b, 0xa6, 0x2c, 0x37, 0x7e, 0x4b, 0x5c, 0x24, 0xac, 0x36, + 0x6b, 0x89, 0x24, 0x6c, 0x4f, 0xba, 0xf9, 0xaf, 0x68, 0x5b, 0xd3, 0x97, 0x95, 0x9c, 0x42, 0xbd, + 0x75, 0xf5, 0xf7, 0x01, 0x28, 0xb1, 0x8d, 0x3f, 0x9f, 0x81, 0xe7, 0x07, 0x91, 0xa7, 0xe6, 0x8b, + 0xcb, 0x9c, 0x2e, 0x5f, 0xdc, 0x55, 0xc8, 0x73, 0x98, 0x9e, 0xb5, 0x59, 0x90, 0x3a, 0x4d, 0x33, + 0x2a, 0x36, 0x8a, 0x00, 0xd5, 0x66, 0x6d, 0xb3, 0xc3, 0xaf, 0x33, 0xde, 0x82, 0x11, 0xd6, 0xb6, + 0x44, 0x47, 0xb1, 0xa6, 0x16, 0xd7, 0xd7, 0x04, 0x12, 0xb7, 0x78, 0x03, 0xbb, 0xdd, 0x32, 0x11, + 0xd9, 0xd8, 0x85, 0x19, 0x1d, 0x83, 0x54, 0xf4, 0x00, 0xf8, 0xf8, 0xa1, 0x99, 0x15, 0xcf, 0xe3, + 0xfe, 0x85, 0x95, 0x0b, 0x3f, 0x38, 0x5e, 0x02, 0xf6, 0x93, 0xd3, 0xa4, 0x05, 0xc8, 0x1b, 0xdf, + 0xcb, 0xc2, 0x42, 0x7c, 0xc8, 0x26, 0x87, 0xeb, 0x99, 0xf5, 0x99, 0x17, 0x35, 0x9f, 0xee, 0x52, + 0xcf, 0x5b, 0x0e, 0xf2, 0x03, 0x07, 0xb8, 0x92, 0xee, 0xc2, 0x62, 0x3f, 0x7c, 0xf2, 0x5a, 0x4f, + 0xb6, 0x75, 0x11, 0x0c, 0x16, 0xa5, 0x65, 0x57, 0x92, 0xaf, 0xff, 0xeb, 0x0c, 0x5c, 0x14, 0xdb, + 0xfc, 0x75, 0xdb, 0x71, 0xf1, 0x85, 0x99, 0x06, 0x7d, 0x3a, 0x87, 0x2d, 0x77, 0xb5, 0x29, 0xf3, + 0xaa, 0xee, 0xcd, 0xe9, 0xa9, 0xad, 0xff, 0xd7, 0x92, 0xab, 0x18, 0x41, 0xd7, 0xe0, 0x3b, 0xad, + 0x11, 0x7e, 0x42, 0xec, 0x32, 0x80, 0x7a, 0x42, 0x8c, 0x18, 0xc6, 0x4f, 0xc0, 0x8b, 0x83, 0x2b, + 0x20, 0xdf, 0x80, 0xe9, 0xe2, 0x01, 0x75, 0xc3, 0xed, 0xce, 0x81, 0x6f, 0x37, 0xa9, 0xf4, 0x7e, + 0x49, 0x43, 0x53, 0x2d, 0xe3, 0x51, 0x83, 0xe2, 0xc4, 0x92, 0xc1, 0xad, 0xae, 0x20, 0xd2, 0x42, + 0x9d, 0x55, 0x6e, 0xc6, 0x4f, 0x66, 0x80, 0xf4, 0xf2, 0x20, 0xb7, 0x61, 0x6a, 0x7b, 0xab, 0x54, + 0x0f, 0x6d, 0x3f, 0x5c, 0xf5, 0xba, 0xbc, 0x3b, 0xa7, 0xc5, 0xd9, 0x5b, 0xd8, 0xb0, 0x02, 0x56, + 0x60, 0x1d, 0x7a, 0x5d, 0xdf, 0xd4, 0xf0, 0x30, 0x47, 0x05, 0xa5, 0xf7, 0x9b, 0xf6, 0x91, 0x9e, + 0xa3, 0x42, 0xc0, 0xb4, 0x1c, 0x15, 0x02, 0x66, 0xfc, 0xcd, 0x0c, 0x3c, 0x27, 0x2d, 0xc4, 0x66, + 0x4a, 0x5b, 0x4a, 0x18, 0xa6, 0xe1, 0xcb, 0x6b, 0x05, 0x83, 0xb4, 0xfc, 0x9c, 0x8c, 0x64, 0xc2, + 0x06, 0xa2, 0xba, 0xe7, 0xb4, 0xf8, 0xbc, 0x56, 0xe8, 0x75, 0x86, 0x08, 0x65, 0x2a, 0x44, 0x23, + 0x1a, 0x7a, 0x1d, 0x64, 0x81, 0x94, 0x06, 0x85, 0x05, 0xb5, 0x71, 0xb2, 0xc5, 0x64, 0x1d, 0xc6, + 0x45, 0xb8, 0xa6, 0x50, 0xf7, 0x32, 0x82, 0x77, 0xc0, 0x37, 0xad, 0xcc, 0xca, 0x78, 0x29, 0x11, + 0xd8, 0x6e, 0x4a, 0x1e, 0xc6, 0x16, 0x7f, 0xd8, 0x13, 0x2f, 0x7a, 0x3d, 0xa1, 0x44, 0x2b, 0xda, + 0xfb, 0xff, 0x9f, 0x81, 0x05, 0x66, 0x02, 0x57, 0xdb, 0x1d, 0xcf, 0x0f, 0xcd, 0x6e, 0x4b, 0xce, + 0xbe, 0x2b, 0x90, 0xaf, 0x49, 0xc3, 0x9f, 0x9f, 0x07, 0xa2, 0xab, 0x45, 0x1a, 0xff, 0x66, 0x54, + 0x4a, 0x56, 0x21, 0x2f, 0xee, 0xc4, 0xc8, 0x67, 0xee, 0xa4, 0xb7, 0x57, 0x67, 0x2c, 0x90, 0xd8, + 0xdc, 0x40, 0x85, 0x22, 0x68, 0xcc, 0x88, 0xda, 0xf8, 0x93, 0x0c, 0x9c, 0xef, 0x43, 0x43, 0xde, + 0x85, 0x51, 0x74, 0xf8, 0x8a, 0xbe, 0x7c, 0xbe, 0x4f, 0x15, 0x61, 0xe3, 0x70, 0xe7, 0x26, 0x3f, + 0x86, 0x68, 0xb3, 0x1f, 0x26, 0xa7, 0x22, 0x5f, 0x83, 0x89, 0x62, 0xb3, 0xa9, 0x3d, 0xc6, 0xf7, + 0xc6, 0xe0, 0x56, 0x5e, 0x8f, 0xf0, 0xf9, 0xab, 0x66, 0xdc, 0x71, 0xd1, 0x6c, 0x8a, 0xd7, 0xcc, + 0xcc, 0x98, 0xdf, 0xc5, 0x77, 0x60, 0x46, 0x47, 0x3e, 0x95, 0xf7, 0xee, 0xd7, 0x33, 0x50, 0xd0, + 0xdb, 0xf0, 0xe9, 0xc4, 0x5d, 0xa5, 0x0d, 0xf3, 0x09, 0x6b, 0xfb, 0x8f, 0xc2, 0xd9, 0xd4, 0x0e, + 0x26, 0x6f, 0xc0, 0x58, 0xb1, 0xd3, 0xa9, 0x96, 0xb9, 0x68, 0x8b, 0x95, 0xdc, 0xee, 0x74, 0x12, + 0x81, 0xda, 0x02, 0x89, 0xdc, 0x82, 0x3c, 0xca, 0x2d, 0x23, 0xc8, 0xc6, 0xb1, 0xdd, 0x78, 0x95, + 0x31, 0x19, 0xdb, 0x2d, 0x11, 0xa3, 0x7e, 0x29, 0x06, 0x81, 0x73, 0xe0, 0xb6, 0xa9, 0x1b, 0x7e, + 0x7a, 0xfd, 0x12, 0xd7, 0x31, 0x54, 0xbf, 0x7c, 0x7f, 0x84, 0xcf, 0x9a, 0x24, 0xd9, 0x09, 0xef, + 0xba, 0x94, 0x61, 0x9c, 0x5f, 0xd7, 0x91, 0x22, 0xf8, 0x42, 0x6a, 0x13, 0x38, 0xce, 0xce, 0x4d, + 0xbe, 0x6a, 0x73, 0x07, 0x71, 0x60, 0x4a, 0x52, 0xb2, 0x03, 0x93, 0xa5, 0x16, 0xb5, 0xdd, 0x6e, + 0x67, 0xc8, 0xe7, 0x99, 0x17, 0xc5, 0xb7, 0x4c, 0x35, 0x38, 0x59, 0xfc, 0x3e, 0xb3, 0xca, 0x88, + 0x6c, 0x45, 0x3e, 0xa3, 0x11, 0xdc, 0xe2, 0x7c, 0x7e, 0x40, 0xff, 0x24, 0x81, 0x48, 0xa7, 0x3b, + 0x44, 0x85, 0x53, 0xc9, 0x82, 0x99, 0x35, 0x3b, 0x08, 0xb7, 0x7c, 0xdb, 0x0d, 0x30, 0x50, 0x7a, + 0x88, 0xe8, 0x35, 0x99, 0x9d, 0x77, 0x16, 0x03, 0x2b, 0xc2, 0x88, 0x14, 0xdb, 0x9c, 0x60, 0xc7, + 0xcc, 0x84, 0x3b, 0x8e, 0x6b, 0xb7, 0x9c, 0xef, 0x48, 0xd7, 0x3a, 0x37, 0x13, 0xf6, 0x25, 0xd0, + 0x8c, 0xcb, 0x8d, 0xaf, 0xf7, 0x8c, 0x1b, 0x6f, 0xe5, 0x24, 0x8c, 0x8b, 0xb3, 0x47, 0x7e, 0x16, + 0x57, 0xab, 0x6c, 0x94, 0xab, 0x1b, 0x77, 0x0b, 0x19, 0x32, 0x03, 0x50, 0x33, 0x37, 0x4b, 0x95, + 0x7a, 0x9d, 0xfd, 0xce, 0xb2, 0xdf, 0xe2, 0xa0, 0xee, 0xce, 0xf6, 0x5a, 0x21, 0xa7, 0x9c, 0xd5, + 0x8d, 0x18, 0xff, 0x2a, 0x03, 0xe7, 0xd2, 0x87, 0x92, 0x6c, 0x01, 0x9e, 0xd6, 0x8a, 0xdd, 0xe3, + 0xed, 0x81, 0xe3, 0x9e, 0x0a, 0x4e, 0x9e, 0xfa, 0x86, 0xfc, 0x34, 0x91, 0xed, 0xa5, 0xb3, 0x7a, + 0x96, 0x5c, 0xa7, 0x69, 0x94, 0x60, 0xb1, 0x1f, 0x0f, 0xfd, 0x53, 0x67, 0x61, 0xb2, 0x58, 0xab, + 0xad, 0x55, 0x4b, 0xc5, 0xad, 0xea, 0xe6, 0x46, 0x21, 0x43, 0x26, 0x60, 0xf4, 0xae, 0xb9, 0xb9, + 0x5d, 0x2b, 0x64, 0x8d, 0xbf, 0x9c, 0x81, 0xe9, 0xaa, 0x1b, 0xd2, 0x03, 0x9e, 0x15, 0xe8, 0x49, + 0x27, 0xdf, 0x97, 0xb5, 0xc9, 0xb7, 0x18, 0xc5, 0x35, 0x44, 0x15, 0x0c, 0x35, 0xf3, 0x1e, 0xc2, + 0x5c, 0x0f, 0x09, 0xa9, 0xc3, 0x78, 0x71, 0xb7, 0xbe, 0x59, 0x2d, 0x97, 0x44, 0xc3, 0xa4, 0x2d, + 0x2a, 0xa0, 0xbd, 0x95, 0xf0, 0x73, 0x90, 0x87, 0x81, 0xe5, 0x39, 0x4d, 0x25, 0xd1, 0xd8, 0xea, + 0x19, 0x53, 0x72, 0x62, 0x7b, 0x58, 0x61, 0x4e, 0xa3, 0xa5, 0xba, 0x06, 0x8b, 0xfd, 0xb8, 0x31, + 0x03, 0xdd, 0xf4, 0x5a, 0xb4, 0x68, 0x6e, 0xa8, 0xc7, 0x2c, 0x78, 0x2f, 0xd4, 0xf6, 0xdd, 0xe4, + 0xbd, 0xd0, 0xa2, 0xb9, 0x61, 0xfc, 0xd5, 0x2c, 0x9c, 0x63, 0xfd, 0xd2, 0xa2, 0x41, 0xc0, 0xb6, + 0xc4, 0x6c, 0x27, 0x23, 0x5e, 0xf7, 0xfb, 0x22, 0x8c, 0x1d, 0x0e, 0xd1, 0xc9, 0x79, 0xd9, 0xc9, + 0xa6, 0x40, 0x27, 0x04, 0x50, 0xd7, 0x88, 0x05, 0x06, 0xff, 0x26, 0x2f, 0x80, 0x92, 0x01, 0x10, + 0x55, 0xc5, 0x94, 0x39, 0xd1, 0x89, 0xf2, 0x00, 0x7e, 0x09, 0x46, 0x31, 0x84, 0x55, 0xcc, 0x78, + 0x69, 0xa0, 0xa4, 0xb7, 0x0c, 0x63, 0x5b, 0x4d, 0x4e, 0x40, 0x6e, 0x00, 0xc4, 0xf7, 0xf6, 0xc4, + 0x94, 0x96, 0x9b, 0xa2, 0xe8, 0xea, 0x9e, 0x39, 0xd1, 0xde, 0xb7, 0xc5, 0x2d, 0xbe, 0x6b, 0x30, + 0x27, 0x53, 0x65, 0x76, 0x64, 0x0c, 0x26, 0x0f, 0x37, 0x35, 0x67, 0x79, 0x41, 0xb5, 0x23, 0xe2, + 0x30, 0x8d, 0xff, 0x29, 0x0b, 0x13, 0xbb, 0x6c, 0xa5, 0xc1, 0xcd, 0xcc, 0xe0, 0xcd, 0xd1, 0x32, + 0x4c, 0xae, 0x79, 0x76, 0x53, 0x7f, 0x9d, 0x0a, 0x0f, 0x0d, 0x5a, 0x9e, 0x2d, 0x7d, 0x18, 0x81, + 0xa9, 0x22, 0x9d, 0x70, 0xe0, 0xf1, 0x21, 0x8c, 0xf1, 0x18, 0x6e, 0x91, 0x4b, 0x53, 0x9a, 0x1a, + 0x51, 0x8b, 0xae, 0xf3, 0x62, 0x6e, 0x16, 0xe0, 0x01, 0xd9, 0x3e, 0x02, 0xd4, 0x85, 0x4f, 0x44, + 0x81, 0x2b, 0x5b, 0xb7, 0xd1, 0xe1, 0xb6, 0x6e, 0x4a, 0xa0, 0xde, 0xd8, 0x30, 0x81, 0x7a, 0x17, + 0xdf, 0x82, 0x49, 0xa5, 0x3d, 0xa7, 0xb2, 0x3c, 0x7e, 0x2a, 0x0b, 0xd3, 0xf8, 0x55, 0x91, 0x93, + 0xeb, 0xd9, 0xdc, 0x88, 0x7e, 0x59, 0xdb, 0x88, 0x2e, 0xaa, 0xe3, 0xc5, 0xbf, 0x6c, 0xc0, 0x0e, + 0xf4, 0x43, 0x98, 0xeb, 0x41, 0x24, 0x6f, 0xc2, 0x28, 0x6b, 0xbe, 0x34, 0xdc, 0x0b, 0x49, 0x09, + 0x88, 0x6f, 0x46, 0xb0, 0x0f, 0x0f, 0x4c, 0x8e, 0x6d, 0xfc, 0xdf, 0x19, 0x98, 0xe2, 0xef, 0x35, + 0x56, 0xdd, 0x7d, 0xef, 0x99, 0xed, 0xce, 0xb7, 0xb4, 0xee, 0x3c, 0x1f, 0x05, 0x7b, 0xca, 0x0f, + 0x1b, 0xd0, 0x9b, 0xff, 0x0c, 0xef, 0x10, 0xe8, 0x88, 0xa4, 0xcc, 0xdf, 0xd8, 0xd5, 0x55, 0x73, + 0x12, 0x8b, 0xe9, 0x6a, 0x4c, 0xd3, 0x32, 0x97, 0xfe, 0xe0, 0xee, 0xc5, 0x43, 0x54, 0xf2, 0x32, + 0x65, 0x4a, 0xfc, 0x40, 0xab, 0x92, 0x32, 0x25, 0x7e, 0xa0, 0x55, 0x7d, 0x96, 0xf5, 0x06, 0x00, + 0x46, 0xcf, 0xb9, 0x0d, 0x1a, 0xb9, 0x8f, 0xf0, 0x88, 0xd0, 0x11, 0x50, 0x86, 0xaf, 0xa0, 0x18, + 0x7f, 0x27, 0x07, 0x10, 0x1f, 0x1d, 0xb0, 0x19, 0x49, 0xb5, 0xec, 0x07, 0xc2, 0x6d, 0x85, 0x20, + 0x75, 0x94, 0x04, 0x88, 0x5c, 0x86, 0x11, 0x25, 0xfd, 0x61, 0x6a, 0x4c, 0x2e, 0x86, 0xa9, 0x97, + 0x00, 0x82, 0x23, 0xb7, 0x61, 0x35, 0x69, 0xcb, 0xe6, 0xca, 0x39, 0x87, 0x0f, 0x27, 0x2d, 0xc4, + 0xd0, 0x3e, 0x09, 0xfa, 0x26, 0x18, 0x46, 0x99, 0x21, 0x90, 0x77, 0x61, 0x4a, 0xcd, 0x71, 0x2b, + 0x0e, 0x6a, 0x31, 0xb6, 0x58, 0x85, 0xab, 0xb1, 0xc5, 0x76, 0xc7, 0x91, 0x19, 0x70, 0xd9, 0xbe, + 0x5c, 0xa6, 0x78, 0x51, 0x35, 0x54, 0x5a, 0xba, 0x46, 0x09, 0x63, 0x34, 0x1d, 0x3b, 0x08, 0x1e, + 0x7a, 0x7e, 0x53, 0x7b, 0xb5, 0x4c, 0xc0, 0x54, 0x1a, 0x09, 0x23, 0x35, 0x98, 0x70, 0xdc, 0x07, + 0xd4, 0x0d, 0x3d, 0xff, 0x68, 0x71, 0x1c, 0x67, 0xd5, 0x05, 0xe5, 0x94, 0xa6, 0x2a, 0xcb, 0xb8, + 0x52, 0xc5, 0xdd, 0x41, 0x84, 0xaf, 0x5e, 0xe6, 0x88, 0x80, 0xe2, 0x48, 0xe6, 0x9f, 0x67, 0x81, + 0xf4, 0x32, 0x20, 0x5f, 0x86, 0x49, 0xae, 0x93, 0x2d, 0x3f, 0xf8, 0xb6, 0x38, 0xcc, 0xe1, 0xd7, + 0xf8, 0x14, 0xb0, 0x9a, 0x43, 0x85, 0x83, 0xcd, 0xe0, 0xdb, 0x2d, 0xf2, 0x0d, 0x98, 0xc7, 0x01, + 0xe8, 0x50, 0xdf, 0xf1, 0x9a, 0x16, 0x06, 0xde, 0xdb, 0x2d, 0x91, 0x6e, 0xe7, 0x0d, 0xcc, 0x0b, + 0xd7, 0x5b, 0xdc, 0x67, 0xa0, 0xe6, 0x18, 0x6a, 0x0d, 0x31, 0x6b, 0x1c, 0x91, 0x6c, 0x41, 0x41, + 0xa5, 0xdf, 0xef, 0xb6, 0x5a, 0x62, 0xec, 0xaf, 0xe1, 0x73, 0x11, 0x89, 0xb2, 0x3e, 0x8c, 0x67, + 0x62, 0xc6, 0x77, 0xba, 0xad, 0x16, 0xf9, 0x22, 0x80, 0xe7, 0x5a, 0x6d, 0x27, 0x08, 0x1c, 0xf7, + 0x40, 0x08, 0x01, 0x86, 0xd4, 0xc7, 0x50, 0xb5, 0x1b, 0x3d, 0x77, 0x9d, 0x03, 0x79, 0x37, 0x5e, + 0x7b, 0x1f, 0x66, 0x65, 0x78, 0xd5, 0xd6, 0x5a, 0x1d, 0xa3, 0xa1, 0x67, 0x61, 0x72, 0xa7, 0x62, + 0x56, 0xef, 0x7c, 0x6c, 0xdd, 0xd9, 0x5e, 0x5b, 0x2b, 0x9c, 0x21, 0xd3, 0x30, 0x21, 0x00, 0xa5, + 0x62, 0x21, 0x43, 0xa6, 0x20, 0x5f, 0xdd, 0xa8, 0x57, 0x4a, 0xdb, 0x66, 0xa5, 0x90, 0xbd, 0xb6, + 0x0c, 0x33, 0x71, 0x3a, 0x73, 0xb4, 0x33, 0xc7, 0x21, 0x67, 0x16, 0x77, 0x0b, 0x67, 0x98, 0x85, + 0x5c, 0xbb, 0x57, 0xaa, 0xdf, 0xbc, 0x59, 0xc8, 0x30, 0xe3, 0xf3, 0x6e, 0xa9, 0x66, 0xdd, 0x5b, + 0xaf, 0x17, 0xb2, 0xd7, 0x3e, 0x0f, 0x73, 0x78, 0x91, 0x77, 0xcd, 0x09, 0x42, 0xea, 0x52, 0x1f, + 0xab, 0x9d, 0x82, 0x7c, 0x9d, 0x76, 0x6c, 0xdf, 0x0e, 0x29, 0xaf, 0x73, 0xbd, 0xdb, 0x0a, 0x9d, + 0x4e, 0x8b, 0x3e, 0x2a, 0x64, 0xae, 0xbd, 0x05, 0xb3, 0xa6, 0xd7, 0x0d, 0x1d, 0xf7, 0xa0, 0x1e, + 0x32, 0x8c, 0x83, 0x23, 0x72, 0x16, 0xe6, 0xb6, 0x37, 0x8a, 0xeb, 0x2b, 0xd5, 0xbb, 0xdb, 0x9b, + 0xdb, 0x75, 0x6b, 0xbd, 0xb8, 0x55, 0x5a, 0xe5, 0x86, 0xed, 0xfa, 0x66, 0x7d, 0xcb, 0x32, 0x2b, + 0xa5, 0xca, 0xc6, 0x56, 0x21, 0x73, 0xed, 0xe7, 0x32, 0x30, 0xc3, 0x36, 0x61, 0xe8, 0xcd, 0xdf, + 0xc6, 0x70, 0xa7, 0x4b, 0xf0, 0xfc, 0x76, 0xbd, 0x62, 0x5a, 0x5b, 0x9b, 0xf7, 0x2a, 0x1b, 0xd6, + 0x76, 0xbd, 0x78, 0x37, 0x19, 0x92, 0xb8, 0x04, 0xcf, 0x29, 0x18, 0x66, 0xa5, 0xb4, 0xb9, 0x53, + 0x31, 0xad, 0x5a, 0xb1, 0x5e, 0xdf, 0xdd, 0x34, 0xcb, 0x85, 0x0c, 0xb9, 0x08, 0xe7, 0x52, 0x10, + 0xd6, 0xef, 0x14, 0x0b, 0xd9, 0x9e, 0xb2, 0x8d, 0xca, 0x6e, 0x71, 0xcd, 0x5a, 0xd9, 0xdc, 0x2a, + 0xe4, 0xae, 0xe1, 0xeb, 0xdc, 0x18, 0x87, 0xc4, 0x6f, 0x0c, 0xe5, 0x61, 0x64, 0x63, 0x73, 0xa3, + 0x92, 0xdc, 0x7c, 0x4c, 0x41, 0xbe, 0x58, 0xab, 0x99, 0x9b, 0x3b, 0x95, 0x72, 0x21, 0xcb, 0x3a, + 0xb2, 0x5c, 0xd9, 0x60, 0x2d, 0xcb, 0x5d, 0x33, 0x60, 0xae, 0x44, 0xfd, 0xb0, 0xf2, 0x28, 0xa4, + 0x2e, 0xd3, 0xf9, 0xd8, 0x77, 0xd3, 0x30, 0x51, 0xf9, 0xca, 0x56, 0x65, 0xa3, 0xce, 0x6c, 0xf9, + 0x33, 0xd7, 0x9e, 0x4f, 0xe0, 0xc8, 0x61, 0xa9, 0xd7, 0x57, 0x0b, 0x67, 0xae, 0x7d, 0x9d, 0xad, + 0x55, 0xca, 0x6d, 0xb8, 0xf3, 0x30, 0xaf, 0xfe, 0xae, 0x51, 0xb7, 0xe9, 0xb8, 0x07, 0x85, 0x33, + 0xc9, 0x02, 0xb3, 0xeb, 0xba, 0xac, 0x00, 0x3f, 0x5e, 0x2d, 0xd8, 0xa2, 0x7e, 0xdb, 0x71, 0xed, + 0x90, 0x36, 0x0b, 0xd9, 0x6b, 0xd7, 0x61, 0x5a, 0x0b, 0xe1, 0x62, 0xf5, 0xae, 0x6d, 0x0a, 0x71, + 0x58, 0xaf, 0x94, 0xab, 0xdb, 0xeb, 0x85, 0x51, 0xf6, 0xd9, 0xab, 0xd5, 0xbb, 0xab, 0x05, 0xb8, + 0xf6, 0x75, 0x98, 0x11, 0x77, 0x02, 0xd6, 0xef, 0x14, 0x65, 0x43, 0x37, 0xef, 0xdc, 0x11, 0xa1, + 0x91, 0x6c, 0xfb, 0x85, 0xfb, 0x93, 0xe7, 0x61, 0x51, 0xfc, 0xb0, 0x8a, 0x1b, 0x65, 0x6b, 0xb5, + 0x68, 0x96, 0x77, 0x8b, 0x66, 0xc5, 0xba, 0x57, 0xf9, 0xb8, 0x90, 0x25, 0xe7, 0x80, 0xa8, 0x10, + 0x6b, 0x6b, 0x73, 0xbb, 0xb4, 0x5a, 0xc8, 0x5d, 0x73, 0xa0, 0x90, 0x3c, 0xa8, 0xeb, 0xd9, 0xf2, + 0x99, 0xdb, 0x1b, 0x1b, 0xbc, 0xd7, 0x67, 0x61, 0x72, 0x73, 0x6b, 0xb5, 0x62, 0x8a, 0x30, 0x54, + 0x8c, 0x3b, 0xdd, 0xde, 0x28, 0x6e, 0x6f, 0xad, 0x6e, 0x9a, 0xd5, 0xaf, 0xb2, 0xee, 0x27, 0x8b, + 0xb0, 0x50, 0x5f, 0x2b, 0x96, 0xee, 0x59, 0x1b, 0x9b, 0x5b, 0x56, 0x75, 0xc3, 0x2a, 0xad, 0x16, + 0x37, 0x36, 0x2a, 0x6b, 0x05, 0xb8, 0xf6, 0xaf, 0x33, 0xf0, 0xdc, 0x00, 0xfb, 0x99, 0xbc, 0x01, + 0x57, 0x57, 0x2b, 0xc5, 0xf2, 0x5a, 0xa5, 0x5e, 0xb7, 0x18, 0xcb, 0xca, 0xc6, 0x96, 0xd8, 0x7d, + 0x59, 0xf5, 0xad, 0xe2, 0x56, 0x52, 0x02, 0xaf, 0xc2, 0xab, 0x83, 0xd1, 0x63, 0x61, 0xb9, 0x02, + 0xaf, 0x0c, 0x46, 0x15, 0xc2, 0x93, 0x25, 0xd7, 0xe0, 0xf2, 0x60, 0xcc, 0x48, 0xe8, 0x72, 0x2b, + 0xef, 0xfe, 0xfe, 0x1f, 0xbe, 0x78, 0xe6, 0xf7, 0xff, 0xe8, 0xc5, 0xcc, 0x1f, 0xfc, 0xd1, 0x8b, + 0x99, 0x7f, 0xfb, 0x47, 0x2f, 0x66, 0xbe, 0xfa, 0xda, 0x29, 0x52, 0x78, 0xed, 0x8d, 0xe1, 0xf6, + 0xfe, 0xd6, 0xff, 0x13, 0x00, 0x00, 0xff, 0xff, 0xb6, 0x0d, 0x5e, 0xa0, 0x03, 0x3c, 0x01, 0x00, } func (this *PluginSpecV1) Equal(that interface{}) bool { @@ -33890,13 +33882,6 @@ func (m *PluginBearerTokenCredentials) MarshalToSizedBuffer(dAtA []byte) (int, e i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - if len(m.TokenFile) > 0 { - i -= len(m.TokenFile) - copy(dAtA[i:], m.TokenFile) - i = encodeVarintTypes(dAtA, i, uint64(len(m.TokenFile))) - i-- - dAtA[i] = 0x12 - } if len(m.Token) > 0 { i -= len(m.Token) copy(dAtA[i:], m.Token) @@ -43016,10 +43001,6 @@ func (m *PluginBearerTokenCredentials) Size() (n int) { if l > 0 { n += 1 + l + sovTypes(uint64(l)) } - l = len(m.TokenFile) - if l > 0 { - n += 1 + l + sovTypes(uint64(l)) - } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -93001,38 +92982,6 @@ func (m *PluginBearerTokenCredentials) Unmarshal(dAtA []byte) error { } m.Token = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TokenFile", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - 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 ErrInvalidLengthTypes - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTypes - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TokenFile = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) diff --git a/lib/assist/assist.go b/lib/assist/assist.go index 0e24731d08d9e..0fcbe9f50685c 100644 --- a/lib/assist/assist.go +++ b/lib/assist/assist.go @@ -21,9 +21,7 @@ package assist import ( "context" "encoding/json" - "os" "regexp" - "strings" "time" "github.com/gravitational/trace" @@ -423,13 +421,6 @@ func getOpenAITokenFromDefaultPlugin(ctx context.Context, proxyClient auth.Clien if creds == nil { return "", trace.BadParameter("malformed credentials") } - if creds.TokenFile != "" { - tokenBytes, err := os.ReadFile(creds.TokenFile) - if err != nil { - return "", trace.Wrap(err) - } - return strings.TrimSpace(string(tokenBytes)), nil - } return creds.Token, nil }