diff --git a/api/proto/teleport/legacy/types/types.proto b/api/proto/teleport/legacy/types/types.proto index ca24f40a8de6f..b04198d4f45aa 100644 --- a/api/proto/teleport/legacy/types/types.proto +++ b/api/proto/teleport/legacy/types/types.proto @@ -5195,13 +5195,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 50ac58b44ebc9..8f215d501b606 100644 --- a/api/types/types.pb.go +++ b/api/types/types.pb.go @@ -13682,14 +13682,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:"-"` @@ -15581,7 +15574,7 @@ func init() { func init() { proto.RegisterFile("teleport/legacy/types/types.proto", fileDescriptor_9198ee693835762e) } var fileDescriptor_9198ee693835762e = []byte{ - // 20798 bytes of a gzipped FileDescriptorProto + // 20796 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0xbd, 0x6d, 0x90, 0x1c, 0x49, 0x76, 0x18, 0x86, 0xee, 0x9e, 0x8f, 0x9e, 0x37, 0x5f, 0x3d, 0x89, 0x01, 0x30, 0xc0, 0x7e, 0x0c, 0xb6, 0x76, 0x17, 0x07, 0x60, 0x77, 0x81, 0xc3, 0xe0, 0x16, 0x77, 0x7b, 0xfb, 0xd9, 0xd3, 0xdd, @@ -16743,145 +16736,145 @@ var fileDescriptor_9198ee693835762e = []byte{ 0xf8, 0xe6, 0x84, 0x50, 0xc4, 0xe5, 0x7f, 0x76, 0xc5, 0xe1, 0xef, 0x65, 0xc0, 0x38, 0xf9, 0xa3, 0xd8, 0xb0, 0xf4, 0xf4, 0xca, 0x84, 0x39, 0x69, 0x2b, 0x9f, 0xf8, 0x32, 0x4c, 0xfb, 0x74, 0xdf, 0xa7, 0xc1, 0xa1, 0xf2, 0x8d, 0x13, 0xe6, 0x94, 0x00, 0xca, 0xd6, 0xcb, 0xfb, 0x13, 0x43, 0x6c, - 0x63, 0x94, 0x87, 0xfa, 0x05, 0x91, 0x51, 0x8f, 0x66, 0x79, 0x6a, 0x67, 0x31, 0x43, 0x5c, 0x6d, - 0x20, 0xff, 0xc1, 0xb4, 0x21, 0xbf, 0xe1, 0xb1, 0xef, 0xb4, 0xa2, 0x4c, 0xd4, 0x08, 0x59, 0x71, - 0x5a, 0xd4, 0x78, 0x4b, 0xae, 0x8e, 0x6b, 0x4e, 0x10, 0xee, 0xdc, 0x22, 0xd7, 0x60, 0x9c, 0x2f, - 0x88, 0x72, 0x8b, 0x3c, 0xab, 0x75, 0xf0, 0xce, 0x2d, 0x53, 0x96, 0x1b, 0xbf, 0x29, 0x2e, 0x21, - 0x56, 0x9b, 0xb5, 0x44, 0x02, 0xb7, 0x27, 0xf5, 0x04, 0x54, 0xb4, 0x7d, 0xea, 0xcb, 0x4a, 0x3e, - 0xa2, 0xde, 0xba, 0xfa, 0x3b, 0x04, 0x94, 0xb8, 0xc8, 0x9f, 0xcb, 0xc0, 0xf3, 0x83, 0xc8, 0x53, - 0x73, 0xcd, 0x65, 0x4e, 0x97, 0x6b, 0xee, 0x1a, 0xe4, 0x39, 0x4c, 0xcf, 0xf8, 0x2c, 0x48, 0x9d, - 0xa6, 0x19, 0x15, 0x1b, 0x45, 0x80, 0x6a, 0xb3, 0xb6, 0xd9, 0xe1, 0x57, 0x21, 0x6f, 0xc3, 0x08, - 0x6b, 0x5b, 0xa2, 0xa3, 0x58, 0x53, 0x8b, 0xeb, 0x6b, 0x02, 0x89, 0x9b, 0xbf, 0x81, 0xdd, 0x6e, - 0x99, 0x88, 0x6c, 0xec, 0xc2, 0x8c, 0x8e, 0x41, 0x2a, 0x7a, 0xf0, 0x7c, 0xfc, 0x48, 0xcd, 0xb2, - 0xe7, 0x71, 0x67, 0xc3, 0xf2, 0xc5, 0x1f, 0x1c, 0x2f, 0x02, 0xfb, 0xc9, 0x69, 0xd2, 0x82, 0xeb, - 0x8d, 0xef, 0x65, 0x61, 0x3e, 0x3e, 0xa0, 0x93, 0xc3, 0xf5, 0xcc, 0x3a, 0xd0, 0x8b, 0x9a, 0x83, - 0x77, 0xb1, 0xe7, 0x1d, 0x08, 0xf9, 0x81, 0x03, 0xfc, 0x4a, 0x77, 0x61, 0xa1, 0x1f, 0x3e, 0x79, - 0xad, 0x27, 0x53, 0xbb, 0x08, 0x24, 0x8b, 0x52, 0xba, 0x2b, 0x89, 0xdb, 0xff, 0x55, 0x06, 0x2e, - 0x89, 0x3d, 0xff, 0xba, 0xed, 0xb8, 0xf8, 0x3a, 0x4d, 0x83, 0x3e, 0x9d, 0x93, 0x97, 0xbb, 0xda, - 0x94, 0x79, 0x55, 0x77, 0xed, 0xf4, 0xd4, 0xd6, 0xff, 0x6b, 0xc9, 0x35, 0x8c, 0xbe, 0x6b, 0xf0, - 0x6d, 0xd7, 0x08, 0x3f, 0x5d, 0x76, 0x19, 0x40, 0x3d, 0x5d, 0x46, 0x0c, 0xe3, 0xc7, 0xe1, 0xc5, - 0xc1, 0x15, 0x90, 0x6f, 0xc0, 0x74, 0xf1, 0x80, 0xba, 0xe1, 0x76, 0xe7, 0xc0, 0xb7, 0x9b, 0x54, - 0xba, 0xc2, 0xa4, 0xd5, 0xa9, 0x96, 0xf1, 0x88, 0x43, 0x71, 0xda, 0xc9, 0xe0, 0x56, 0x57, 0x10, - 0x69, 0x61, 0xd2, 0x2a, 0x37, 0xe3, 0x27, 0x32, 0x40, 0x7a, 0x79, 0x90, 0x3b, 0x30, 0xb5, 0xbd, - 0x55, 0xaa, 0x87, 0xb6, 0x1f, 0xae, 0x7a, 0x5d, 0xde, 0x9d, 0xd3, 0xe2, 0x20, 0x2e, 0x6c, 0x58, - 0x01, 0x2b, 0xb0, 0x0e, 0xbd, 0xae, 0x6f, 0x6a, 0x78, 0x98, 0xdf, 0x82, 0xd2, 0xfb, 0x4d, 0xfb, - 0x48, 0xcf, 0x6f, 0x21, 0x60, 0x5a, 0x7e, 0x0b, 0x01, 0x33, 0xfe, 0x46, 0x06, 0x9e, 0x93, 0xe6, - 0x62, 0x33, 0xa5, 0x2d, 0x25, 0x0c, 0xf1, 0xf0, 0xe5, 0x95, 0x84, 0x41, 0x2a, 0x7f, 0x4e, 0x46, - 0x41, 0x61, 0x03, 0x51, 0xf7, 0x73, 0x5a, 0x7c, 0x9a, 0x2b, 0xf4, 0x3a, 0x43, 0x84, 0x41, 0x15, - 0xa2, 0x11, 0x0d, 0xbd, 0x0e, 0xb2, 0x40, 0x4a, 0x83, 0xc2, 0xbc, 0xda, 0x38, 0xd9, 0x62, 0xb2, - 0x0e, 0xe3, 0x22, 0xd4, 0x53, 0xa8, 0x7b, 0x19, 0xfd, 0x3b, 0xe0, 0x9b, 0x96, 0x67, 0x65, 0xac, - 0x95, 0x08, 0x8a, 0x37, 0x25, 0x0f, 0x63, 0x8b, 0x3f, 0x0a, 0x8a, 0x97, 0xc4, 0x9e, 0x50, 0xa2, - 0x15, 0xed, 0xfd, 0xef, 0x66, 0x60, 0x9e, 0xd9, 0xc3, 0xd5, 0x76, 0xc7, 0xf3, 0x43, 0xb3, 0xdb, - 0x92, 0xb3, 0xef, 0x2a, 0xe4, 0x6b, 0x72, 0x17, 0xc0, 0x0f, 0x07, 0xd1, 0xef, 0x22, 0x77, 0x02, - 0x66, 0x54, 0x4a, 0x56, 0x21, 0x2f, 0xee, 0xd3, 0xc8, 0x27, 0xf2, 0xa4, 0xeb, 0x57, 0x67, 0x2c, - 0x90, 0xd8, 0xdc, 0x40, 0x85, 0x22, 0x68, 0xcc, 0x88, 0xda, 0xf8, 0xe3, 0x0c, 0x5c, 0xe8, 0x43, - 0x43, 0xde, 0x85, 0x51, 0xf4, 0xfe, 0x8a, 0xbe, 0x7c, 0xbe, 0x4f, 0x15, 0x61, 0xe3, 0x70, 0xe7, - 0x16, 0x3f, 0x93, 0x68, 0xb3, 0x1f, 0x26, 0xa7, 0x22, 0x5f, 0x83, 0x89, 0x62, 0xb3, 0xa9, 0x3d, - 0xe4, 0xf7, 0xc6, 0xe0, 0x56, 0xde, 0x88, 0xf0, 0xf9, 0x8b, 0x68, 0xdc, 0x8b, 0xd1, 0x6c, 0x8a, - 0x97, 0xd0, 0xcc, 0x98, 0xdf, 0xa5, 0x77, 0x60, 0x46, 0x47, 0x3e, 0x95, 0x2b, 0xef, 0xd7, 0x32, - 0x50, 0xd0, 0xdb, 0xf0, 0xe9, 0xc4, 0x6c, 0xa5, 0x0d, 0xf3, 0x09, 0x6b, 0xfb, 0x2f, 0x65, 0xe1, - 0x5c, 0x6a, 0x0f, 0x93, 0x37, 0x60, 0xac, 0xd8, 0xe9, 0x54, 0xcb, 0x5c, 0xb6, 0xc5, 0x52, 0x6e, - 0x77, 0x3a, 0x89, 0x28, 0x6f, 0x81, 0x44, 0x6e, 0x43, 0x1e, 0x05, 0x97, 0x11, 0x64, 0xe3, 0xc0, - 0x70, 0xbc, 0x07, 0x99, 0x0c, 0x0c, 0x97, 0x88, 0x64, 0x05, 0x66, 0x44, 0xf8, 0x86, 0x49, 0x0f, - 0xe8, 0xa3, 0xe8, 0xaa, 0x21, 0xde, 0x86, 0x94, 0xc1, 0x1e, 0x96, 0xcf, 0xcb, 0xd4, 0x5b, 0x23, - 0x3a, 0x15, 0xe6, 0xf1, 0x67, 0x3c, 0x55, 0x4e, 0x3c, 0x3a, 0x9d, 0xe7, 0xf1, 0xc7, 0x46, 0xf4, - 0xe1, 0xd5, 0x43, 0x19, 0x0d, 0x57, 0x31, 0x08, 0x9c, 0x03, 0xb7, 0x4d, 0xdd, 0xf0, 0xd3, 0x1b, - 0xae, 0xb8, 0x8e, 0xa1, 0x86, 0xeb, 0xfb, 0x23, 0x7c, 0x32, 0x27, 0xc9, 0x4e, 0x78, 0xaa, 0xa6, - 0x0c, 0xe3, 0xfc, 0x06, 0x92, 0x9c, 0x19, 0x2f, 0xa4, 0x36, 0x81, 0xe3, 0xec, 0xdc, 0xe2, 0xc6, - 0x04, 0x77, 0x62, 0x07, 0xa6, 0x24, 0x25, 0x3b, 0x30, 0x59, 0x6a, 0x51, 0xdb, 0xed, 0x76, 0x86, - 0x7c, 0x71, 0x7a, 0x41, 0x7c, 0xcb, 0x54, 0x83, 0x93, 0xc5, 0x4f, 0x4e, 0xab, 0x8c, 0xc8, 0x56, - 0xe4, 0xd7, 0x1a, 0xc1, 0x6d, 0xd8, 0xe7, 0x07, 0xf4, 0x4f, 0x12, 0x88, 0x74, 0xba, 0xd3, 0x56, - 0x38, 0xbe, 0x2c, 0x98, 0x59, 0xb3, 0x83, 0x70, 0xcb, 0xb7, 0xdd, 0x00, 0x63, 0xbf, 0x87, 0x08, - 0xc8, 0x93, 0x09, 0x87, 0x67, 0x31, 0xf8, 0x23, 0x8c, 0x48, 0xb1, 0xcd, 0x09, 0x76, 0xcc, 0x7a, - 0x59, 0x71, 0x5c, 0xbb, 0xe5, 0x7c, 0x47, 0xba, 0xff, 0xb9, 0xf5, 0xb2, 0x2f, 0x81, 0x66, 0x5c, - 0x6e, 0x7c, 0xbd, 0x67, 0xdc, 0x78, 0x2b, 0x27, 0x61, 0x5c, 0x9c, 0x8f, 0xf2, 0xf3, 0xc2, 0x5a, - 0x65, 0xa3, 0x5c, 0xdd, 0xb8, 0x5b, 0xc8, 0x90, 0x19, 0x80, 0x9a, 0xb9, 0x59, 0xaa, 0xd4, 0xeb, - 0xec, 0x77, 0x96, 0xfd, 0x16, 0x87, 0x89, 0x2b, 0xdb, 0x6b, 0x85, 0x9c, 0x72, 0x9e, 0x38, 0x62, - 0xfc, 0xcb, 0x0c, 0x9c, 0x4f, 0x1f, 0x4a, 0xb2, 0x05, 0x78, 0xa2, 0x2c, 0x76, 0xb8, 0x77, 0x06, - 0x8e, 0x7b, 0x2a, 0x38, 0x79, 0x32, 0x1d, 0xf2, 0x13, 0x4f, 0xb6, 0xdf, 0xcf, 0xea, 0x89, 0x7f, - 0x9d, 0xa6, 0x51, 0x82, 0x85, 0x7e, 0x3c, 0xf4, 0x4f, 0x9d, 0x85, 0xc9, 0x62, 0xad, 0xb6, 0x56, - 0x2d, 0x15, 0xb7, 0xaa, 0x9b, 0x1b, 0x85, 0x0c, 0x99, 0x80, 0xd1, 0xbb, 0xe6, 0xe6, 0x76, 0xad, - 0x90, 0x35, 0xfe, 0x52, 0x06, 0xa6, 0xab, 0x6e, 0x48, 0x0f, 0x78, 0xa2, 0xa3, 0x27, 0x9d, 0x7c, - 0x5f, 0xd6, 0x26, 0xdf, 0x42, 0x14, 0x7b, 0x11, 0x55, 0x30, 0xd4, 0xcc, 0x7b, 0x08, 0x73, 0x3d, - 0x24, 0xa4, 0x0e, 0xe3, 0xc5, 0xdd, 0xfa, 0x66, 0xb5, 0x5c, 0x12, 0x0d, 0x93, 0x26, 0xb2, 0x80, - 0xf6, 0x56, 0xc2, 0xcf, 0x6a, 0x1e, 0x06, 0x96, 0xe7, 0x34, 0x95, 0xdc, 0x69, 0xab, 0x67, 0x4c, - 0xc9, 0x89, 0xed, 0xb3, 0x85, 0x95, 0x8f, 0x06, 0xf4, 0x1a, 0x2c, 0xf4, 0xe3, 0xc6, 0xf6, 0x0d, - 0xa6, 0xd7, 0xa2, 0x45, 0x73, 0x43, 0x3d, 0x0a, 0xc2, 0xab, 0xae, 0xb6, 0xef, 0x26, 0xaf, 0xba, - 0x16, 0xcd, 0x0d, 0xe3, 0xaf, 0x64, 0xe1, 0x3c, 0xeb, 0x97, 0x16, 0x0d, 0x02, 0xb6, 0x6d, 0x67, - 0x1b, 0x2c, 0xf1, 0x60, 0xe1, 0x17, 0x61, 0xec, 0x70, 0x88, 0x4e, 0xce, 0xcb, 0x4e, 0x36, 0x05, - 0x3a, 0x21, 0x80, 0xba, 0x46, 0xac, 0x7b, 0xf8, 0x37, 0xdb, 0x38, 0xc7, 0x49, 0x0d, 0x51, 0x55, - 0x4c, 0x99, 0x13, 0x9d, 0x28, 0xb5, 0xe1, 0x97, 0x60, 0x14, 0xa3, 0x72, 0xc5, 0x8c, 0x97, 0x76, - 0x53, 0x7a, 0xcb, 0x30, 0x5c, 0xd7, 0xe4, 0x04, 0xe4, 0x26, 0x40, 0x7c, 0x15, 0x51, 0x4c, 0x69, - 0xb9, 0x57, 0x8b, 0x6e, 0x23, 0x9a, 0x13, 0xed, 0x7d, 0x5b, 0x5c, 0x4c, 0xbc, 0x0e, 0x73, 0x32, - 0xfb, 0x67, 0x47, 0x86, 0x95, 0xf2, 0x08, 0x5a, 0x73, 0x96, 0x17, 0x54, 0x3b, 0x22, 0xb4, 0xd4, - 0xf8, 0x9f, 0xb3, 0x30, 0xb1, 0xcb, 0xd6, 0x3f, 0xdc, 0x63, 0x0d, 0xde, 0xb3, 0x2d, 0xc1, 0xe4, - 0x9a, 0x67, 0x37, 0xf5, 0x07, 0xb7, 0xf0, 0x60, 0xa3, 0xe5, 0xd9, 0xd2, 0xcf, 0x12, 0x98, 0x2a, - 0xd2, 0x09, 0x87, 0x32, 0x1f, 0xc2, 0x18, 0x0f, 0x4b, 0x17, 0xe9, 0x41, 0xa5, 0x05, 0x14, 0xb5, - 0xe8, 0x06, 0x2f, 0xe6, 0xd6, 0x0a, 0x1e, 0xe2, 0xed, 0x23, 0x40, 0x5d, 0x8e, 0x45, 0x60, 0xbb, - 0xb2, 0xa3, 0x1c, 0x1d, 0x6e, 0x47, 0xa9, 0x04, 0x13, 0x8e, 0x0d, 0x13, 0x4c, 0x78, 0xe9, 0x2d, - 0x98, 0x54, 0xda, 0x73, 0x2a, 0x83, 0xe8, 0x27, 0xb3, 0x30, 0x8d, 0x5f, 0x15, 0x39, 0xe2, 0x9e, - 0xcd, 0xfd, 0xf1, 0x97, 0xb5, 0xfd, 0xf1, 0x82, 0x3a, 0x5e, 0xfc, 0xcb, 0x06, 0x6c, 0x8c, 0x3f, - 0x84, 0xb9, 0x1e, 0x44, 0xf2, 0x26, 0x8c, 0xb2, 0xe6, 0xcb, 0xfd, 0x44, 0x21, 0x29, 0x01, 0xf1, - 0x65, 0x0f, 0xf6, 0xe1, 0x81, 0xc9, 0xb1, 0x8d, 0xff, 0x27, 0x03, 0x53, 0xfc, 0x09, 0xca, 0xaa, - 0xbb, 0xef, 0x3d, 0xb3, 0xdd, 0xf9, 0x96, 0xd6, 0x9d, 0x17, 0xa2, 0x80, 0x54, 0xf9, 0x61, 0x03, - 0x7a, 0xf3, 0x9f, 0xe2, 0xb5, 0x08, 0x1d, 0x91, 0x94, 0xf9, 0xb3, 0xc1, 0xba, 0x6a, 0x4e, 0x62, - 0x31, 0x5d, 0x8d, 0x99, 0x67, 0xe6, 0xd2, 0xdf, 0x10, 0xbe, 0x74, 0x88, 0x4a, 0x5e, 0x66, 0x81, - 0x89, 0xdf, 0x9c, 0x55, 0xb2, 0xc0, 0xc4, 0x6f, 0xce, 0xaa, 0x2f, 0xcd, 0xde, 0x04, 0xc0, 0x08, - 0x3f, 0xb7, 0x41, 0x23, 0xaf, 0x16, 0x1e, 0x63, 0x3a, 0x02, 0xca, 0xf0, 0x15, 0x14, 0xe3, 0x6f, - 0xe7, 0x00, 0xe2, 0xe3, 0x0d, 0x36, 0x23, 0xa9, 0x96, 0xd0, 0x41, 0x78, 0xd3, 0x10, 0xa4, 0x8e, - 0x92, 0x00, 0x91, 0x2b, 0x30, 0xa2, 0x64, 0x74, 0x4c, 0x8d, 0x1b, 0xc6, 0xc8, 0xfb, 0x12, 0x40, - 0x70, 0xe4, 0x36, 0xac, 0x26, 0x6d, 0xd9, 0x5c, 0x39, 0xe7, 0xf0, 0x2d, 0xa8, 0xf9, 0x18, 0xda, - 0x27, 0xe7, 0xe0, 0x04, 0xc3, 0x28, 0x33, 0x04, 0xf2, 0x2e, 0x4c, 0xa9, 0x69, 0x7b, 0xc5, 0x61, - 0x32, 0x86, 0x4b, 0xab, 0x70, 0x35, 0x5c, 0xda, 0xee, 0x38, 0x32, 0xa9, 0x2f, 0x59, 0x82, 0x28, - 0x6b, 0x8d, 0xaa, 0xa1, 0xd2, 0x32, 0x50, 0x4a, 0x18, 0xa3, 0xe9, 0xd8, 0x41, 0xf0, 0xd0, 0xf3, - 0x9b, 0xda, 0x43, 0x6c, 0x02, 0xa6, 0xd2, 0x48, 0x18, 0xa9, 0xc1, 0x84, 0xe3, 0x3e, 0xa0, 0x6e, - 0xe8, 0xf9, 0x47, 0x0b, 0xe3, 0x38, 0xab, 0x2e, 0x2a, 0x27, 0x49, 0x55, 0x59, 0xc6, 0x95, 0x2a, - 0xee, 0x59, 0x22, 0x7c, 0xf5, 0x7e, 0x4a, 0x04, 0x14, 0xc7, 0x46, 0xff, 0x2c, 0x0b, 0xa4, 0x97, - 0x01, 0xf9, 0x32, 0x4c, 0x72, 0x9d, 0x6c, 0xf9, 0xc1, 0xb7, 0xc5, 0x81, 0x13, 0xbf, 0x99, 0xa8, - 0x80, 0xd5, 0xb4, 0x30, 0x1c, 0x6c, 0x06, 0xdf, 0x6e, 0x91, 0x6f, 0xc0, 0x59, 0x1c, 0x80, 0x0e, - 0xf5, 0x1d, 0xaf, 0x69, 0xe1, 0x5d, 0x02, 0xbb, 0x25, 0x32, 0x08, 0xbd, 0x81, 0xa9, 0xee, 0x7a, - 0x8b, 0xfb, 0x0c, 0xd4, 0x1c, 0x43, 0xad, 0x21, 0x66, 0x8d, 0x23, 0x92, 0x2d, 0x28, 0xa8, 0xf4, - 0xfb, 0xdd, 0x56, 0x4b, 0x8c, 0xfd, 0x75, 0x7c, 0x01, 0x23, 0x51, 0xd6, 0x87, 0xf1, 0x4c, 0xcc, - 0x78, 0xa5, 0xdb, 0x6a, 0x91, 0x2f, 0x02, 0x78, 0xae, 0xd5, 0x76, 0x82, 0xc0, 0x71, 0x0f, 0x84, - 0x10, 0xe0, 0x2d, 0x81, 0x18, 0xaa, 0x76, 0xa3, 0xe7, 0xae, 0x73, 0x20, 0xef, 0xc6, 0xeb, 0xef, - 0xc3, 0xac, 0x0c, 0x01, 0xdb, 0x5a, 0xab, 0x63, 0xc4, 0xf6, 0x2c, 0x4c, 0xee, 0x54, 0xcc, 0xea, - 0xca, 0xc7, 0xd6, 0xca, 0xf6, 0xda, 0x5a, 0xe1, 0x0c, 0x99, 0x86, 0x09, 0x01, 0x28, 0x15, 0x0b, - 0x19, 0x32, 0x05, 0xf9, 0xea, 0x46, 0xbd, 0x52, 0xda, 0x36, 0x2b, 0x85, 0xec, 0xf5, 0x25, 0x98, - 0x89, 0x33, 0xb4, 0xa3, 0x9d, 0x39, 0x0e, 0x39, 0xb3, 0xb8, 0x5b, 0x38, 0xc3, 0x2c, 0xe4, 0xda, - 0xbd, 0x52, 0xfd, 0xd6, 0xad, 0x42, 0x86, 0x19, 0x9f, 0x77, 0x4b, 0x35, 0xeb, 0xde, 0x7a, 0xbd, - 0x90, 0xbd, 0xfe, 0x79, 0x98, 0xc3, 0xbb, 0xc9, 0x6b, 0x4e, 0x10, 0x52, 0x97, 0xfa, 0x58, 0xed, - 0x14, 0xe4, 0xeb, 0xb4, 0x63, 0xfb, 0x76, 0x48, 0x79, 0x9d, 0xeb, 0xdd, 0x56, 0xe8, 0x74, 0x5a, - 0xf4, 0x51, 0x21, 0x73, 0xfd, 0x2d, 0x98, 0x35, 0xbd, 0x6e, 0xe8, 0xb8, 0x07, 0xf5, 0x90, 0x61, - 0x1c, 0x1c, 0x91, 0x73, 0x30, 0xb7, 0xbd, 0x51, 0x5c, 0x5f, 0xae, 0xde, 0xdd, 0xde, 0xdc, 0xae, - 0x5b, 0xeb, 0xc5, 0xad, 0xd2, 0x2a, 0x37, 0x6c, 0xd7, 0x37, 0xeb, 0x5b, 0x96, 0x59, 0x29, 0x55, - 0x36, 0xb6, 0x0a, 0x99, 0xeb, 0x3f, 0x9b, 0x81, 0x19, 0xb6, 0x09, 0xc3, 0x13, 0x87, 0x6d, 0x0c, - 0xc9, 0xba, 0x0c, 0xcf, 0x6f, 0xd7, 0x2b, 0xa6, 0xb5, 0xb5, 0x79, 0xaf, 0xb2, 0x61, 0x6d, 0xd7, - 0x8b, 0x77, 0x93, 0x61, 0x93, 0x8b, 0xf0, 0x9c, 0x82, 0x61, 0x56, 0x4a, 0x9b, 0x3b, 0x15, 0xd3, - 0xaa, 0x15, 0xeb, 0xf5, 0xdd, 0x4d, 0xb3, 0x5c, 0xc8, 0x90, 0x4b, 0x70, 0x3e, 0x05, 0x61, 0x7d, - 0xa5, 0x58, 0xc8, 0xf6, 0x94, 0x6d, 0x54, 0x76, 0x8b, 0x6b, 0xd6, 0xf2, 0xe6, 0x56, 0x21, 0x77, - 0x1d, 0x1f, 0x1c, 0xc7, 0x58, 0x29, 0x7e, 0x09, 0x2a, 0x0f, 0x23, 0x1b, 0x9b, 0x1b, 0x95, 0xe4, - 0xe6, 0x63, 0x0a, 0xf2, 0xc5, 0x5a, 0xcd, 0xdc, 0xdc, 0xa9, 0x94, 0x0b, 0x59, 0xd6, 0x91, 0xe5, - 0xca, 0x06, 0x6b, 0x59, 0xee, 0xba, 0x01, 0x73, 0x25, 0xea, 0x87, 0x95, 0x47, 0x21, 0x75, 0x99, - 0xce, 0xc7, 0xbe, 0x9b, 0x86, 0x89, 0xca, 0x57, 0xb6, 0x2a, 0x1b, 0x75, 0x66, 0xcb, 0x9f, 0xb9, - 0xfe, 0x7c, 0x02, 0x47, 0x0e, 0x4b, 0xbd, 0xbe, 0x5a, 0x38, 0x73, 0xfd, 0xeb, 0x6c, 0xad, 0x52, - 0x2e, 0xf8, 0x5d, 0x80, 0xb3, 0xea, 0xef, 0x1a, 0x75, 0x9b, 0x8e, 0x7b, 0x50, 0x38, 0x93, 0x2c, - 0x30, 0xbb, 0xae, 0xcb, 0x0a, 0xf0, 0xe3, 0xd5, 0x82, 0x2d, 0xea, 0xb7, 0x1d, 0xd7, 0x0e, 0x69, - 0xb3, 0x90, 0xbd, 0x7e, 0x03, 0xa6, 0xb5, 0x30, 0x33, 0x56, 0xef, 0xda, 0xa6, 0x10, 0x87, 0xf5, - 0x4a, 0xb9, 0xba, 0xbd, 0x5e, 0x18, 0x65, 0x9f, 0xbd, 0x5a, 0xbd, 0xbb, 0x5a, 0x80, 0xeb, 0x5f, - 0x87, 0x19, 0x71, 0x6f, 0x61, 0x7d, 0xa5, 0x28, 0x1b, 0xba, 0xb9, 0xb2, 0x22, 0xc2, 0x37, 0xd9, - 0xf6, 0x0b, 0xf7, 0x27, 0xcf, 0xc3, 0x82, 0xf8, 0x61, 0x15, 0x37, 0xca, 0xd6, 0x6a, 0xd1, 0x2c, - 0xef, 0x16, 0xcd, 0x8a, 0x75, 0xaf, 0xf2, 0x71, 0x21, 0x4b, 0xce, 0x03, 0x51, 0x21, 0xd6, 0xd6, - 0xe6, 0x76, 0x69, 0xb5, 0x90, 0xbb, 0xee, 0x40, 0x21, 0x79, 0x98, 0xd8, 0xb3, 0xe5, 0x33, 0xb7, - 0x37, 0x36, 0x78, 0xaf, 0xcf, 0xc2, 0xe4, 0xe6, 0xd6, 0x6a, 0xc5, 0x14, 0xa1, 0xb2, 0x18, 0x1b, - 0xbb, 0xbd, 0x51, 0xdc, 0xde, 0x5a, 0xdd, 0x34, 0xab, 0x5f, 0x65, 0xdd, 0x4f, 0x16, 0x60, 0xbe, - 0xbe, 0x56, 0x2c, 0xdd, 0xb3, 0x36, 0x36, 0xb7, 0xac, 0xea, 0x86, 0x55, 0x5a, 0x2d, 0x6e, 0x6c, - 0x54, 0xd6, 0x0a, 0x70, 0xfd, 0x5f, 0x65, 0xe0, 0xb9, 0x01, 0xf6, 0x33, 0x79, 0x03, 0xae, 0xad, - 0x56, 0x8a, 0xe5, 0xb5, 0x4a, 0xbd, 0x6e, 0x31, 0x96, 0x95, 0x8d, 0x2d, 0xb1, 0xfb, 0xb2, 0xea, - 0x5b, 0xc5, 0xad, 0xa4, 0x04, 0x5e, 0x83, 0x57, 0x07, 0xa3, 0xc7, 0xc2, 0x72, 0x15, 0x5e, 0x19, - 0x8c, 0x2a, 0x84, 0x27, 0x4b, 0xae, 0xc3, 0x95, 0xc1, 0x98, 0x91, 0xd0, 0xe5, 0x96, 0xdf, 0xfd, - 0xbd, 0x3f, 0x78, 0xf1, 0xcc, 0xef, 0xfd, 0xe1, 0x8b, 0x99, 0xdf, 0xff, 0xc3, 0x17, 0x33, 0xff, - 0xe6, 0x0f, 0x5f, 0xcc, 0x7c, 0xf5, 0xb5, 0x53, 0x64, 0x25, 0xdb, 0x1b, 0xc3, 0xed, 0xfd, 0xed, - 0xff, 0x37, 0x00, 0x00, 0xff, 0xff, 0xbf, 0x9f, 0x10, 0x87, 0xd6, 0x3c, 0x01, 0x00, + 0x63, 0x94, 0x87, 0xfa, 0x05, 0x91, 0xb1, 0x12, 0xcd, 0xf2, 0xd4, 0xce, 0x62, 0x86, 0xb8, 0xda, + 0x40, 0xfe, 0xe3, 0xc3, 0x91, 0x7c, 0xb6, 0x90, 0x33, 0xc5, 0x2d, 0x8f, 0x7d, 0xa7, 0x45, 0x8d, + 0xb7, 0xe4, 0x82, 0xb8, 0xe6, 0x04, 0xe1, 0xce, 0x2d, 0x72, 0x0d, 0xc6, 0xf9, 0x1a, 0x28, 0x77, + 0xc5, 0xb3, 0x5a, 0x9f, 0xee, 0xdc, 0x32, 0x65, 0xb9, 0xf1, 0x9b, 0xe2, 0xde, 0x61, 0xb5, 0x59, + 0x4b, 0xe4, 0x6c, 0x7b, 0xd2, 0xcd, 0x7f, 0x45, 0xdb, 0x9a, 0xbe, 0xac, 0xa4, 0x20, 0xea, 0xad, + 0xab, 0xbf, 0x0f, 0x40, 0x09, 0x85, 0xfc, 0xb9, 0x0c, 0x3c, 0x3f, 0x88, 0x3c, 0x35, 0xbd, 0x5c, + 0xe6, 0x74, 0xe9, 0xe5, 0xae, 0x41, 0x9e, 0xc3, 0xf4, 0x24, 0xcf, 0x82, 0xd4, 0x69, 0x9a, 0x51, + 0xb1, 0x51, 0x04, 0xa8, 0x36, 0x6b, 0x9b, 0x1d, 0x7e, 0xfb, 0xf1, 0x36, 0x8c, 0xb0, 0xb6, 0x25, + 0x3a, 0x8a, 0x35, 0xb5, 0xb8, 0xbe, 0x26, 0x90, 0xb8, 0xc5, 0x1b, 0xd8, 0xed, 0x96, 0x89, 0xc8, + 0xc6, 0x2e, 0xcc, 0xe8, 0x18, 0xa4, 0xa2, 0xc7, 0xcb, 0xc7, 0xef, 0xd2, 0x2c, 0x7b, 0x1e, 0xf7, + 0x2f, 0x2c, 0x5f, 0xfc, 0xc1, 0xf1, 0x22, 0xb0, 0x9f, 0x9c, 0x26, 0x2d, 0x9e, 0xde, 0xf8, 0x5e, + 0x16, 0xe6, 0xe3, 0x33, 0x39, 0x39, 0x5c, 0xcf, 0xac, 0xcf, 0xbc, 0xa8, 0xf9, 0x74, 0x17, 0x7b, + 0x9e, 0x7e, 0x90, 0x1f, 0x38, 0xc0, 0x95, 0x74, 0x17, 0x16, 0xfa, 0xe1, 0x93, 0xd7, 0x7a, 0x92, + 0xb3, 0x8b, 0xd8, 0xb1, 0x28, 0x8b, 0xbb, 0x92, 0xab, 0xfd, 0x5f, 0x65, 0xe0, 0x92, 0xd8, 0xe6, + 0xaf, 0xdb, 0x8e, 0x8b, 0x0f, 0xd2, 0x34, 0xe8, 0xd3, 0x39, 0x6c, 0xb9, 0xab, 0x4d, 0x99, 0x57, + 0x75, 0x6f, 0x4e, 0x4f, 0x6d, 0xfd, 0xbf, 0x96, 0x5c, 0xc3, 0x80, 0xbb, 0x06, 0xdf, 0x69, 0x8d, + 0xf0, 0x03, 0x65, 0x97, 0x01, 0xd4, 0x03, 0x65, 0xc4, 0x30, 0x7e, 0x1c, 0x5e, 0x1c, 0x5c, 0x01, + 0xf9, 0x06, 0x4c, 0x17, 0x0f, 0xa8, 0x1b, 0x6e, 0x77, 0x0e, 0x7c, 0xbb, 0x49, 0xa5, 0xf7, 0x4b, + 0x1a, 0x9a, 0x6a, 0x19, 0x0f, 0x32, 0x14, 0x07, 0x9c, 0x0c, 0x6e, 0x75, 0x05, 0x91, 0x16, 0x19, + 0xad, 0x72, 0x33, 0x7e, 0x22, 0x03, 0xa4, 0x97, 0x07, 0xb9, 0x03, 0x53, 0xdb, 0x5b, 0xa5, 0x7a, + 0x68, 0xfb, 0xe1, 0xaa, 0xd7, 0xe5, 0xdd, 0x39, 0x2d, 0xce, 0xde, 0xc2, 0x86, 0x15, 0xb0, 0x02, + 0xeb, 0xd0, 0xeb, 0xfa, 0xa6, 0x86, 0x87, 0x29, 0x2d, 0x28, 0xbd, 0xdf, 0xb4, 0x8f, 0xf4, 0x94, + 0x16, 0x02, 0xa6, 0xa5, 0xb4, 0x10, 0x30, 0xe3, 0x6f, 0x64, 0xe0, 0x39, 0x69, 0x21, 0x36, 0x53, + 0xda, 0x52, 0xc2, 0xa8, 0x0e, 0x5f, 0xde, 0x42, 0x18, 0xa4, 0xe5, 0xe7, 0x64, 0xe0, 0x13, 0x36, + 0x10, 0xd5, 0x3d, 0xa7, 0xc5, 0xd7, 0xb8, 0x42, 0xaf, 0x33, 0x44, 0xe4, 0x53, 0x21, 0x1a, 0xd1, + 0xd0, 0xeb, 0x20, 0x0b, 0xa4, 0x34, 0x28, 0xcc, 0xab, 0x8d, 0x93, 0x2d, 0x26, 0xeb, 0x30, 0x2e, + 0xa2, 0x3b, 0x85, 0xba, 0x97, 0x01, 0xbf, 0x03, 0xbe, 0x69, 0x79, 0x56, 0x86, 0x57, 0x89, 0x38, + 0x78, 0x53, 0xf2, 0x30, 0xb6, 0xf8, 0x3b, 0xa0, 0x78, 0x2f, 0xec, 0x09, 0x25, 0x5a, 0xd1, 0xde, + 0xff, 0x6e, 0x06, 0xe6, 0x99, 0x09, 0x5c, 0x6d, 0x77, 0x3c, 0x3f, 0x34, 0xbb, 0x2d, 0x39, 0xfb, + 0xae, 0x42, 0xbe, 0x26, 0x0d, 0x7f, 0x7e, 0x1e, 0x88, 0xae, 0x16, 0x69, 0xfc, 0x9b, 0x51, 0x29, + 0x59, 0x85, 0xbc, 0xb8, 0x42, 0x23, 0x5f, 0xc5, 0x93, 0xde, 0x5e, 0x9d, 0xb1, 0x40, 0x62, 0x73, + 0x03, 0x15, 0x8a, 0xa0, 0x31, 0x23, 0x6a, 0xe3, 0x8f, 0x33, 0x70, 0xa1, 0x0f, 0x0d, 0x79, 0x17, + 0x46, 0xd1, 0xe1, 0x2b, 0xfa, 0xf2, 0xf9, 0x3e, 0x55, 0x84, 0x8d, 0xc3, 0x9d, 0x5b, 0xfc, 0x18, + 0xa2, 0xcd, 0x7e, 0x98, 0x9c, 0x8a, 0x7c, 0x0d, 0x26, 0x8a, 0xcd, 0xa6, 0xf6, 0x76, 0xdf, 0x1b, + 0x83, 0x5b, 0x79, 0x23, 0xc2, 0xe7, 0x8f, 0xa0, 0x71, 0xc7, 0x45, 0xb3, 0x29, 0x1e, 0x3f, 0x33, + 0x63, 0x7e, 0x97, 0xde, 0x81, 0x19, 0x1d, 0xf9, 0x54, 0xde, 0xbb, 0x5f, 0xcb, 0x40, 0x41, 0x6f, + 0xc3, 0xa7, 0x13, 0xa6, 0x95, 0x36, 0xcc, 0x27, 0xac, 0xed, 0xbf, 0x94, 0x85, 0x73, 0xa9, 0x3d, + 0x4c, 0xde, 0x80, 0xb1, 0x62, 0xa7, 0x53, 0x2d, 0x73, 0xd9, 0x16, 0x4b, 0xb9, 0xdd, 0xe9, 0x24, + 0x02, 0xbb, 0x05, 0x12, 0xb9, 0x0d, 0x79, 0x14, 0x5c, 0x46, 0x90, 0x8d, 0x63, 0xc1, 0xf1, 0xea, + 0x63, 0x32, 0x16, 0x5c, 0x22, 0x92, 0x15, 0x98, 0x11, 0x11, 0x1b, 0x26, 0x3d, 0xa0, 0x8f, 0xa2, + 0xdb, 0x85, 0x78, 0x01, 0x52, 0xc6, 0x77, 0x58, 0x3e, 0x2f, 0x53, 0x2f, 0x8a, 0xe8, 0x54, 0x98, + 0xba, 0x9f, 0xf1, 0x54, 0x39, 0xf1, 0x80, 0x74, 0x9e, 0xba, 0x1f, 0x1b, 0xd1, 0x87, 0x57, 0x0f, + 0x65, 0x34, 0x5c, 0xc5, 0x20, 0x70, 0x0e, 0xdc, 0x36, 0x75, 0xc3, 0x4f, 0x6f, 0xb8, 0xe2, 0x3a, + 0x86, 0x1a, 0xae, 0xef, 0x8f, 0xf0, 0xc9, 0x9c, 0x24, 0x3b, 0xe1, 0x75, 0x9a, 0x32, 0x8c, 0xf3, + 0x4b, 0x47, 0x72, 0x66, 0xbc, 0x90, 0xda, 0x04, 0x8e, 0xb3, 0x73, 0x8b, 0x1b, 0x13, 0xdc, 0x6f, + 0x1d, 0x98, 0x92, 0x94, 0xec, 0xc0, 0x64, 0xa9, 0x45, 0x6d, 0xb7, 0xdb, 0x19, 0xf2, 0x91, 0xe9, + 0x05, 0xf1, 0x2d, 0x53, 0x0d, 0x4e, 0x16, 0xbf, 0x32, 0xad, 0x32, 0x22, 0x5b, 0x91, 0x2b, 0x6b, + 0x04, 0x77, 0x5e, 0x9f, 0x1f, 0xd0, 0x3f, 0x49, 0x20, 0xd2, 0xe9, 0x7e, 0x5a, 0xe1, 0xeb, 0xb2, + 0x60, 0x66, 0xcd, 0x0e, 0xc2, 0x2d, 0xdf, 0x76, 0x03, 0x0c, 0xf7, 0x1e, 0x22, 0x06, 0x4f, 0xe6, + 0x18, 0x9e, 0xc5, 0x78, 0x8f, 0x30, 0x22, 0xc5, 0x36, 0x27, 0xd8, 0x31, 0xeb, 0x65, 0xc5, 0x71, + 0xed, 0x96, 0xf3, 0x1d, 0xe9, 0xf1, 0xe7, 0xd6, 0xcb, 0xbe, 0x04, 0x9a, 0x71, 0xb9, 0xf1, 0xf5, + 0x9e, 0x71, 0xe3, 0xad, 0x9c, 0x84, 0x71, 0x71, 0x24, 0xca, 0x8f, 0x08, 0x6b, 0x95, 0x8d, 0x72, + 0x75, 0xe3, 0x6e, 0x21, 0x43, 0x66, 0x00, 0x6a, 0xe6, 0x66, 0xa9, 0x52, 0xaf, 0xb3, 0xdf, 0x59, + 0xf6, 0x5b, 0x9c, 0x1f, 0xae, 0x6c, 0xaf, 0x15, 0x72, 0xca, 0x11, 0xe2, 0x88, 0xf1, 0x2f, 0x33, + 0x70, 0x3e, 0x7d, 0x28, 0xc9, 0x16, 0xe0, 0x21, 0xb2, 0xd8, 0xd4, 0xde, 0x19, 0x38, 0xee, 0xa9, + 0xe0, 0xe4, 0x61, 0x74, 0xc8, 0x0f, 0x39, 0xd9, 0x16, 0x3f, 0xab, 0xe7, 0xfa, 0x75, 0x9a, 0x46, + 0x09, 0x16, 0xfa, 0xf1, 0xd0, 0x3f, 0x75, 0x16, 0x26, 0x8b, 0xb5, 0xda, 0x5a, 0xb5, 0x54, 0xdc, + 0xaa, 0x6e, 0x6e, 0x14, 0x32, 0x64, 0x02, 0x46, 0xef, 0x9a, 0x9b, 0xdb, 0xb5, 0x42, 0xd6, 0xf8, + 0x4b, 0x19, 0x98, 0xae, 0xba, 0x21, 0x3d, 0xe0, 0xb9, 0x8d, 0x9e, 0x74, 0xf2, 0x7d, 0x59, 0x9b, + 0x7c, 0x0b, 0x51, 0xb8, 0x45, 0x54, 0xc1, 0x50, 0x33, 0xef, 0x21, 0xcc, 0xf5, 0x90, 0x90, 0x3a, + 0x8c, 0x17, 0x77, 0xeb, 0x9b, 0xd5, 0x72, 0x49, 0x34, 0x4c, 0x9a, 0xc8, 0x02, 0xda, 0x5b, 0x09, + 0x3f, 0x9e, 0x79, 0x18, 0x58, 0x9e, 0xd3, 0x54, 0xd2, 0xa5, 0xad, 0x9e, 0x31, 0x25, 0x27, 0xb6, + 0xb5, 0x16, 0x56, 0x3e, 0x1a, 0xd0, 0x6b, 0xb0, 0xd0, 0x8f, 0x1b, 0xdb, 0x37, 0x98, 0x5e, 0x8b, + 0x16, 0xcd, 0x0d, 0xf5, 0xf4, 0x07, 0x6f, 0xb7, 0xda, 0xbe, 0x9b, 0xbc, 0xdd, 0x5a, 0x34, 0x37, + 0x8c, 0xbf, 0x92, 0x85, 0xf3, 0xac, 0x5f, 0x5a, 0x34, 0x08, 0xd8, 0x4e, 0x9d, 0x6d, 0xb0, 0xc4, + 0x1b, 0x85, 0x5f, 0x84, 0xb1, 0xc3, 0x21, 0x3a, 0x39, 0x2f, 0x3b, 0xd9, 0x14, 0xe8, 0x84, 0x00, + 0xea, 0x1a, 0xb1, 0xee, 0xe1, 0xdf, 0xe4, 0x05, 0x50, 0xf2, 0x18, 0xa2, 0xaa, 0x98, 0x32, 0x27, + 0x3a, 0x51, 0x36, 0xc3, 0x2f, 0xc1, 0x28, 0x06, 0xe2, 0x8a, 0x19, 0x2f, 0xed, 0xa6, 0xf4, 0x96, + 0x61, 0x84, 0xae, 0xc9, 0x09, 0xc8, 0x4d, 0x80, 0xf8, 0xf6, 0xa1, 0x98, 0xd2, 0x72, 0xaf, 0x16, + 0x5d, 0x40, 0x34, 0x27, 0xda, 0xfb, 0xb6, 0xb8, 0x8b, 0x78, 0x1d, 0xe6, 0x64, 0xc2, 0xcf, 0x8e, + 0x8c, 0x24, 0xe5, 0x41, 0xb3, 0xe6, 0x2c, 0x2f, 0xa8, 0x76, 0x44, 0x34, 0xa9, 0xf1, 0x3f, 0x67, + 0x61, 0x62, 0x97, 0xad, 0x7f, 0xb8, 0xc7, 0x1a, 0xbc, 0x67, 0x5b, 0x82, 0xc9, 0x35, 0xcf, 0x6e, + 0xea, 0x6f, 0x6c, 0xe1, 0x59, 0x46, 0xcb, 0xb3, 0xa5, 0x6b, 0x25, 0x30, 0x55, 0xa4, 0x13, 0xce, + 0x61, 0x3e, 0x84, 0x31, 0x1e, 0x89, 0x2e, 0x32, 0x82, 0x4a, 0x0b, 0x28, 0x6a, 0xd1, 0x0d, 0x5e, + 0xcc, 0xad, 0x15, 0x3c, 0xb7, 0xdb, 0x47, 0x80, 0xba, 0x1c, 0x8b, 0x58, 0x76, 0x65, 0x47, 0x39, + 0x3a, 0xdc, 0x8e, 0x52, 0x89, 0x1f, 0x1c, 0x1b, 0x26, 0x7e, 0xf0, 0xd2, 0x5b, 0x30, 0xa9, 0xb4, + 0xe7, 0x54, 0x06, 0xd1, 0x4f, 0x66, 0x61, 0x1a, 0xbf, 0x2a, 0xf2, 0xbd, 0x3d, 0x9b, 0xfb, 0xe3, + 0x2f, 0x6b, 0xfb, 0xe3, 0x05, 0x75, 0xbc, 0xf8, 0x97, 0x0d, 0xd8, 0x18, 0x7f, 0x08, 0x73, 0x3d, + 0x88, 0xe4, 0x4d, 0x18, 0x65, 0xcd, 0x97, 0xfb, 0x89, 0x42, 0x52, 0x02, 0xe2, 0xfb, 0x1d, 0xec, + 0xc3, 0x03, 0x93, 0x63, 0x1b, 0xff, 0x4f, 0x06, 0xa6, 0xf8, 0xab, 0x93, 0x55, 0x77, 0xdf, 0x7b, + 0x66, 0xbb, 0xf3, 0x2d, 0xad, 0x3b, 0x2f, 0x44, 0x31, 0xa8, 0xf2, 0xc3, 0x06, 0xf4, 0xe6, 0x3f, + 0xc5, 0x9b, 0x10, 0x3a, 0x22, 0x29, 0xf3, 0x97, 0x82, 0x75, 0xd5, 0x9c, 0xc4, 0x62, 0xba, 0x1a, + 0x93, 0xcd, 0xcc, 0xa5, 0x3f, 0x1b, 0x7c, 0xe9, 0x10, 0x95, 0xbc, 0x4c, 0xfc, 0x12, 0x3f, 0x33, + 0xab, 0x24, 0x7e, 0x89, 0x9f, 0x99, 0x55, 0x1f, 0x97, 0xbd, 0x09, 0x80, 0x41, 0x7d, 0x6e, 0x83, + 0x46, 0x5e, 0x2d, 0x3c, 0xb9, 0x74, 0x04, 0x94, 0xe1, 0x2b, 0x28, 0xc6, 0xdf, 0xce, 0x01, 0xc4, + 0x27, 0x1a, 0x6c, 0x46, 0x52, 0x2d, 0x87, 0x83, 0xf0, 0xa6, 0x21, 0x48, 0x1d, 0x25, 0x01, 0x22, + 0x57, 0x60, 0x44, 0x49, 0xe2, 0x98, 0x1a, 0x2a, 0x8c, 0xc1, 0xf6, 0x25, 0x80, 0xe0, 0xc8, 0x6d, + 0x58, 0x4d, 0xda, 0xb2, 0xb9, 0x72, 0xce, 0xe1, 0xf3, 0x4f, 0xf3, 0x31, 0xb4, 0x4f, 0x9a, 0xc1, + 0x09, 0x86, 0x51, 0x66, 0x08, 0xe4, 0x5d, 0x98, 0x52, 0x33, 0xf5, 0x8a, 0xf3, 0x63, 0x8c, 0x90, + 0x56, 0xe1, 0x6a, 0x84, 0xb4, 0xdd, 0x71, 0x64, 0x1e, 0x5f, 0xb2, 0x04, 0x51, 0xa2, 0x1a, 0x55, + 0x43, 0xa5, 0x25, 0x9d, 0x94, 0x30, 0x46, 0xd3, 0xb1, 0x83, 0xe0, 0xa1, 0xe7, 0x37, 0xb5, 0xb7, + 0xd7, 0x04, 0x4c, 0xa5, 0x91, 0x30, 0x52, 0x83, 0x09, 0xc7, 0x7d, 0x40, 0xdd, 0xd0, 0xf3, 0x8f, + 0x16, 0xc6, 0x71, 0x56, 0x5d, 0x54, 0x0e, 0x8f, 0xaa, 0xb2, 0x8c, 0x2b, 0x55, 0xdc, 0xb3, 0x44, + 0xf8, 0xea, 0x95, 0x94, 0x08, 0x28, 0x4e, 0x8a, 0xfe, 0x59, 0x16, 0x48, 0x2f, 0x03, 0xf2, 0x65, + 0x98, 0xe4, 0x3a, 0xd9, 0xf2, 0x83, 0x6f, 0x8b, 0x33, 0x26, 0x7e, 0x19, 0x51, 0x01, 0xab, 0x99, + 0x60, 0x38, 0xd8, 0x0c, 0xbe, 0xdd, 0x22, 0xdf, 0x80, 0xb3, 0x38, 0x00, 0x1d, 0xea, 0x3b, 0x5e, + 0xd3, 0xc2, 0xeb, 0x03, 0x76, 0x4b, 0x24, 0x0d, 0x7a, 0x03, 0xb3, 0xdb, 0xf5, 0x16, 0xf7, 0x19, + 0xa8, 0x39, 0x86, 0x5a, 0x43, 0xcc, 0x1a, 0x47, 0x24, 0x5b, 0x50, 0x50, 0xe9, 0xf7, 0xbb, 0xad, + 0x96, 0x18, 0xfb, 0xeb, 0xf8, 0xe8, 0x45, 0xa2, 0xac, 0x0f, 0xe3, 0x99, 0x98, 0xf1, 0x4a, 0xb7, + 0xd5, 0x22, 0x5f, 0x04, 0xf0, 0x5c, 0xab, 0xed, 0x04, 0x81, 0xe3, 0x1e, 0x08, 0x21, 0xc0, 0x8b, + 0x01, 0x31, 0x54, 0xed, 0x46, 0xcf, 0x5d, 0xe7, 0x40, 0xde, 0x8d, 0xd7, 0xdf, 0x87, 0x59, 0x19, + 0xf5, 0xb5, 0xb5, 0x56, 0xc7, 0x20, 0xed, 0x59, 0x98, 0xdc, 0xa9, 0x98, 0xd5, 0x95, 0x8f, 0xad, + 0x95, 0xed, 0xb5, 0xb5, 0xc2, 0x19, 0x32, 0x0d, 0x13, 0x02, 0x50, 0x2a, 0x16, 0x32, 0x64, 0x0a, + 0xf2, 0xd5, 0x8d, 0x7a, 0xa5, 0xb4, 0x6d, 0x56, 0x0a, 0xd9, 0xeb, 0x4b, 0x30, 0x13, 0x27, 0x65, + 0x47, 0x3b, 0x73, 0x1c, 0x72, 0x66, 0x71, 0xb7, 0x70, 0x86, 0x59, 0xc8, 0xb5, 0x7b, 0xa5, 0xfa, + 0xad, 0x5b, 0x85, 0x0c, 0x33, 0x3e, 0xef, 0x96, 0x6a, 0xd6, 0xbd, 0xf5, 0x7a, 0x21, 0x7b, 0xfd, + 0xf3, 0x30, 0x87, 0xd7, 0x91, 0xd7, 0x9c, 0x20, 0xa4, 0x2e, 0xf5, 0xb1, 0xda, 0x29, 0xc8, 0xd7, + 0x69, 0xc7, 0xf6, 0xed, 0x90, 0xf2, 0x3a, 0xd7, 0xbb, 0xad, 0xd0, 0xe9, 0xb4, 0xe8, 0xa3, 0x42, + 0xe6, 0xfa, 0x5b, 0x30, 0x6b, 0x7a, 0xdd, 0xd0, 0x71, 0x0f, 0xea, 0x21, 0xc3, 0x38, 0x38, 0x22, + 0xe7, 0x60, 0x6e, 0x7b, 0xa3, 0xb8, 0xbe, 0x5c, 0xbd, 0xbb, 0xbd, 0xb9, 0x5d, 0xb7, 0xd6, 0x8b, + 0x5b, 0xa5, 0x55, 0x6e, 0xd8, 0xae, 0x6f, 0xd6, 0xb7, 0x2c, 0xb3, 0x52, 0xaa, 0x6c, 0x6c, 0x15, + 0x32, 0xd7, 0x7f, 0x36, 0x03, 0x33, 0x6c, 0x13, 0x86, 0x87, 0x0c, 0xdb, 0x18, 0x85, 0x75, 0x19, + 0x9e, 0xdf, 0xae, 0x57, 0x4c, 0x6b, 0x6b, 0xf3, 0x5e, 0x65, 0xc3, 0xda, 0xae, 0x17, 0xef, 0x26, + 0x23, 0x25, 0x17, 0xe1, 0x39, 0x05, 0xc3, 0xac, 0x94, 0x36, 0x77, 0x2a, 0xa6, 0x55, 0x2b, 0xd6, + 0xeb, 0xbb, 0x9b, 0x66, 0xb9, 0x90, 0x21, 0x97, 0xe0, 0x7c, 0x0a, 0xc2, 0xfa, 0x4a, 0xb1, 0x90, + 0xed, 0x29, 0xdb, 0xa8, 0xec, 0x16, 0xd7, 0xac, 0xe5, 0xcd, 0xad, 0x42, 0xee, 0x3a, 0xbe, 0x31, + 0x8e, 0xe1, 0x51, 0xfc, 0xde, 0x53, 0x1e, 0x46, 0x36, 0x36, 0x37, 0x2a, 0xc9, 0xcd, 0xc7, 0x14, + 0xe4, 0x8b, 0xb5, 0x9a, 0xb9, 0xb9, 0x53, 0x29, 0x17, 0xb2, 0xac, 0x23, 0xcb, 0x95, 0x0d, 0xd6, + 0xb2, 0xdc, 0x75, 0x03, 0xe6, 0x4a, 0xd4, 0x0f, 0x2b, 0x8f, 0x42, 0xea, 0x32, 0x9d, 0x8f, 0x7d, + 0x37, 0x0d, 0x13, 0x95, 0xaf, 0x6c, 0x55, 0x36, 0xea, 0xcc, 0x96, 0x3f, 0x73, 0xfd, 0xf9, 0x04, + 0x8e, 0x1c, 0x96, 0x7a, 0x7d, 0xb5, 0x70, 0xe6, 0xfa, 0xd7, 0xd9, 0x5a, 0xa5, 0xdc, 0xe9, 0xbb, + 0x00, 0x67, 0xd5, 0xdf, 0x35, 0xea, 0x36, 0x1d, 0xf7, 0xa0, 0x70, 0x26, 0x59, 0x60, 0x76, 0x5d, + 0x97, 0x15, 0xe0, 0xc7, 0xab, 0x05, 0x5b, 0xd4, 0x6f, 0x3b, 0xae, 0x1d, 0xd2, 0x66, 0x21, 0x7b, + 0xfd, 0x06, 0x4c, 0x6b, 0x91, 0x65, 0xac, 0xde, 0xb5, 0x4d, 0x21, 0x0e, 0xeb, 0x95, 0x72, 0x75, + 0x7b, 0xbd, 0x30, 0xca, 0x3e, 0x7b, 0xb5, 0x7a, 0x77, 0xb5, 0x00, 0xd7, 0xbf, 0x0e, 0x33, 0xe2, + 0xaa, 0xc2, 0xfa, 0x4a, 0x51, 0x36, 0x74, 0x73, 0x65, 0x45, 0x44, 0x6c, 0xb2, 0xed, 0x17, 0xee, + 0x4f, 0x9e, 0x87, 0x05, 0xf1, 0xc3, 0x2a, 0x6e, 0x94, 0xad, 0xd5, 0xa2, 0x59, 0xde, 0x2d, 0x9a, + 0x15, 0xeb, 0x5e, 0xe5, 0xe3, 0x42, 0x96, 0x9c, 0x07, 0xa2, 0x42, 0xac, 0xad, 0xcd, 0xed, 0xd2, + 0x6a, 0x21, 0x77, 0xdd, 0x81, 0x42, 0xf2, 0xfc, 0xb0, 0x67, 0xcb, 0x67, 0x6e, 0x6f, 0x6c, 0xf0, + 0x5e, 0x9f, 0x85, 0xc9, 0xcd, 0xad, 0xd5, 0x8a, 0x29, 0xa2, 0x63, 0x31, 0x1c, 0x76, 0x7b, 0xa3, + 0xb8, 0xbd, 0xb5, 0xba, 0x69, 0x56, 0xbf, 0xca, 0xba, 0x9f, 0x2c, 0xc0, 0x7c, 0x7d, 0xad, 0x58, + 0xba, 0x67, 0x6d, 0x6c, 0x6e, 0x59, 0xd5, 0x0d, 0xab, 0xb4, 0x5a, 0xdc, 0xd8, 0xa8, 0xac, 0x15, + 0xe0, 0xfa, 0xbf, 0xca, 0xc0, 0x73, 0x03, 0xec, 0x67, 0xf2, 0x06, 0x5c, 0x5b, 0xad, 0x14, 0xcb, + 0x6b, 0x95, 0x7a, 0xdd, 0x62, 0x2c, 0x2b, 0x1b, 0x5b, 0x62, 0xf7, 0x65, 0xd5, 0xb7, 0x8a, 0x5b, + 0x49, 0x09, 0xbc, 0x06, 0xaf, 0x0e, 0x46, 0x8f, 0x85, 0xe5, 0x2a, 0xbc, 0x32, 0x18, 0x55, 0x08, + 0x4f, 0x96, 0x5c, 0x87, 0x2b, 0x83, 0x31, 0x23, 0xa1, 0xcb, 0x2d, 0xbf, 0xfb, 0x7b, 0x7f, 0xf0, + 0xe2, 0x99, 0xdf, 0xfb, 0xc3, 0x17, 0x33, 0xbf, 0xff, 0x87, 0x2f, 0x66, 0xfe, 0xcd, 0x1f, 0xbe, + 0x98, 0xf9, 0xea, 0x6b, 0xa7, 0x48, 0x44, 0xb6, 0x37, 0x86, 0xdb, 0xfb, 0xdb, 0xff, 0x6f, 0x00, + 0x00, 0x00, 0xff, 0xff, 0xcd, 0x6d, 0xa9, 0x32, 0xc9, 0x3c, 0x01, 0x00, } func (this *PluginSpecV1) Equal(that interface{}) bool { @@ -33910,13 +33903,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) @@ -43058,10 +43044,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) } @@ -93087,38 +93069,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 }