From 10ee69b44c151ab760b44b983d4948d95da3d66c Mon Sep 17 00:00:00 2001 From: Hitoshi Mitake Date: Thu, 2 Jun 2016 23:25:15 +0900 Subject: [PATCH] *: support getting role in auth v3 This commit implements RoleGet() RPC of etcdserver and adds a new subcommand "role get" to etcdctl v3. It will list up permissions that are granted to a given role. $ ETCDCTL_API=3 bin/etcdctl role get r1 Role r1 KV Read: b d KV Write: a c d --- auth/store.go | 27 ++ clientv3/auth.go | 9 + etcdctl/ctlv3/command/role_command.go | 35 ++ etcdserver/api/v3rpc/auth.go | 7 +- etcdserver/apply.go | 7 + etcdserver/etcdserverpb/raft_internal.pb.go | 131 ++++-- etcdserver/etcdserverpb/raft_internal.proto | 1 + etcdserver/etcdserverpb/rpc.pb.go | 426 ++++++++++++-------- etcdserver/etcdserverpb/rpc.proto | 3 + etcdserver/v3_server.go | 12 + 10 files changed, 452 insertions(+), 206 deletions(-) diff --git a/auth/store.go b/auth/store.go index 7443b3771..c401cedf9 100644 --- a/auth/store.go +++ b/auth/store.go @@ -82,6 +82,9 @@ type AuthStore interface { // RoleGrant grants a permission to a role RoleGrant(r *pb.AuthRoleGrantRequest) (*pb.AuthRoleGrantResponse, error) + // RoleGet gets the detailed information of a role + RoleGet(r *pb.AuthRoleGetRequest) (*pb.AuthRoleGetResponse, error) + // UsernameFromToken gets a username from the given Token UsernameFromToken(token string) (string, bool) @@ -321,6 +324,30 @@ func (as *authStore) UserGet(r *pb.AuthUserGetRequest) (*pb.AuthUserGetResponse, return &resp, nil } +func (as *authStore) RoleGet(r *pb.AuthRoleGetRequest) (*pb.AuthRoleGetResponse, error) { + tx := as.be.BatchTx() + tx.Lock() + defer tx.Unlock() + + _, vs := tx.UnsafeRange(authRolesBucketName, []byte(r.Role), nil, 0) + if len(vs) != 1 { + return nil, ErrRoleNotFound + } + + role := &authpb.Role{} + err := role.Unmarshal(vs[0]) + if err != nil { + return nil, err + } + + var resp pb.AuthRoleGetResponse + for _, perm := range role.KeyPermission { + resp.Perm = append(resp.Perm, perm) + } + + return &resp, nil +} + func (as *authStore) RoleAdd(r *pb.AuthRoleAddRequest) (*pb.AuthRoleAddResponse, error) { tx := as.be.BatchTx() tx.Lock() diff --git a/clientv3/auth.go b/clientv3/auth.go index 8fe14b939..f903a8226 100644 --- a/clientv3/auth.go +++ b/clientv3/auth.go @@ -36,6 +36,7 @@ type ( AuthUserGetResponse pb.AuthUserGetResponse AuthRoleAddResponse pb.AuthRoleAddResponse AuthRoleGrantResponse pb.AuthRoleGrantResponse + AuthRoleGetResponse pb.AuthRoleGetResponse PermissionType authpb.Permission_Type ) @@ -73,6 +74,9 @@ type Auth interface { // RoleGrant grants a permission to a role. RoleGrant(ctx context.Context, name string, key string, permType PermissionType) (*AuthRoleGrantResponse, error) + + // RoleGet gets a detailed information of a role. + RoleGet(ctx context.Context, role string) (*AuthRoleGetResponse, error) } type auth struct { @@ -140,6 +144,11 @@ func (auth *auth) RoleGrant(ctx context.Context, name string, key string, permTy return (*AuthRoleGrantResponse)(resp), rpctypes.Error(err) } +func (auth *auth) RoleGet(ctx context.Context, role string) (*AuthRoleGetResponse, error) { + resp, err := auth.remote.RoleGet(ctx, &pb.AuthRoleGetRequest{Role: role}) + return (*AuthRoleGetResponse)(resp), rpctypes.Error(err) +} + func StrToPermissionType(s string) (PermissionType, error) { val, ok := authpb.Permission_Type_value[strings.ToUpper(s)] if ok { diff --git a/etcdctl/ctlv3/command/role_command.go b/etcdctl/ctlv3/command/role_command.go index 5da0214b8..c12c1c217 100644 --- a/etcdctl/ctlv3/command/role_command.go +++ b/etcdctl/ctlv3/command/role_command.go @@ -31,6 +31,7 @@ func NewRoleCommand() *cobra.Command { ac.AddCommand(newRoleAddCommand()) ac.AddCommand(newRoleGrantCommand()) + ac.AddCommand(newRoleGetCommand()) return ac } @@ -51,6 +52,14 @@ func newRoleGrantCommand() *cobra.Command { } } +func newRoleGetCommand() *cobra.Command { + return &cobra.Command{ + Use: "get ", + Short: "get detailed information of a role", + Run: roleGetCommandFunc, + } +} + // roleAddCommandFunc executes the "role add" command. func roleAddCommandFunc(cmd *cobra.Command, args []string) { if len(args) != 1 { @@ -83,3 +92,29 @@ func roleGrantCommandFunc(cmd *cobra.Command, args []string) { fmt.Printf("Role %s updated\n", args[0]) } + +// roleGetCommandFunc executes the "role get" command. +func roleGetCommandFunc(cmd *cobra.Command, args []string) { + if len(args) != 1 { + ExitWithError(ExitBadArgs, fmt.Errorf("role get command requires role name as its argument.")) + } + + resp, err := mustClientFromCmd(cmd).Auth.RoleGet(context.TODO(), args[0]) + if err != nil { + ExitWithError(ExitError, err) + } + + fmt.Printf("Role %s\n", args[0]) + fmt.Println("KV Read:") + for _, perm := range resp.Perm { + if perm.PermType == clientv3.PermRead || perm.PermType == clientv3.PermReadWrite { + fmt.Printf("\t%s\n", string(perm.Key)) + } + } + fmt.Println("KV Write:") + for _, perm := range resp.Perm { + if perm.PermType == clientv3.PermWrite || perm.PermType == clientv3.PermReadWrite { + fmt.Printf("\t%s\n", string(perm.Key)) + } + } +} diff --git a/etcdserver/api/v3rpc/auth.go b/etcdserver/api/v3rpc/auth.go index 9fa9a7020..da8752bca 100644 --- a/etcdserver/api/v3rpc/auth.go +++ b/etcdserver/api/v3rpc/auth.go @@ -66,8 +66,11 @@ func (as *AuthServer) RoleDelete(ctx context.Context, r *pb.AuthRoleDeleteReques } func (as *AuthServer) RoleGet(ctx context.Context, r *pb.AuthRoleGetRequest) (*pb.AuthRoleGetResponse, error) { - plog.Info("not implemented yet") - return nil, nil + resp, err := as.authenticator.RoleGet(ctx, r) + if err != nil { + return nil, togRPCError(err) + } + return resp, nil } func (as *AuthServer) RoleRevoke(ctx context.Context, r *pb.AuthRoleRevokeRequest) (*pb.AuthRoleRevokeResponse, error) { diff --git a/etcdserver/apply.go b/etcdserver/apply.go index 7668bf5c5..fd0d104f4 100644 --- a/etcdserver/apply.go +++ b/etcdserver/apply.go @@ -64,6 +64,7 @@ type applierV3 interface { UserGet(ua *pb.AuthUserGetRequest) (*pb.AuthUserGetResponse, error) RoleAdd(ua *pb.AuthRoleAddRequest) (*pb.AuthRoleAddResponse, error) RoleGrant(ua *pb.AuthRoleGrantRequest) (*pb.AuthRoleGrantResponse, error) + RoleGet(ua *pb.AuthRoleGetRequest) (*pb.AuthRoleGetResponse, error) } type applierV3backend struct { @@ -117,6 +118,8 @@ func (s *EtcdServer) applyV3Request(r *pb.InternalRaftRequest) *applyResult { ar.resp, ar.err = s.applyV3.RoleAdd(r.AuthRoleAdd) case r.AuthRoleGrant != nil: ar.resp, ar.err = s.applyV3.RoleGrant(r.AuthRoleGrant) + case r.AuthRoleGet != nil: + ar.resp, ar.err = s.applyV3.RoleGet(r.AuthRoleGet) default: panic("not implemented") } @@ -547,6 +550,10 @@ func (a *applierV3backend) RoleGrant(r *pb.AuthRoleGrantRequest) (*pb.AuthRoleGr return a.s.AuthStore().RoleGrant(r) } +func (a *applierV3backend) RoleGet(r *pb.AuthRoleGetRequest) (*pb.AuthRoleGetResponse, error) { + return a.s.AuthStore().RoleGet(r) +} + type quotaApplierV3 struct { applierV3 q Quota diff --git a/etcdserver/etcdserverpb/raft_internal.pb.go b/etcdserver/etcdserverpb/raft_internal.pb.go index 066239102..c793d6c98 100644 --- a/etcdserver/etcdserverpb/raft_internal.pb.go +++ b/etcdserver/etcdserverpb/raft_internal.pb.go @@ -54,6 +54,7 @@ type InternalRaftRequest struct { AuthRoleGrant *AuthRoleGrantRequest `protobuf:"bytes,1017,opt,name=auth_role_grant,json=authRoleGrant" json:"auth_role_grant,omitempty"` Authenticate *AuthenticateRequest `protobuf:"bytes,1018,opt,name=authenticate" json:"authenticate,omitempty"` AuthUserGet *AuthUserGetRequest `protobuf:"bytes,1019,opt,name=auth_user_get,json=authUserGet" json:"auth_user_get,omitempty"` + AuthRoleGet *AuthRoleGetRequest `protobuf:"bytes,1020,opt,name=auth_role_get,json=authRoleGet" json:"auth_role_get,omitempty"` } func (m *InternalRaftRequest) Reset() { *m = InternalRaftRequest{} } @@ -345,6 +346,18 @@ func (m *InternalRaftRequest) MarshalTo(data []byte) (int, error) { } i += n20 } + if m.AuthRoleGet != nil { + data[i] = 0xe2 + i++ + data[i] = 0x3f + i++ + i = encodeVarintRaftInternal(data, i, uint64(m.AuthRoleGet.Size())) + n21, err := m.AuthRoleGet.MarshalTo(data[i:]) + if err != nil { + return 0, err + } + i += n21 + } return i, nil } @@ -492,6 +505,10 @@ func (m *InternalRaftRequest) Size() (n int) { l = m.AuthUserGet.Size() n += 2 + l + sovRaftInternal(uint64(l)) } + if m.AuthRoleGet != nil { + l = m.AuthRoleGet.Size() + n += 2 + l + sovRaftInternal(uint64(l)) + } return n } @@ -1320,6 +1337,39 @@ func (m *InternalRaftRequest) Unmarshal(data []byte) error { return err } iNdEx = postIndex + case 1020: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AuthRoleGet", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowRaftInternal + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := data[iNdEx] + iNdEx++ + msglen |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthRaftInternal + } + postIndex := iNdEx + msglen + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.AuthRoleGet == nil { + m.AuthRoleGet = &AuthRoleGetRequest{} + } + if err := m.AuthRoleGet.Unmarshal(data[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipRaftInternal(data[iNdEx:]) @@ -1497,44 +1547,45 @@ var ( ) var fileDescriptorRaftInternal = []byte{ - // 617 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x7c, 0x94, 0xcd, 0x6f, 0xd3, 0x30, - 0x18, 0xc6, 0x59, 0xf7, 0x59, 0xb7, 0xdd, 0x2a, 0x0f, 0x90, 0x29, 0xd2, 0x18, 0x45, 0x48, 0x08, - 0xa4, 0x82, 0xb6, 0x23, 0x07, 0x28, 0x6d, 0x19, 0x13, 0x08, 0x4d, 0x11, 0x9c, 0x23, 0x37, 0x79, - 0x49, 0x2b, 0xd2, 0x24, 0x38, 0x6e, 0x19, 0x7f, 0x1f, 0x97, 0x1d, 0xf9, 0x13, 0x80, 0x13, 0x77, - 0xbe, 0xe1, 0x82, 0x3f, 0x12, 0xa7, 0x59, 0x5d, 0x0e, 0x91, 0x92, 0xc7, 0xcf, 0xfb, 0x7b, 0x5f, - 0xdb, 0x8f, 0x82, 0x76, 0x19, 0x7d, 0xc5, 0xdd, 0x71, 0xc4, 0x81, 0x45, 0x34, 0xec, 0x24, 0x2c, - 0xe6, 0x31, 0xae, 0x03, 0xf7, 0xfc, 0x14, 0xd8, 0x0c, 0x58, 0x32, 0x6c, 0x5d, 0x0c, 0xe2, 0x20, - 0x56, 0x0b, 0x77, 0xe5, 0x9b, 0xf6, 0xb4, 0x9a, 0x85, 0x27, 0x53, 0xaa, 0x2c, 0xf1, 0xf4, 0x6b, - 0xfb, 0x3e, 0x6a, 0x38, 0xf0, 0x66, 0x0a, 0x29, 0x7f, 0x02, 0xd4, 0x07, 0x86, 0xb7, 0x51, 0xe5, - 0xb8, 0x4f, 0x56, 0xf6, 0x57, 0x6e, 0xad, 0x39, 0x95, 0x71, 0x1f, 0xb7, 0xd0, 0xd6, 0x34, 0x95, - 0x2d, 0x27, 0x40, 0x2a, 0x42, 0xad, 0x3a, 0xe6, 0xbb, 0xfd, 0x1e, 0xa1, 0xdd, 0xe3, 0x6c, 0x20, - 0x47, 0x4c, 0x97, 0x91, 0x16, 0x18, 0x37, 0x51, 0x65, 0x76, 0xa0, 0xaa, 0x6b, 0x07, 0x97, 0x3a, - 0xf3, 0x23, 0x77, 0xb2, 0x12, 0x47, 0x18, 0xf0, 0x3d, 0xb4, 0xce, 0x68, 0x14, 0x00, 0x59, 0x55, - 0xce, 0xd6, 0x39, 0xa7, 0x5c, 0xca, 0xed, 0xda, 0x88, 0x6f, 0xa3, 0xd5, 0x64, 0xca, 0xc9, 0x9a, - 0xf2, 0x93, 0xb2, 0xff, 0x64, 0x9a, 0xcf, 0xe3, 0x48, 0x13, 0xee, 0xa1, 0xba, 0x0f, 0x21, 0x70, - 0x70, 0x75, 0x93, 0x75, 0x55, 0xb4, 0x5f, 0x2e, 0xea, 0x2b, 0x47, 0xa9, 0x55, 0xcd, 0x2f, 0x34, - 0xd9, 0x90, 0x9f, 0x46, 0x64, 0xc3, 0xd6, 0xf0, 0xc5, 0x69, 0x64, 0x1a, 0x0a, 0x13, 0x7e, 0x80, - 0x90, 0x17, 0x4f, 0x12, 0xea, 0xf1, 0x71, 0x1c, 0x91, 0x4d, 0x55, 0x72, 0xad, 0x5c, 0xd2, 0x33, - 0xeb, 0x79, 0xe5, 0x5c, 0x09, 0x7e, 0x88, 0x6a, 0x21, 0xd0, 0x14, 0xdc, 0x40, 0x4c, 0xcc, 0xc9, - 0x96, 0x8d, 0xf0, 0x4c, 0x1a, 0x8e, 0xe4, 0xba, 0x21, 0x84, 0x46, 0x92, 0x7b, 0xd6, 0x04, 0x06, - 0xb3, 0xf8, 0x35, 0x90, 0xaa, 0x6d, 0xcf, 0x0a, 0xe1, 0x28, 0x83, 0xd9, 0x73, 0x58, 0x68, 0xf2, - 0x5a, 0x68, 0x48, 0xd9, 0x84, 0x20, 0xdb, 0xb5, 0x74, 0xe5, 0x92, 0xb9, 0x16, 0x65, 0xc4, 0x87, - 0x68, 0x63, 0xa4, 0xd2, 0x44, 0x7c, 0x55, 0x72, 0xd5, 0x7a, 0xe7, 0x3a, 0x70, 0x4e, 0x66, 0xc5, - 0x5d, 0x54, 0xa3, 0x53, 0x3e, 0x72, 0x21, 0xa2, 0xc3, 0x10, 0xc8, 0x17, 0xeb, 0x81, 0x75, 0x85, - 0x63, 0xa0, 0x0c, 0x66, 0xbb, 0xd4, 0x48, 0xb8, 0x8f, 0xea, 0x0a, 0xe1, 0x8f, 0x53, 0xc5, 0xf8, - 0xba, 0x69, 0xdb, 0xaf, 0x64, 0xf4, 0xb5, 0xc3, 0xec, 0x97, 0x16, 0x1a, 0x1e, 0xa0, 0x86, 0xa2, - 0xc8, 0x98, 0xbb, 0xd4, 0xf7, 0xc9, 0xb7, 0xa5, 0x98, 0x97, 0xe2, 0xab, 0xeb, 0xfb, 0x25, 0x4c, - 0xa6, 0xe1, 0xe7, 0xa8, 0x59, 0x60, 0x74, 0x86, 0xc8, 0x77, 0x4d, 0xba, 0x61, 0x27, 0x65, 0xe1, - 0xcb, 0x60, 0xdb, 0xb4, 0x24, 0xe3, 0x00, 0x5d, 0x29, 0x78, 0xde, 0x48, 0xc6, 0xd1, 0x4d, 0x68, - 0x9a, 0xbe, 0x8d, 0x99, 0x4f, 0x7e, 0x68, 0xf0, 0x1d, 0x3b, 0xb8, 0xa7, 0xdc, 0x27, 0x99, 0x39, - 0x6f, 0x70, 0x99, 0x5a, 0x97, 0xf1, 0x53, 0xb4, 0x53, 0x34, 0xd2, 0xd1, 0xfb, 0xa9, 0xf1, 0x6d, - 0x3b, 0xbe, 0x14, 0xbf, 0x06, 0x9d, 0x57, 0xcd, 0x61, 0xb2, 0x38, 0x04, 0x75, 0x98, 0xbf, 0x96, - 0x1e, 0xa6, 0x23, 0x2c, 0xe7, 0x0f, 0x33, 0xd3, 0xcc, 0x4c, 0x0a, 0xa3, 0x67, 0xfa, 0xbd, 0x74, - 0x26, 0x59, 0xb4, 0x38, 0x93, 0x51, 0xf1, 0x63, 0x1d, 0x13, 0x88, 0xf8, 0xd8, 0xa3, 0xe2, 0x56, - 0xfe, 0x68, 0xd2, 0xf5, 0x45, 0x52, 0x6e, 0xc9, 0x41, 0xa5, 0xba, 0x72, 0x50, 0x02, 0xe0, 0xe4, - 0xef, 0x7f, 0x83, 0x72, 0x04, 0x7c, 0x21, 0x28, 0x42, 0x6b, 0xef, 0xa0, 0xc6, 0x60, 0x92, 0xf0, - 0x77, 0x0e, 0xa4, 0x49, 0x1c, 0xa5, 0xf0, 0xa8, 0x79, 0xf6, 0x69, 0xef, 0xc2, 0xd9, 0xe7, 0xbd, - 0x95, 0x0f, 0xe2, 0xf9, 0x28, 0x9e, 0xe1, 0x86, 0xfa, 0x59, 0x1f, 0xfe, 0x0b, 0x00, 0x00, 0xff, - 0xff, 0x8a, 0x9d, 0xc9, 0xf9, 0x04, 0x06, 0x00, 0x00, + // 630 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x7c, 0x94, 0xcb, 0x6e, 0xd3, 0x40, + 0x14, 0x86, 0x49, 0xda, 0xa6, 0xcd, 0x24, 0x69, 0xa3, 0x29, 0xa0, 0x21, 0x48, 0xa5, 0x04, 0x21, + 0x21, 0x90, 0x02, 0x6a, 0x97, 0x2c, 0x20, 0x24, 0xa1, 0x54, 0x20, 0x54, 0x59, 0xb0, 0xb6, 0x26, + 0xf6, 0xc1, 0x89, 0x70, 0x6c, 0x33, 0x9e, 0x84, 0xf2, 0x0a, 0x3c, 0x59, 0x97, 0x3c, 0x02, 0xb0, + 0x62, 0xcf, 0xfd, 0xb2, 0x60, 0x2e, 0xf6, 0x38, 0x4e, 0x9c, 0x2e, 0x2c, 0xd9, 0xff, 0xfc, 0xe7, + 0x3b, 0x97, 0x39, 0x32, 0xda, 0x65, 0xf4, 0x15, 0xb7, 0xc7, 0x01, 0x07, 0x16, 0x50, 0xbf, 0x13, + 0xb1, 0x90, 0x87, 0xb8, 0x0e, 0xdc, 0x71, 0x63, 0x60, 0x33, 0x60, 0xd1, 0xb0, 0x75, 0xd1, 0x0b, + 0xbd, 0x50, 0x1d, 0xdc, 0x95, 0x6f, 0xda, 0xd3, 0x6a, 0x66, 0x9e, 0x44, 0xa9, 0xb2, 0xc8, 0xd1, + 0xaf, 0xed, 0xfb, 0xa8, 0x61, 0xc1, 0x9b, 0x29, 0xc4, 0xfc, 0x09, 0x50, 0x17, 0x18, 0xde, 0x46, + 0xe5, 0xe3, 0x3e, 0x29, 0xed, 0x97, 0x6e, 0xad, 0x5b, 0xe5, 0x71, 0x1f, 0xb7, 0xd0, 0xd6, 0x34, + 0x96, 0x29, 0x27, 0x40, 0xca, 0x42, 0xad, 0x5a, 0xe6, 0xbb, 0xfd, 0xbe, 0x86, 0x76, 0x8f, 0x93, + 0x82, 0x2c, 0x51, 0x5d, 0x42, 0x5a, 0x62, 0xdc, 0x44, 0xe5, 0xd9, 0x81, 0x8a, 0xae, 0x1d, 0x5c, + 0xea, 0xcc, 0x97, 0xdc, 0x49, 0x42, 0x2c, 0x61, 0xc0, 0xf7, 0xd0, 0x06, 0xa3, 0x81, 0x07, 0x64, + 0x4d, 0x39, 0x5b, 0x0b, 0x4e, 0x79, 0x94, 0xda, 0xb5, 0x11, 0xdf, 0x46, 0x6b, 0xd1, 0x94, 0x93, + 0x75, 0xe5, 0x27, 0x79, 0xff, 0xc9, 0x34, 0xad, 0xc7, 0x92, 0x26, 0xdc, 0x43, 0x75, 0x17, 0x7c, + 0xe0, 0x60, 0xeb, 0x24, 0x1b, 0x2a, 0x68, 0x3f, 0x1f, 0xd4, 0x57, 0x8e, 0x5c, 0xaa, 0x9a, 0x9b, + 0x69, 0x32, 0x21, 0x3f, 0x0d, 0x48, 0xa5, 0x28, 0xe1, 0x8b, 0xd3, 0xc0, 0x24, 0x14, 0x26, 0xfc, + 0x00, 0x21, 0x27, 0x9c, 0x44, 0xd4, 0xe1, 0xe3, 0x30, 0x20, 0x9b, 0x2a, 0xe4, 0x5a, 0x3e, 0xa4, + 0x67, 0xce, 0xd3, 0xc8, 0xb9, 0x10, 0xfc, 0x10, 0xd5, 0x7c, 0xa0, 0x31, 0xd8, 0x9e, 0xa8, 0x98, + 0x93, 0xad, 0x22, 0xc2, 0x33, 0x69, 0x38, 0x92, 0xe7, 0x86, 0xe0, 0x1b, 0x49, 0xf6, 0xac, 0x09, + 0x0c, 0x66, 0xe1, 0x6b, 0x20, 0xd5, 0xa2, 0x9e, 0x15, 0xc2, 0x52, 0x06, 0xd3, 0xb3, 0x9f, 0x69, + 0xf2, 0x5a, 0xa8, 0x4f, 0xd9, 0x84, 0xa0, 0xa2, 0x6b, 0xe9, 0xca, 0x23, 0x73, 0x2d, 0xca, 0x88, + 0x0f, 0x51, 0x65, 0xa4, 0xb6, 0x89, 0xb8, 0x2a, 0xe4, 0x6a, 0xe1, 0x9d, 0xeb, 0x85, 0xb3, 0x12, + 0x2b, 0xee, 0xa2, 0x1a, 0x9d, 0xf2, 0x91, 0x0d, 0x01, 0x1d, 0xfa, 0x40, 0xbe, 0x14, 0x0e, 0xac, + 0x2b, 0x1c, 0x03, 0x65, 0x30, 0xed, 0x52, 0x23, 0xe1, 0x3e, 0xaa, 0x2b, 0x84, 0x3b, 0x8e, 0x15, + 0xe3, 0xeb, 0x66, 0x51, 0xbf, 0x92, 0xd1, 0xd7, 0x0e, 0xd3, 0x2f, 0xcd, 0x34, 0x3c, 0x40, 0x0d, + 0x45, 0x91, 0x6b, 0x6e, 0x53, 0xd7, 0x25, 0xdf, 0x56, 0x62, 0x5e, 0x8a, 0xaf, 0xae, 0xeb, 0xe6, + 0x30, 0x89, 0x86, 0x9f, 0xa3, 0x66, 0x86, 0xd1, 0x3b, 0x44, 0xbe, 0x6b, 0xd2, 0x8d, 0x62, 0x52, + 0xb2, 0x7c, 0x09, 0x6c, 0x9b, 0xe6, 0x64, 0xec, 0xa1, 0x2b, 0x19, 0xcf, 0x19, 0xc9, 0x75, 0xb4, + 0x23, 0x1a, 0xc7, 0x6f, 0x43, 0xe6, 0x92, 0x1f, 0x1a, 0x7c, 0xa7, 0x18, 0xdc, 0x53, 0xee, 0x93, + 0xc4, 0x9c, 0x26, 0xb8, 0x4c, 0x0b, 0x8f, 0xf1, 0x53, 0xb4, 0x93, 0x25, 0xd2, 0xab, 0xf7, 0x53, + 0xe3, 0xdb, 0xc5, 0xf8, 0xdc, 0xfa, 0x35, 0xe8, 0xbc, 0x6a, 0x86, 0xc9, 0x42, 0x1f, 0xd4, 0x30, + 0x7f, 0xad, 0x1c, 0xa6, 0x25, 0x2c, 0x8b, 0xc3, 0x4c, 0x34, 0x53, 0x93, 0xc2, 0xe8, 0x9a, 0x7e, + 0xaf, 0xac, 0x49, 0x06, 0x2d, 0xd7, 0x64, 0x54, 0xfc, 0x58, 0xaf, 0x09, 0x04, 0x7c, 0xec, 0x50, + 0x71, 0x2b, 0x7f, 0x34, 0xe9, 0xfa, 0x32, 0x29, 0xb5, 0xa4, 0xa0, 0x5c, 0x5c, 0x7e, 0x51, 0x3c, + 0xe0, 0xe4, 0xef, 0xb9, 0x8b, 0x72, 0x04, 0x7c, 0x69, 0x51, 0x84, 0x96, 0x1f, 0x91, 0xc4, 0xfc, + 0x3b, 0x77, 0x44, 0x8b, 0x98, 0x44, 0x6b, 0xef, 0xa0, 0xc6, 0x60, 0x12, 0xf1, 0x77, 0x16, 0xc4, + 0x51, 0x18, 0xc4, 0xf0, 0xa8, 0x79, 0xf6, 0x69, 0xef, 0xc2, 0xd9, 0xe7, 0xbd, 0xd2, 0x07, 0xf1, + 0x7c, 0x14, 0xcf, 0xb0, 0xa2, 0xfe, 0xf9, 0x87, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0xbc, 0x96, + 0xbf, 0x32, 0x4b, 0x06, 0x00, 0x00, } diff --git a/etcdserver/etcdserverpb/raft_internal.proto b/etcdserver/etcdserverpb/raft_internal.proto index 05ec5f1e7..0b7c9eb6a 100644 --- a/etcdserver/etcdserverpb/raft_internal.proto +++ b/etcdserver/etcdserverpb/raft_internal.proto @@ -45,6 +45,7 @@ message InternalRaftRequest { AuthRoleGrantRequest auth_role_grant = 1017; AuthenticateRequest authenticate = 1018; AuthUserGetRequest auth_user_get = 1019; + AuthRoleGetRequest auth_role_get = 1020; } message EmptyResponse { diff --git a/etcdserver/etcdserverpb/rpc.pb.go b/etcdserver/etcdserverpb/rpc.pb.go index fd99e421d..ae8c0fe66 100644 --- a/etcdserver/etcdserverpb/rpc.pb.go +++ b/etcdserver/etcdserverpb/rpc.pb.go @@ -1611,6 +1611,7 @@ func (*AuthRoleAddRequest) ProtoMessage() {} func (*AuthRoleAddRequest) Descriptor() ([]byte, []int) { return fileDescriptorRpc, []int{53} } type AuthRoleGetRequest struct { + Role string `protobuf:"bytes,1,opt,name=role,proto3" json:"role,omitempty"` } func (m *AuthRoleGetRequest) Reset() { *m = AuthRoleGetRequest{} } @@ -1819,7 +1820,8 @@ func (m *AuthRoleAddResponse) GetHeader() *ResponseHeader { } type AuthRoleGetResponse struct { - Header *ResponseHeader `protobuf:"bytes,1,opt,name=header" json:"header,omitempty"` + Header *ResponseHeader `protobuf:"bytes,1,opt,name=header" json:"header,omitempty"` + Perm []*authpb.Permission `protobuf:"bytes,2,rep,name=perm" json:"perm,omitempty"` } func (m *AuthRoleGetResponse) Reset() { *m = AuthRoleGetResponse{} } @@ -1834,6 +1836,13 @@ func (m *AuthRoleGetResponse) GetHeader() *ResponseHeader { return nil } +func (m *AuthRoleGetResponse) GetPerm() []*authpb.Permission { + if m != nil { + return m.Perm + } + return nil +} + type AuthRoleDeleteResponse struct { Header *ResponseHeader `protobuf:"bytes,1,opt,name=header" json:"header,omitempty"` } @@ -5313,6 +5322,12 @@ func (m *AuthRoleGetRequest) MarshalTo(data []byte) (int, error) { _ = i var l int _ = l + if len(m.Role) > 0 { + data[i] = 0xa + i++ + i = encodeVarintRpc(data, i, uint64(len(m.Role))) + i += copy(data[i:], m.Role) + } return i, nil } @@ -5712,6 +5727,18 @@ func (m *AuthRoleGetResponse) MarshalTo(data []byte) (int, error) { } i += n43 } + if len(m.Perm) > 0 { + for _, msg := range m.Perm { + data[i] = 0x12 + i++ + i = encodeVarintRpc(data, i, uint64(msg.Size())) + n, err := msg.MarshalTo(data[i:]) + if err != nil { + return 0, err + } + i += n + } + } return i, nil } @@ -6646,6 +6673,10 @@ func (m *AuthRoleAddRequest) Size() (n int) { func (m *AuthRoleGetRequest) Size() (n int) { var l int _ = l + l = len(m.Role) + if l > 0 { + n += 1 + l + sovRpc(uint64(l)) + } return n } @@ -6792,6 +6823,12 @@ func (m *AuthRoleGetResponse) Size() (n int) { l = m.Header.Size() n += 1 + l + sovRpc(uint64(l)) } + if len(m.Perm) > 0 { + for _, e := range m.Perm { + l = e.Size() + n += 1 + l + sovRpc(uint64(l)) + } + } return n } @@ -12501,6 +12538,35 @@ func (m *AuthRoleGetRequest) Unmarshal(data []byte) error { return fmt.Errorf("proto: AuthRoleGetRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Role", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowRpc + } + 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 ErrInvalidLengthRpc + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Role = string(data[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipRpc(data[iNdEx:]) @@ -13684,6 +13750,37 @@ func (m *AuthRoleGetResponse) Unmarshal(data []byte) error { return err } iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Perm", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowRpc + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := data[iNdEx] + iNdEx++ + msglen |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthRpc + } + postIndex := iNdEx + msglen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Perm = append(m.Perm, &authpb.Permission{}) + if err := m.Perm[len(m.Perm)-1].Unmarshal(data[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipRpc(data[iNdEx:]) @@ -14060,167 +14157,168 @@ var ( ) var fileDescriptorRpc = []byte{ - // 2584 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x1a, 0xcb, 0x72, 0x1b, 0xc7, - 0x91, 0x78, 0x10, 0x20, 0x1a, 0x20, 0x44, 0x0d, 0x29, 0x99, 0x82, 0x1e, 0x96, 0x57, 0x92, 0xad, - 0xc4, 0x0e, 0x15, 0x33, 0xce, 0x21, 0x15, 0x97, 0x52, 0x20, 0x01, 0x4b, 0x34, 0x29, 0x92, 0x5e, - 0x82, 0x54, 0x7c, 0x62, 0x2d, 0x81, 0x11, 0xb9, 0x25, 0xbc, 0xbc, 0xbb, 0xa0, 0x44, 0x55, 0xe5, - 0x92, 0xaa, 0x7c, 0x81, 0x73, 0x4a, 0xe5, 0x07, 0xf2, 0x01, 0xf9, 0x87, 0x54, 0x2e, 0xc9, 0x17, - 0x24, 0xa9, 0x9c, 0x52, 0xb9, 0xe4, 0x9e, 0x5c, 0xd2, 0xf3, 0xda, 0x9d, 0x1d, 0xec, 0x42, 0x72, - 0x96, 0x39, 0x88, 0xdc, 0xe9, 0xe9, 0xee, 0xe9, 0xd7, 0xf4, 0x74, 0x37, 0x05, 0x15, 0x6f, 0xdc, - 0x5d, 0x1b, 0x7b, 0xa3, 0x60, 0x44, 0x6a, 0x34, 0xe8, 0xf6, 0x7c, 0xea, 0x9d, 0x53, 0x6f, 0x7c, - 0xd2, 0x58, 0x39, 0x1d, 0x9d, 0x8e, 0xf8, 0xc6, 0x23, 0xf6, 0x25, 0x70, 0x1a, 0x37, 0x18, 0xce, - 0xa3, 0xc1, 0x79, 0xb7, 0xcb, 0x7f, 0x8c, 0x4f, 0x1e, 0xbd, 0x3c, 0x97, 0x5b, 0x37, 0xf9, 0x96, - 0x33, 0x09, 0xce, 0xf8, 0x0f, 0xdc, 0x62, 0xbf, 0xc4, 0xa6, 0xf5, 0xab, 0x1c, 0xd4, 0x6d, 0xea, - 0x8f, 0x47, 0x43, 0x9f, 0x3e, 0xa5, 0x4e, 0x8f, 0x7a, 0xe4, 0x36, 0x40, 0xb7, 0x3f, 0xf1, 0x03, - 0xea, 0x1d, 0xbb, 0xbd, 0xd5, 0xdc, 0xdd, 0xdc, 0xc3, 0xa2, 0x5d, 0x91, 0x90, 0xad, 0x1e, 0xb9, - 0x09, 0x95, 0x01, 0x1d, 0x9c, 0x88, 0xdd, 0x3c, 0xdf, 0x5d, 0x10, 0x00, 0xdc, 0x6c, 0xc0, 0x82, - 0x47, 0xcf, 0x5d, 0xdf, 0x1d, 0x0d, 0x57, 0x0b, 0xb8, 0x57, 0xb0, 0xc3, 0x35, 0x23, 0xf4, 0x9c, - 0x17, 0xc1, 0x31, 0xb2, 0x19, 0xac, 0x16, 0x05, 0x21, 0x03, 0x74, 0x70, 0x6d, 0xfd, 0xba, 0x00, - 0x35, 0xdb, 0x19, 0x9e, 0x52, 0x9b, 0x7e, 0x33, 0xa1, 0x7e, 0x40, 0x96, 0xa0, 0xf0, 0x92, 0x5e, - 0xf0, 0xe3, 0x6b, 0x36, 0xfb, 0x14, 0xf4, 0x88, 0x71, 0x4c, 0x87, 0xe2, 0xe0, 0x1a, 0xa3, 0x47, - 0x40, 0x7b, 0xd8, 0x23, 0x2b, 0x30, 0xdf, 0x77, 0x07, 0x6e, 0x20, 0x4f, 0x15, 0x8b, 0x98, 0x38, - 0x45, 0x43, 0x9c, 0x4d, 0x00, 0x7f, 0xe4, 0x05, 0xc7, 0x23, 0x0f, 0x95, 0x5e, 0x9d, 0xc7, 0xdd, - 0xfa, 0xfa, 0xfd, 0x35, 0xdd, 0xd4, 0x6b, 0xba, 0x40, 0x6b, 0x07, 0x88, 0xbc, 0xc7, 0x70, 0xed, - 0x8a, 0xaf, 0x3e, 0xc9, 0x17, 0x50, 0xe5, 0x4c, 0x02, 0xc7, 0x3b, 0xa5, 0xc1, 0x6a, 0x89, 0x73, - 0x79, 0xf0, 0x16, 0x2e, 0x1d, 0x8e, 0x6c, 0xf3, 0xe3, 0xc5, 0x37, 0xb1, 0xa0, 0x86, 0xf8, 0xae, - 0xd3, 0x77, 0xdf, 0x38, 0x27, 0x7d, 0xba, 0x5a, 0x46, 0x46, 0x0b, 0x76, 0x0c, 0x66, 0xad, 0x41, - 0x25, 0x94, 0x81, 0x2c, 0x40, 0x71, 0x77, 0x6f, 0xb7, 0xbd, 0x34, 0x47, 0x00, 0x4a, 0xcd, 0x83, - 0xcd, 0xf6, 0x6e, 0x6b, 0x29, 0x47, 0xaa, 0x50, 0x6e, 0xb5, 0xc5, 0x22, 0x6f, 0x6d, 0x00, 0x44, - 0xa7, 0x91, 0x32, 0x14, 0xb6, 0xdb, 0x5f, 0x23, 0x3e, 0xe2, 0x1c, 0xb5, 0xed, 0x83, 0xad, 0xbd, - 0x5d, 0x24, 0x40, 0xe2, 0x4d, 0xbb, 0xdd, 0xec, 0xb4, 0x97, 0xf2, 0x0c, 0xe3, 0xd9, 0x5e, 0x6b, - 0xa9, 0x40, 0x2a, 0x30, 0x7f, 0xd4, 0xdc, 0x39, 0x6c, 0x2f, 0x15, 0xad, 0x5f, 0xc0, 0xa2, 0x14, - 0x5f, 0x84, 0x08, 0xf9, 0x0c, 0x4a, 0x67, 0x3c, 0x4c, 0xb8, 0x67, 0xaa, 0xeb, 0xb7, 0x0c, 0x5d, - 0x63, 0xa1, 0x64, 0x4b, 0x5c, 0x54, 0xaf, 0xf0, 0xf2, 0xdc, 0x47, 0xa7, 0x15, 0x90, 0x64, 0x69, - 0x4d, 0x44, 0xe8, 0xda, 0x36, 0xbd, 0x38, 0x72, 0xfa, 0x13, 0x6a, 0xb3, 0x4d, 0x42, 0xa0, 0x38, - 0x18, 0x79, 0x94, 0x3b, 0x70, 0xc1, 0xe6, 0xdf, 0xd6, 0x97, 0x00, 0xfb, 0x93, 0x20, 0x3d, 0x24, - 0xd0, 0xeb, 0xe7, 0x8c, 0x83, 0x0c, 0x07, 0xb1, 0xe0, 0xb1, 0x40, 0x1d, 0x9f, 0x86, 0xb1, 0xc0, - 0x16, 0xd6, 0x26, 0x54, 0x39, 0xaf, 0x2c, 0x8a, 0x20, 0x13, 0xd2, 0xa2, 0x7d, 0x1a, 0xd0, 0x0c, - 0xb1, 0x6a, 0x51, 0x58, 0x8e, 0x31, 0xc9, 0x64, 0xda, 0x55, 0x28, 0xf7, 0x38, 0x33, 0x71, 0x4e, - 0xc1, 0x56, 0x4b, 0xeb, 0x5f, 0x39, 0xbc, 0x52, 0x42, 0xc2, 0xc3, 0x21, 0x8b, 0xf8, 0x26, 0x2c, - 0x7a, 0x62, 0x7d, 0xcc, 0x65, 0x91, 0xe7, 0x34, 0xd2, 0xc3, 0xf5, 0xe9, 0x9c, 0x5d, 0x93, 0x24, - 0x1c, 0x4c, 0x7e, 0x0a, 0x55, 0xc5, 0x62, 0x3c, 0x09, 0xf8, 0x89, 0xd5, 0xf5, 0xd5, 0x38, 0x83, - 0xc8, 0x63, 0x48, 0x0e, 0x12, 0x1d, 0x81, 0xa4, 0x03, 0x2b, 0x8a, 0x58, 0xc8, 0x28, 0xc5, 0x28, - 0x70, 0x2e, 0x77, 0xe3, 0x5c, 0xa6, 0xcd, 0x8c, 0xdc, 0x88, 0xa4, 0xd7, 0x36, 0x37, 0x2a, 0x50, - 0x96, 0x50, 0xeb, 0xdf, 0x39, 0x0c, 0x57, 0x69, 0x26, 0xa1, 0x72, 0x0b, 0xea, 0x9e, 0x04, 0xc4, - 0x74, 0xbe, 0x99, 0xa8, 0xb3, 0x34, 0xf0, 0x9c, 0xbd, 0xa8, 0x88, 0x84, 0xd6, 0x8f, 0xa1, 0x16, - 0x72, 0x89, 0xd4, 0xbe, 0x91, 0xa0, 0x76, 0xc8, 0xa1, 0xaa, 0x08, 0x98, 0xe2, 0xcf, 0xe1, 0x5a, - 0x48, 0x9f, 0xa0, 0xf9, 0x07, 0x33, 0x34, 0x0f, 0x19, 0x2e, 0x2b, 0x0e, 0xba, 0xee, 0xc0, 0xf2, - 0x9b, 0x00, 0x5b, 0xbf, 0x29, 0x40, 0x79, 0x73, 0x34, 0x18, 0x3b, 0x1e, 0x73, 0x53, 0x09, 0xe1, - 0x93, 0x7e, 0xc0, 0xd5, 0xad, 0xaf, 0xdf, 0x8b, 0x9f, 0x20, 0xd1, 0xd4, 0x6f, 0x9b, 0xa3, 0xda, - 0x92, 0x84, 0x11, 0xcb, 0x74, 0x96, 0x7f, 0x07, 0x62, 0x99, 0xcc, 0x24, 0x89, 0xba, 0x0a, 0x85, - 0xe8, 0x2a, 0x34, 0xa0, 0x8c, 0x84, 0x51, 0x0a, 0x46, 0x5d, 0x14, 0x80, 0x7c, 0x0f, 0xae, 0x74, - 0x3d, 0xea, 0x30, 0x7b, 0xa8, 0x34, 0x3d, 0x2f, 0x71, 0xea, 0x62, 0xc3, 0x56, 0xe9, 0xfa, 0x1e, - 0xd4, 0x06, 0xa3, 0x5e, 0x84, 0x57, 0x92, 0x78, 0x55, 0x84, 0x86, 0x48, 0xd7, 0x55, 0x3e, 0x60, - 0xf9, 0xb3, 0x86, 0xbb, 0x62, 0x69, 0x7d, 0x0a, 0x8b, 0x31, 0x5d, 0x59, 0x8a, 0x6b, 0x7f, 0x75, - 0xd8, 0xdc, 0x11, 0xf9, 0xf0, 0x09, 0x4f, 0x81, 0x36, 0xe6, 0x43, 0x4c, 0xab, 0x3b, 0xed, 0x83, - 0x03, 0xcc, 0x9e, 0x9f, 0x87, 0x24, 0x32, 0x81, 0x6a, 0x79, 0x73, 0x4e, 0xcb, 0x9b, 0x39, 0x95, - 0x37, 0xf3, 0x51, 0xde, 0x2c, 0x6c, 0xd4, 0xa1, 0x26, 0x0c, 0x72, 0x3c, 0x61, 0x71, 0x68, 0xfd, - 0x2e, 0x07, 0xd0, 0x79, 0x3d, 0x54, 0x09, 0xe3, 0x11, 0x94, 0xbb, 0x82, 0x39, 0x3a, 0x88, 0xe5, - 0xc4, 0x6b, 0x89, 0x36, 0xb6, 0x15, 0x16, 0xe6, 0x86, 0xb2, 0x3f, 0xe9, 0x76, 0xa9, 0xaf, 0x92, - 0xa8, 0x79, 0x69, 0xb5, 0x7b, 0x6e, 0x2b, 0x54, 0x46, 0xf5, 0xc2, 0x71, 0xfb, 0x13, 0x9e, 0x55, - 0xdf, 0x4a, 0x25, 0x51, 0xad, 0xdf, 0xe6, 0xa0, 0xca, 0x65, 0xcd, 0x94, 0x97, 0x6e, 0x41, 0x85, - 0x8b, 0x41, 0x7b, 0x32, 0x33, 0x2d, 0xd8, 0x11, 0x80, 0xfc, 0x04, 0xf3, 0xa3, 0xa4, 0xf3, 0xa5, - 0x6c, 0x37, 0x93, 0xd9, 0x0a, 0xe1, 0x22, 0x6c, 0x6b, 0x1b, 0xae, 0x72, 0xf3, 0x74, 0x03, 0xb6, - 0x21, 0x0d, 0xaa, 0x3f, 0xf4, 0x39, 0xe3, 0xa1, 0xc7, 0xbd, 0xf1, 0xd9, 0x85, 0xef, 0x76, 0x9d, - 0xbe, 0x14, 0x24, 0x5c, 0xe3, 0x03, 0x43, 0x74, 0x66, 0x99, 0xde, 0x86, 0x45, 0xa8, 0x3e, 0x75, - 0xfc, 0x33, 0x29, 0x92, 0xf5, 0x73, 0xa8, 0x89, 0x65, 0x26, 0x33, 0xe2, 0xab, 0x78, 0x86, 0x5c, - 0xb8, 0xe0, 0x8b, 0x36, 0xff, 0xb6, 0xae, 0xc2, 0x95, 0x83, 0xa1, 0x33, 0xf6, 0xcf, 0x46, 0x2a, - 0xd1, 0xb2, 0x32, 0x6e, 0x29, 0x82, 0x65, 0x3a, 0xf1, 0x23, 0xb8, 0xe2, 0xd1, 0x81, 0xe3, 0x0e, - 0xdd, 0xe1, 0xe9, 0xf1, 0xc9, 0x45, 0x40, 0x7d, 0x59, 0xe5, 0xd5, 0x43, 0xf0, 0x06, 0x83, 0x32, - 0xd1, 0x4e, 0xfa, 0xa3, 0x13, 0x79, 0xd7, 0xf9, 0xb7, 0xf5, 0x7b, 0x7c, 0x73, 0x9e, 0x3b, 0x41, - 0x57, 0x59, 0x81, 0x6c, 0x41, 0x3d, 0xbc, 0xe1, 0x1c, 0x22, 0x65, 0x31, 0xb2, 0x3d, 0xa7, 0xd9, - 0x94, 0x37, 0x5e, 0x65, 0xfb, 0xc5, 0xae, 0x0e, 0xe0, 0xac, 0x9c, 0x61, 0x97, 0xf6, 0x43, 0x56, - 0xf9, 0x74, 0x56, 0x1c, 0x51, 0x67, 0xa5, 0x03, 0x36, 0xae, 0x44, 0x2f, 0xa1, 0xb8, 0x9f, 0xdf, - 0xe6, 0x80, 0x4c, 0xcb, 0xf0, 0x5d, 0x8b, 0xd0, 0x07, 0x50, 0xf7, 0xf1, 0xda, 0x07, 0xc7, 0x46, - 0x0d, 0xbc, 0xc8, 0xa1, 0x61, 0x96, 0x42, 0x0b, 0x63, 0xf1, 0x7d, 0x8a, 0x21, 0xed, 0x1f, 0x0f, - 0x47, 0x81, 0xfb, 0xe2, 0x82, 0x67, 0xc6, 0x05, 0xbb, 0xae, 0xc0, 0xbb, 0x1c, 0x6a, 0x3d, 0x52, - 0x42, 0xe9, 0xc2, 0x93, 0x1b, 0xb0, 0xf0, 0x8a, 0x41, 0x55, 0x75, 0x8e, 0x4f, 0x3e, 0x5f, 0x6f, - 0xf5, 0xac, 0x7f, 0xe0, 0x03, 0x28, 0xcd, 0x9f, 0x29, 0x06, 0xf4, 0x23, 0xf2, 0xb1, 0x23, 0x58, - 0xbd, 0x21, 0xdc, 0xd2, 0x93, 0x95, 0x9a, 0x5a, 0xb2, 0x7b, 0x26, 0xac, 0x8c, 0x5b, 0x42, 0x9f, - 0x70, 0x8d, 0x89, 0x7e, 0xa9, 0x2b, 0xee, 0x99, 0x91, 0xe9, 0xed, 0x2b, 0x12, 0x1e, 0x5a, 0xe7, - 0x01, 0x94, 0xe8, 0x39, 0x1d, 0x06, 0xfe, 0x6a, 0x95, 0xe7, 0x85, 0x45, 0x55, 0x2e, 0xb6, 0x19, - 0xd4, 0x96, 0x9b, 0xd6, 0x8f, 0xe1, 0xea, 0x0e, 0xab, 0xeb, 0x9e, 0xa0, 0xf5, 0xf5, 0x0a, 0xb1, - 0xd3, 0xd9, 0x91, 0x56, 0x29, 0x04, 0x9d, 0x1d, 0x52, 0x87, 0xfc, 0x56, 0x4b, 0xea, 0x90, 0x77, - 0x5b, 0xd6, 0x2f, 0xd1, 0xd1, 0x3a, 0x5d, 0x26, 0x33, 0x19, 0xcc, 0xd5, 0xf1, 0x85, 0xe8, 0x78, - 0x2c, 0x45, 0xa9, 0xe7, 0x8d, 0x3c, 0x6e, 0x90, 0x8a, 0x2d, 0x16, 0xd6, 0x7d, 0x29, 0x03, 0xea, - 0x3c, 0x7a, 0x19, 0x06, 0x9b, 0xe0, 0x96, 0x0b, 0x45, 0xdd, 0x86, 0xe5, 0x18, 0x56, 0xa6, 0xe4, - 0xf4, 0x11, 0x5c, 0xe3, 0xcc, 0xb6, 0x29, 0x1d, 0x37, 0xfb, 0xee, 0x79, 0xea, 0xa9, 0x63, 0xb8, - 0x6e, 0x22, 0xfe, 0x7f, 0x6d, 0x64, 0x9d, 0x41, 0xe9, 0x19, 0xef, 0x1f, 0x35, 0x59, 0x8a, 0x1c, - 0x17, 0x33, 0xcc, 0xd0, 0x19, 0x88, 0xea, 0xbe, 0x62, 0xf3, 0x6f, 0x9e, 0xcd, 0x29, 0xf5, 0x0e, - 0xed, 0x1d, 0xf1, 0x70, 0x54, 0xec, 0x70, 0x4d, 0xee, 0xb0, 0xce, 0xd5, 0xc5, 0xf0, 0xe0, 0xbb, - 0x45, 0xbe, 0xab, 0x41, 0xb0, 0x83, 0x5a, 0x12, 0x27, 0x35, 0x7b, 0x3d, 0xed, 0xe5, 0x08, 0xf9, - 0xe5, 0xe2, 0xfc, 0xac, 0x57, 0x70, 0x55, 0xc3, 0xcf, 0x64, 0x86, 0x4f, 0xa0, 0x24, 0x9a, 0x64, - 0x99, 0xb4, 0x56, 0xe2, 0x54, 0xe2, 0x18, 0x5b, 0xe2, 0x58, 0x0f, 0x60, 0x59, 0x42, 0xe8, 0x60, - 0x94, 0xe4, 0x2b, 0x6e, 0x1f, 0x6b, 0x07, 0x56, 0xe2, 0x68, 0x99, 0x42, 0xa4, 0xa9, 0x0e, 0x3d, - 0x1c, 0xf7, 0xb4, 0x1c, 0x68, 0x3a, 0x45, 0x37, 0x58, 0xde, 0x30, 0x58, 0x28, 0x90, 0x62, 0x91, - 0x49, 0xa0, 0x65, 0x65, 0xfe, 0x1d, 0xd7, 0x0f, 0x5f, 0xba, 0x37, 0x40, 0x74, 0x60, 0x26, 0xa7, - 0xac, 0x41, 0x59, 0x18, 0x5c, 0x55, 0x55, 0xc9, 0x5e, 0x51, 0x48, 0x4c, 0xa0, 0x16, 0x7d, 0xe1, - 0x39, 0xa7, 0x03, 0x1a, 0xe6, 0x1c, 0x56, 0x42, 0xe8, 0xc0, 0x4c, 0x1a, 0xff, 0x09, 0x9f, 0xcf, - 0x66, 0xdf, 0xf1, 0x06, 0xca, 0xf8, 0x8f, 0xa1, 0x24, 0x6a, 0x13, 0x59, 0xc8, 0x7f, 0x18, 0x67, - 0xa3, 0xe3, 0x8a, 0x45, 0x53, 0x54, 0x32, 0x92, 0x8a, 0x39, 0x4b, 0xce, 0x66, 0x5a, 0xc6, 0xac, - 0xa6, 0x45, 0x7e, 0x00, 0xf3, 0x0e, 0x23, 0xe1, 0x77, 0xb1, 0xbe, 0xfe, 0x5e, 0x02, 0xeb, 0xce, - 0xc5, 0x98, 0xda, 0x02, 0xcb, 0xfa, 0x0c, 0xaa, 0xda, 0x09, 0xac, 0xea, 0x7d, 0xd2, 0xee, 0x60, - 0x29, 0x5c, 0x83, 0x85, 0xe6, 0x66, 0x67, 0xeb, 0x48, 0x14, 0xc3, 0x75, 0x80, 0x56, 0x3b, 0x5c, - 0xe7, 0xb1, 0x0a, 0x12, 0x54, 0xf2, 0x86, 0xeb, 0xf2, 0xe4, 0xd2, 0xe4, 0xc9, 0xbf, 0x93, 0x3c, - 0xaf, 0x61, 0x51, 0xaa, 0x9f, 0x29, 0x06, 0x3e, 0x45, 0x0b, 0x33, 0x36, 0x2a, 0x04, 0x6e, 0x24, - 0x1c, 0xab, 0x6e, 0xa7, 0x40, 0xb4, 0xb0, 0x7a, 0x38, 0x08, 0x9c, 0x60, 0xe2, 0xab, 0x10, 0xf8, - 0x63, 0x0e, 0xea, 0x0a, 0x92, 0xb5, 0x99, 0x57, 0xbd, 0x92, 0xc8, 0x79, 0x61, 0xa7, 0x74, 0x1d, - 0x4a, 0xbd, 0x93, 0x03, 0xf7, 0x8d, 0x1a, 0x6a, 0xc8, 0x15, 0x83, 0xf7, 0xc5, 0x39, 0x62, 0xa2, - 0x26, 0x57, 0xac, 0xfc, 0x66, 0xb3, 0xb5, 0xad, 0x61, 0x8f, 0xbe, 0xe6, 0x2f, 0x6d, 0xd1, 0x8e, - 0x00, 0xbc, 0x5c, 0x96, 0x93, 0x37, 0xde, 0x48, 0xe9, 0x93, 0x38, 0x0c, 0xf2, 0xe6, 0x24, 0x38, - 0x6b, 0x0f, 0xd9, 0xd0, 0x49, 0x69, 0xb8, 0x02, 0x84, 0x01, 0x5b, 0xae, 0xaf, 0x43, 0xdb, 0xb0, - 0xcc, 0xa0, 0x18, 0xf7, 0x58, 0x4c, 0x47, 0x19, 0x43, 0xa5, 0xed, 0x9c, 0x91, 0xb6, 0x1d, 0xdf, - 0x7f, 0x35, 0xf2, 0x7a, 0x52, 0xb5, 0x70, 0x6d, 0xb5, 0x04, 0xf3, 0x43, 0x3f, 0x96, 0x98, 0xbf, - 0x2b, 0x97, 0x87, 0x11, 0x97, 0x27, 0x34, 0x98, 0xc1, 0xc5, 0xfa, 0x18, 0xae, 0x29, 0x4c, 0xd9, - 0x4c, 0xcf, 0x40, 0xde, 0x83, 0xdb, 0x0a, 0x79, 0xf3, 0x8c, 0x15, 0x7a, 0xfb, 0xf2, 0xc0, 0xff, - 0x55, 0xce, 0xc7, 0xb0, 0x12, 0xca, 0xa9, 0xd7, 0x2e, 0xc8, 0x67, 0xe2, 0xcb, 0x78, 0x41, 0x3e, - 0xec, 0x9b, 0xc1, 0xbc, 0x51, 0x3f, 0x7c, 0x00, 0xd9, 0xb7, 0xf5, 0x5e, 0x24, 0x7d, 0xac, 0x7e, - 0x50, 0x06, 0xb0, 0x11, 0x69, 0xb6, 0x19, 0x95, 0x37, 0x19, 0x66, 0x64, 0x2a, 0xc5, 0x98, 0x41, - 0x63, 0x66, 0xb1, 0x6c, 0x21, 0x31, 0x47, 0x37, 0x24, 0x9e, 0xd2, 0xfc, 0x43, 0x28, 0x8e, 0xa9, - 0xbc, 0xc3, 0xd5, 0x75, 0xb2, 0x26, 0x26, 0xce, 0x6b, 0xfb, 0x08, 0x73, 0x7d, 0x16, 0xc9, 0x36, - 0xdf, 0xd7, 0x0f, 0x8b, 0x6b, 0xf1, 0xa5, 0x90, 0x4d, 0x85, 0x5f, 0xa6, 0x74, 0xba, 0x2d, 0xe2, - 0x33, 0x8c, 0xda, 0x4c, 0xcc, 0x4e, 0x84, 0x15, 0xa2, 0x60, 0xcf, 0x74, 0xd3, 0xb1, 0x30, 0x0c, - 0x50, 0x6b, 0x75, 0xcf, 0xc5, 0x42, 0x09, 0x1c, 0xde, 0x84, 0x4c, 0x02, 0x3b, 0x11, 0x33, 0xee, - 0xe5, 0xac, 0xf2, 0xb2, 0xe8, 0x53, 0x4f, 0xbe, 0x58, 0x58, 0xbb, 0x70, 0xdd, 0xbc, 0x49, 0x99, - 0x44, 0x3e, 0x82, 0x3b, 0x69, 0x97, 0x2d, 0x13, 0xdf, 0x67, 0xd1, 0x9d, 0xb9, 0x84, 0xba, 0x5f, - 0x57, 0xfb, 0x52, 0x8a, 0x73, 0xe9, 0xf6, 0xf0, 0xe6, 0x5e, 0x16, 0xb3, 0xcc, 0x6e, 0x57, 0x9a, - 0xea, 0x39, 0xe1, 0x32, 0x1c, 0xa1, 0xa5, 0x92, 0xcb, 0x12, 0xef, 0x32, 0x1c, 0xf1, 0x7d, 0x0b, - 0x2a, 0x61, 0x9d, 0xa1, 0xfd, 0x89, 0xa5, 0x0a, 0xe5, 0xdd, 0xbd, 0x83, 0xfd, 0xe6, 0x26, 0x56, - 0x38, 0xeb, 0xff, 0xcc, 0x43, 0x7e, 0xfb, 0x88, 0x6c, 0xc0, 0xbc, 0x18, 0x0e, 0xcf, 0x18, 0x9f, - 0x37, 0x66, 0x8d, 0x99, 0xad, 0x39, 0xf2, 0x39, 0x14, 0xd8, 0x78, 0x38, 0x75, 0x7e, 0xde, 0x48, - 0x1f, 0x31, 0x23, 0x75, 0x07, 0xaa, 0xda, 0x2c, 0x98, 0xbc, 0x75, 0x7e, 0xde, 0x78, 0xfb, 0x9c, - 0x59, 0xc8, 0xd4, 0x79, 0x3d, 0x34, 0x65, 0x8a, 0x66, 0x97, 0xa6, 0x4c, 0xda, 0xa4, 0x10, 0xa9, - 0x77, 0xe5, 0x0c, 0xba, 0x1b, 0x90, 0xf7, 0x13, 0x46, 0x9a, 0xfa, 0xcc, 0xae, 0x71, 0x37, 0x1d, - 0x41, 0xf1, 0x5b, 0xdf, 0x83, 0x79, 0x3e, 0xcf, 0x20, 0x5f, 0xa8, 0x8f, 0x46, 0xc2, 0xb4, 0x27, - 0xc5, 0xdc, 0xb1, 0x49, 0x88, 0x35, 0xf7, 0x30, 0xf7, 0xc3, 0xdc, 0xfa, 0xb7, 0x79, 0x98, 0xe7, - 0xfd, 0x2d, 0xf9, 0x0a, 0x20, 0x1a, 0x04, 0x98, 0xd2, 0x4e, 0x8d, 0x16, 0x4c, 0x69, 0xa7, 0x67, - 0x08, 0xc2, 0x23, 0x5a, 0xc7, 0x4e, 0x92, 0x48, 0x62, 0x8f, 0x9d, 0xe9, 0x91, 0x84, 0x76, 0x1f, - 0xb9, 0x3a, 0x50, 0x8f, 0x77, 0xe4, 0xe4, 0x5e, 0x02, 0x99, 0xd9, 0xd8, 0x37, 0xee, 0xcf, 0x46, - 0x8a, 0x59, 0xe5, 0x2f, 0x79, 0xf4, 0x9b, 0xf8, 0x0b, 0x2f, 0xba, 0xb0, 0x12, 0x36, 0xbd, 0xe4, - 0x4e, 0x52, 0x43, 0x14, 0x55, 0x17, 0x8d, 0xf7, 0x53, 0xf7, 0x43, 0xf1, 0x9f, 0x43, 0x4d, 0x6f, - 0x52, 0xc9, 0x07, 0x89, 0x3d, 0x96, 0xde, 0xe7, 0x36, 0xac, 0x59, 0x28, 0xd3, 0x8c, 0x45, 0xb3, - 0x99, 0xcc, 0x38, 0xd6, 0xcb, 0x26, 0x33, 0x8e, 0xf7, 0xaa, 0xc8, 0x18, 0x23, 0x23, 0x6a, 0x31, - 0x49, 0xa2, 0x8a, 0x5a, 0x47, 0x6a, 0x46, 0xc6, 0x74, 0x77, 0x8a, 0x71, 0xfc, 0x9f, 0x3c, 0x54, - 0x9f, 0x39, 0xee, 0x30, 0xa0, 0x43, 0x36, 0x12, 0x63, 0xd9, 0x83, 0x27, 0x1a, 0x33, 0x9c, 0xf5, - 0x86, 0xce, 0x0c, 0xe7, 0x58, 0xb7, 0x83, 0x62, 0xb6, 0xa1, 0x24, 0x9a, 0x0e, 0x62, 0x20, 0xc6, - 0x9a, 0x93, 0xc6, 0xad, 0xe4, 0x4d, 0x5d, 0xdb, 0xa8, 0x7f, 0x35, 0xb5, 0x9d, 0x6a, 0x77, 0x1b, - 0x77, 0xd3, 0x11, 0x42, 0x96, 0x3f, 0x83, 0x22, 0x1b, 0x7d, 0x13, 0x23, 0x55, 0x68, 0xd3, 0xf1, - 0x46, 0x23, 0x69, 0x2b, 0x64, 0xf0, 0x0c, 0x16, 0xd4, 0x34, 0x9b, 0xdc, 0x36, 0xe4, 0x8f, 0x4f, - 0xbe, 0x1b, 0x77, 0xd2, 0xb6, 0x15, 0x33, 0x0c, 0xef, 0xbf, 0x56, 0xa0, 0xc8, 0xde, 0x09, 0xa6, - 0x6b, 0x54, 0x5c, 0x9a, 0xba, 0x4e, 0x75, 0x3d, 0xa6, 0xae, 0xd3, 0x75, 0xa9, 0xb8, 0xf3, 0x5a, - 0x8d, 0x49, 0x12, 0x48, 0xe2, 0x4d, 0x93, 0x79, 0xe7, 0x13, 0x0a, 0x54, 0x11, 0xdb, 0x7a, 0xb1, - 0x49, 0x12, 0x88, 0x8c, 0xae, 0xcb, 0x8c, 0xed, 0xa4, 0x5a, 0x15, 0x19, 0xef, 0x43, 0x59, 0x56, - 0x97, 0x49, 0xa2, 0xc6, 0x5b, 0xb0, 0x24, 0x51, 0x8d, 0xd2, 0x34, 0xe2, 0x88, 0xb5, 0x46, 0x1a, - 0xc7, 0xa8, 0xc7, 0x48, 0xe3, 0xa8, 0x15, 0x2a, 0xc8, 0xf1, 0x6b, 0x80, 0xa8, 0xa2, 0x34, 0x93, - 0x5d, 0x62, 0xe7, 0x66, 0x26, 0xbb, 0xe4, 0xa2, 0x14, 0x59, 0x7f, 0x03, 0x64, 0xba, 0xb8, 0x24, - 0x1f, 0x27, 0x53, 0x27, 0xf6, 0x7b, 0x8d, 0x4f, 0xde, 0x0d, 0x39, 0x3c, 0xf2, 0x08, 0x2a, 0x61, - 0xdd, 0x49, 0xac, 0x14, 0xfd, 0xf5, 0x97, 0xe6, 0xde, 0x4c, 0x1c, 0xd3, 0x4a, 0xf2, 0xad, 0x49, - 0x21, 0x8a, 0x3f, 0x37, 0xf7, 0x67, 0x23, 0xe9, 0x2e, 0x95, 0xb5, 0x68, 0x92, 0x4b, 0xe3, 0x0d, - 0x66, 0x92, 0x4b, 0x8d, 0x42, 0x36, 0xe2, 0x98, 0x12, 0x24, 0xf1, 0x46, 0x34, 0x8d, 0xe3, 0x54, - 0x90, 0x44, 0x55, 0x69, 0x92, 0xfa, 0x53, 0x7d, 0x6c, 0x92, 0xfa, 0xd3, 0x85, 0xad, 0xf0, 0x58, - 0x58, 0xa0, 0x26, 0x79, 0xcc, 0x6c, 0x84, 0x1b, 0xf7, 0x66, 0xe2, 0x98, 0x22, 0xa7, 0x7b, 0x6c, - 0xaa, 0x1b, 0x4e, 0x13, 0xd9, 0xf4, 0xd8, 0x46, 0xed, 0x0f, 0x7f, 0xbf, 0x93, 0xfb, 0x33, 0xfe, - 0xfb, 0x1b, 0xfe, 0x3b, 0x29, 0xf1, 0xff, 0xdb, 0xf5, 0xa3, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, - 0xf5, 0x43, 0xe6, 0x66, 0x44, 0x26, 0x00, 0x00, + // 2599 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x5a, 0xcd, 0x72, 0x1b, 0xc7, + 0x11, 0x26, 0x7e, 0x08, 0x10, 0x0d, 0x10, 0xa2, 0x86, 0x94, 0x4c, 0x41, 0x3f, 0x96, 0x57, 0x92, + 0xad, 0xc4, 0x0e, 0x15, 0x33, 0xce, 0x21, 0x15, 0x97, 0x52, 0x20, 0x01, 0x4b, 0x34, 0x29, 0x52, + 0x5e, 0x82, 0x54, 0x7c, 0x62, 0x2d, 0x80, 0x11, 0xb9, 0x25, 0xfc, 0x79, 0x77, 0x41, 0x89, 0xaa, + 0xca, 0x25, 0x55, 0x79, 0x02, 0xe7, 0x94, 0xca, 0x0b, 0xe4, 0x01, 0xf2, 0x0e, 0xa9, 0x5c, 0x92, + 0x27, 0x48, 0x52, 0x39, 0xa5, 0x72, 0xc9, 0x3d, 0xb9, 0xa4, 0xe7, 0x6f, 0x77, 0x76, 0xb0, 0x0b, + 0xc9, 0x59, 0xe5, 0x20, 0x72, 0xa7, 0xa7, 0xfb, 0x9b, 0xee, 0x9e, 0x9e, 0x9e, 0xee, 0xa1, 0xa0, + 0xe2, 0x4d, 0x7a, 0x1b, 0x13, 0x6f, 0x1c, 0x8c, 0x49, 0x8d, 0x06, 0xbd, 0xbe, 0x4f, 0xbd, 0x73, + 0xea, 0x4d, 0xba, 0x8d, 0xb5, 0xd3, 0xf1, 0xe9, 0x98, 0x4f, 0x3c, 0x60, 0x5f, 0x82, 0xa7, 0x71, + 0x8d, 0xf1, 0x3c, 0x18, 0x9e, 0xf7, 0x7a, 0xfc, 0xc7, 0xa4, 0xfb, 0xe0, 0xc5, 0xb9, 0x9c, 0xba, + 0xce, 0xa7, 0x9c, 0x69, 0x70, 0xc6, 0x7f, 0xe0, 0x14, 0xfb, 0x25, 0x26, 0xad, 0x5f, 0xe5, 0xa0, + 0x6e, 0x53, 0x7f, 0x32, 0x1e, 0xf9, 0xf4, 0x31, 0x75, 0xfa, 0xd4, 0x23, 0x37, 0x01, 0x7a, 0x83, + 0xa9, 0x1f, 0x50, 0xef, 0xc4, 0xed, 0xaf, 0xe7, 0x6e, 0xe7, 0xee, 0x17, 0xed, 0x8a, 0xa4, 0xec, + 0xf4, 0xc9, 0x75, 0xa8, 0x0c, 0xe9, 0xb0, 0x2b, 0x66, 0xf3, 0x7c, 0x76, 0x49, 0x10, 0x70, 0xb2, + 0x01, 0x4b, 0x1e, 0x3d, 0x77, 0x7d, 0x77, 0x3c, 0x5a, 0x2f, 0xe0, 0x5c, 0xc1, 0x0e, 0xc7, 0x4c, + 0xd0, 0x73, 0x9e, 0x07, 0x27, 0x08, 0x33, 0x5c, 0x2f, 0x0a, 0x41, 0x46, 0xe8, 0xe0, 0xd8, 0xfa, + 0x75, 0x01, 0x6a, 0xb6, 0x33, 0x3a, 0xa5, 0x36, 0xfd, 0x66, 0x4a, 0xfd, 0x80, 0xac, 0x40, 0xe1, + 0x05, 0xbd, 0xe0, 0xcb, 0xd7, 0x6c, 0xf6, 0x29, 0xe4, 0x91, 0xe3, 0x84, 0x8e, 0xc4, 0xc2, 0x35, + 0x26, 0x8f, 0x84, 0xf6, 0xa8, 0x4f, 0xd6, 0x60, 0x71, 0xe0, 0x0e, 0xdd, 0x40, 0xae, 0x2a, 0x06, + 0x31, 0x75, 0x8a, 0x86, 0x3a, 0xdb, 0x00, 0xfe, 0xd8, 0x0b, 0x4e, 0xc6, 0x1e, 0x1a, 0xbd, 0xbe, + 0x88, 0xb3, 0xf5, 0xcd, 0xbb, 0x1b, 0xba, 0xab, 0x37, 0x74, 0x85, 0x36, 0x0e, 0x91, 0xf9, 0x80, + 0xf1, 0xda, 0x15, 0x5f, 0x7d, 0x92, 0x2f, 0xa0, 0xca, 0x41, 0x02, 0xc7, 0x3b, 0xa5, 0xc1, 0x7a, + 0x89, 0xa3, 0xdc, 0x7b, 0x03, 0x4a, 0x87, 0x33, 0xdb, 0x7c, 0x79, 0xf1, 0x4d, 0x2c, 0xa8, 0x21, + 0xbf, 0xeb, 0x0c, 0xdc, 0xd7, 0x4e, 0x77, 0x40, 0xd7, 0xcb, 0x08, 0xb4, 0x64, 0xc7, 0x68, 0xd6, + 0x06, 0x54, 0x42, 0x1d, 0xc8, 0x12, 0x14, 0xf7, 0x0f, 0xf6, 0xdb, 0x2b, 0x0b, 0x04, 0xa0, 0xd4, + 0x3c, 0xdc, 0x6e, 0xef, 0xb7, 0x56, 0x72, 0xa4, 0x0a, 0xe5, 0x56, 0x5b, 0x0c, 0xf2, 0xd6, 0x16, + 0x40, 0xb4, 0x1a, 0x29, 0x43, 0x61, 0xb7, 0xfd, 0x35, 0xf2, 0x23, 0xcf, 0x71, 0xdb, 0x3e, 0xdc, + 0x39, 0xd8, 0x47, 0x01, 0x14, 0xde, 0xb6, 0xdb, 0xcd, 0x4e, 0x7b, 0x25, 0xcf, 0x38, 0x9e, 0x1c, + 0xb4, 0x56, 0x0a, 0xa4, 0x02, 0x8b, 0xc7, 0xcd, 0xbd, 0xa3, 0xf6, 0x4a, 0xd1, 0xfa, 0x05, 0x2c, + 0x4b, 0xf5, 0x45, 0x88, 0x90, 0xcf, 0xa0, 0x74, 0xc6, 0xc3, 0x84, 0xef, 0x4c, 0x75, 0xf3, 0x86, + 0x61, 0x6b, 0x2c, 0x94, 0x6c, 0xc9, 0x8b, 0xe6, 0x15, 0x5e, 0x9c, 0xfb, 0xb8, 0x69, 0x05, 0x14, + 0x59, 0xd9, 0x10, 0x11, 0xba, 0xb1, 0x4b, 0x2f, 0x8e, 0x9d, 0xc1, 0x94, 0xda, 0x6c, 0x92, 0x10, + 0x28, 0x0e, 0xc7, 0x1e, 0xe5, 0x1b, 0xb8, 0x64, 0xf3, 0x6f, 0xeb, 0x4b, 0x80, 0xa7, 0xd3, 0x20, + 0x3d, 0x24, 0x70, 0xd7, 0xcf, 0x19, 0x82, 0x0c, 0x07, 0x31, 0xe0, 0xb1, 0x40, 0x1d, 0x9f, 0x86, + 0xb1, 0xc0, 0x06, 0xd6, 0x36, 0x54, 0x39, 0x56, 0x16, 0x43, 0x10, 0x84, 0xb4, 0xe8, 0x80, 0x06, + 0x34, 0x43, 0xac, 0x5a, 0x14, 0x56, 0x63, 0x20, 0x99, 0x5c, 0xbb, 0x0e, 0xe5, 0x3e, 0x07, 0x13, + 0xeb, 0x14, 0x6c, 0x35, 0xb4, 0xfe, 0x95, 0xc3, 0x23, 0x25, 0x34, 0x3c, 0x1a, 0xb1, 0x88, 0x6f, + 0xc2, 0xb2, 0x27, 0xc6, 0x27, 0x5c, 0x17, 0xb9, 0x4e, 0x23, 0x3d, 0x5c, 0x1f, 0x2f, 0xd8, 0x35, + 0x29, 0xc2, 0xc9, 0xe4, 0xa7, 0x50, 0x55, 0x10, 0x93, 0x69, 0xc0, 0x57, 0xac, 0x6e, 0xae, 0xc7, + 0x01, 0xa2, 0x1d, 0x43, 0x71, 0x90, 0xec, 0x48, 0x24, 0x1d, 0x58, 0x53, 0xc2, 0x42, 0x47, 0xa9, + 0x46, 0x81, 0xa3, 0xdc, 0x8e, 0xa3, 0xcc, 0xba, 0x19, 0xd1, 0x88, 0x94, 0xd7, 0x26, 0xb7, 0x2a, + 0x50, 0x96, 0x54, 0xeb, 0xdf, 0x39, 0x0c, 0x57, 0xe9, 0x26, 0x61, 0x72, 0x0b, 0xea, 0x9e, 0x24, + 0xc4, 0x6c, 0xbe, 0x9e, 0x68, 0xb3, 0x74, 0xf0, 0x82, 0xbd, 0xac, 0x84, 0x84, 0xd5, 0x0f, 0xa1, + 0x16, 0xa2, 0x44, 0x66, 0x5f, 0x4b, 0x30, 0x3b, 0x44, 0xa8, 0x2a, 0x01, 0x66, 0xf8, 0x33, 0xb8, + 0x12, 0xca, 0x27, 0x58, 0xfe, 0xc1, 0x1c, 0xcb, 0x43, 0xc0, 0x55, 0x85, 0xa0, 0xdb, 0x0e, 0x2c, + 0xbf, 0x09, 0xb2, 0xf5, 0x9b, 0x02, 0x94, 0xb7, 0xc7, 0xc3, 0x89, 0xe3, 0xb1, 0x6d, 0x2a, 0x21, + 0x7d, 0x3a, 0x08, 0xb8, 0xb9, 0xf5, 0xcd, 0x3b, 0xf1, 0x15, 0x24, 0x9b, 0xfa, 0x6d, 0x73, 0x56, + 0x5b, 0x8a, 0x30, 0x61, 0x99, 0xce, 0xf2, 0x6f, 0x21, 0x2c, 0x93, 0x99, 0x14, 0x51, 0x47, 0xa1, + 0x10, 0x1d, 0x85, 0x06, 0x94, 0x51, 0x30, 0x4a, 0xc1, 0x68, 0x8b, 0x22, 0x90, 0xef, 0xc1, 0xa5, + 0x9e, 0x47, 0x1d, 0xe6, 0x0f, 0x95, 0xa6, 0x17, 0x25, 0x4f, 0x5d, 0x4c, 0xd8, 0x2a, 0x5d, 0xdf, + 0x81, 0xda, 0x70, 0xdc, 0x8f, 0xf8, 0x4a, 0x92, 0xaf, 0x8a, 0xd4, 0x90, 0xe9, 0xaa, 0xca, 0x07, + 0x2c, 0x7f, 0xd6, 0x70, 0x56, 0x0c, 0xad, 0x4f, 0x61, 0x39, 0x66, 0x2b, 0x4b, 0x71, 0xed, 0xaf, + 0x8e, 0x9a, 0x7b, 0x22, 0x1f, 0x3e, 0xe2, 0x29, 0xd0, 0xc6, 0x7c, 0x88, 0x69, 0x75, 0xaf, 0x7d, + 0x78, 0x88, 0xd9, 0xf3, 0xf3, 0x50, 0x44, 0x26, 0x50, 0x2d, 0x6f, 0x2e, 0x68, 0x79, 0x33, 0xa7, + 0xf2, 0x66, 0x3e, 0xca, 0x9b, 0x85, 0xad, 0x3a, 0xd4, 0x84, 0x43, 0x4e, 0xa6, 0x2c, 0x0e, 0xad, + 0xdf, 0xe5, 0x00, 0x3a, 0xaf, 0x46, 0x2a, 0x61, 0x3c, 0x80, 0x72, 0x4f, 0x80, 0xe3, 0x06, 0xb1, + 0x9c, 0x78, 0x25, 0xd1, 0xc7, 0xb6, 0xe2, 0xc2, 0xdc, 0x50, 0xf6, 0xa7, 0xbd, 0x1e, 0xf5, 0x55, + 0x12, 0x35, 0x0f, 0xad, 0x76, 0xce, 0x6d, 0xc5, 0xca, 0xa4, 0x9e, 0x3b, 0xee, 0x60, 0xca, 0xb3, + 0xea, 0x1b, 0xa5, 0x24, 0xab, 0xf5, 0xdb, 0x1c, 0x54, 0xb9, 0xae, 0x99, 0xf2, 0xd2, 0x0d, 0xa8, + 0x70, 0x35, 0x68, 0x5f, 0x66, 0xa6, 0x25, 0x3b, 0x22, 0x90, 0x9f, 0x60, 0x7e, 0x94, 0x72, 0xbe, + 0xd4, 0xed, 0x7a, 0x32, 0xac, 0x50, 0x2e, 0xe2, 0xb6, 0x76, 0xe1, 0x32, 0x77, 0x4f, 0x2f, 0x60, + 0x13, 0xd2, 0xa1, 0xfa, 0x45, 0x9f, 0x33, 0x2e, 0x7a, 0x9c, 0x9b, 0x9c, 0x5d, 0xf8, 0x6e, 0xcf, + 0x19, 0x48, 0x45, 0xc2, 0x31, 0x5e, 0x30, 0x44, 0x07, 0xcb, 0x74, 0x37, 0x2c, 0x43, 0xf5, 0xb1, + 0xe3, 0x9f, 0x49, 0x95, 0xac, 0x9f, 0x43, 0x4d, 0x0c, 0x33, 0xb9, 0x11, 0x6f, 0xc5, 0x33, 0x44, + 0xe1, 0x8a, 0x2f, 0xdb, 0xfc, 0xdb, 0xba, 0x0c, 0x97, 0x0e, 0x47, 0xce, 0xc4, 0x3f, 0x1b, 0xab, + 0x44, 0xcb, 0xca, 0xb8, 0x95, 0x88, 0x96, 0x69, 0xc5, 0x8f, 0xe0, 0x92, 0x47, 0x87, 0x8e, 0x3b, + 0x72, 0x47, 0xa7, 0x27, 0xdd, 0x8b, 0x80, 0xfa, 0xb2, 0xca, 0xab, 0x87, 0xe4, 0x2d, 0x46, 0x65, + 0xaa, 0x75, 0x07, 0xe3, 0xae, 0x3c, 0xeb, 0xfc, 0xdb, 0xfa, 0x3d, 0xde, 0x39, 0xcf, 0x9c, 0xa0, + 0xa7, 0xbc, 0x40, 0x76, 0xa0, 0x1e, 0x9e, 0x70, 0x4e, 0x91, 0xba, 0x18, 0xd9, 0x9e, 0xcb, 0x6c, + 0xcb, 0x13, 0xaf, 0xb2, 0xfd, 0x72, 0x4f, 0x27, 0x70, 0x28, 0x67, 0xd4, 0xa3, 0x83, 0x10, 0x2a, + 0x9f, 0x0e, 0xc5, 0x19, 0x75, 0x28, 0x9d, 0xb0, 0x75, 0x29, 0xba, 0x09, 0xc5, 0xf9, 0xfc, 0x36, + 0x07, 0x64, 0x56, 0x87, 0xef, 0x5a, 0x84, 0xde, 0x83, 0xba, 0x8f, 0xc7, 0x3e, 0x38, 0x31, 0x6a, + 0xe0, 0x65, 0x4e, 0x0d, 0xb3, 0x14, 0x7a, 0x18, 0x8b, 0xef, 0x53, 0x0c, 0x69, 0xff, 0x64, 0x34, + 0x0e, 0xdc, 0xe7, 0x17, 0x3c, 0x33, 0x2e, 0xd9, 0x75, 0x45, 0xde, 0xe7, 0x54, 0xeb, 0x81, 0x52, + 0x4a, 0x57, 0x9e, 0x5c, 0x83, 0xa5, 0x97, 0x8c, 0xaa, 0xaa, 0x73, 0xbc, 0xf2, 0xf9, 0x78, 0xa7, + 0x6f, 0xfd, 0x03, 0x2f, 0x40, 0xe9, 0xfe, 0x4c, 0x31, 0xa0, 0x2f, 0x91, 0x8f, 0x2d, 0xc1, 0xea, + 0x0d, 0xb1, 0x2d, 0x7d, 0x59, 0xa9, 0xa9, 0x21, 0x3b, 0x67, 0xc2, 0xcb, 0x38, 0x25, 0xec, 0x09, + 0xc7, 0x98, 0xe8, 0x57, 0x7a, 0xe2, 0x9c, 0x19, 0x99, 0xde, 0xbe, 0x24, 0xe9, 0xa1, 0x77, 0xee, + 0x41, 0x89, 0x9e, 0xd3, 0x51, 0xe0, 0xaf, 0x57, 0x79, 0x5e, 0x58, 0x56, 0xe5, 0x62, 0x9b, 0x51, + 0x6d, 0x39, 0x69, 0xfd, 0x18, 0x2e, 0xef, 0xb1, 0xba, 0xee, 0x11, 0x7a, 0x5f, 0xaf, 0x10, 0x3b, + 0x9d, 0x3d, 0xe9, 0x95, 0x42, 0xd0, 0xd9, 0x23, 0x75, 0xc8, 0xef, 0xb4, 0xa4, 0x0d, 0x79, 0xb7, + 0x65, 0xfd, 0x12, 0x37, 0x5a, 0x97, 0xcb, 0xe4, 0x26, 0x03, 0x5c, 0x2d, 0x5f, 0x88, 0x96, 0xc7, + 0x52, 0x94, 0x7a, 0xde, 0xd8, 0xe3, 0x0e, 0xa9, 0xd8, 0x62, 0x60, 0xdd, 0x95, 0x3a, 0xa0, 0xcd, + 0xe3, 0x17, 0x61, 0xb0, 0x09, 0xb4, 0x5c, 0xa8, 0xea, 0x2e, 0xac, 0xc6, 0xb8, 0x32, 0x25, 0xa7, + 0x8f, 0xe0, 0x0a, 0x07, 0xdb, 0xa5, 0x74, 0xd2, 0x1c, 0xb8, 0xe7, 0xa9, 0xab, 0x4e, 0xe0, 0xaa, + 0xc9, 0xf8, 0xff, 0xf5, 0x91, 0x75, 0x06, 0xa5, 0x27, 0xbc, 0x7f, 0xd4, 0x74, 0x29, 0x72, 0x5e, + 0xcc, 0x30, 0x23, 0x67, 0x28, 0xaa, 0xfb, 0x8a, 0xcd, 0xbf, 0x79, 0x36, 0xa7, 0xd4, 0x3b, 0xb2, + 0xf7, 0xc4, 0xc5, 0x51, 0xb1, 0xc3, 0x31, 0xb9, 0xc5, 0x3a, 0x57, 0x17, 0xc3, 0x83, 0xcf, 0x16, + 0xf9, 0xac, 0x46, 0xc1, 0x0e, 0x6a, 0x45, 0xac, 0xd4, 0xec, 0xf7, 0xb5, 0x9b, 0x23, 0xc4, 0xcb, + 0xc5, 0xf1, 0xac, 0x97, 0x70, 0x59, 0xe3, 0xcf, 0xe4, 0x86, 0x4f, 0xa0, 0x24, 0x9a, 0x64, 0x99, + 0xb4, 0xd6, 0xe2, 0x52, 0x62, 0x19, 0x5b, 0xf2, 0x58, 0xf7, 0x60, 0x55, 0x52, 0xe8, 0x70, 0x9c, + 0xb4, 0x57, 0xdc, 0x3f, 0xd6, 0x1e, 0xac, 0xc5, 0xd9, 0x32, 0x85, 0x48, 0x53, 0x2d, 0x7a, 0x34, + 0xe9, 0x6b, 0x39, 0xd0, 0xdc, 0x14, 0xdd, 0x61, 0x79, 0xc3, 0x61, 0xa1, 0x42, 0x0a, 0x22, 0x93, + 0x42, 0xab, 0xca, 0xfd, 0x7b, 0xae, 0x1f, 0xde, 0x74, 0xaf, 0x81, 0xe8, 0xc4, 0x4c, 0x9b, 0xb2, + 0x01, 0x65, 0xe1, 0x70, 0x55, 0x55, 0x25, 0xef, 0x8a, 0x62, 0x62, 0x0a, 0xb5, 0xe8, 0x73, 0xcf, + 0x39, 0x1d, 0xd2, 0x30, 0xe7, 0xb0, 0x12, 0x42, 0x27, 0x66, 0xb2, 0xf8, 0x4f, 0x78, 0x7d, 0x36, + 0x07, 0x8e, 0x37, 0x54, 0xce, 0x7f, 0x08, 0x25, 0x51, 0x9b, 0xc8, 0x42, 0xfe, 0xc3, 0x38, 0x8c, + 0xce, 0x2b, 0x06, 0x4d, 0x51, 0xc9, 0x48, 0x29, 0xb6, 0x59, 0xf2, 0x6d, 0xa6, 0x65, 0xbc, 0xd5, + 0xb4, 0xc8, 0x0f, 0x60, 0xd1, 0x61, 0x22, 0xfc, 0x2c, 0xd6, 0x37, 0xdf, 0x4b, 0x80, 0xee, 0x5c, + 0x4c, 0xa8, 0x2d, 0xb8, 0xac, 0xcf, 0xa0, 0xaa, 0xad, 0xc0, 0xaa, 0xde, 0x47, 0xed, 0x0e, 0x96, + 0xc2, 0x35, 0x58, 0x6a, 0x6e, 0x77, 0x76, 0x8e, 0x45, 0x31, 0x5c, 0x07, 0x68, 0xb5, 0xc3, 0x71, + 0x1e, 0xab, 0x20, 0x21, 0x25, 0x4f, 0xb8, 0xae, 0x4f, 0x2e, 0x4d, 0x9f, 0xfc, 0x5b, 0xe9, 0xf3, + 0x0a, 0x96, 0xa5, 0xf9, 0x99, 0x62, 0xe0, 0x53, 0xf4, 0x30, 0x83, 0x51, 0x21, 0x70, 0x2d, 0x61, + 0x59, 0x75, 0x3a, 0x05, 0xa3, 0x85, 0xd5, 0xc3, 0x61, 0xe0, 0x04, 0x53, 0x5f, 0x85, 0xc0, 0x1f, + 0x73, 0x50, 0x57, 0x94, 0xac, 0xcd, 0xbc, 0xea, 0x95, 0x44, 0xce, 0x0b, 0x3b, 0xa5, 0xab, 0x50, + 0xea, 0x77, 0x0f, 0xdd, 0xd7, 0xea, 0x51, 0x43, 0x8e, 0x18, 0x7d, 0x20, 0xd6, 0x11, 0x2f, 0x6a, + 0x72, 0xc4, 0xca, 0x6f, 0xf6, 0xb6, 0xb6, 0x33, 0xea, 0xd3, 0x57, 0xfc, 0xa6, 0x2d, 0xda, 0x11, + 0x81, 0x97, 0xcb, 0xf2, 0xe5, 0x8d, 0x37, 0x52, 0xfa, 0x4b, 0x1c, 0x06, 0x79, 0x73, 0x1a, 0x9c, + 0xb5, 0x47, 0xec, 0xd1, 0x49, 0x59, 0xb8, 0x06, 0x84, 0x11, 0x5b, 0xae, 0xaf, 0x53, 0xdb, 0xb0, + 0xca, 0xa8, 0x18, 0xf7, 0x58, 0x4c, 0x47, 0x19, 0x43, 0xa5, 0xed, 0x9c, 0x91, 0xb6, 0x1d, 0xdf, + 0x7f, 0x39, 0xf6, 0xfa, 0xd2, 0xb4, 0x70, 0x6c, 0xb5, 0x04, 0xf8, 0x91, 0x1f, 0x4b, 0xcc, 0xdf, + 0x15, 0xe5, 0x7e, 0x84, 0xf2, 0x88, 0x06, 0x73, 0x50, 0xac, 0x8f, 0xe1, 0x8a, 0xe2, 0x94, 0xcd, + 0xf4, 0x1c, 0xe6, 0x03, 0xb8, 0xa9, 0x98, 0xb7, 0xcf, 0x58, 0xa1, 0xf7, 0x54, 0x2e, 0xf8, 0xbf, + 0xea, 0xf9, 0x10, 0xd6, 0x42, 0x3d, 0xf5, 0xda, 0x05, 0x71, 0xa6, 0xbe, 0x8c, 0x17, 0xc4, 0x61, + 0xdf, 0x8c, 0xe6, 0x8d, 0x07, 0xe1, 0x05, 0xc8, 0xbe, 0xad, 0xf7, 0x22, 0xed, 0x63, 0xf5, 0x83, + 0x72, 0x80, 0x8d, 0x4c, 0xf3, 0xdd, 0xa8, 0x73, 0xc6, 0x5d, 0xc5, 0x17, 0xcb, 0xcd, 0x2e, 0xc6, + 0x38, 0x63, 0xae, 0xb2, 0x6c, 0x61, 0x05, 0x87, 0x30, 0xac, 0x98, 0xf1, 0xc6, 0x87, 0x50, 0x9c, + 0x50, 0x79, 0xae, 0xab, 0x9b, 0x64, 0x43, 0xbc, 0x42, 0x6f, 0x3c, 0x45, 0x9a, 0xeb, 0xb3, 0xe8, + 0xb6, 0xf9, 0xbc, 0xbe, 0x58, 0xdc, 0xb2, 0x2f, 0x85, 0xbe, 0x2a, 0x24, 0x33, 0xa5, 0xd8, 0x5d, + 0x11, 0xb3, 0x61, 0x24, 0x67, 0x02, 0xeb, 0x0a, 0x2f, 0x44, 0x07, 0x20, 0xd3, 0xe9, 0xc7, 0x62, + 0x31, 0x40, 0xab, 0xd5, 0xd9, 0x17, 0x03, 0xa5, 0x70, 0x78, 0x3a, 0x32, 0x29, 0xec, 0x44, 0x60, + 0x7c, 0xe7, 0xb3, 0xea, 0xcb, 0x82, 0x44, 0x95, 0x01, 0x62, 0x60, 0xed, 0xc3, 0x55, 0xf3, 0x74, + 0x65, 0x52, 0xf9, 0x18, 0x6e, 0xa5, 0x1d, 0xc0, 0x4c, 0xb8, 0x4f, 0xa2, 0x73, 0xf4, 0x0e, 0x7a, + 0x01, 0xdd, 0xec, 0x77, 0x52, 0xb0, 0xcb, 0x6d, 0x0f, 0x4f, 0x73, 0x26, 0x30, 0x3f, 0x02, 0xcb, + 0xbe, 0xed, 0xd1, 0x71, 0x2e, 0xcc, 0x3d, 0xce, 0xd2, 0x23, 0x7a, 0xee, 0x78, 0x17, 0x1b, 0xa6, + 0xa5, 0x9c, 0x77, 0xb1, 0x61, 0x7a, 0xb6, 0xc9, 0x82, 0xf7, 0x7d, 0x0b, 0x2a, 0x61, 0x8d, 0xa2, + 0xfd, 0x79, 0xa6, 0x0a, 0xe5, 0xfd, 0x83, 0xc3, 0xa7, 0xcd, 0x6d, 0xac, 0x8e, 0x36, 0xff, 0x99, + 0x87, 0xfc, 0xee, 0x31, 0xd9, 0x82, 0x45, 0xf1, 0xb0, 0x3c, 0xe7, 0xe9, 0xbd, 0x31, 0xef, 0x89, + 0xda, 0x5a, 0x20, 0x9f, 0x43, 0x81, 0x3d, 0x2d, 0xa7, 0xbe, 0xbd, 0x37, 0xd2, 0x9f, 0xa7, 0x51, + 0xba, 0x03, 0x55, 0xed, 0x1d, 0x99, 0xbc, 0xf1, 0xed, 0xbd, 0xf1, 0xe6, 0x37, 0x6a, 0xa1, 0x53, + 0xe7, 0xd5, 0xc8, 0xd4, 0x29, 0x7a, 0xf7, 0x34, 0x75, 0xd2, 0x5e, 0x19, 0x51, 0x7a, 0x5f, 0xbe, + 0x5f, 0xf7, 0x02, 0xf2, 0x7e, 0xc2, 0x73, 0xa8, 0xfe, 0xde, 0xd7, 0xb8, 0x9d, 0xce, 0xa0, 0xf0, + 0x36, 0x0f, 0x60, 0x91, 0xbf, 0x85, 0x90, 0x2f, 0xd4, 0x47, 0x23, 0xe1, 0xa5, 0x28, 0xc5, 0xdd, + 0xb1, 0x57, 0x14, 0x6b, 0xe1, 0x7e, 0xee, 0x87, 0xb9, 0xcd, 0x6f, 0xf3, 0xb0, 0xc8, 0x7b, 0x63, + 0xf2, 0x15, 0x40, 0xf4, 0x88, 0x60, 0x6a, 0x3b, 0xf3, 0x2c, 0x61, 0x6a, 0x3b, 0xfb, 0xfe, 0x20, + 0x76, 0x44, 0xeb, 0xf6, 0x49, 0x92, 0x48, 0xec, 0x52, 0x34, 0x77, 0x24, 0xe1, 0xa9, 0x00, 0x51, + 0x1d, 0xa8, 0xc7, 0xbb, 0x79, 0x72, 0x27, 0x41, 0xcc, 0x7c, 0x14, 0x68, 0xdc, 0x9d, 0xcf, 0x14, + 0xf3, 0xca, 0x5f, 0xf2, 0xb8, 0x6f, 0xe2, 0xaf, 0xc3, 0xb8, 0x85, 0x95, 0xb0, 0x61, 0x26, 0xb7, + 0x92, 0x9a, 0xa9, 0xa8, 0x32, 0x69, 0xbc, 0x9f, 0x3a, 0x1f, 0xaa, 0xff, 0x0c, 0x6a, 0x7a, 0x83, + 0x4b, 0x3e, 0x48, 0xec, 0xcf, 0xf4, 0x1e, 0xb9, 0x61, 0xcd, 0x63, 0x99, 0x05, 0x16, 0x8d, 0x6a, + 0x32, 0x70, 0xac, 0x0f, 0x4e, 0x06, 0x8e, 0xf7, 0xb9, 0x08, 0x8c, 0x91, 0x11, 0xb5, 0xa7, 0x24, + 0xd1, 0x44, 0xad, 0x9b, 0x35, 0x23, 0x63, 0xb6, 0xb3, 0xc5, 0x38, 0xfe, 0x4f, 0x1e, 0xaa, 0x4f, + 0x1c, 0x77, 0x14, 0xd0, 0x11, 0x7b, 0x4e, 0x63, 0xd9, 0x83, 0x27, 0x1a, 0x33, 0x9c, 0xf5, 0x66, + 0xd0, 0x0c, 0xe7, 0x58, 0xa7, 0x84, 0x6a, 0xb6, 0xa1, 0x24, 0x1a, 0x16, 0x62, 0x30, 0xc6, 0x1a, + 0x9b, 0xc6, 0x8d, 0xe4, 0x49, 0xdd, 0xda, 0xa8, 0xf7, 0x35, 0xad, 0x9d, 0x69, 0x95, 0x1b, 0xb7, + 0xd3, 0x19, 0x42, 0xc8, 0x9f, 0x41, 0x91, 0x3d, 0x9b, 0x13, 0x23, 0x55, 0x68, 0x2f, 0xeb, 0x8d, + 0x46, 0xd2, 0x54, 0x08, 0xf0, 0x04, 0x96, 0xd4, 0x4b, 0x38, 0xb9, 0x69, 0xe8, 0x1f, 0x7f, 0x35, + 0x6f, 0xdc, 0x4a, 0x9b, 0x56, 0x60, 0x18, 0xde, 0x7f, 0xad, 0x40, 0x91, 0xdd, 0x13, 0xcc, 0xd6, + 0xa8, 0x08, 0x35, 0x6d, 0x9d, 0xe9, 0x98, 0x4c, 0x5b, 0x67, 0xeb, 0x57, 0x71, 0xe6, 0xb5, 0x5a, + 0x94, 0x24, 0x88, 0xc4, 0x1b, 0x2e, 0xf3, 0xcc, 0x27, 0x14, 0xb2, 0x22, 0xb6, 0xf5, 0xa2, 0x94, + 0x24, 0x08, 0x19, 0x1d, 0x9b, 0x19, 0xdb, 0x49, 0x35, 0x2d, 0x02, 0x3f, 0x85, 0xb2, 0xac, 0x42, + 0x93, 0x54, 0x8d, 0xb7, 0x6f, 0x49, 0xaa, 0x1a, 0x25, 0x6c, 0x84, 0x88, 0x35, 0x49, 0x1a, 0x62, + 0xd4, 0x9f, 0xa4, 0x21, 0x6a, 0x05, 0x0d, 0x22, 0x7e, 0x0d, 0x10, 0x55, 0x9e, 0x66, 0xb2, 0x4b, + 0xec, 0xfa, 0xcc, 0x64, 0x97, 0x5c, 0xbc, 0x22, 0xf4, 0x37, 0x40, 0x66, 0x8b, 0x50, 0xf2, 0x71, + 0xb2, 0x74, 0x62, 0xaf, 0xd8, 0xf8, 0xe4, 0xed, 0x98, 0xc3, 0x25, 0x8f, 0xa1, 0x12, 0xd6, 0xa7, + 0xc4, 0x4a, 0xb1, 0x5f, 0xbf, 0x69, 0xee, 0xcc, 0xe5, 0x31, 0xbd, 0x24, 0xef, 0x9a, 0x14, 0xa1, + 0xf8, 0x75, 0x73, 0x77, 0x3e, 0x93, 0xbe, 0xa5, 0xb2, 0x66, 0x4d, 0xda, 0xd2, 0x78, 0x73, 0x9a, + 0xb4, 0xa5, 0x46, 0xc1, 0x1b, 0x21, 0xa6, 0x04, 0x49, 0xbc, 0x89, 0x4d, 0x43, 0x9c, 0x09, 0x92, + 0xa8, 0x2a, 0x4d, 0x32, 0x7f, 0xa6, 0xdf, 0x4d, 0x32, 0x7f, 0xb6, 0xb0, 0x15, 0x3b, 0x16, 0x16, + 0xa8, 0x49, 0x3b, 0x66, 0x36, 0xcc, 0x8d, 0x3b, 0x73, 0x79, 0x4c, 0x95, 0xd3, 0x77, 0x6c, 0xa6, + 0x6b, 0x4e, 0x53, 0xd9, 0xdc, 0xb1, 0xad, 0xda, 0x1f, 0xfe, 0x7e, 0x2b, 0xf7, 0x67, 0xfc, 0xf7, + 0x37, 0xfc, 0xd7, 0x2d, 0xf1, 0xff, 0x17, 0xf6, 0xa3, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x48, + 0x31, 0xae, 0xd9, 0x80, 0x26, 0x00, 0x00, } diff --git a/etcdserver/etcdserverpb/rpc.proto b/etcdserver/etcdserverpb/rpc.proto index ee3d91f42..0bb2f8a3e 100644 --- a/etcdserver/etcdserverpb/rpc.proto +++ b/etcdserver/etcdserverpb/rpc.proto @@ -603,6 +603,7 @@ message AuthRoleAddRequest { } message AuthRoleGetRequest { + string role = 1; } message AuthRoleDeleteRequest { @@ -664,6 +665,8 @@ message AuthRoleAddResponse { message AuthRoleGetResponse { ResponseHeader header = 1; + + repeated authpb.Permission perm = 2; } message AuthRoleDeleteResponse { diff --git a/etcdserver/v3_server.go b/etcdserver/v3_server.go index aee2447bf..97eebe34e 100644 --- a/etcdserver/v3_server.go +++ b/etcdserver/v3_server.go @@ -66,6 +66,7 @@ type Authenticator interface { UserGet(ctx context.Context, r *pb.AuthUserGetRequest) (*pb.AuthUserGetResponse, error) RoleAdd(ctx context.Context, r *pb.AuthRoleAddRequest) (*pb.AuthRoleAddResponse, error) RoleGrant(ctx context.Context, r *pb.AuthRoleGrantRequest) (*pb.AuthRoleGrantResponse, error) + RoleGet(ctx context.Context, r *pb.AuthRoleGetRequest) (*pb.AuthRoleGetResponse, error) } func (s *EtcdServer) Range(ctx context.Context, r *pb.RangeRequest) (*pb.RangeResponse, error) { @@ -345,6 +346,17 @@ func (s *EtcdServer) RoleGrant(ctx context.Context, r *pb.AuthRoleGrantRequest) return result.resp.(*pb.AuthRoleGrantResponse), nil } +func (s *EtcdServer) RoleGet(ctx context.Context, r *pb.AuthRoleGetRequest) (*pb.AuthRoleGetResponse, error) { + result, err := s.processInternalRaftRequest(ctx, pb.InternalRaftRequest{AuthRoleGet: r}) + if err != nil { + return nil, err + } + if result.err != nil { + return nil, result.err + } + return result.resp.(*pb.AuthRoleGetResponse), nil +} + func (s *EtcdServer) usernameFromCtx(ctx context.Context) (string, error) { md, mdexist := metadata.FromContext(ctx) if mdexist {