From 0c7fe288a09f04291eff15c4ac6e91ae63475268 Mon Sep 17 00:00:00 2001 From: Hitoshi Mitake Date: Mon, 5 Jun 2017 16:20:09 +0900 Subject: [PATCH] etcdserver: protect revoking lease with auth Currently clients can revoke any lease without permission. This commit lets etcdserver protect revoking with write permission. This commit adds a new field Expire to LeaseRevokeRequest. The flag is used for indicating that the revoking operation is issued by time progress. In such a case, the permission check can be omitted. --- .../apispec/swagger/rpc.swagger.json | 5 + etcdserver/apply.go | 1 + etcdserver/apply_auth.go | 36 ++- etcdserver/etcdserverpb/rpc.pb.go | 269 ++++++++++-------- etcdserver/etcdserverpb/rpc.proto | 3 + etcdserver/server.go | 2 +- 6 files changed, 196 insertions(+), 120 deletions(-) diff --git a/Documentation/dev-guide/apispec/swagger/rpc.swagger.json b/Documentation/dev-guide/apispec/swagger/rpc.swagger.json index a162a00ec709..116986331777 100644 --- a/Documentation/dev-guide/apispec/swagger/rpc.swagger.json +++ b/Documentation/dev-guide/apispec/swagger/rpc.swagger.json @@ -1607,6 +1607,11 @@ "type": "string", "format": "int64", "description": "ID is the lease ID to revoke. When the ID is revoked, all associated keys will be deleted." + }, + "expire": { + "type": "boolean", + "format": "boolean", + "description": "expire is the flag for indicating that the revoke request is invoked by expire.\nIn such a case, permission checking can be skipped." } } }, diff --git a/etcdserver/apply.go b/etcdserver/apply.go index 426f8019531e..9d520767720b 100644 --- a/etcdserver/apply.go +++ b/etcdserver/apply.go @@ -84,6 +84,7 @@ func (s *EtcdServer) newApplierV3() applierV3 { return newAuthApplierV3( s.AuthStore(), newQuotaApplierV3(s, &applierV3backend{s}), + s.lessor, ) } diff --git a/etcdserver/apply_auth.go b/etcdserver/apply_auth.go index 7da4ae45df5d..47a3505ceb9b 100644 --- a/etcdserver/apply_auth.go +++ b/etcdserver/apply_auth.go @@ -19,12 +19,14 @@ import ( "github.com/coreos/etcd/auth" pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "github.com/coreos/etcd/lease" "github.com/coreos/etcd/mvcc" ) type authApplierV3 struct { applierV3 - as auth.AuthStore + as auth.AuthStore + lessor lease.Lessor // mu serializes Apply so that user isn't corrupted and so that // serialized requests don't leak data from TOCTOU errors @@ -33,8 +35,8 @@ type authApplierV3 struct { authInfo auth.AuthInfo } -func newAuthApplierV3(as auth.AuthStore, base applierV3) *authApplierV3 { - return &authApplierV3{applierV3: base, as: as} +func newAuthApplierV3(as auth.AuthStore, base applierV3, lessor lease.Lessor) *authApplierV3 { + return &authApplierV3{applierV3: base, as: as, lessor: lessor} } func (aa *authApplierV3) Apply(r *pb.InternalRaftRequest) *applyResult { @@ -63,6 +65,20 @@ func (aa *authApplierV3) Put(txn mvcc.TxnWrite, r *pb.PutRequest) (*pb.PutRespon if err := aa.as.IsPutPermitted(&aa.authInfo, r.Key); err != nil { return nil, err } + + lease := aa.lessor.Lookup(lease.LeaseID(r.Lease)) + if lease != nil { + for _, key := range lease.Keys() { + if err := aa.as.IsPutPermitted(&aa.authInfo, []byte(key)); err != nil { + // The especified lease is already attached with a key that cannot + // be written by this user. It means the user cannot revoke the + // lease so attaching the lease to the newly written key should + // be forbidden. + return nil, err + } + } + } + if r.PrevKv { err := aa.as.IsRangePermitted(&aa.authInfo, r.Key, nil) if err != nil { @@ -158,6 +174,20 @@ func (aa *authApplierV3) Txn(rt *pb.TxnRequest) (*pb.TxnResponse, error) { return aa.applierV3.Txn(rt) } +func (aa *authApplierV3) LeaseRevoke(lc *pb.LeaseRevokeRequest) (*pb.LeaseRevokeResponse, error) { + if !lc.Expire { + // If lc.Expire == true, it means LeaseRevoke() is invoked by time progress, + // no permission check is required. + lease := aa.lessor.Lookup(lease.LeaseID(lc.ID)) + for _, key := range lease.Keys() { + if err := aa.as.IsPutPermitted(&aa.authInfo, []byte(key)); err != nil { + return nil, err + } + } + } + return aa.applierV3.LeaseRevoke(lc) +} + func needAdminPermission(r *pb.InternalRaftRequest) bool { switch { case r.AuthEnable != nil: diff --git a/etcdserver/etcdserverpb/rpc.pb.go b/etcdserver/etcdserverpb/rpc.pb.go index 018a3652be7a..2c06519005c0 100644 --- a/etcdserver/etcdserverpb/rpc.pb.go +++ b/etcdserver/etcdserverpb/rpc.pb.go @@ -1296,6 +1296,9 @@ func (m *LeaseGrantResponse) GetHeader() *ResponseHeader { type LeaseRevokeRequest struct { // ID is the lease ID to revoke. When the ID is revoked, all associated keys will be deleted. ID int64 `protobuf:"varint,1,opt,name=ID,proto3" json:"ID,omitempty"` + // expire is the flag for indicating that the revoke request is invoked by expire. + // In such a case, permission checking can be skipped. + Expire bool `protobuf:"varint,2,opt,name=expire,proto3" json:"expire,omitempty"` } func (m *LeaseRevokeRequest) Reset() { *m = LeaseRevokeRequest{} } @@ -4918,6 +4921,16 @@ func (m *LeaseRevokeRequest) MarshalTo(dAtA []byte) (int, error) { i++ i = encodeVarintRpc(dAtA, i, uint64(m.ID)) } + if m.Expire { + dAtA[i] = 0x10 + i++ + if m.Expire { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i++ + } return i, nil } @@ -7128,6 +7141,9 @@ func (m *LeaseRevokeRequest) Size() (n int) { if m.ID != 0 { n += 1 + sovRpc(uint64(m.ID)) } + if m.Expire { + n += 2 + } return n } @@ -11189,6 +11205,26 @@ func (m *LeaseRevokeRequest) Unmarshal(dAtA []byte) error { break } } + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Expire", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowRpc + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + m.Expire = bool(v != 0) default: iNdEx = preIndex skippy, err := skipRpc(dAtA[iNdEx:]) @@ -16329,7 +16365,7 @@ var ( func init() { proto.RegisterFile("rpc.proto", fileDescriptorRpc) } var fileDescriptorRpc = []byte{ - // 3450 bytes of a gzipped FileDescriptorProto + // 3462 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x3b, 0x5b, 0x6f, 0x1b, 0xc7, 0xb9, 0x5a, 0x5e, 0xc5, 0x8f, 0x17, 0xd1, 0x23, 0xd9, 0xa6, 0x68, 0x5b, 0x96, 0xc7, 0x37, 0xd9, 0x4e, 0xa4, 0x44, 0xc9, 0x39, 0x0f, 0x3e, 0x41, 0x70, 0x64, 0x89, 0xb1, 0x74, 0x24, 0x4b, 0xce, @@ -16431,119 +16467,120 @@ var fileDescriptorRpc = []byte{ 0x8f, 0x1d, 0xc3, 0x52, 0xcb, 0xf3, 0x83, 0x83, 0x1d, 0x61, 0x3a, 0xfa, 0x89, 0x2a, 0x90, 0xda, 0xda, 0x10, 0x8a, 0xa6, 0xb6, 0x36, 0xf0, 0x27, 0x1a, 0x20, 0x75, 0xdd, 0x44, 0xb6, 0x8c, 0x10, 0x97, 0xec, 0xd3, 0x01, 0xfb, 0x39, 0xc8, 0x12, 0xc7, 0xb1, 0x1d, 0x66, 0xb5, 0x82, 0xce, 0x07, - 0xf8, 0x96, 0x90, 0x41, 0x27, 0x43, 0xfb, 0xd8, 0x77, 0x0c, 0x4e, 0x4d, 0xf3, 0x45, 0xdd, 0x86, - 0xd9, 0x10, 0xd6, 0x44, 0x81, 0xf4, 0x2e, 0x5c, 0x64, 0xc4, 0xb6, 0x09, 0xe9, 0xaf, 0x75, 0xcd, - 0x61, 0x22, 0xd7, 0x3e, 0x5c, 0x8a, 0x22, 0x7e, 0xbd, 0x36, 0xc2, 0x6f, 0x09, 0x8e, 0x07, 0x66, - 0x8f, 0x1c, 0xd8, 0x3b, 0xc9, 0xb2, 0xd1, 0xe8, 0x48, 0x6f, 0xdd, 0x22, 0xe3, 0xb0, 0x6f, 0xfc, - 0x2b, 0x0d, 0x2e, 0x8f, 0x2c, 0xff, 0x9a, 0x77, 0x75, 0x01, 0xa0, 0x43, 0x8f, 0x0f, 0x69, 0xd3, - 0x09, 0x7e, 0x5f, 0x54, 0x20, 0xbe, 0x9c, 0x34, 0xc0, 0x94, 0x84, 0x9c, 0x47, 0x90, 0x7b, 0xc2, - 0x5a, 0x35, 0x8a, 0x56, 0x19, 0xa9, 0x95, 0x65, 0xf4, 0xf8, 0x05, 0xb2, 0xa0, 0xb3, 0x6f, 0x96, - 0x5f, 0x09, 0x71, 0x9e, 0xe9, 0x3b, 0x3c, 0x8f, 0x17, 0x74, 0x7f, 0x4c, 0xb9, 0xb7, 0xba, 0x26, - 0xb1, 0x3c, 0x36, 0x9b, 0x61, 0xb3, 0x0a, 0x04, 0x2f, 0x43, 0x95, 0x73, 0x5a, 0x6b, 0xb7, 0x95, - 0x5c, 0xee, 0xd3, 0xd3, 0xc2, 0xf4, 0xf0, 0xaf, 0x35, 0xb8, 0xa0, 0x2c, 0x98, 0xc8, 0x76, 0xaf, - 0x40, 0x8e, 0x37, 0xa4, 0x44, 0x1e, 0x99, 0x0b, 0xaf, 0xe2, 0x6c, 0x74, 0x81, 0x83, 0x96, 0x21, - 0xcf, 0xbf, 0x64, 0xb1, 0x12, 0x8f, 0x2e, 0x91, 0xf0, 0x6d, 0x98, 0x15, 0x20, 0xd2, 0xb3, 0xe3, - 0x8e, 0x09, 0x33, 0x28, 0xfe, 0x18, 0xe6, 0xc2, 0x68, 0x13, 0xa9, 0xa4, 0x08, 0x99, 0x3a, 0x8f, - 0x90, 0x6b, 0x52, 0xc8, 0x67, 0xfd, 0xb6, 0x92, 0xf6, 0xa2, 0xbb, 0xae, 0xee, 0x48, 0x2a, 0xb2, - 0x23, 0xbe, 0x02, 0x92, 0xc4, 0x37, 0xaa, 0xc0, 0xac, 0x3c, 0x0e, 0x3b, 0xa6, 0xeb, 0x17, 0x43, - 0x1f, 0x01, 0x52, 0x81, 0xdf, 0xb4, 0x40, 0x1b, 0xe4, 0x85, 0x63, 0x74, 0x7a, 0xc4, 0x0f, 0xf5, - 0xb4, 0xca, 0x54, 0x81, 0x13, 0x05, 0xc7, 0x3f, 0x68, 0x50, 0x5a, 0xeb, 0x1a, 0x4e, 0x4f, 0x6e, - 0xd6, 0xdb, 0x90, 0xe3, 0xe5, 0xab, 0xb8, 0xf1, 0xdd, 0x09, 0x93, 0x51, 0x71, 0xf9, 0x60, 0x8d, - 0x17, 0xbb, 0x62, 0x15, 0xdd, 0x5c, 0xd1, 0x97, 0xdd, 0x88, 0xf4, 0x69, 0x37, 0xd0, 0xab, 0x90, - 0x35, 0xe8, 0x12, 0x16, 0x50, 0x2a, 0xd1, 0x8b, 0x03, 0xa3, 0xc6, 0x4a, 0x0d, 0x8e, 0x85, 0xdf, - 0x84, 0xa2, 0xc2, 0x81, 0xde, 0x87, 0x1e, 0x37, 0x44, 0x39, 0xb1, 0xb6, 0x7e, 0xb0, 0xf5, 0x9c, - 0x5f, 0x93, 0x2a, 0x00, 0x1b, 0x0d, 0x7f, 0x9c, 0xc2, 0xef, 0x8b, 0x55, 0x22, 0xe4, 0xa8, 0xf2, - 0x68, 0x49, 0xf2, 0xa4, 0xce, 0x25, 0xcf, 0x09, 0x94, 0x85, 0xfa, 0x13, 0x9d, 0x81, 0xd7, 0x21, - 0xc7, 0xe8, 0xc9, 0x23, 0x30, 0x1f, 0xc3, 0x56, 0x46, 0x0b, 0x8e, 0x88, 0x67, 0xa0, 0xbc, 0xef, - 0x19, 0xde, 0xc0, 0x95, 0x47, 0xe0, 0xf7, 0x1a, 0x54, 0x24, 0x64, 0xd2, 0xe6, 0x90, 0xbc, 0x54, - 0xf3, 0x20, 0xec, 0x5f, 0xa9, 0x2f, 0x41, 0xae, 0x7d, 0xb8, 0x6f, 0x7e, 0x24, 0x1b, 0x79, 0x62, - 0x44, 0xe1, 0x5d, 0xce, 0x87, 0x77, 0xd3, 0xc5, 0x88, 0x5e, 0xcf, 0x1c, 0xe3, 0x85, 0xb7, 0x65, - 0xb5, 0xc9, 0x09, 0xab, 0x82, 0x32, 0x7a, 0x00, 0x60, 0x37, 0x2a, 0xd1, 0x75, 0x67, 0xa5, 0x8f, - 0xda, 0x85, 0x9f, 0x85, 0x0b, 0x6b, 0x03, 0xef, 0xa8, 0x61, 0x19, 0x87, 0x5d, 0x19, 0x34, 0xf0, - 0x1c, 0x20, 0x0a, 0xdc, 0x30, 0x5d, 0x15, 0xda, 0x80, 0x59, 0x0a, 0x25, 0x96, 0x67, 0xb6, 0x94, - 0x08, 0x23, 0xf3, 0x88, 0x16, 0xc9, 0x23, 0x86, 0xeb, 0xbe, 0xb4, 0x9d, 0xb6, 0x50, 0xcd, 0x1f, - 0xe3, 0x0d, 0x4e, 0xfc, 0x99, 0x1b, 0xca, 0x14, 0x5f, 0x95, 0xca, 0x52, 0x40, 0xe5, 0x31, 0xf1, - 0xc6, 0x50, 0xc1, 0x0f, 0xe0, 0xa2, 0xc4, 0x14, 0x5d, 0x97, 0x31, 0xc8, 0x7b, 0x70, 0x4d, 0x22, - 0xaf, 0x1f, 0xd1, 0xbb, 0xc0, 0x53, 0xc1, 0xf0, 0xdf, 0x95, 0xf3, 0x11, 0xd4, 0x7c, 0x39, 0x59, - 0xe9, 0x67, 0x77, 0x55, 0x01, 0x06, 0xae, 0x38, 0x33, 0x05, 0x9d, 0x7d, 0x53, 0x98, 0x63, 0x77, - 0xfd, 0xac, 0x4c, 0xbf, 0xf1, 0x3a, 0xcc, 0x4b, 0x1a, 0xa2, 0x28, 0x0b, 0x13, 0x19, 0x11, 0x28, - 0x8e, 0x88, 0x30, 0x18, 0x5d, 0x3a, 0xde, 0xec, 0x2a, 0x66, 0xd8, 0xb4, 0x8c, 0xa6, 0xa6, 0xd0, - 0xbc, 0xc8, 0x4f, 0x04, 0x15, 0x4c, 0x0d, 0xda, 0x02, 0x4c, 0x09, 0xa8, 0x60, 0xb1, 0x11, 0x14, - 0x3c, 0xb2, 0x11, 0x23, 0xa4, 0x3f, 0x80, 0x05, 0x5f, 0x08, 0x6a, 0xb7, 0xa7, 0xc4, 0xe9, 0x99, - 0xae, 0xab, 0xf4, 0x09, 0xe2, 0x14, 0xbf, 0x03, 0x99, 0x3e, 0x11, 0x31, 0xa5, 0xb8, 0x8a, 0x96, - 0xf9, 0xdb, 0xd8, 0xb2, 0xb2, 0x98, 0xcd, 0xe3, 0x36, 0x5c, 0x97, 0xd4, 0xb9, 0x45, 0x63, 0xc9, - 0x47, 0x85, 0x92, 0x77, 0x48, 0x6e, 0xd6, 0xd1, 0x3b, 0x64, 0x9a, 0xef, 0xbd, 0xbc, 0x43, 0xd2, - 0x5c, 0xa1, 0xfa, 0xd6, 0x44, 0xb9, 0x62, 0x9b, 0xdb, 0xd4, 0x77, 0xc9, 0x89, 0x88, 0x1d, 0xc2, - 0x5c, 0xd8, 0x93, 0x27, 0x0a, 0x63, 0x73, 0x90, 0xf5, 0xec, 0x63, 0x22, 0x83, 0x18, 0x1f, 0x48, - 0x81, 0x7d, 0x37, 0x9f, 0x48, 0x60, 0x23, 0x20, 0xc6, 0x8e, 0xe4, 0xa4, 0xf2, 0xd2, 0xdd, 0x94, - 0xf5, 0x0f, 0x1f, 0xe0, 0x5d, 0xb8, 0x14, 0x0d, 0x13, 0x13, 0x89, 0xfc, 0x9c, 0x1f, 0xe0, 0xb8, - 0x48, 0x32, 0x11, 0xdd, 0x77, 0x83, 0x60, 0xa0, 0x04, 0x94, 0x89, 0x48, 0xea, 0x50, 0x8f, 0x8b, - 0x2f, 0xff, 0x89, 0xf3, 0xea, 0x87, 0x9b, 0x89, 0x88, 0xb9, 0x01, 0xb1, 0xc9, 0xb7, 0x3f, 0x88, - 0x11, 0xe9, 0xb1, 0x31, 0x42, 0x38, 0x49, 0x10, 0xc5, 0xbe, 0x86, 0x43, 0x27, 0x78, 0x04, 0x01, - 0x74, 0x52, 0x1e, 0x34, 0x87, 0xf8, 0x3c, 0xd8, 0x40, 0x1e, 0x6c, 0x35, 0xec, 0x4e, 0xb4, 0x19, - 0xef, 0x05, 0xb1, 0x73, 0x24, 0x32, 0x4f, 0x44, 0xf8, 0x7d, 0x58, 0x4c, 0x0e, 0xca, 0x93, 0x50, - 0xbe, 0x8f, 0xa1, 0xe0, 0x17, 0x94, 0xca, 0xbb, 0x72, 0x11, 0xf2, 0xbb, 0x7b, 0xfb, 0x4f, 0xd7, - 0xd6, 0x1b, 0x55, 0x6d, 0xf5, 0x1f, 0x69, 0x48, 0x6d, 0x3f, 0x47, 0xdf, 0x82, 0x2c, 0x7f, 0x2e, - 0x1a, 0xf3, 0x9a, 0x56, 0x1f, 0xf7, 0xf0, 0x84, 0xaf, 0x7e, 0xf2, 0xa7, 0xbf, 0x7e, 0x9e, 0xba, - 0x84, 0x2f, 0xac, 0x0c, 0xdf, 0x30, 0xba, 0xfd, 0x23, 0x63, 0xe5, 0x78, 0xb8, 0xc2, 0x72, 0xc2, - 0x43, 0xed, 0x3e, 0x7a, 0x0e, 0xe9, 0xa7, 0x03, 0x0f, 0x25, 0x3e, 0xb5, 0xd5, 0x93, 0x1f, 0xa4, - 0x70, 0x9d, 0x51, 0x9e, 0xc3, 0x33, 0x2a, 0xe5, 0xfe, 0xc0, 0xa3, 0x74, 0x87, 0x50, 0x54, 0xde, - 0x94, 0xd0, 0x99, 0x8f, 0x70, 0xf5, 0xb3, 0xdf, 0xab, 0x30, 0x66, 0xfc, 0xae, 0xe2, 0xcb, 0x2a, - 0x3f, 0xfe, 0xf4, 0xa5, 0xea, 0x73, 0x70, 0x62, 0x45, 0xf5, 0x09, 0x9e, 0x45, 0xa2, 0xfa, 0x28, - 0x4f, 0x11, 0xf1, 0xfa, 0x78, 0x27, 0x16, 0xa5, 0x6b, 0x8b, 0x77, 0xb0, 0x96, 0x87, 0xae, 0xc7, - 0xbc, 0xa3, 0xa8, 0x2f, 0x06, 0xf5, 0xc5, 0x64, 0x04, 0xc1, 0xe9, 0x06, 0xe3, 0x74, 0x05, 0x5f, - 0x52, 0x39, 0xb5, 0x7c, 0xbc, 0x87, 0xda, 0xfd, 0xd5, 0x23, 0xc8, 0xb2, 0x3e, 0x27, 0x6a, 0xca, - 0x8f, 0x7a, 0x4c, 0x87, 0x36, 0xe1, 0x04, 0x84, 0x3a, 0xa4, 0x78, 0x9e, 0x71, 0x9b, 0xc5, 0x15, - 0x9f, 0x1b, 0x6b, 0x75, 0x3e, 0xd4, 0xee, 0x2f, 0x69, 0xaf, 0x69, 0xab, 0xdf, 0xcb, 0x40, 0x96, - 0xb5, 0x8e, 0x50, 0x1f, 0x20, 0x68, 0x0a, 0x46, 0xf5, 0x1c, 0x69, 0x33, 0x46, 0xf5, 0x1c, 0xed, - 0x27, 0xe2, 0xeb, 0x8c, 0xf3, 0x3c, 0x9e, 0xf3, 0x39, 0xb3, 0x57, 0xfb, 0x15, 0xd6, 0x24, 0xa2, - 0x66, 0x7d, 0x09, 0x45, 0xa5, 0xb9, 0x87, 0xe2, 0x28, 0x86, 0xba, 0x83, 0xd1, 0x63, 0x12, 0xd3, - 0x19, 0xc4, 0x37, 0x19, 0xd3, 0x6b, 0xb8, 0xa6, 0x1a, 0x97, 0xf3, 0x75, 0x18, 0x26, 0x65, 0xfc, - 0xa9, 0x06, 0x95, 0x70, 0x83, 0x0f, 0xdd, 0x8c, 0x21, 0x1d, 0xed, 0x13, 0xd6, 0x6f, 0x8d, 0x47, - 0x4a, 0x14, 0x81, 0xf3, 0x3f, 0x26, 0xa4, 0x6f, 0x50, 0x4c, 0x61, 0x7b, 0xf4, 0x7d, 0x0d, 0x66, - 0x22, 0x6d, 0x3b, 0x14, 0xc7, 0x62, 0xa4, 0x29, 0x58, 0xbf, 0x7d, 0x06, 0x96, 0x90, 0xe4, 0x2e, - 0x93, 0xe4, 0x06, 0xbe, 0x3a, 0x6a, 0x0c, 0xcf, 0xec, 0x11, 0xcf, 0x16, 0xd2, 0xac, 0xfe, 0x33, - 0x0d, 0xf9, 0x75, 0xfe, 0x13, 0x2b, 0xe4, 0x41, 0xc1, 0xef, 0x84, 0xa1, 0x85, 0xb8, 0xae, 0x44, - 0x50, 0xb2, 0xd7, 0xaf, 0x27, 0xce, 0x0b, 0x11, 0xee, 0x30, 0x11, 0x16, 0xf1, 0x15, 0x5f, 0x04, - 0xf1, 0x53, 0xae, 0x15, 0x7e, 0xf9, 0x5e, 0x31, 0xda, 0x6d, 0xba, 0x25, 0xdf, 0xd5, 0xa0, 0xa4, - 0x36, 0xac, 0xd0, 0x8d, 0xd8, 0x7e, 0x88, 0xda, 0xf3, 0xaa, 0xe3, 0x71, 0x28, 0x82, 0xff, 0x3d, - 0xc6, 0xff, 0x26, 0x5e, 0x48, 0xe2, 0xef, 0x30, 0xfc, 0xb0, 0x08, 0xbc, 0xe5, 0x14, 0x2f, 0x42, - 0xa8, 0xa3, 0x15, 0x2f, 0x42, 0xb8, 0x63, 0x75, 0xb6, 0x08, 0x03, 0x86, 0x4f, 0x45, 0x38, 0x01, - 0x08, 0x3a, 0x4c, 0x28, 0xd6, 0xb8, 0xca, 0x25, 0x26, 0xea, 0x83, 0xa3, 0xcd, 0xa9, 0x98, 0x13, - 0x10, 0xe1, 0xdd, 0x35, 0x5d, 0xea, 0x8b, 0xab, 0xbf, 0xcd, 0x40, 0xf1, 0x89, 0x61, 0x5a, 0x1e, - 0xb1, 0x0c, 0xab, 0x45, 0x50, 0x07, 0xb2, 0x2c, 0x4b, 0x45, 0x03, 0x8f, 0xda, 0xf6, 0x89, 0x06, - 0x9e, 0x50, 0x4f, 0x04, 0xdf, 0x66, 0xac, 0xaf, 0xe3, 0xba, 0xcf, 0xba, 0x17, 0xd0, 0x5f, 0x61, - 0xfd, 0x0c, 0xaa, 0xf2, 0x31, 0xe4, 0x78, 0xff, 0x02, 0x45, 0xa8, 0x85, 0xfa, 0x1c, 0xf5, 0xab, - 0xf1, 0x93, 0x89, 0xa7, 0x4c, 0xe5, 0xe5, 0x32, 0x64, 0xca, 0xec, 0xdb, 0x00, 0x41, 0xc3, 0x2c, - 0x6a, 0xdf, 0x91, 0xfe, 0x5a, 0x7d, 0x31, 0x19, 0x41, 0x30, 0xbe, 0xcf, 0x18, 0xdf, 0xc2, 0xd7, - 0x63, 0x19, 0xb7, 0xfd, 0x05, 0x94, 0x79, 0x0b, 0x32, 0x9b, 0x86, 0x7b, 0x84, 0x22, 0x49, 0x48, - 0x79, 0xdb, 0xad, 0xd7, 0xe3, 0xa6, 0x04, 0xab, 0x5b, 0x8c, 0xd5, 0x02, 0x9e, 0x8f, 0x65, 0x75, - 0x64, 0xb8, 0x34, 0xa6, 0xa3, 0x01, 0x4c, 0xcb, 0xf7, 0x5a, 0x74, 0x2d, 0x62, 0xb3, 0xf0, 0xdb, - 0x6e, 0x7d, 0x21, 0x69, 0x5a, 0x30, 0x5c, 0x62, 0x0c, 0x31, 0xbe, 0x16, 0x6f, 0x54, 0x81, 0xfe, - 0x50, 0xbb, 0xff, 0x9a, 0xb6, 0xfa, 0xc3, 0x2a, 0x64, 0x68, 0xbd, 0x44, 0xb3, 0x48, 0x70, 0xcd, - 0x8c, 0x5a, 0x78, 0xa4, 0xb9, 0x13, 0xb5, 0xf0, 0xe8, 0x0d, 0x35, 0x26, 0x8b, 0xb0, 0x1f, 0x9a, - 0x12, 0x86, 0x45, 0x35, 0xf6, 0xa0, 0xa8, 0x5c, 0x46, 0x51, 0x0c, 0xc5, 0x70, 0xeb, 0x28, 0x9a, - 0x45, 0x62, 0x6e, 0xb2, 0x78, 0x91, 0x31, 0xad, 0xe3, 0x8b, 0x61, 0xa6, 0x6d, 0x8e, 0x46, 0xb9, - 0x7e, 0x0c, 0x25, 0xf5, 0xd6, 0x8a, 0x62, 0x88, 0x46, 0x7a, 0x53, 0xd1, 0x58, 0x11, 0x77, 0xe9, - 0x8d, 0x71, 0x1a, 0xff, 0x67, 0xb5, 0x12, 0x97, 0x72, 0xff, 0x10, 0xf2, 0xe2, 0x2e, 0x1b, 0xa7, - 0x6f, 0xb8, 0x9b, 0x15, 0xa7, 0x6f, 0xe4, 0x22, 0x1c, 0x53, 0x92, 0x30, 0xb6, 0xb4, 0x66, 0x97, - 0x01, 0x5a, 0xb0, 0x7c, 0x4c, 0xbc, 0x24, 0x96, 0x41, 0x7f, 0x26, 0x89, 0xa5, 0x72, 0x5f, 0x1a, - 0xcb, 0xb2, 0x43, 0x3c, 0x71, 0x96, 0xe5, 0x65, 0x04, 0x25, 0x50, 0x54, 0xa3, 0x21, 0x1e, 0x87, - 0x92, 0x58, 0x45, 0x06, 0x5c, 0x45, 0x28, 0x44, 0xdf, 0x01, 0x08, 0x2e, 0xde, 0xd1, 0xc2, 0x20, - 0xb6, 0x7b, 0x17, 0x2d, 0x0c, 0xe2, 0xef, 0xee, 0x31, 0x1e, 0x1c, 0x30, 0xe7, 0x95, 0x2c, 0x65, - 0xff, 0x13, 0x0d, 0xd0, 0xe8, 0x45, 0x1d, 0x3d, 0x88, 0x67, 0x11, 0xdb, 0x18, 0xac, 0xbf, 0x72, - 0x3e, 0xe4, 0xc4, 0xe8, 0x19, 0xc8, 0xd5, 0x62, 0x4b, 0xfa, 0x2f, 0xa9, 0x64, 0x9f, 0x69, 0x50, - 0x0e, 0x5d, 0xf5, 0xd1, 0x9d, 0x84, 0x7d, 0x8e, 0x34, 0x17, 0xeb, 0x77, 0xcf, 0xc4, 0x4b, 0xac, - 0x9d, 0x94, 0x53, 0x21, 0xeb, 0xc6, 0x1f, 0x68, 0x50, 0x09, 0xf7, 0x07, 0x50, 0x02, 0x83, 0x91, - 0x0e, 0x65, 0x7d, 0xe9, 0x6c, 0xc4, 0x73, 0xec, 0x56, 0x50, 0x4a, 0x7e, 0x08, 0x79, 0xd1, 0x56, - 0x88, 0x73, 0x8b, 0x70, 0x83, 0x33, 0xce, 0x2d, 0x22, 0x3d, 0x89, 0x24, 0xb7, 0xa0, 0x37, 0x74, - 0xc5, 0x13, 0x45, 0xf3, 0x21, 0x89, 0xe5, 0x78, 0x4f, 0x8c, 0x74, 0x2e, 0xc6, 0xb2, 0x0c, 0x3c, - 0x51, 0xb6, 0x1e, 0x50, 0x02, 0xc5, 0x33, 0x3c, 0x31, 0xda, 0xb9, 0x48, 0xf2, 0x44, 0xc6, 0x55, - 0xf1, 0xc4, 0xa0, 0x53, 0x10, 0xe7, 0x89, 0x23, 0xed, 0xdb, 0x38, 0x4f, 0x1c, 0x6d, 0x36, 0x24, - 0xed, 0x2d, 0x63, 0x1e, 0xf2, 0xc4, 0xd9, 0x98, 0xce, 0x02, 0x7a, 0x25, 0xc1, 0xa6, 0xb1, 0xad, - 0xe1, 0xfa, 0xab, 0xe7, 0xc4, 0x1e, 0xef, 0x01, 0x7c, 0x37, 0xa4, 0x07, 0xfc, 0x42, 0x83, 0xb9, - 0xb8, 0xd6, 0x04, 0x4a, 0x60, 0x96, 0xd0, 0x57, 0xae, 0x2f, 0x9f, 0x17, 0xfd, 0x1c, 0x76, 0xf3, - 0x7d, 0xe2, 0x51, 0xf5, 0x77, 0x5f, 0x2e, 0x68, 0x7f, 0xfc, 0x72, 0x41, 0xfb, 0xf3, 0x97, 0x0b, - 0xda, 0x4f, 0xff, 0xb2, 0x30, 0x75, 0x98, 0x63, 0xff, 0xdb, 0xe3, 0x8d, 0x7f, 0x05, 0x00, 0x00, - 0xff, 0xff, 0x63, 0x1c, 0x78, 0x24, 0x74, 0x32, 0x00, 0x00, + 0xf8, 0x2d, 0x21, 0x83, 0x4e, 0x86, 0xf6, 0xb1, 0xef, 0x18, 0x9c, 0x9a, 0xe6, 0x53, 0xbb, 0x04, + 0x39, 0x72, 0xd2, 0x37, 0x1d, 0x22, 0x22, 0xac, 0x18, 0xe1, 0x6d, 0x98, 0x0d, 0xad, 0x9e, 0x28, + 0xc0, 0xde, 0x85, 0x8b, 0x8c, 0xd8, 0x36, 0x21, 0xfd, 0xb5, 0xae, 0x39, 0x4c, 0x92, 0x06, 0xf7, + 0xe1, 0x52, 0x14, 0xf1, 0xeb, 0xb5, 0x1d, 0x7e, 0x4b, 0x70, 0x3c, 0x30, 0x7b, 0xe4, 0xc0, 0xde, + 0x49, 0x96, 0x8d, 0x46, 0x4d, 0x7a, 0x1b, 0x17, 0x76, 0x62, 0xdf, 0xf8, 0x57, 0x1a, 0x5c, 0x1e, + 0x59, 0xfe, 0x35, 0xef, 0xf6, 0x02, 0x40, 0x87, 0x1e, 0x2b, 0xd2, 0xa6, 0x13, 0xfc, 0x1e, 0xa9, + 0x40, 0x7c, 0x39, 0x69, 0xe0, 0x29, 0x09, 0x39, 0x8f, 0x20, 0xf7, 0x84, 0xb5, 0x70, 0x14, 0xad, + 0x32, 0x52, 0x2b, 0xcb, 0xe8, 0xf1, 0xdd, 0x2f, 0xe8, 0xec, 0x9b, 0xe5, 0x5d, 0x42, 0x9c, 0x67, + 0xfa, 0x0e, 0xcf, 0xef, 0x05, 0xdd, 0x1f, 0x53, 0xee, 0xad, 0xae, 0x49, 0x2c, 0x8f, 0xcd, 0x66, + 0xd8, 0xac, 0x02, 0xc1, 0xcb, 0x50, 0xe5, 0x9c, 0xd6, 0xda, 0x6d, 0x25, 0xc7, 0xfb, 0xf4, 0xb4, + 0x30, 0x3d, 0xfc, 0x6b, 0x0d, 0x2e, 0x28, 0x0b, 0x26, 0xb2, 0xdd, 0x2b, 0x90, 0xe3, 0x8d, 0x2a, + 0x91, 0x5f, 0xe6, 0xc2, 0xab, 0x38, 0x1b, 0x5d, 0xe0, 0xa0, 0x65, 0xc8, 0xf3, 0x2f, 0x59, 0xc4, + 0xc4, 0xa3, 0x4b, 0x24, 0x7c, 0x1b, 0x66, 0x05, 0x88, 0xf4, 0xec, 0xb8, 0x63, 0xc2, 0x0c, 0x8a, + 0x3f, 0x86, 0xb9, 0x30, 0xda, 0x44, 0x2a, 0x29, 0x42, 0xa6, 0xce, 0x23, 0xe4, 0x9a, 0x14, 0xf2, + 0x59, 0xbf, 0xad, 0xa4, 0xc3, 0xe8, 0xae, 0xab, 0x3b, 0x92, 0x8a, 0xec, 0x88, 0xaf, 0x80, 0x24, + 0xf1, 0x8d, 0x2a, 0x30, 0x2b, 0x8f, 0xc3, 0x8e, 0xe9, 0xfa, 0x45, 0xd2, 0x47, 0x80, 0x54, 0xe0, + 0x37, 0x2d, 0xd0, 0x06, 0x79, 0xe1, 0x18, 0x9d, 0x1e, 0xf1, 0x53, 0x00, 0xad, 0x3e, 0x55, 0xe0, + 0x44, 0xc1, 0xf1, 0x0f, 0x1a, 0x94, 0xd6, 0xba, 0x86, 0xd3, 0x93, 0x9b, 0xf5, 0x36, 0xe4, 0x78, + 0x59, 0x2b, 0x6e, 0x82, 0x77, 0xc2, 0x64, 0x54, 0x5c, 0x3e, 0x58, 0xe3, 0x45, 0xb0, 0x58, 0x45, + 0x37, 0x57, 0xf4, 0x6b, 0x37, 0x22, 0xfd, 0xdb, 0x0d, 0xf4, 0x2a, 0x64, 0x0d, 0xba, 0x84, 0x05, + 0x94, 0x4a, 0xf4, 0x42, 0xc1, 0xa8, 0xb1, 0x12, 0x84, 0x63, 0xe1, 0x37, 0xa1, 0xa8, 0x70, 0xa0, + 0xf7, 0xa4, 0xc7, 0x0d, 0x51, 0x66, 0xac, 0xad, 0x1f, 0x6c, 0x3d, 0xe7, 0xd7, 0xa7, 0x0a, 0xc0, + 0x46, 0xc3, 0x1f, 0xa7, 0xf0, 0xfb, 0x62, 0x95, 0x08, 0x39, 0xaa, 0x3c, 0x5a, 0x92, 0x3c, 0xa9, + 0x73, 0xc9, 0x73, 0x02, 0x65, 0xa1, 0xfe, 0x44, 0x67, 0xe0, 0x75, 0xc8, 0x31, 0x7a, 0xf2, 0x08, + 0xcc, 0xc7, 0xb0, 0x95, 0xd1, 0x82, 0x23, 0xe2, 0x19, 0x28, 0xef, 0x7b, 0x86, 0x37, 0x70, 0xe5, + 0x11, 0xf8, 0xbd, 0x06, 0x15, 0x09, 0x99, 0xb4, 0x69, 0x24, 0x2f, 0xdb, 0x3c, 0x08, 0xfb, 0x57, + 0xed, 0x4b, 0x90, 0x6b, 0x1f, 0xee, 0x9b, 0x1f, 0xc9, 0x06, 0x9f, 0x18, 0x51, 0x78, 0x97, 0xf3, + 0xe1, 0x5d, 0x76, 0x31, 0xa2, 0xd7, 0x36, 0xc7, 0x78, 0xe1, 0x6d, 0x59, 0x6d, 0x72, 0xc2, 0xaa, + 0xa3, 0x8c, 0x1e, 0x00, 0xd8, 0x4d, 0x4b, 0x74, 0xe3, 0x59, 0x49, 0xa4, 0x76, 0xe7, 0x67, 0xe1, + 0xc2, 0xda, 0xc0, 0x3b, 0x6a, 0x58, 0xc6, 0x61, 0x57, 0x06, 0x0d, 0x3c, 0x07, 0x88, 0x02, 0x37, + 0x4c, 0x57, 0x85, 0x36, 0x60, 0x96, 0x42, 0x89, 0xe5, 0x99, 0x2d, 0x25, 0xc2, 0xc8, 0x3c, 0xa2, + 0x45, 0xf2, 0x88, 0xe1, 0xba, 0x2f, 0x6d, 0xa7, 0x2d, 0x54, 0xf3, 0xc7, 0x78, 0x83, 0x13, 0x7f, + 0xe6, 0x86, 0x32, 0xc5, 0x57, 0xa5, 0xb2, 0x14, 0x50, 0x79, 0x4c, 0xbc, 0x31, 0x54, 0xf0, 0x03, + 0xb8, 0x28, 0x31, 0x45, 0x37, 0x66, 0x0c, 0xf2, 0x1e, 0x5c, 0x93, 0xc8, 0xeb, 0x47, 0xf4, 0x8e, + 0xf0, 0x54, 0x30, 0xfc, 0x77, 0xe5, 0x7c, 0x04, 0x35, 0x5f, 0x4e, 0x56, 0x12, 0xda, 0x5d, 0x55, + 0x80, 0x81, 0x2b, 0xce, 0x4c, 0x41, 0x67, 0xdf, 0x14, 0xe6, 0xd8, 0x5d, 0x3f, 0x2b, 0xd3, 0x6f, + 0xbc, 0x0e, 0xf3, 0x92, 0x86, 0x28, 0xca, 0xc2, 0x44, 0x46, 0x04, 0x8a, 0x23, 0x22, 0x0c, 0x46, + 0x97, 0x8e, 0x37, 0xbb, 0x8a, 0x19, 0x36, 0x2d, 0xa3, 0xa9, 0x29, 0x34, 0x2f, 0xf2, 0x13, 0x41, + 0x05, 0x53, 0x83, 0xb6, 0x00, 0x53, 0x02, 0x2a, 0x58, 0x6c, 0x04, 0x05, 0x8f, 0x6c, 0xc4, 0x08, + 0xe9, 0x0f, 0x60, 0xc1, 0x17, 0x82, 0xda, 0xed, 0x29, 0x71, 0x7a, 0xa6, 0xeb, 0x2a, 0xfd, 0x83, + 0x38, 0xc5, 0xef, 0x40, 0xa6, 0x4f, 0x44, 0x4c, 0x29, 0xae, 0xa2, 0x65, 0xfe, 0x66, 0xb6, 0xac, + 0x2c, 0x66, 0xf3, 0xb8, 0x0d, 0xd7, 0x25, 0x75, 0x6e, 0xd1, 0x58, 0xf2, 0x51, 0xa1, 0xe4, 0xdd, + 0x92, 0x9b, 0x75, 0xf4, 0x6e, 0x99, 0xe6, 0x7b, 0x2f, 0xef, 0x96, 0x34, 0x57, 0xa8, 0xbe, 0x35, + 0x51, 0xae, 0xd8, 0xe6, 0x36, 0xf5, 0x5d, 0x72, 0x22, 0x62, 0x87, 0x30, 0x17, 0xf6, 0xe4, 0x89, + 0xc2, 0xd8, 0x1c, 0x64, 0x3d, 0xfb, 0x98, 0xc8, 0x20, 0xc6, 0x07, 0x52, 0x60, 0xdf, 0xcd, 0x27, + 0x12, 0xd8, 0x08, 0x88, 0xb1, 0x23, 0x39, 0xa9, 0xbc, 0x74, 0x37, 0x65, 0xfd, 0xc3, 0x07, 0x78, + 0x17, 0x2e, 0x45, 0xc3, 0xc4, 0x44, 0x22, 0x3f, 0xe7, 0x07, 0x38, 0x2e, 0x92, 0x4c, 0x44, 0xf7, + 0xdd, 0x20, 0x18, 0x28, 0x01, 0x65, 0x22, 0x92, 0x3a, 0xd4, 0xe3, 0xe2, 0xcb, 0x7f, 0xe2, 0xbc, + 0xfa, 0xe1, 0x66, 0x22, 0x62, 0x6e, 0x40, 0x6c, 0xf2, 0xed, 0x0f, 0x62, 0x44, 0x7a, 0x6c, 0x8c, + 0x10, 0x4e, 0x12, 0x44, 0xb1, 0xaf, 0xe1, 0xd0, 0x09, 0x1e, 0x41, 0x00, 0x9d, 0x94, 0x07, 0xcd, + 0x21, 0x3e, 0x0f, 0x36, 0x90, 0x07, 0x5b, 0x0d, 0xbb, 0x13, 0x6d, 0xc6, 0x7b, 0x41, 0xec, 0x1c, + 0x89, 0xcc, 0x13, 0x11, 0x7e, 0x1f, 0x16, 0x93, 0x83, 0xf2, 0x24, 0x94, 0xef, 0x63, 0x28, 0xf8, + 0x05, 0xa5, 0xf2, 0xde, 0x5c, 0x84, 0xfc, 0xee, 0xde, 0xfe, 0xd3, 0xb5, 0xf5, 0x46, 0x55, 0x5b, + 0xfd, 0x47, 0x1a, 0x52, 0xdb, 0xcf, 0xd1, 0xb7, 0x20, 0xcb, 0x9f, 0x91, 0xc6, 0xbc, 0xb2, 0xd5, + 0xc7, 0x3d, 0x48, 0xe1, 0xab, 0x9f, 0xfc, 0xe9, 0xaf, 0x9f, 0xa7, 0x2e, 0xe1, 0x0b, 0x2b, 0xc3, + 0x37, 0x8c, 0x6e, 0xff, 0xc8, 0x58, 0x39, 0x1e, 0xae, 0xb0, 0x9c, 0xf0, 0x50, 0xbb, 0x8f, 0x9e, + 0x43, 0xfa, 0xe9, 0xc0, 0x43, 0x89, 0x4f, 0x70, 0xf5, 0xe4, 0x87, 0x2a, 0x5c, 0x67, 0x94, 0xe7, + 0xf0, 0x8c, 0x4a, 0xb9, 0x3f, 0xf0, 0x28, 0xdd, 0x21, 0x14, 0x95, 0xb7, 0x26, 0x74, 0xe6, 0xe3, + 0x5c, 0xfd, 0xec, 0x77, 0x2c, 0x8c, 0x19, 0xbf, 0xab, 0xf8, 0xb2, 0xca, 0x8f, 0x3f, 0x89, 0xa9, + 0xfa, 0x1c, 0x9c, 0x58, 0x51, 0x7d, 0x82, 0xe7, 0x92, 0xa8, 0x3e, 0xca, 0x13, 0x45, 0xbc, 0x3e, + 0xde, 0x89, 0x45, 0xe9, 0xda, 0xe2, 0x7d, 0xac, 0xe5, 0xa1, 0xeb, 0x31, 0xef, 0x2b, 0xea, 0x4b, + 0x42, 0x7d, 0x31, 0x19, 0x41, 0x70, 0xba, 0xc1, 0x38, 0x5d, 0xc1, 0x97, 0x54, 0x4e, 0x2d, 0x1f, + 0xef, 0xa1, 0x76, 0x7f, 0xf5, 0x08, 0xb2, 0xac, 0xff, 0x89, 0x9a, 0xf2, 0xa3, 0x1e, 0xd3, 0xb9, + 0x4d, 0x38, 0x01, 0xa1, 0xce, 0x29, 0x9e, 0x67, 0xdc, 0x66, 0x71, 0xc5, 0xe7, 0xc6, 0x5a, 0xa0, + 0x0f, 0xb5, 0xfb, 0x4b, 0xda, 0x6b, 0xda, 0xea, 0xf7, 0x32, 0x90, 0x65, 0xad, 0x23, 0xd4, 0x07, + 0x08, 0x9a, 0x85, 0x51, 0x3d, 0x47, 0xda, 0x8f, 0x51, 0x3d, 0x47, 0xfb, 0x8c, 0xf8, 0x3a, 0xe3, + 0x3c, 0x8f, 0xe7, 0x7c, 0xce, 0xec, 0x35, 0x7f, 0x85, 0x35, 0x89, 0xa8, 0x59, 0x5f, 0x42, 0x51, + 0x69, 0xee, 0xa1, 0x38, 0x8a, 0xa1, 0xae, 0x61, 0xf4, 0x98, 0xc4, 0x74, 0x06, 0xf1, 0x4d, 0xc6, + 0xf4, 0x1a, 0xae, 0xa9, 0xc6, 0xe5, 0x7c, 0x1d, 0x86, 0x49, 0x19, 0x7f, 0xaa, 0x41, 0x25, 0xdc, + 0xe0, 0x43, 0x37, 0x63, 0x48, 0x47, 0xfb, 0x84, 0xf5, 0x5b, 0xe3, 0x91, 0x12, 0x45, 0xe0, 0xfc, + 0x8f, 0x09, 0xe9, 0x1b, 0x14, 0x53, 0xd8, 0x1e, 0x7d, 0x5f, 0x83, 0x99, 0x48, 0xdb, 0x0e, 0xc5, + 0xb1, 0x18, 0x69, 0x0a, 0xd6, 0x6f, 0x9f, 0x81, 0x25, 0x24, 0xb9, 0xcb, 0x24, 0xb9, 0x81, 0xaf, + 0x8e, 0x1a, 0xc3, 0x33, 0x7b, 0xc4, 0xb3, 0x85, 0x34, 0xab, 0xff, 0x4c, 0x43, 0x7e, 0x9d, 0xff, + 0xf4, 0x0a, 0x79, 0x50, 0xf0, 0x3b, 0x61, 0x68, 0x21, 0xae, 0x2b, 0x11, 0x94, 0xec, 0xf5, 0xeb, + 0x89, 0xf3, 0x42, 0x84, 0x3b, 0x4c, 0x84, 0x45, 0x7c, 0xc5, 0x17, 0x41, 0xfc, 0xc4, 0x6b, 0x85, + 0x5f, 0xbe, 0x57, 0x8c, 0x76, 0x9b, 0x6e, 0xc9, 0x77, 0x35, 0x28, 0xa9, 0x0d, 0x2b, 0x74, 0x23, + 0xb6, 0x1f, 0xa2, 0xf6, 0xbc, 0xea, 0x78, 0x1c, 0x8a, 0xe0, 0x7f, 0x8f, 0xf1, 0xbf, 0x89, 0x17, + 0x92, 0xf8, 0x3b, 0x0c, 0x3f, 0x2c, 0x02, 0x6f, 0x39, 0xc5, 0x8b, 0x10, 0xea, 0x68, 0xc5, 0x8b, + 0x10, 0xee, 0x58, 0x9d, 0x2d, 0xc2, 0x80, 0xe1, 0x53, 0x11, 0x4e, 0x00, 0x82, 0x0e, 0x13, 0x8a, + 0x35, 0xae, 0x72, 0x89, 0x89, 0xfa, 0xe0, 0x68, 0x73, 0x2a, 0xe6, 0x04, 0x44, 0x78, 0x77, 0x4d, + 0x97, 0xfa, 0xe2, 0xea, 0x6f, 0x33, 0x50, 0x7c, 0x62, 0x98, 0x96, 0x47, 0x2c, 0xc3, 0x6a, 0x11, + 0xd4, 0x81, 0x2c, 0xcb, 0x52, 0xd1, 0xc0, 0xa3, 0xb6, 0x7d, 0xa2, 0x81, 0x27, 0xd4, 0x13, 0xc1, + 0xb7, 0x19, 0xeb, 0xeb, 0xb8, 0xee, 0xb3, 0xee, 0x05, 0xf4, 0x57, 0x58, 0x3f, 0x83, 0xaa, 0x7c, + 0x0c, 0x39, 0xde, 0xbf, 0x40, 0x11, 0x6a, 0xa1, 0x3e, 0x47, 0xfd, 0x6a, 0xfc, 0x64, 0xe2, 0x29, + 0x53, 0x79, 0xb9, 0x0c, 0x99, 0x32, 0xfb, 0x36, 0x40, 0xd0, 0x30, 0x8b, 0xda, 0x77, 0xa4, 0xbf, + 0x56, 0x5f, 0x4c, 0x46, 0x10, 0x8c, 0xef, 0x33, 0xc6, 0xb7, 0xf0, 0xf5, 0x58, 0xc6, 0x6d, 0x7f, + 0x01, 0x65, 0xde, 0x82, 0xcc, 0xa6, 0xe1, 0x1e, 0xa1, 0x48, 0x12, 0x52, 0xde, 0x7c, 0xeb, 0xf5, + 0xb8, 0x29, 0xc1, 0xea, 0x16, 0x63, 0xb5, 0x80, 0xe7, 0x63, 0x59, 0x1d, 0x19, 0x2e, 0x8d, 0xe9, + 0x68, 0x00, 0xd3, 0xf2, 0x1d, 0x17, 0x5d, 0x8b, 0xd8, 0x2c, 0xfc, 0xe6, 0x5b, 0x5f, 0x48, 0x9a, + 0x16, 0x0c, 0x97, 0x18, 0x43, 0x8c, 0xaf, 0xc5, 0x1b, 0x55, 0xa0, 0x3f, 0xd4, 0xee, 0xbf, 0xa6, + 0xad, 0xfe, 0xb0, 0x0a, 0x19, 0x5a, 0x2f, 0xd1, 0x2c, 0x12, 0x5c, 0x33, 0xa3, 0x16, 0x1e, 0x69, + 0xee, 0x44, 0x2d, 0x3c, 0x7a, 0x43, 0x8d, 0xc9, 0x22, 0xec, 0x07, 0xa8, 0x84, 0x61, 0x51, 0x8d, + 0x3d, 0x28, 0x2a, 0x97, 0x51, 0x14, 0x43, 0x31, 0xdc, 0x3a, 0x8a, 0x66, 0x91, 0x98, 0x9b, 0x2c, + 0x5e, 0x64, 0x4c, 0xeb, 0xf8, 0x62, 0x98, 0x69, 0x9b, 0xa3, 0x51, 0xae, 0x1f, 0x43, 0x49, 0xbd, + 0xb5, 0xa2, 0x18, 0xa2, 0x91, 0xde, 0x54, 0x34, 0x56, 0xc4, 0x5d, 0x7a, 0x63, 0x9c, 0xc6, 0xff, + 0xb9, 0xad, 0xc4, 0xa5, 0xdc, 0x3f, 0x84, 0xbc, 0xb8, 0xcb, 0xc6, 0xe9, 0x1b, 0xee, 0x66, 0xc5, + 0xe9, 0x1b, 0xb9, 0x08, 0xc7, 0x94, 0x24, 0x8c, 0x2d, 0xad, 0xd9, 0x65, 0x80, 0x16, 0x2c, 0x1f, + 0x13, 0x2f, 0x89, 0x65, 0xd0, 0x9f, 0x49, 0x62, 0xa9, 0xdc, 0x97, 0xc6, 0xb2, 0xec, 0x10, 0x4f, + 0x9c, 0x65, 0x79, 0x19, 0x41, 0x09, 0x14, 0xd5, 0x68, 0x88, 0xc7, 0xa1, 0x24, 0x56, 0x91, 0x01, + 0x57, 0x11, 0x0a, 0xd1, 0x77, 0x00, 0x82, 0x8b, 0x77, 0xb4, 0x30, 0x88, 0xed, 0xde, 0x45, 0x0b, + 0x83, 0xf8, 0xbb, 0x7b, 0x8c, 0x07, 0x07, 0xcc, 0x79, 0x25, 0x4b, 0xd9, 0xff, 0x44, 0x03, 0x34, + 0x7a, 0x51, 0x47, 0x0f, 0xe2, 0x59, 0xc4, 0x36, 0x06, 0xeb, 0xaf, 0x9c, 0x0f, 0x39, 0x31, 0x7a, + 0x06, 0x72, 0xb5, 0xd8, 0x92, 0xfe, 0x4b, 0x2a, 0xd9, 0x67, 0x1a, 0x94, 0x43, 0x57, 0x7d, 0x74, + 0x27, 0x61, 0x9f, 0x23, 0xcd, 0xc5, 0xfa, 0xdd, 0x33, 0xf1, 0x12, 0x6b, 0x27, 0xe5, 0x54, 0xc8, + 0xba, 0xf1, 0x07, 0x1a, 0x54, 0xc2, 0xfd, 0x01, 0x94, 0xc0, 0x60, 0xa4, 0x43, 0x59, 0x5f, 0x3a, + 0x1b, 0xf1, 0x1c, 0xbb, 0x15, 0x94, 0x92, 0x1f, 0x42, 0x5e, 0xb4, 0x15, 0xe2, 0xdc, 0x22, 0xdc, + 0xe0, 0x8c, 0x73, 0x8b, 0x48, 0x4f, 0x22, 0xc9, 0x2d, 0xe8, 0x0d, 0x5d, 0xf1, 0x44, 0xd1, 0x7c, + 0x48, 0x62, 0x39, 0xde, 0x13, 0x23, 0x9d, 0x8b, 0xb1, 0x2c, 0x03, 0x4f, 0x94, 0xad, 0x07, 0x94, + 0x40, 0xf1, 0x0c, 0x4f, 0x8c, 0x76, 0x2e, 0x92, 0x3c, 0x91, 0x71, 0x55, 0x3c, 0x31, 0xe8, 0x14, + 0xc4, 0x79, 0xe2, 0x48, 0xfb, 0x36, 0xce, 0x13, 0x47, 0x9b, 0x0d, 0x49, 0x7b, 0xcb, 0x98, 0x87, + 0x3c, 0x71, 0x36, 0xa6, 0xb3, 0x80, 0x5e, 0x49, 0xb0, 0x69, 0x6c, 0x6b, 0xb8, 0xfe, 0xea, 0x39, + 0xb1, 0xc7, 0x7b, 0x00, 0xdf, 0x0d, 0xe9, 0x01, 0xbf, 0xd0, 0x60, 0x2e, 0xae, 0x35, 0x81, 0x12, + 0x98, 0x25, 0xf4, 0x95, 0xeb, 0xcb, 0xe7, 0x45, 0x3f, 0x87, 0xdd, 0x7c, 0x9f, 0x78, 0x54, 0xfd, + 0xdd, 0x97, 0x0b, 0xda, 0x1f, 0xbf, 0x5c, 0xd0, 0xfe, 0xfc, 0xe5, 0x82, 0xf6, 0xd3, 0xbf, 0x2c, + 0x4c, 0x1d, 0xe6, 0xd8, 0xff, 0x02, 0x79, 0xe3, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x73, 0x81, + 0x7c, 0x77, 0x8c, 0x32, 0x00, 0x00, } diff --git a/etcdserver/etcdserverpb/rpc.proto b/etcdserver/etcdserverpb/rpc.proto index a6cd00ab7c3e..9b521e9b0ac1 100644 --- a/etcdserver/etcdserverpb/rpc.proto +++ b/etcdserver/etcdserverpb/rpc.proto @@ -679,6 +679,9 @@ message LeaseGrantResponse { message LeaseRevokeRequest { // ID is the lease ID to revoke. When the ID is revoked, all associated keys will be deleted. int64 ID = 1; + // expire is the flag for indicating that the revoke request is invoked by expire. + // In such a case, permission checking can be skipped. + bool expire = 2; } message LeaseRevokeResponse { diff --git a/etcdserver/server.go b/etcdserver/server.go index a410845b781d..9444d2743cb3 100644 --- a/etcdserver/server.go +++ b/etcdserver/server.go @@ -747,7 +747,7 @@ func (s *EtcdServer) run() { } lid := lease.ID s.goAttach(func() { - s.LeaseRevoke(s.ctx, &pb.LeaseRevokeRequest{ID: int64(lid)}) + s.LeaseRevoke(s.ctx, &pb.LeaseRevokeRequest{ID: int64(lid), Expire: true}) <-c }) }