From 957b07c408e23931303ab8de9ae4d8258c95736d Mon Sep 17 00:00:00 2001 From: Hitoshi Mitake Date: Fri, 3 Jun 2016 16:38:59 +0900 Subject: [PATCH] *: support revoking a role from a user in auth v3 This commit implements UserRevoke() RPC for supporting revoking a role from a user in auth v3. It also adds a new subcommand "user revoke" to etcdctl. --- auth/store.go | 41 +++ clientv3/auth.go | 9 + etcdctl/ctlv3/command/user_command.go | 23 ++ etcdserver/api/v3rpc/auth.go | 7 +- etcdserver/apply.go | 7 + etcdserver/etcdserverpb/raft_internal.pb.go | 133 ++++--- etcdserver/etcdserverpb/raft_internal.proto | 1 + etcdserver/etcdserverpb/rpc.pb.go | 384 ++++++++++++-------- etcdserver/etcdserverpb/rpc.proto | 2 + etcdserver/v3_server.go | 12 + 10 files changed, 424 insertions(+), 195 deletions(-) diff --git a/auth/store.go b/auth/store.go index c401cedf9..f4cf1ad06 100644 --- a/auth/store.go +++ b/auth/store.go @@ -76,6 +76,9 @@ type AuthStore interface { // UserGet gets the detailed information of a user UserGet(r *pb.AuthUserGetRequest) (*pb.AuthUserGetResponse, error) + // UserRevoke revokes a role of a user + UserRevoke(r *pb.AuthUserRevokeRequest) (*pb.AuthUserRevokeResponse, error) + // RoleAdd adds a new role RoleAdd(r *pb.AuthRoleAddRequest) (*pb.AuthRoleAddResponse, error) @@ -324,6 +327,44 @@ func (as *authStore) UserGet(r *pb.AuthUserGetRequest) (*pb.AuthUserGetResponse, return &resp, nil } +func (as *authStore) UserRevoke(r *pb.AuthUserRevokeRequest) (*pb.AuthUserRevokeResponse, error) { + tx := as.be.BatchTx() + tx.Lock() + defer tx.Unlock() + + _, vs := tx.UnsafeRange(authUsersBucketName, []byte(r.Name), nil, 0) + if len(vs) != 1 { + return nil, ErrUserNotFound + } + + user := &authpb.User{} + err := user.Unmarshal(vs[0]) + if err != nil { + return nil, err + } + + updatedUser := &authpb.User{} + updatedUser.Name = user.Name + updatedUser.Password = user.Password + + // TODO(mitake): return error if the target role doesn't exist in the granted roles of the user + for _, role := range user.Roles { + if strings.Compare(role, r.Role) != 0 { + updatedUser.Roles = append(updatedUser.Roles, role) + } + } + + marshaledUser, merr := updatedUser.Marshal() + if merr != nil { + return nil, merr + } + + tx.UnsafePut(authUsersBucketName, updatedUser.Name, marshaledUser) + + plog.Noticef("revoked role %s from user %s", r.Role, r.Name) + return &pb.AuthUserRevokeResponse{}, nil +} + func (as *authStore) RoleGet(r *pb.AuthRoleGetRequest) (*pb.AuthRoleGetResponse, error) { tx := as.be.BatchTx() tx.Lock() diff --git a/clientv3/auth.go b/clientv3/auth.go index f903a8226..879cea0f0 100644 --- a/clientv3/auth.go +++ b/clientv3/auth.go @@ -34,6 +34,7 @@ type ( AuthUserChangePasswordResponse pb.AuthUserChangePasswordResponse AuthUserGrantResponse pb.AuthUserGrantResponse AuthUserGetResponse pb.AuthUserGetResponse + AuthUserRevokeResponse pb.AuthUserRevokeResponse AuthRoleAddResponse pb.AuthRoleAddResponse AuthRoleGrantResponse pb.AuthRoleGrantResponse AuthRoleGetResponse pb.AuthRoleGetResponse @@ -69,6 +70,9 @@ type Auth interface { // UserGet gets a detailed information of a user. UserGet(ctx context.Context, name string) (*AuthUserGetResponse, error) + // UserRevoke revokes a role of a user. + UserRevoke(ctx context.Context, name string, role string) (*AuthUserRevokeResponse, error) + // RoleAdd adds a new role to an etcd cluster. RoleAdd(ctx context.Context, name string) (*AuthRoleAddResponse, error) @@ -130,6 +134,11 @@ func (auth *auth) UserGet(ctx context.Context, name string) (*AuthUserGetRespons return (*AuthUserGetResponse)(resp), rpctypes.Error(err) } +func (auth *auth) UserRevoke(ctx context.Context, name string, role string) (*AuthUserRevokeResponse, error) { + resp, err := auth.remote.UserRevoke(ctx, &pb.AuthUserRevokeRequest{Name: name, Role: role}) + return (*AuthUserRevokeResponse)(resp), rpctypes.Error(err) +} + func (auth *auth) RoleAdd(ctx context.Context, name string) (*AuthRoleAddResponse, error) { resp, err := auth.remote.RoleAdd(ctx, &pb.AuthRoleAddRequest{Name: name}) return (*AuthRoleAddResponse)(resp), rpctypes.Error(err) diff --git a/etcdctl/ctlv3/command/user_command.go b/etcdctl/ctlv3/command/user_command.go index 42bc9bcc1..0b9036616 100644 --- a/etcdctl/ctlv3/command/user_command.go +++ b/etcdctl/ctlv3/command/user_command.go @@ -35,6 +35,7 @@ func NewUserCommand() *cobra.Command { ac.AddCommand(newUserChangePasswordCommand()) ac.AddCommand(newUserGrantCommand()) ac.AddCommand(newUserGetCommand()) + ac.AddCommand(newUserRevokeRoleCommand()) return ac } @@ -92,6 +93,14 @@ func newUserGetCommand() *cobra.Command { } } +func newUserRevokeRoleCommand() *cobra.Command { + return &cobra.Command{ + Use: "revoke-role ", + Short: "revoke a role from from a user", + Run: userRevokeRoleCommandFunc, + } +} + // userAddCommandFunc executes the "user add" command. func userAddCommandFunc(cmd *cobra.Command, args []string) { if len(args) != 1 { @@ -183,6 +192,20 @@ func userGetCommandFunc(cmd *cobra.Command, args []string) { fmt.Printf("\n") } +// userRevokeRoleCommandFunc executes the "user revoke-role" command. +func userRevokeRoleCommandFunc(cmd *cobra.Command, args []string) { + if len(args) != 2 { + ExitWithError(ExitBadArgs, fmt.Errorf("user revoke-role requires user name and role name as its argument.")) + } + + _, err := mustClientFromCmd(cmd).Auth.UserRevoke(context.TODO(), args[0], args[1]) + if err != nil { + ExitWithError(ExitError, err) + } + + fmt.Printf("Role %s is revoked from user %s\n", args[1], args[0]) +} + func readPasswordInteractive(name string) string { prompt1 := fmt.Sprintf("Password of %s: ", name) password1, err1 := speakeasy.Ask(prompt1) diff --git a/etcdserver/api/v3rpc/auth.go b/etcdserver/api/v3rpc/auth.go index da8752bca..6928585df 100644 --- a/etcdserver/api/v3rpc/auth.go +++ b/etcdserver/api/v3rpc/auth.go @@ -119,8 +119,11 @@ func (as *AuthServer) UserGrant(ctx context.Context, r *pb.AuthUserGrantRequest) } func (as *AuthServer) UserRevoke(ctx context.Context, r *pb.AuthUserRevokeRequest) (*pb.AuthUserRevokeResponse, error) { - plog.Info("not implemented yet") - return nil, nil + resp, err := as.authenticator.UserRevoke(ctx, r) + if err != nil { + return nil, togRPCError(err) + } + return resp, nil } func (as *AuthServer) UserChangePassword(ctx context.Context, r *pb.AuthUserChangePasswordRequest) (*pb.AuthUserChangePasswordResponse, error) { diff --git a/etcdserver/apply.go b/etcdserver/apply.go index fd0d104f4..28085e15a 100644 --- a/etcdserver/apply.go +++ b/etcdserver/apply.go @@ -62,6 +62,7 @@ type applierV3 interface { UserChangePassword(ua *pb.AuthUserChangePasswordRequest) (*pb.AuthUserChangePasswordResponse, error) UserGrant(ua *pb.AuthUserGrantRequest) (*pb.AuthUserGrantResponse, error) UserGet(ua *pb.AuthUserGetRequest) (*pb.AuthUserGetResponse, error) + UserRevoke(ua *pb.AuthUserRevokeRequest) (*pb.AuthUserRevokeResponse, error) RoleAdd(ua *pb.AuthRoleAddRequest) (*pb.AuthRoleAddResponse, error) RoleGrant(ua *pb.AuthRoleGrantRequest) (*pb.AuthRoleGrantResponse, error) RoleGet(ua *pb.AuthRoleGetRequest) (*pb.AuthRoleGetResponse, error) @@ -114,6 +115,8 @@ func (s *EtcdServer) applyV3Request(r *pb.InternalRaftRequest) *applyResult { ar.resp, ar.err = s.applyV3.UserGrant(r.AuthUserGrant) case r.AuthUserGet != nil: ar.resp, ar.err = s.applyV3.UserGet(r.AuthUserGet) + case r.AuthUserRevoke != nil: + ar.resp, ar.err = s.applyV3.UserRevoke(r.AuthUserRevoke) case r.AuthRoleAdd != nil: ar.resp, ar.err = s.applyV3.RoleAdd(r.AuthRoleAdd) case r.AuthRoleGrant != nil: @@ -542,6 +545,10 @@ func (a *applierV3backend) UserGet(r *pb.AuthUserGetRequest) (*pb.AuthUserGetRes return a.s.AuthStore().UserGet(r) } +func (a *applierV3backend) UserRevoke(r *pb.AuthUserRevokeRequest) (*pb.AuthUserRevokeResponse, error) { + return a.s.AuthStore().UserRevoke(r) +} + func (a *applierV3backend) RoleAdd(r *pb.AuthRoleAddRequest) (*pb.AuthRoleAddResponse, error) { return a.s.AuthStore().RoleAdd(r) } diff --git a/etcdserver/etcdserverpb/raft_internal.pb.go b/etcdserver/etcdserverpb/raft_internal.pb.go index c793d6c98..e1a8fa096 100644 --- a/etcdserver/etcdserverpb/raft_internal.pb.go +++ b/etcdserver/etcdserverpb/raft_internal.pb.go @@ -55,6 +55,7 @@ type InternalRaftRequest struct { 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"` + AuthUserRevoke *AuthUserRevokeRequest `protobuf:"bytes,1021,opt,name=auth_user_revoke,json=authUserRevoke" json:"auth_user_revoke,omitempty"` } func (m *InternalRaftRequest) Reset() { *m = InternalRaftRequest{} } @@ -358,6 +359,18 @@ func (m *InternalRaftRequest) MarshalTo(data []byte) (int, error) { } i += n21 } + if m.AuthUserRevoke != nil { + data[i] = 0xea + i++ + data[i] = 0x3f + i++ + i = encodeVarintRaftInternal(data, i, uint64(m.AuthUserRevoke.Size())) + n22, err := m.AuthUserRevoke.MarshalTo(data[i:]) + if err != nil { + return 0, err + } + i += n22 + } return i, nil } @@ -509,6 +522,10 @@ func (m *InternalRaftRequest) Size() (n int) { l = m.AuthRoleGet.Size() n += 2 + l + sovRaftInternal(uint64(l)) } + if m.AuthUserRevoke != nil { + l = m.AuthUserRevoke.Size() + n += 2 + l + sovRaftInternal(uint64(l)) + } return n } @@ -1370,6 +1387,39 @@ func (m *InternalRaftRequest) Unmarshal(data []byte) error { return err } iNdEx = postIndex + case 1021: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AuthUserRevoke", 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.AuthUserRevoke == nil { + m.AuthUserRevoke = &AuthUserRevokeRequest{} + } + if err := m.AuthUserRevoke.Unmarshal(data[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipRaftInternal(data[iNdEx:]) @@ -1547,45 +1597,46 @@ var ( ) var fileDescriptorRaftInternal = []byte{ - // 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, + // 644 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x7c, 0x95, 0xcb, 0x6f, 0xd3, 0x4c, + 0x14, 0xc5, 0xbf, 0xa6, 0xef, 0x49, 0xd3, 0x56, 0xd3, 0x0f, 0x34, 0x04, 0xa9, 0x94, 0x20, 0x24, + 0x04, 0x52, 0x41, 0xed, 0x92, 0x05, 0x84, 0xa6, 0x94, 0x0a, 0x84, 0x2a, 0x0b, 0xd6, 0xd6, 0xd4, + 0xbe, 0x38, 0x11, 0x8e, 0x6d, 0xc6, 0x93, 0x50, 0xfe, 0xc3, 0x2e, 0x59, 0xb3, 0x02, 0x56, 0xec, + 0x79, 0xbf, 0x24, 0xe6, 0xe5, 0x71, 0x26, 0x71, 0xb2, 0x88, 0x64, 0x9f, 0x39, 0xf7, 0x77, 0xef, + 0xcc, 0x1c, 0x2b, 0x68, 0x8b, 0xd1, 0x17, 0xdc, 0xef, 0x25, 0x1c, 0x58, 0x42, 0xe3, 0xdd, 0x8c, + 0xa5, 0x3c, 0xc5, 0x6b, 0xc0, 0x83, 0x30, 0x07, 0x36, 0x04, 0x96, 0x9d, 0x36, 0xff, 0x8f, 0xd2, + 0x28, 0x55, 0x0b, 0xb7, 0xe5, 0x93, 0xf6, 0x34, 0x37, 0x4b, 0x8f, 0x51, 0x56, 0x59, 0x16, 0xe8, + 0xc7, 0xd6, 0x5d, 0xd4, 0xf0, 0xe0, 0xd5, 0x00, 0x72, 0xfe, 0x08, 0x68, 0x08, 0x0c, 0xaf, 0xa3, + 0xda, 0x71, 0x87, 0xcc, 0xed, 0xcc, 0xdd, 0x58, 0xf0, 0x6a, 0xbd, 0x0e, 0x6e, 0xa2, 0x95, 0x41, + 0x2e, 0x5b, 0xf6, 0x81, 0xd4, 0x84, 0xba, 0xea, 0xd9, 0xf7, 0xd6, 0xbb, 0x3a, 0xda, 0x3a, 0x36, + 0x03, 0x79, 0x62, 0x3a, 0x43, 0x9a, 0x60, 0x5c, 0x47, 0xb5, 0xe1, 0x9e, 0xaa, 0xae, 0xef, 0x5d, + 0xd8, 0x1d, 0x1d, 0x79, 0xd7, 0x94, 0x78, 0xc2, 0x80, 0xef, 0xa0, 0x45, 0x46, 0x93, 0x08, 0xc8, + 0xbc, 0x72, 0x36, 0xc7, 0x9c, 0x72, 0xa9, 0xb0, 0x6b, 0x23, 0xbe, 0x89, 0xe6, 0xb3, 0x01, 0x27, + 0x0b, 0xca, 0x4f, 0x5c, 0xff, 0xc9, 0xa0, 0x98, 0xc7, 0x93, 0x26, 0x7c, 0x80, 0xd6, 0x42, 0x88, + 0x81, 0x83, 0xaf, 0x9b, 0x2c, 0xaa, 0xa2, 0x1d, 0xb7, 0xa8, 0xa3, 0x1c, 0x4e, 0xab, 0x7a, 0x58, + 0x6a, 0xb2, 0x21, 0x3f, 0x4b, 0xc8, 0x52, 0x55, 0xc3, 0x67, 0x67, 0x89, 0x6d, 0x28, 0x4c, 0xf8, + 0x1e, 0x42, 0x41, 0xda, 0xcf, 0x68, 0xc0, 0x7b, 0x69, 0x42, 0x96, 0x55, 0xc9, 0x15, 0xb7, 0xe4, + 0xc0, 0xae, 0x17, 0x95, 0x23, 0x25, 0xf8, 0x3e, 0xaa, 0xc7, 0x40, 0x73, 0xf0, 0x23, 0x31, 0x31, + 0x27, 0x2b, 0x55, 0x84, 0x27, 0xd2, 0x70, 0x24, 0xd7, 0x2d, 0x21, 0xb6, 0x92, 0xdc, 0xb3, 0x26, + 0x30, 0x18, 0xa6, 0x2f, 0x81, 0xac, 0x56, 0xed, 0x59, 0x21, 0x3c, 0x65, 0xb0, 0x7b, 0x8e, 0x4b, + 0x4d, 0x5e, 0x0b, 0x8d, 0x29, 0xeb, 0x13, 0x54, 0x75, 0x2d, 0x6d, 0xb9, 0x64, 0xaf, 0x45, 0x19, + 0xf1, 0x3e, 0x5a, 0xea, 0xaa, 0x34, 0x91, 0x50, 0x95, 0x5c, 0xae, 0xbc, 0x73, 0x1d, 0x38, 0xcf, + 0x58, 0x71, 0x1b, 0xd5, 0xe9, 0x80, 0x77, 0x7d, 0x48, 0xe8, 0x69, 0x0c, 0xe4, 0x53, 0xe5, 0x81, + 0xb5, 0x85, 0xe3, 0x50, 0x19, 0xec, 0x76, 0xa9, 0x95, 0x70, 0x07, 0xad, 0x29, 0x44, 0xd8, 0xcb, + 0x15, 0xe3, 0xf3, 0x72, 0xd5, 0x7e, 0x25, 0xa3, 0xa3, 0x1d, 0x76, 0xbf, 0xb4, 0xd4, 0xf0, 0x21, + 0x6a, 0x28, 0x8a, 0x8c, 0xb9, 0x4f, 0xc3, 0x90, 0x7c, 0x99, 0x8a, 0x79, 0x2e, 0xde, 0xda, 0x61, + 0xe8, 0x60, 0x8c, 0x86, 0x9f, 0xa2, 0xcd, 0x12, 0xa3, 0x33, 0x44, 0xbe, 0x6a, 0xd2, 0xb5, 0x6a, + 0x92, 0x09, 0x9f, 0x81, 0xad, 0x53, 0x47, 0xc6, 0x11, 0xba, 0x54, 0xf2, 0x82, 0xae, 0x8c, 0xa3, + 0x9f, 0xd1, 0x3c, 0x7f, 0x9d, 0xb2, 0x90, 0x7c, 0xd3, 0xe0, 0x5b, 0xd5, 0xe0, 0x03, 0xe5, 0x3e, + 0x31, 0xe6, 0xa2, 0xc1, 0x45, 0x5a, 0xb9, 0x8c, 0x1f, 0xa3, 0x8d, 0xb2, 0x91, 0x8e, 0xde, 0x77, + 0x8d, 0x6f, 0x55, 0xe3, 0x9d, 0xf8, 0x35, 0xe8, 0xa8, 0x6a, 0x0f, 0x93, 0xa5, 0x31, 0xa8, 0xc3, + 0xfc, 0x31, 0xf5, 0x30, 0x3d, 0x61, 0x19, 0x3f, 0x4c, 0xa3, 0xd9, 0x99, 0x14, 0x46, 0xcf, 0xf4, + 0x73, 0xea, 0x4c, 0xb2, 0x68, 0x72, 0x26, 0xab, 0xe2, 0x87, 0x3a, 0x26, 0x90, 0xf0, 0x5e, 0x40, + 0xc5, 0xad, 0xfc, 0xd2, 0xa4, 0xab, 0x93, 0xa4, 0xc2, 0x52, 0x80, 0x9c, 0x3a, 0x37, 0x28, 0x11, + 0x70, 0xf2, 0x7b, 0x66, 0x50, 0x8e, 0x80, 0x4f, 0x04, 0x45, 0x68, 0xee, 0x11, 0x49, 0xcc, 0x9f, + 0x99, 0x47, 0x34, 0x8e, 0x31, 0x9a, 0x9b, 0x37, 0xf3, 0xbd, 0xff, 0x9d, 0x99, 0x37, 0xf7, 0x9b, + 0xb7, 0x79, 0xd3, 0x72, 0x6b, 0x03, 0x35, 0x0e, 0xfb, 0x19, 0x7f, 0xe3, 0x41, 0x9e, 0xa5, 0x49, + 0x0e, 0x0f, 0x36, 0xcf, 0x3f, 0x6c, 0xff, 0x77, 0xfe, 0x71, 0x7b, 0xee, 0xad, 0xf8, 0xbd, 0x17, + 0xbf, 0xd3, 0x25, 0xf5, 0x1f, 0xb2, 0xff, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x2d, 0xe3, 0x72, 0x0d, + 0x9b, 0x06, 0x00, 0x00, } diff --git a/etcdserver/etcdserverpb/raft_internal.proto b/etcdserver/etcdserverpb/raft_internal.proto index 0b7c9eb6a..ef3c0bd69 100644 --- a/etcdserver/etcdserverpb/raft_internal.proto +++ b/etcdserver/etcdserverpb/raft_internal.proto @@ -46,6 +46,7 @@ message InternalRaftRequest { AuthenticateRequest authenticate = 1018; AuthUserGetRequest auth_user_get = 1019; AuthRoleGetRequest auth_role_get = 1020; + AuthUserRevokeRequest auth_user_revoke = 1021; } message EmptyResponse { diff --git a/etcdserver/etcdserverpb/rpc.pb.go b/etcdserver/etcdserverpb/rpc.pb.go index ae8c0fe66..743ba0c3b 100644 --- a/etcdserver/etcdserverpb/rpc.pb.go +++ b/etcdserver/etcdserverpb/rpc.pb.go @@ -1593,6 +1593,8 @@ func (*AuthUserGrantRequest) ProtoMessage() {} func (*AuthUserGrantRequest) Descriptor() ([]byte, []int) { return fileDescriptorRpc, []int{51} } type AuthUserRevokeRequest struct { + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Role string `protobuf:"bytes,2,opt,name=role,proto3" json:"role,omitempty"` } func (m *AuthUserRevokeRequest) Reset() { *m = AuthUserRevokeRequest{} } @@ -5280,6 +5282,18 @@ func (m *AuthUserRevokeRequest) MarshalTo(data []byte) (int, error) { _ = i var l int _ = l + if len(m.Name) > 0 { + data[i] = 0xa + i++ + i = encodeVarintRpc(data, i, uint64(len(m.Name))) + i += copy(data[i:], m.Name) + } + if len(m.Role) > 0 { + data[i] = 0x12 + i++ + i = encodeVarintRpc(data, i, uint64(len(m.Role))) + i += copy(data[i:], m.Role) + } return i, nil } @@ -6657,6 +6671,14 @@ func (m *AuthUserGrantRequest) Size() (n int) { func (m *AuthUserRevokeRequest) Size() (n int) { var l int _ = l + l = len(m.Name) + if l > 0 { + n += 1 + l + sovRpc(uint64(l)) + } + l = len(m.Role) + if l > 0 { + n += 1 + l + sovRpc(uint64(l)) + } return n } @@ -12409,6 +12431,64 @@ func (m *AuthUserRevokeRequest) Unmarshal(data []byte) error { return fmt.Errorf("proto: AuthUserRevokeRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Name", 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.Name = string(data[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + 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:]) @@ -14157,14 +14237,14 @@ var ( ) var fileDescriptorRpc = []byte{ - // 2599 bytes of a gzipped FileDescriptorProto + // 2605 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, + 0xad, 0xc4, 0x0e, 0x15, 0x33, 0xce, 0x21, 0x15, 0x97, 0x5c, 0x20, 0x01, 0x4b, 0x0c, 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, + 0xc9, 0x59, 0xe5, 0x20, 0x72, 0xa7, 0xa7, 0xe7, 0x9b, 0xee, 0x9e, 0x9e, 0x9e, 0xee, 0xa6, 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, @@ -14172,153 +14252,153 @@ var fileDescriptorRpc = []byte{ 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, + 0x01, 0x4b, 0x1e, 0x3d, 0x77, 0x7d, 0x77, 0x3c, 0x5a, 0x2f, 0xe0, 0x5c, 0xc1, 0x0e, 0xc7, 0x6c, + 0xa1, 0xe7, 0x3c, 0x0f, 0x4e, 0x10, 0x66, 0xb8, 0x5e, 0x14, 0x0b, 0x19, 0xa1, 0x83, 0x63, 0xeb, + 0xd7, 0x05, 0xa8, 0xd9, 0xce, 0xe8, 0x94, 0xda, 0xf4, 0x9b, 0x29, 0xf5, 0x03, 0xb2, 0x02, 0x85, + 0x17, 0xf4, 0x82, 0x6f, 0x5f, 0xb3, 0xd9, 0xa7, 0x58, 0x8f, 0x1c, 0x27, 0x74, 0x24, 0x36, 0xae, + 0xb1, 0xf5, 0x48, 0x68, 0x8f, 0xfa, 0x64, 0x0d, 0x16, 0x07, 0xee, 0xd0, 0x0d, 0xe4, 0xae, 0x62, + 0x10, 0x13, 0xa7, 0x68, 0x88, 0xb3, 0x0d, 0xe0, 0x8f, 0xbd, 0xe0, 0x64, 0xec, 0xa1, 0xd2, 0xeb, + 0x8b, 0x38, 0x5b, 0xdf, 0xbc, 0xbb, 0xa1, 0x9b, 0x7a, 0x43, 0x17, 0x68, 0xe3, 0x10, 0x99, 0x0f, + 0x18, 0xaf, 0x5d, 0xf1, 0xd5, 0x27, 0xf9, 0x12, 0xaa, 0x1c, 0x24, 0x70, 0xbc, 0x53, 0x1a, 0xac, + 0x97, 0x38, 0xca, 0xbd, 0x37, 0xa0, 0x74, 0x38, 0xb3, 0xcd, 0xb7, 0x17, 0xdf, 0xc4, 0x82, 0x1a, + 0xf2, 0xbb, 0xce, 0xc0, 0x7d, 0xed, 0x74, 0x07, 0x74, 0xbd, 0x8c, 0x40, 0x4b, 0x76, 0x8c, 0x66, + 0x6d, 0x40, 0x25, 0x94, 0x81, 0x2c, 0x41, 0x71, 0xff, 0x60, 0xbf, 0xbd, 0xb2, 0x40, 0x00, 0x4a, + 0xcd, 0xc3, 0xed, 0xf6, 0x7e, 0x6b, 0x25, 0x47, 0xaa, 0x50, 0x6e, 0xb5, 0xc5, 0x20, 0x6f, 0x6d, + 0x01, 0x44, 0xbb, 0x91, 0x32, 0x14, 0x76, 0xdb, 0x5f, 0x23, 0x3f, 0xf2, 0x1c, 0xb7, 0xed, 0xc3, + 0x9d, 0x83, 0x7d, 0x5c, 0x80, 0x8b, 0xb7, 0xed, 0x76, 0xb3, 0xd3, 0x5e, 0xc9, 0x33, 0x8e, 0x27, + 0x07, 0xad, 0x95, 0x02, 0xa9, 0xc0, 0xe2, 0x71, 0x73, 0xef, 0xa8, 0xbd, 0x52, 0xb4, 0x7e, 0x01, + 0xcb, 0x52, 0x7c, 0xe1, 0x22, 0xe4, 0x33, 0x28, 0x9d, 0x71, 0x37, 0xe1, 0x27, 0x53, 0xdd, 0xbc, + 0x61, 0xe8, 0x1a, 0x73, 0x25, 0x5b, 0xf2, 0xa2, 0x7a, 0x85, 0x17, 0xe7, 0x3e, 0x1e, 0x5a, 0x01, + 0x97, 0xac, 0x6c, 0x08, 0x0f, 0xdd, 0xd8, 0xa5, 0x17, 0xc7, 0xce, 0x60, 0x4a, 0x6d, 0x36, 0x49, + 0x08, 0x14, 0x87, 0x63, 0x8f, 0xf2, 0x03, 0x5c, 0xb2, 0xf9, 0xb7, 0xf5, 0x33, 0x80, 0xa7, 0xd3, + 0x20, 0xdd, 0x25, 0xf0, 0xd4, 0xcf, 0x19, 0x82, 0x74, 0x07, 0x31, 0xe0, 0xbe, 0x40, 0x1d, 0x9f, + 0x86, 0xbe, 0xc0, 0x06, 0xd6, 0x36, 0x54, 0x39, 0x56, 0x16, 0x45, 0x10, 0x84, 0xb4, 0xe8, 0x80, + 0x06, 0x34, 0x83, 0xaf, 0x5a, 0x14, 0x56, 0x63, 0x20, 0x99, 0x4c, 0xbb, 0x0e, 0xe5, 0x3e, 0x07, + 0x13, 0xfb, 0x14, 0x6c, 0x35, 0xb4, 0xfe, 0x95, 0xc3, 0x2b, 0x25, 0x24, 0x3c, 0x1a, 0x31, 0x8f, + 0x6f, 0xc2, 0xb2, 0x27, 0xc6, 0x27, 0x5c, 0x16, 0xb9, 0x4f, 0x23, 0xdd, 0x5d, 0x1f, 0x2f, 0xd8, + 0x35, 0xb9, 0x84, 0x93, 0xc9, 0x4f, 0xa1, 0xaa, 0x20, 0x26, 0xd3, 0x80, 0xef, 0x58, 0xdd, 0x5c, + 0x8f, 0x03, 0x44, 0x27, 0x86, 0xcb, 0x41, 0xb2, 0x23, 0x91, 0x74, 0x60, 0x4d, 0x2d, 0x16, 0x32, + 0x4a, 0x31, 0x0a, 0x1c, 0xe5, 0x76, 0x1c, 0x65, 0xd6, 0xcc, 0x88, 0x46, 0xe4, 0x7a, 0x6d, 0x72, + 0xab, 0x02, 0x65, 0x49, 0xb5, 0xfe, 0x9d, 0x43, 0x77, 0x95, 0x66, 0x12, 0x2a, 0xb7, 0xa0, 0xee, + 0x49, 0x42, 0x4c, 0xe7, 0xeb, 0x89, 0x3a, 0x4b, 0x03, 0x2f, 0xd8, 0xcb, 0x6a, 0x91, 0xd0, 0xfa, + 0x21, 0xd4, 0x42, 0x94, 0x48, 0xed, 0x6b, 0x09, 0x6a, 0x87, 0x08, 0x55, 0xb5, 0x80, 0x29, 0xfe, + 0x0c, 0xae, 0x84, 0xeb, 0x13, 0x34, 0xff, 0x60, 0x8e, 0xe6, 0x21, 0xe0, 0xaa, 0x42, 0xd0, 0x75, + 0x07, 0x16, 0xdf, 0x04, 0xd9, 0xfa, 0x4d, 0x01, 0xca, 0xdb, 0xe3, 0xe1, 0xc4, 0xf1, 0xd8, 0x31, + 0x95, 0x90, 0x3e, 0x1d, 0x04, 0x5c, 0xdd, 0xfa, 0xe6, 0x9d, 0xf8, 0x0e, 0x92, 0x4d, 0xfd, 0xb6, + 0x39, 0xab, 0x2d, 0x97, 0xb0, 0xc5, 0x32, 0x9c, 0xe5, 0xdf, 0x62, 0xb1, 0x0c, 0x66, 0x72, 0x89, + 0xba, 0x0a, 0x85, 0xe8, 0x2a, 0x34, 0xa0, 0x8c, 0x0b, 0xa3, 0x10, 0x8c, 0xba, 0x28, 0x02, 0xf9, + 0x1e, 0x5c, 0xea, 0x79, 0xd4, 0x61, 0xf6, 0x50, 0x61, 0x7a, 0x51, 0xf2, 0xd4, 0xc5, 0x84, 0xad, + 0xc2, 0xf5, 0x1d, 0xa8, 0x0d, 0xc7, 0xfd, 0x88, 0xaf, 0x24, 0xf9, 0xaa, 0x48, 0x0d, 0x99, 0xae, + 0xaa, 0x78, 0xc0, 0xe2, 0x67, 0x0d, 0x67, 0xc5, 0xd0, 0xfa, 0x14, 0x96, 0x63, 0xba, 0xb2, 0x10, + 0xd7, 0xfe, 0xea, 0xa8, 0xb9, 0x27, 0xe2, 0xe1, 0x23, 0x1e, 0x02, 0x6d, 0x8c, 0x87, 0x18, 0x56, + 0xf7, 0xda, 0x87, 0x87, 0x18, 0x3d, 0x3f, 0x0f, 0x97, 0xc8, 0x00, 0xaa, 0xc5, 0xcd, 0x05, 0x2d, + 0x6e, 0xe6, 0x54, 0xdc, 0xcc, 0x47, 0x71, 0xb3, 0xb0, 0x55, 0x87, 0x9a, 0x30, 0xc8, 0xc9, 0x94, + 0xf9, 0xa1, 0xf5, 0xbb, 0x1c, 0x40, 0xe7, 0xd5, 0x48, 0x05, 0x8c, 0x07, 0x50, 0xee, 0x09, 0x70, + 0x3c, 0x20, 0x16, 0x13, 0xaf, 0x24, 0xda, 0xd8, 0x56, 0x5c, 0x18, 0x1b, 0xca, 0xfe, 0xb4, 0xd7, + 0xa3, 0xbe, 0x0a, 0xa2, 0xe6, 0xa5, 0xd5, 0xee, 0xb9, 0xad, 0x58, 0xd9, 0xaa, 0xe7, 0x8e, 0x3b, + 0x98, 0xf2, 0xa8, 0xfa, 0xc6, 0x55, 0x92, 0xd5, 0xfa, 0x6d, 0x0e, 0xaa, 0x5c, 0xd6, 0x4c, 0x71, + 0xe9, 0x06, 0x54, 0xb8, 0x18, 0xb4, 0x2f, 0x23, 0xd3, 0x92, 0x1d, 0x11, 0xc8, 0x4f, 0x30, 0x3e, + 0xca, 0x75, 0xbe, 0x94, 0xed, 0x7a, 0x32, 0xac, 0x10, 0x2e, 0xe2, 0xb6, 0x76, 0xe1, 0x32, 0x37, + 0x4f, 0x2f, 0x60, 0x13, 0xd2, 0xa0, 0xfa, 0x43, 0x9f, 0x33, 0x1e, 0x7a, 0x9c, 0x9b, 0x9c, 0x5d, + 0xf8, 0x6e, 0xcf, 0x19, 0x48, 0x41, 0xc2, 0x31, 0x3e, 0x30, 0x44, 0x07, 0xcb, 0xf4, 0x36, 0x2c, + 0x43, 0xf5, 0xb1, 0xe3, 0x9f, 0x49, 0x91, 0xac, 0x9f, 0x43, 0x4d, 0x0c, 0x33, 0x99, 0x11, 0x5f, + 0xc5, 0x33, 0x44, 0xe1, 0x82, 0x2f, 0xdb, 0xfc, 0xdb, 0xba, 0x0c, 0x97, 0x0e, 0x47, 0xce, 0xc4, + 0x3f, 0x1b, 0xab, 0x40, 0xcb, 0xd2, 0xb8, 0x95, 0x88, 0x96, 0x69, 0xc7, 0x8f, 0xe0, 0x92, 0x47, + 0x87, 0x8e, 0x3b, 0x72, 0x47, 0xa7, 0x27, 0xdd, 0x8b, 0x80, 0xfa, 0x32, 0xcb, 0xab, 0x87, 0xe4, + 0x2d, 0x46, 0x65, 0xa2, 0x75, 0x07, 0xe3, 0xae, 0xbc, 0xeb, 0xfc, 0xdb, 0xfa, 0x3d, 0xbe, 0x39, + 0xcf, 0x9c, 0xa0, 0xa7, 0xac, 0x40, 0x76, 0xa0, 0x1e, 0xde, 0x70, 0x4e, 0x91, 0xb2, 0x18, 0xd1, + 0x9e, 0xaf, 0xd9, 0x96, 0x37, 0x5e, 0x45, 0xfb, 0xe5, 0x9e, 0x4e, 0xe0, 0x50, 0xce, 0xa8, 0x47, + 0x07, 0x21, 0x54, 0x3e, 0x1d, 0x8a, 0x33, 0xea, 0x50, 0x3a, 0x61, 0xeb, 0x52, 0xf4, 0x12, 0x8a, + 0xfb, 0xf9, 0x6d, 0x0e, 0xc8, 0xac, 0x0c, 0xdf, 0x35, 0x09, 0xbd, 0x07, 0x75, 0x1f, 0xaf, 0x7d, + 0x70, 0x62, 0xe4, 0xc0, 0xcb, 0x9c, 0x1a, 0x46, 0x29, 0xb4, 0x30, 0x26, 0xdf, 0xa7, 0xe8, 0xd2, + 0xfe, 0xc9, 0x68, 0x1c, 0xb8, 0xcf, 0x2f, 0x78, 0x64, 0x5c, 0xb2, 0xeb, 0x8a, 0xbc, 0xcf, 0xa9, + 0xd6, 0x03, 0x25, 0x94, 0x2e, 0x3c, 0xb9, 0x06, 0x4b, 0x2f, 0x19, 0x55, 0x65, 0xe7, 0xf8, 0xe4, + 0xf3, 0xf1, 0x4e, 0xdf, 0xfa, 0x07, 0x3e, 0x80, 0xd2, 0xfc, 0x99, 0x7c, 0x40, 0xdf, 0x22, 0x1f, + 0xdb, 0x82, 0xe5, 0x1b, 0xe2, 0x58, 0xfa, 0x32, 0x53, 0x53, 0x43, 0x76, 0xcf, 0x84, 0x95, 0x71, + 0x4a, 0xe8, 0x13, 0x8e, 0x31, 0xd0, 0xaf, 0xf4, 0xc4, 0x3d, 0x33, 0x22, 0xbd, 0x7d, 0x49, 0xd2, + 0x43, 0xeb, 0xdc, 0x83, 0x12, 0x3d, 0xa7, 0xa3, 0xc0, 0x5f, 0xaf, 0xf2, 0xb8, 0xb0, 0xac, 0xd2, + 0xc5, 0x36, 0xa3, 0xda, 0x72, 0xd2, 0xfa, 0x31, 0x5c, 0xde, 0x63, 0x79, 0xdd, 0x23, 0xb4, 0xbe, + 0x9e, 0x21, 0x76, 0x3a, 0x7b, 0xd2, 0x2a, 0x85, 0xa0, 0xb3, 0x47, 0xea, 0x90, 0xdf, 0x69, 0x49, + 0x1d, 0xf2, 0x6e, 0xcb, 0xfa, 0x25, 0x1e, 0xb4, 0xbe, 0x2e, 0x93, 0x99, 0x0c, 0x70, 0xb5, 0x7d, + 0x21, 0xda, 0x1e, 0x53, 0x51, 0xea, 0x79, 0x63, 0x8f, 0x1b, 0xa4, 0x62, 0x8b, 0x81, 0x75, 0x57, + 0xca, 0x80, 0x3a, 0x8f, 0x5f, 0x84, 0xce, 0x26, 0xd0, 0x72, 0xa1, 0xa8, 0xbb, 0xb0, 0x1a, 0xe3, + 0xca, 0x14, 0x9c, 0x3e, 0x82, 0x2b, 0x1c, 0x6c, 0x97, 0xd2, 0x49, 0x73, 0xe0, 0x9e, 0xa7, 0xee, + 0x3a, 0x81, 0xab, 0x26, 0xe3, 0xff, 0xd7, 0x46, 0xd6, 0x19, 0x94, 0x9e, 0xf0, 0xfa, 0x51, 0x93, + 0xa5, 0xc8, 0x79, 0x31, 0xc2, 0x8c, 0x9c, 0xa1, 0xc8, 0xee, 0x2b, 0x36, 0xff, 0xe6, 0xd1, 0x9c, + 0x52, 0xef, 0xc8, 0xde, 0x13, 0x0f, 0x47, 0xc5, 0x0e, 0xc7, 0xe4, 0x16, 0xab, 0x5c, 0x5d, 0x74, + 0x0f, 0x3e, 0x5b, 0xe4, 0xb3, 0x1a, 0x05, 0x2b, 0xa8, 0x15, 0xb1, 0x53, 0xb3, 0xdf, 0xd7, 0x5e, + 0x8e, 0x10, 0x2f, 0x17, 0xc7, 0xb3, 0x5e, 0xc2, 0x65, 0x8d, 0x3f, 0x93, 0x19, 0x3e, 0x81, 0x92, + 0x28, 0x92, 0x65, 0xd0, 0x5a, 0x8b, 0xaf, 0x12, 0xdb, 0xd8, 0x92, 0xc7, 0xba, 0x07, 0xab, 0x92, + 0x42, 0x87, 0xe3, 0xa4, 0xb3, 0xe2, 0xf6, 0xb1, 0xf6, 0x60, 0x2d, 0xce, 0x96, 0xc9, 0x45, 0x9a, + 0x6a, 0xd3, 0xa3, 0x49, 0x5f, 0x8b, 0x81, 0xe6, 0xa1, 0xe8, 0x06, 0xcb, 0x1b, 0x06, 0x0b, 0x05, + 0x52, 0x10, 0x99, 0x04, 0x5a, 0x55, 0xe6, 0xdf, 0x73, 0xfd, 0xf0, 0xa5, 0x7b, 0x0d, 0x44, 0x27, + 0x66, 0x3a, 0x94, 0x0d, 0x28, 0x0b, 0x83, 0xab, 0xac, 0x2a, 0xf9, 0x54, 0x14, 0x13, 0x13, 0xa8, + 0x45, 0x9f, 0x7b, 0xce, 0xe9, 0x90, 0x86, 0x31, 0x87, 0xa5, 0x10, 0x3a, 0x31, 0x93, 0xc6, 0x7f, + 0xc2, 0xe7, 0xb3, 0x39, 0x70, 0xbc, 0xa1, 0x32, 0xfe, 0x43, 0x28, 0x89, 0xdc, 0x44, 0x26, 0xf2, + 0x1f, 0xc6, 0x61, 0x74, 0x5e, 0x31, 0x68, 0x8a, 0x4c, 0x46, 0xae, 0x62, 0x87, 0x25, 0x7b, 0x33, + 0x2d, 0xa3, 0x57, 0xd3, 0x22, 0x3f, 0x80, 0x45, 0x87, 0x2d, 0xe1, 0x77, 0xb1, 0xbe, 0xf9, 0x5e, + 0x02, 0x74, 0xe7, 0x62, 0x42, 0x6d, 0xc1, 0x65, 0x7d, 0x06, 0x55, 0x6d, 0x07, 0x96, 0xf5, 0x3e, + 0x6a, 0x77, 0x30, 0x15, 0xae, 0xc1, 0x52, 0x73, 0xbb, 0xb3, 0x73, 0x2c, 0x92, 0xe1, 0x3a, 0x40, + 0xab, 0x1d, 0x8e, 0xf3, 0x98, 0x05, 0x89, 0x55, 0xf2, 0x86, 0xeb, 0xf2, 0xe4, 0xd2, 0xe4, 0xc9, + 0xbf, 0x95, 0x3c, 0xaf, 0x60, 0x59, 0xaa, 0x9f, 0xc9, 0x07, 0x3e, 0x45, 0x0b, 0x33, 0x18, 0xe5, + 0x02, 0xd7, 0x12, 0xb6, 0x55, 0xb7, 0x53, 0x30, 0x5a, 0x98, 0x3d, 0x1c, 0x06, 0x4e, 0x30, 0xf5, + 0x95, 0x0b, 0xfc, 0x31, 0x07, 0x75, 0x45, 0xc9, 0x5a, 0xcc, 0xab, 0x5a, 0x49, 0xc4, 0xbc, 0xb0, + 0x52, 0xba, 0x0a, 0xa5, 0x7e, 0xf7, 0xd0, 0x7d, 0xad, 0x9a, 0x1a, 0x72, 0xc4, 0xe8, 0x03, 0xb1, + 0x8f, 0xe8, 0xa8, 0xc9, 0x11, 0x4b, 0xbf, 0x59, 0x6f, 0x6d, 0x67, 0xd4, 0xa7, 0xaf, 0xf8, 0x4b, + 0x5b, 0xb4, 0x23, 0x02, 0x4f, 0x97, 0x65, 0xe7, 0x8d, 0x17, 0x52, 0x7a, 0x27, 0x0e, 0x9d, 0xbc, + 0x39, 0x0d, 0xce, 0xda, 0x23, 0xd6, 0x74, 0x52, 0x1a, 0xae, 0x01, 0x61, 0xc4, 0x96, 0xeb, 0xeb, + 0xd4, 0x36, 0xac, 0x32, 0x2a, 0xfa, 0x3d, 0x26, 0xd3, 0x51, 0xc4, 0x50, 0x61, 0x3b, 0x67, 0x84, + 0x6d, 0xc7, 0xf7, 0x5f, 0x8e, 0xbd, 0xbe, 0x54, 0x2d, 0x1c, 0x5b, 0x2d, 0x01, 0x7e, 0xe4, 0xc7, + 0x02, 0xf3, 0x77, 0x45, 0xb9, 0x1f, 0xa1, 0x3c, 0xa2, 0xc1, 0x1c, 0x14, 0xeb, 0x63, 0xb8, 0xa2, + 0x38, 0x65, 0x31, 0x3d, 0x87, 0xf9, 0x00, 0x6e, 0x2a, 0xe6, 0xed, 0x33, 0x96, 0xe8, 0x3d, 0x95, + 0x1b, 0xfe, 0xaf, 0x72, 0x3e, 0x84, 0xb5, 0x50, 0x4e, 0x3d, 0x77, 0x41, 0x9c, 0xa9, 0x2f, 0xfd, + 0x05, 0x71, 0xd8, 0x37, 0xa3, 0x79, 0xe3, 0x41, 0xf8, 0x00, 0xb2, 0x6f, 0xeb, 0x8b, 0x48, 0xfa, + 0x78, 0xfe, 0x90, 0x24, 0x48, 0x12, 0x80, 0x34, 0x94, 0x8d, 0xdf, 0xf3, 0xcd, 0xad, 0x73, 0xc6, + 0x4d, 0xca, 0x31, 0x73, 0x1a, 0xe6, 0x7b, 0x42, 0x28, 0xc6, 0x19, 0x33, 0xa9, 0x65, 0x0b, 0x6d, + 0x39, 0x84, 0xa1, 0xed, 0x8c, 0xb0, 0x1f, 0x42, 0x71, 0x42, 0xe5, 0xfd, 0xaf, 0x6e, 0x92, 0x0d, + 0xd1, 0xad, 0xde, 0x78, 0x8a, 0x34, 0xd7, 0x67, 0xb7, 0xc0, 0xe6, 0xf3, 0xfa, 0x66, 0x31, 0x0b, + 0xb0, 0x50, 0xac, 0xbb, 0x6e, 0xa6, 0x50, 0xbc, 0x2b, 0x7c, 0x3b, 0xf4, 0xf8, 0x4c, 0x60, 0x5d, + 0x61, 0x85, 0xe8, 0xa2, 0x64, 0x8a, 0x12, 0x98, 0x54, 0x06, 0xa8, 0xb5, 0x8a, 0x11, 0x62, 0xa0, + 0x04, 0x0e, 0x6f, 0x51, 0x26, 0x81, 0x9d, 0x08, 0x8c, 0x9f, 0x7c, 0x56, 0x79, 0x99, 0x93, 0xa8, + 0x74, 0x41, 0x0c, 0xac, 0x7d, 0xb8, 0x6a, 0xde, 0xc2, 0x4c, 0x22, 0x1f, 0xc3, 0xad, 0xb4, 0x8b, + 0x9a, 0x09, 0xf7, 0x49, 0x74, 0xdf, 0xde, 0x41, 0xcd, 0xa0, 0xab, 0xfd, 0x4e, 0x12, 0x7b, 0x79, + 0xec, 0xe1, 0x6d, 0xce, 0x04, 0xe6, 0x47, 0x60, 0xd9, 0x8f, 0x3d, 0xba, 0xce, 0x85, 0xb9, 0xd7, + 0x59, 0x5a, 0x44, 0x8f, 0x1d, 0xef, 0xe2, 0xc0, 0xb4, 0x90, 0xf3, 0x2e, 0x0e, 0x4c, 0x8f, 0x36, + 0x59, 0xf0, 0xbe, 0x6f, 0x41, 0x25, 0xcc, 0x65, 0xb4, 0x3f, 0xe3, 0x54, 0xa1, 0xbc, 0x7f, 0x70, + 0xf8, 0xb4, 0xb9, 0x8d, 0x59, 0xd4, 0xe6, 0x3f, 0xf3, 0x90, 0xdf, 0x3d, 0x26, 0x5b, 0xb0, 0x28, + 0x1a, 0xd0, 0x73, 0x5a, 0xf4, 0x8d, 0x79, 0xad, 0x6c, 0x6b, 0x81, 0x7c, 0x0e, 0x05, 0xd6, 0x82, + 0x4e, 0xed, 0xd1, 0x37, 0xd2, 0xdb, 0xd8, 0xb8, 0xba, 0x03, 0x55, 0xad, 0xdf, 0x4c, 0xde, 0xd8, + 0xa3, 0x6f, 0xbc, 0xb9, 0x97, 0x2d, 0x64, 0xea, 0xbc, 0x1a, 0x99, 0x32, 0x45, 0xfd, 0x51, 0x53, + 0x26, 0xad, 0x1b, 0x89, 0xab, 0xf7, 0x65, 0x9f, 0xbb, 0x17, 0x90, 0xf7, 0x13, 0xda, 0xa6, 0x7a, + 0x5f, 0xb0, 0x71, 0x3b, 0x9d, 0x41, 0xe1, 0x6d, 0x1e, 0xc0, 0x22, 0xef, 0x99, 0x90, 0x2f, 0xd5, + 0x47, 0x23, 0xa1, 0xa3, 0x94, 0x62, 0xee, 0x58, 0xb7, 0xc5, 0x5a, 0xb8, 0x9f, 0xfb, 0x61, 0x6e, + 0xf3, 0xdb, 0x3c, 0x2c, 0xf2, 0x1a, 0x9a, 0x7c, 0x05, 0x10, 0x35, 0x1b, 0x4c, 0x69, 0x67, 0xda, + 0x17, 0xa6, 0xb4, 0xb3, 0x7d, 0x0a, 0x71, 0x22, 0x5a, 0x57, 0x80, 0x24, 0x2d, 0x89, 0x3d, 0x8a, + 0xe6, 0x89, 0x24, 0xb4, 0x14, 0x10, 0xd5, 0x81, 0x7a, 0xbc, 0xea, 0x27, 0x77, 0x12, 0x96, 0x99, + 0xcd, 0x83, 0xc6, 0xdd, 0xf9, 0x4c, 0x31, 0xab, 0xfc, 0x25, 0x8f, 0xe7, 0x26, 0xfe, 0x8a, 0x8c, + 0x47, 0x58, 0x09, 0x0b, 0x6b, 0x72, 0x2b, 0xa9, 0xe8, 0x8a, 0x32, 0x93, 0xc6, 0xfb, 0xa9, 0xf3, + 0xa1, 0xf8, 0xcf, 0xa0, 0xa6, 0x17, 0xc2, 0xe4, 0x83, 0xc4, 0x3a, 0x4e, 0xaf, 0xa5, 0x1b, 0xd6, + 0x3c, 0x96, 0x59, 0x60, 0x51, 0xd0, 0x26, 0x03, 0xc7, 0xea, 0xe5, 0x64, 0xe0, 0x78, 0x3d, 0x8c, + 0xc0, 0xe8, 0x19, 0x51, 0x19, 0x4b, 0x12, 0x55, 0xd4, 0xaa, 0x5e, 0xd3, 0x33, 0x66, 0x2b, 0x60, + 0xf4, 0xe3, 0xff, 0xe4, 0xa1, 0xfa, 0xc4, 0x71, 0x47, 0x01, 0x1d, 0xb1, 0xb6, 0x1b, 0x8b, 0x1e, + 0x3c, 0xd0, 0x98, 0xee, 0xac, 0x17, 0x8d, 0xa6, 0x3b, 0xc7, 0x2a, 0x2a, 0x14, 0xb3, 0x0d, 0x25, + 0x51, 0xd8, 0x10, 0x83, 0x31, 0x56, 0x00, 0x35, 0x6e, 0x24, 0x4f, 0xea, 0xda, 0x46, 0x35, 0xb2, + 0xa9, 0xed, 0x4c, 0x49, 0xdd, 0xb8, 0x9d, 0xce, 0x10, 0x42, 0x7e, 0x01, 0x45, 0xd6, 0x5e, 0x27, + 0x46, 0xa8, 0xd0, 0x3a, 0xf0, 0x8d, 0x46, 0xd2, 0x54, 0x08, 0xf0, 0x04, 0x96, 0x54, 0xc7, 0x9c, + 0xdc, 0x34, 0xe4, 0x8f, 0x77, 0xd7, 0x1b, 0xb7, 0xd2, 0xa6, 0x15, 0x18, 0xba, 0xf7, 0x5f, 0x2b, + 0x50, 0x64, 0xef, 0x04, 0xd3, 0x35, 0x4a, 0x42, 0x4d, 0x5d, 0x67, 0x2a, 0x2b, 0x53, 0xd7, 0xd9, + 0xfc, 0x55, 0xdc, 0x79, 0x2d, 0x17, 0x25, 0x09, 0x4b, 0xe2, 0x85, 0x99, 0x79, 0xe7, 0x13, 0x12, + 0x59, 0xe1, 0xdb, 0x7a, 0x52, 0x4a, 0x12, 0x16, 0x19, 0x95, 0x9d, 0xe9, 0xdb, 0x49, 0x39, 0x2d, + 0x02, 0x3f, 0x85, 0xb2, 0xcc, 0x42, 0x93, 0x44, 0x8d, 0x97, 0x79, 0x49, 0xa2, 0x1a, 0x29, 0x6c, + 0x84, 0x88, 0x39, 0x49, 0x1a, 0x62, 0x54, 0x9f, 0xa4, 0x21, 0x6a, 0x09, 0x0d, 0x22, 0x7e, 0x0d, + 0x10, 0x65, 0x9e, 0x66, 0xb0, 0x4b, 0xac, 0x0e, 0xcd, 0x60, 0x97, 0x9c, 0xbc, 0x22, 0xf4, 0x37, + 0x40, 0x66, 0x93, 0x50, 0xf2, 0x71, 0xf2, 0xea, 0xc4, 0x9a, 0xb2, 0xf1, 0xc9, 0xdb, 0x31, 0x87, + 0x5b, 0x1e, 0x43, 0x25, 0xcc, 0x4f, 0x89, 0x95, 0xa2, 0xbf, 0xfe, 0xd2, 0xdc, 0x99, 0xcb, 0x63, + 0x5a, 0x49, 0xbe, 0x35, 0x29, 0x8b, 0xe2, 0xcf, 0xcd, 0xdd, 0xf9, 0x4c, 0xfa, 0x91, 0xca, 0x9c, + 0x35, 0xe9, 0x48, 0xe3, 0xc5, 0x69, 0xd2, 0x91, 0x1a, 0x09, 0x6f, 0x84, 0x98, 0xe2, 0x24, 0xf1, + 0x22, 0x36, 0x0d, 0x71, 0xc6, 0x49, 0xa2, 0xac, 0x34, 0x49, 0xfd, 0x99, 0x7a, 0x37, 0x49, 0xfd, + 0xd9, 0xc4, 0x56, 0x9c, 0x58, 0x98, 0xa0, 0x26, 0x9d, 0x98, 0x59, 0x30, 0x37, 0xee, 0xcc, 0xe5, + 0x31, 0x45, 0x4e, 0x3f, 0xb1, 0x99, 0xaa, 0x39, 0x4d, 0x64, 0xf3, 0xc4, 0xb6, 0x6a, 0x7f, 0xf8, + 0xfb, 0xad, 0xdc, 0x9f, 0xf1, 0xdf, 0xdf, 0xf0, 0x5f, 0xb7, 0xc4, 0xff, 0xff, 0xd8, 0x8f, 0xfe, + 0x1b, 0x00, 0x00, 0xff, 0xff, 0x82, 0xfb, 0xea, 0x9b, 0xa8, 0x26, 0x00, 0x00, } diff --git a/etcdserver/etcdserverpb/rpc.proto b/etcdserver/etcdserverpb/rpc.proto index 0bb2f8a3e..aa92f725d 100644 --- a/etcdserver/etcdserverpb/rpc.proto +++ b/etcdserver/etcdserverpb/rpc.proto @@ -595,6 +595,8 @@ message AuthUserGrantRequest { } message AuthUserRevokeRequest { + string name = 1; + string role = 2; } message AuthRoleAddRequest { diff --git a/etcdserver/v3_server.go b/etcdserver/v3_server.go index 97eebe34e..3002d75f1 100644 --- a/etcdserver/v3_server.go +++ b/etcdserver/v3_server.go @@ -64,6 +64,7 @@ type Authenticator interface { UserChangePassword(ctx context.Context, r *pb.AuthUserChangePasswordRequest) (*pb.AuthUserChangePasswordResponse, error) UserGrant(ctx context.Context, r *pb.AuthUserGrantRequest) (*pb.AuthUserGrantResponse, error) UserGet(ctx context.Context, r *pb.AuthUserGetRequest) (*pb.AuthUserGetResponse, error) + UserRevoke(ctx context.Context, r *pb.AuthUserRevokeRequest) (*pb.AuthUserRevokeResponse, 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) @@ -324,6 +325,17 @@ func (s *EtcdServer) UserGet(ctx context.Context, r *pb.AuthUserGetRequest) (*pb return result.resp.(*pb.AuthUserGetResponse), nil } +func (s *EtcdServer) UserRevoke(ctx context.Context, r *pb.AuthUserRevokeRequest) (*pb.AuthUserRevokeResponse, error) { + result, err := s.processInternalRaftRequest(ctx, pb.InternalRaftRequest{AuthUserRevoke: r}) + if err != nil { + return nil, err + } + if result.err != nil { + return nil, result.err + } + return result.resp.(*pb.AuthUserRevokeResponse), nil +} + func (s *EtcdServer) RoleAdd(ctx context.Context, r *pb.AuthRoleAddRequest) (*pb.AuthRoleAddResponse, error) { result, err := s.processInternalRaftRequest(ctx, pb.InternalRaftRequest{AuthRoleAdd: r}) if err != nil {