diff --git a/Documentation/dev-guide/api_reference_v3.md b/Documentation/dev-guide/api_reference_v3.md index 2d2000d8a729..33b88b5a7f07 100644 --- a/Documentation/dev-guide/api_reference_v3.md +++ b/Documentation/dev-guide/api_reference_v3.md @@ -247,6 +247,7 @@ Empty field. | ----- | ----------- | ---- | | name | | string | | password | | string | +| options | | authpb.UserAddOptions | @@ -982,6 +983,15 @@ User is a single entry in the bucket authUsers | name | | bytes | | password | | bytes | | roles | | (slice of) string | +| options | | UserAddOptions | + + + +##### message `UserAddOptions` (auth/authpb/auth.proto) + +| Field | Description | Type | +| ----- | ----------- | ---- | +| no_password | | bool | diff --git a/Documentation/dev-guide/apispec/swagger/rpc.swagger.json b/Documentation/dev-guide/apispec/swagger/rpc.swagger.json index a76c9d3a8b17..2bdb96c279dd 100644 --- a/Documentation/dev-guide/apispec/swagger/rpc.swagger.json +++ b/Documentation/dev-guide/apispec/swagger/rpc.swagger.json @@ -1192,6 +1192,15 @@ "READWRITE" ] }, + "authpbUserAddOptions": { + "type": "object", + "properties": { + "no_password": { + "type": "boolean", + "format": "boolean" + } + } + }, "etcdserverpbAlarmMember": { "type": "object", "properties": { @@ -1393,6 +1402,9 @@ "name": { "type": "string" }, + "options": { + "$ref": "#/definitions/authpbUserAddOptions" + }, "password": { "type": "string" } diff --git a/auth/authpb/auth.pb.go b/auth/authpb/auth.pb.go index 1a940c39b26e..7e038df0146c 100644 --- a/auth/authpb/auth.pb.go +++ b/auth/authpb/auth.pb.go @@ -8,6 +8,7 @@ auth.proto It has these top-level messages: + UserAddOptions User Permission Role @@ -59,19 +60,29 @@ var Permission_Type_value = map[string]int32{ func (x Permission_Type) String() string { return proto.EnumName(Permission_Type_name, int32(x)) } -func (Permission_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptorAuth, []int{1, 0} } +func (Permission_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptorAuth, []int{2, 0} } + +type UserAddOptions struct { + NoPassword bool `protobuf:"varint,1,opt,name=no_password,json=noPassword,proto3" json:"no_password,omitempty"` +} + +func (m *UserAddOptions) Reset() { *m = UserAddOptions{} } +func (m *UserAddOptions) String() string { return proto.CompactTextString(m) } +func (*UserAddOptions) ProtoMessage() {} +func (*UserAddOptions) Descriptor() ([]byte, []int) { return fileDescriptorAuth, []int{0} } // User is a single entry in the bucket authUsers type User struct { - Name []byte `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - Password []byte `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty"` - Roles []string `protobuf:"bytes,3,rep,name=roles" json:"roles,omitempty"` + Name []byte `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Password []byte `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty"` + Roles []string `protobuf:"bytes,3,rep,name=roles" json:"roles,omitempty"` + Options *UserAddOptions `protobuf:"bytes,4,opt,name=options" json:"options,omitempty"` } func (m *User) Reset() { *m = User{} } func (m *User) String() string { return proto.CompactTextString(m) } func (*User) ProtoMessage() {} -func (*User) Descriptor() ([]byte, []int) { return fileDescriptorAuth, []int{0} } +func (*User) Descriptor() ([]byte, []int) { return fileDescriptorAuth, []int{1} } // Permission is a single entity type Permission struct { @@ -83,7 +94,7 @@ type Permission struct { func (m *Permission) Reset() { *m = Permission{} } func (m *Permission) String() string { return proto.CompactTextString(m) } func (*Permission) ProtoMessage() {} -func (*Permission) Descriptor() ([]byte, []int) { return fileDescriptorAuth, []int{1} } +func (*Permission) Descriptor() ([]byte, []int) { return fileDescriptorAuth, []int{2} } // Role is a single entry in the bucket authRoles type Role struct { @@ -94,14 +105,43 @@ type Role struct { func (m *Role) Reset() { *m = Role{} } func (m *Role) String() string { return proto.CompactTextString(m) } func (*Role) ProtoMessage() {} -func (*Role) Descriptor() ([]byte, []int) { return fileDescriptorAuth, []int{2} } +func (*Role) Descriptor() ([]byte, []int) { return fileDescriptorAuth, []int{3} } func init() { + proto.RegisterType((*UserAddOptions)(nil), "authpb.UserAddOptions") proto.RegisterType((*User)(nil), "authpb.User") proto.RegisterType((*Permission)(nil), "authpb.Permission") proto.RegisterType((*Role)(nil), "authpb.Role") proto.RegisterEnum("authpb.Permission_Type", Permission_Type_name, Permission_Type_value) } +func (m *UserAddOptions) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalTo(dAtA) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *UserAddOptions) MarshalTo(dAtA []byte) (int, error) { + var i int + _ = i + var l int + _ = l + if m.NoPassword { + dAtA[i] = 0x8 + i++ + if m.NoPassword { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i++ + } + return i, nil +} + func (m *User) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -144,6 +184,16 @@ func (m *User) MarshalTo(dAtA []byte) (int, error) { i += copy(dAtA[i:], s) } } + if m.Options != nil { + dAtA[i] = 0x22 + i++ + i = encodeVarintAuth(dAtA, i, uint64(m.Options.Size())) + n1, err := m.Options.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n1 + } return i, nil } @@ -227,6 +277,15 @@ func encodeVarintAuth(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return offset + 1 } +func (m *UserAddOptions) Size() (n int) { + var l int + _ = l + if m.NoPassword { + n += 2 + } + return n +} + func (m *User) Size() (n int) { var l int _ = l @@ -244,6 +303,10 @@ func (m *User) Size() (n int) { n += 1 + l + sovAuth(uint64(l)) } } + if m.Options != nil { + l = m.Options.Size() + n += 1 + l + sovAuth(uint64(l)) + } return n } @@ -293,6 +356,76 @@ func sovAuth(x uint64) (n int) { func sozAuth(x uint64) (n int) { return sovAuth(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } +func (m *UserAddOptions) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowAuth + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: UserAddOptions: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: UserAddOptions: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field NoPassword", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowAuth + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + m.NoPassword = bool(v != 0) + default: + iNdEx = preIndex + skippy, err := skipAuth(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthAuth + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *User) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -413,6 +546,39 @@ func (m *User) Unmarshal(dAtA []byte) error { } m.Roles = append(m.Roles, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Options", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowAuth + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthAuth + } + postIndex := iNdEx + msglen + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Options == nil { + m.Options = &UserAddOptions{} + } + if err := m.Options.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipAuth(dAtA[iNdEx:]) @@ -785,23 +951,27 @@ var ( func init() { proto.RegisterFile("auth.proto", fileDescriptorAuth) } var fileDescriptorAuth = []byte{ - // 288 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xc1, 0x4a, 0xc3, 0x30, - 0x1c, 0xc6, 0x9b, 0xb6, 0x1b, 0xed, 0x5f, 0x27, 0x25, 0x0c, 0x0c, 0x13, 0x42, 0xe9, 0xa9, 0x78, - 0xa8, 0xb0, 0x5d, 0xbc, 0x2a, 0xf6, 0x20, 0x78, 0x90, 0x50, 0xf1, 0x28, 0x1d, 0x0d, 0x75, 0x6c, - 0x6d, 0x4a, 0x32, 0x91, 0xbe, 0x89, 0x07, 0x1f, 0x68, 0xc7, 0x3d, 0x82, 0xab, 0x2f, 0x22, 0x4d, - 0x64, 0x43, 0xdc, 0xed, 0xfb, 0xbe, 0xff, 0x97, 0xe4, 0x97, 0x3f, 0x40, 0xfe, 0xb6, 0x7e, 0x4d, - 0x1a, 0x29, 0xd6, 0x02, 0x0f, 0x7b, 0xdd, 0xcc, 0x27, 0xe3, 0x52, 0x94, 0x42, 0x47, 0x57, 0xbd, - 0x32, 0xd3, 0xe8, 0x01, 0xdc, 0x27, 0xc5, 0x25, 0xc6, 0xe0, 0xd6, 0x79, 0xc5, 0x09, 0x0a, 0x51, - 0x7c, 0xca, 0xb4, 0xc6, 0x13, 0xf0, 0x9a, 0x5c, 0xa9, 0x77, 0x21, 0x0b, 0x62, 0xeb, 0x7c, 0xef, - 0xf1, 0x18, 0x06, 0x52, 0xac, 0xb8, 0x22, 0x4e, 0xe8, 0xc4, 0x3e, 0x33, 0x26, 0xfa, 0x44, 0x00, - 0x8f, 0x5c, 0x56, 0x0b, 0xa5, 0x16, 0xa2, 0xc6, 0x33, 0xf0, 0x1a, 0x2e, 0xab, 0xac, 0x6d, 0xcc, - 0xc5, 0x67, 0xd3, 0xf3, 0xc4, 0xd0, 0x24, 0x87, 0x56, 0xd2, 0x8f, 0xd9, 0xbe, 0x88, 0x03, 0x70, - 0x96, 0xbc, 0xfd, 0x7d, 0xb0, 0x97, 0xf8, 0x02, 0x7c, 0x99, 0xd7, 0x25, 0x7f, 0xe1, 0x75, 0x41, - 0x1c, 0x03, 0xa2, 0x83, 0xb4, 0x2e, 0xa2, 0x4b, 0x70, 0xf5, 0x31, 0x0f, 0x5c, 0x96, 0xde, 0xdc, - 0x05, 0x16, 0xf6, 0x61, 0xf0, 0xcc, 0xee, 0xb3, 0x34, 0x40, 0x78, 0x04, 0x7e, 0x1f, 0x1a, 0x6b, - 0x47, 0x19, 0xb8, 0x4c, 0xac, 0xf8, 0xd1, 0xcf, 0x5e, 0xc3, 0x68, 0xc9, 0xdb, 0x03, 0x16, 0xb1, - 0x43, 0x27, 0x3e, 0x99, 0xe2, 0xff, 0xc0, 0xec, 0x6f, 0xf1, 0x96, 0x6c, 0x76, 0xd4, 0xda, 0xee, - 0xa8, 0xb5, 0xe9, 0x28, 0xda, 0x76, 0x14, 0x7d, 0x75, 0x14, 0x7d, 0x7c, 0x53, 0x6b, 0x3e, 0xd4, - 0x3b, 0x9e, 0xfd, 0x04, 0x00, 0x00, 0xff, 0xff, 0xcc, 0x76, 0x8d, 0x4f, 0x8f, 0x01, 0x00, 0x00, + // 338 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x91, 0xcf, 0x4e, 0xea, 0x40, + 0x14, 0xc6, 0x3b, 0xb4, 0x70, 0xdb, 0xc3, 0x85, 0x90, 0x13, 0x72, 0x6f, 0x83, 0x49, 0x6d, 0xba, + 0x6a, 0x5c, 0x54, 0x85, 0x8d, 0x5b, 0x8c, 0x2c, 0x5c, 0x49, 0x26, 0x18, 0x97, 0xa4, 0xa4, 0x13, + 0x24, 0xc0, 0x4c, 0x33, 0x83, 0x31, 0x6c, 0x7c, 0x0e, 0x17, 0x3e, 0x10, 0x4b, 0x1e, 0x41, 0xf0, + 0x45, 0x4c, 0x67, 0xf8, 0x13, 0xa2, 0xbb, 0xef, 0x7c, 0xe7, 0xfb, 0x66, 0x7e, 0x99, 0x01, 0x48, + 0x5f, 0x16, 0xcf, 0x49, 0x2e, 0xc5, 0x42, 0x60, 0xa5, 0xd0, 0xf9, 0xa8, 0xd5, 0x1c, 0x8b, 0xb1, + 0xd0, 0xd6, 0x65, 0xa1, 0xcc, 0x36, 0xba, 0x86, 0xfa, 0xa3, 0x62, 0xb2, 0x9b, 0x65, 0x0f, 0xf9, + 0x62, 0x22, 0xb8, 0xc2, 0x73, 0xa8, 0x72, 0x31, 0xcc, 0x53, 0xa5, 0x5e, 0x85, 0xcc, 0x7c, 0x12, + 0x92, 0xd8, 0xa5, 0xc0, 0x45, 0x7f, 0xe7, 0x44, 0x6f, 0xe0, 0x14, 0x15, 0x44, 0x70, 0x78, 0x3a, + 0x67, 0x3a, 0xf1, 0x97, 0x6a, 0x8d, 0x2d, 0x70, 0x0f, 0xcd, 0x92, 0xf6, 0x0f, 0x33, 0x36, 0xa1, + 0x2c, 0xc5, 0x8c, 0x29, 0xdf, 0x0e, 0xed, 0xd8, 0xa3, 0x66, 0xc0, 0x2b, 0xf8, 0x23, 0xcc, 0xcd, + 0xbe, 0x13, 0x92, 0xb8, 0xda, 0xfe, 0x97, 0x18, 0xe0, 0xe4, 0x94, 0x8b, 0xee, 0x63, 0xd1, 0x07, + 0x01, 0xe8, 0x33, 0x39, 0x9f, 0x28, 0x35, 0x11, 0x1c, 0x3b, 0xe0, 0xe6, 0x4c, 0xce, 0x07, 0xcb, + 0xdc, 0xa0, 0xd4, 0xdb, 0xff, 0xf7, 0x27, 0x1c, 0x53, 0x49, 0xb1, 0xa6, 0x87, 0x20, 0x36, 0xc0, + 0x9e, 0xb2, 0xe5, 0x0e, 0xb1, 0x90, 0x78, 0x06, 0x9e, 0x4c, 0xf9, 0x98, 0x0d, 0x19, 0xcf, 0x7c, + 0xdb, 0xa0, 0x6b, 0xa3, 0xc7, 0xb3, 0xe8, 0x02, 0x1c, 0x5d, 0x73, 0xc1, 0xa1, 0xbd, 0xee, 0x5d, + 0xc3, 0x42, 0x0f, 0xca, 0x4f, 0xf4, 0x7e, 0xd0, 0x6b, 0x10, 0xac, 0x81, 0x57, 0x98, 0x66, 0x2c, + 0x45, 0x03, 0x70, 0xa8, 0x98, 0xb1, 0x5f, 0x9f, 0xe7, 0x06, 0x6a, 0x53, 0xb6, 0x3c, 0x62, 0xf9, + 0xa5, 0xd0, 0x8e, 0xab, 0x6d, 0xfc, 0x09, 0x4c, 0x4f, 0x83, 0xb7, 0xfe, 0x6a, 0x13, 0x58, 0xeb, + 0x4d, 0x60, 0xad, 0xb6, 0x01, 0x59, 0x6f, 0x03, 0xf2, 0xb9, 0x0d, 0xc8, 0xfb, 0x57, 0x60, 0x8d, + 0x2a, 0xfa, 0x23, 0x3b, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x61, 0x66, 0xc6, 0x9d, 0xf4, 0x01, + 0x00, 0x00, } diff --git a/auth/authpb/auth.proto b/auth/authpb/auth.proto index 001d33435483..8f82b7cf1e42 100644 --- a/auth/authpb/auth.proto +++ b/auth/authpb/auth.proto @@ -9,11 +9,16 @@ option (gogoproto.unmarshaler_all) = true; option (gogoproto.goproto_getters_all) = false; option (gogoproto.goproto_enum_prefix_all) = false; +message UserAddOptions { + bool no_password = 1; +}; + // User is a single entry in the bucket authUsers message User { bytes name = 1; bytes password = 2; repeated string roles = 3; + UserAddOptions options = 4; } // Permission is a single entity diff --git a/auth/store.go b/auth/store.go index 2e95e0c165b0..c90f47746014 100644 --- a/auth/store.go +++ b/auth/store.go @@ -305,6 +305,10 @@ func (as *authStore) Authenticate(ctx context.Context, username, password string return nil, ErrAuthFailed } + if user.Options.NoPassword { + return nil, ErrAuthFailed + } + // Password checking is already performed in the API layer, so we don't need to check for now. // Staleness of password can be detected with OCC in the API layer, too. @@ -339,6 +343,10 @@ func (as *authStore) CheckPassword(username, password string) (uint64, error) { return 0, ErrAuthFailed } + if user.Options.NoPassword { + return 0, ErrAuthFailed + } + if bcrypt.CompareHashAndPassword(user.Password, []byte(password)) != nil { if as.lg != nil { as.lg.Info("invalid password", zap.String("user-name", username)) @@ -376,18 +384,23 @@ func (as *authStore) UserAdd(r *pb.AuthUserAddRequest) (*pb.AuthUserAddResponse, return nil, ErrUserEmpty } - hashed, err := bcrypt.GenerateFromPassword([]byte(r.Password), as.bcryptCost) - if err != nil { - if as.lg != nil { - as.lg.Warn( - "failed to bcrypt hash password", - zap.String("user-name", r.Name), - zap.Error(err), - ) - } else { - plog.Errorf("failed to hash password: %s", err) + var hashed []byte + var err error + + if !r.Options.NoPassword { + hashed, err = bcrypt.GenerateFromPassword([]byte(r.Password), as.bcryptCost) + if err != nil { + if as.lg != nil { + as.lg.Warn( + "failed to bcrypt hash password", + zap.String("user-name", r.Name), + zap.Error(err), + ) + } else { + plog.Errorf("failed to hash password: %s", err) + } + return nil, err } - return nil, err } tx := as.be.BatchTx() @@ -399,9 +412,17 @@ func (as *authStore) UserAdd(r *pb.AuthUserAddRequest) (*pb.AuthUserAddResponse, return nil, ErrUserAlreadyExist } + options := r.Options + if options == nil { + options = &authpb.UserAddOptions{ + NoPassword: false, + } + } + newUser := &authpb.User{ Name: []byte(r.Name), Password: hashed, + Options: options, } putUser(as.lg, tx, newUser) @@ -484,6 +505,7 @@ func (as *authStore) UserChangePassword(r *pb.AuthUserChangePasswordRequest) (*p Name: []byte(r.Name), Roles: user.Roles, Password: hashed, + Options: user.Options, } putUser(as.lg, tx, updatedUser) @@ -613,6 +635,7 @@ func (as *authStore) UserRevokeRole(r *pb.AuthUserRevokeRoleRequest) (*pb.AuthUs updatedUser := &authpb.User{ Name: user.Name, Password: user.Password, + Options: user.Options, } for _, role := range user.Roles { @@ -744,6 +767,7 @@ func (as *authStore) RoleDelete(r *pb.AuthRoleDeleteRequest) (*pb.AuthRoleDelete updatedUser := &authpb.User{ Name: user.Name, Password: user.Password, + Options: user.Options, } for _, role := range user.Roles { diff --git a/auth/store_test.go b/auth/store_test.go index 67e50f23ff60..74146da3aa96 100644 --- a/auth/store_test.go +++ b/auth/store_test.go @@ -114,7 +114,7 @@ func setupAuthStore(t *testing.T) (store *authStore, teardownfunc func(t *testin t.Fatal(err) } - ua := &pb.AuthUserAddRequest{Name: "foo", Password: "bar"} + ua := &pb.AuthUserAddRequest{Name: "foo", Password: "bar", Options: &authpb.UserAddOptions{NoPassword: false}} _, err = as.UserAdd(ua) // add a non-existing user if err != nil { t.Fatal(err) @@ -129,7 +129,7 @@ func setupAuthStore(t *testing.T) (store *authStore, teardownfunc func(t *testin } func enableAuthAndCreateRoot(as *authStore) error { - _, err := as.UserAdd(&pb.AuthUserAddRequest{Name: "root", Password: "root"}) + _, err := as.UserAdd(&pb.AuthUserAddRequest{Name: "root", Password: "root", Options: &authpb.UserAddOptions{NoPassword: false}}) if err != nil { return err } @@ -151,7 +151,7 @@ func TestUserAdd(t *testing.T) { as, tearDown := setupAuthStore(t) defer tearDown(t) - ua := &pb.AuthUserAddRequest{Name: "foo"} + ua := &pb.AuthUserAddRequest{Name: "foo", Options: &authpb.UserAddOptions{NoPassword: false}} _, err := as.UserAdd(ua) // add an existing user if err == nil { t.Fatalf("expected %v, got %v", ErrUserAlreadyExist, err) @@ -160,7 +160,7 @@ func TestUserAdd(t *testing.T) { t.Fatalf("expected %v, got %v", ErrUserAlreadyExist, err) } - ua = &pb.AuthUserAddRequest{Name: ""} + ua = &pb.AuthUserAddRequest{Name: "", Options: &authpb.UserAddOptions{NoPassword: false}} _, err = as.UserAdd(ua) // add a user with empty name if err != ErrUserEmpty { t.Fatal(err) @@ -390,7 +390,7 @@ func TestListUsers(t *testing.T) { as, tearDown := setupAuthStore(t) defer tearDown(t) - ua := &pb.AuthUserAddRequest{Name: "user1", Password: "pwd1"} + ua := &pb.AuthUserAddRequest{Name: "user1", Password: "pwd1", Options: &authpb.UserAddOptions{NoPassword: false}} _, err := as.UserAdd(ua) // add a non-existing user if err != nil { t.Fatal(err) @@ -633,7 +633,7 @@ func TestAuthInfoFromCtxRace(t *testing.T) { ctx := metadata.NewIncomingContext(context.Background(), metadata.New(map[string]string{rpctypes.TokenFieldNameGRPC: "test"})) as.AuthInfoFromCtx(ctx) }() - as.UserAdd(&pb.AuthUserAddRequest{Name: "test"}) + as.UserAdd(&pb.AuthUserAddRequest{Name: "test", Options: &authpb.UserAddOptions{NoPassword: false}}) <-donec } @@ -669,7 +669,7 @@ func TestIsAdminPermitted(t *testing.T) { func TestRecoverFromSnapshot(t *testing.T) { as, _ := setupAuthStore(t) - ua := &pb.AuthUserAddRequest{Name: "foo"} + ua := &pb.AuthUserAddRequest{Name: "foo", Options: &authpb.UserAddOptions{NoPassword: false}} _, err := as.UserAdd(ua) // add an existing user if err == nil { t.Fatalf("expected %v, got %v", ErrUserAlreadyExist, err) @@ -678,7 +678,7 @@ func TestRecoverFromSnapshot(t *testing.T) { t.Fatalf("expected %v, got %v", ErrUserAlreadyExist, err) } - ua = &pb.AuthUserAddRequest{Name: ""} + ua = &pb.AuthUserAddRequest{Name: "", Options: &authpb.UserAddOptions{NoPassword: false}} _, err = as.UserAdd(ua) // add a user with empty name if err != ErrUserEmpty { t.Fatal(err) @@ -734,7 +734,7 @@ func TestHammerSimpleAuthenticate(t *testing.T) { // create lots of users for i := 0; i < 50; i++ { u := fmt.Sprintf("user-%d", i) - ua := &pb.AuthUserAddRequest{Name: u, Password: "123"} + ua := &pb.AuthUserAddRequest{Name: u, Password: "123", Options: &authpb.UserAddOptions{NoPassword: false}} if _, err := as.UserAdd(ua); err != nil { t.Fatal(err) } @@ -779,7 +779,7 @@ func TestRolesOrder(t *testing.T) { } username := "user" - _, err = as.UserAdd(&pb.AuthUserAddRequest{Name: username, Password: "pass"}) + _, err = as.UserAdd(&pb.AuthUserAddRequest{Name: username, Password: "pass", Options: &authpb.UserAddOptions{NoPassword: false}}) if err != nil { t.Fatal(err) } diff --git a/clientv3/auth.go b/clientv3/auth.go index 921f50f5e269..c954f1bf4746 100644 --- a/clientv3/auth.go +++ b/clientv3/auth.go @@ -52,6 +52,8 @@ const ( PermReadWrite = authpb.READWRITE ) +type UserAddOptions authpb.UserAddOptions + type Auth interface { // AuthEnable enables auth of an etcd cluster. AuthEnable(ctx context.Context) (*AuthEnableResponse, error) @@ -62,6 +64,9 @@ type Auth interface { // UserAdd adds a new user to an etcd cluster. UserAdd(ctx context.Context, name string, password string) (*AuthUserAddResponse, error) + // UserAddWithOptions adds a new user to an etcd cluster with some options. + UserAddWithOptions(ctx context.Context, name string, password string, opt *UserAddOptions) (*AuthUserAddResponse, error) + // UserDelete deletes a user from an etcd cluster. UserDelete(ctx context.Context, name string) (*AuthUserDeleteResponse, error) @@ -123,7 +128,12 @@ func (auth *authClient) AuthDisable(ctx context.Context) (*AuthDisableResponse, } func (auth *authClient) UserAdd(ctx context.Context, name string, password string) (*AuthUserAddResponse, error) { - resp, err := auth.remote.UserAdd(ctx, &pb.AuthUserAddRequest{Name: name, Password: password}, auth.callOpts...) + resp, err := auth.remote.UserAdd(ctx, &pb.AuthUserAddRequest{Name: name, Password: password, Options: &authpb.UserAddOptions{NoPassword: false}}, auth.callOpts...) + return (*AuthUserAddResponse)(resp), toErr(ctx, err) +} + +func (auth *authClient) UserAddWithOptions(ctx context.Context, name string, password string, options *UserAddOptions) (*AuthUserAddResponse, error) { + resp, err := auth.remote.UserAdd(ctx, &pb.AuthUserAddRequest{Name: name, Password: password, Options: (*authpb.UserAddOptions)(options)}, auth.callOpts...) return (*AuthUserAddResponse)(resp), toErr(ctx, err) } diff --git a/etcdctl/ctlv3/command/user_command.go b/etcdctl/ctlv3/command/user_command.go index f9148d3d430a..7b324261eb26 100644 --- a/etcdctl/ctlv3/command/user_command.go +++ b/etcdctl/ctlv3/command/user_command.go @@ -21,6 +21,7 @@ import ( "github.com/bgentry/speakeasy" "github.com/spf13/cobra" + "go.etcd.io/etcd/clientv3" ) var ( @@ -48,6 +49,7 @@ func NewUserCommand() *cobra.Command { var ( passwordInteractive bool passwordFromFlag string + noPassword bool ) func newUserAddCommand() *cobra.Command { @@ -59,6 +61,7 @@ func newUserAddCommand() *cobra.Command { cmd.Flags().BoolVar(&passwordInteractive, "interactive", true, "Read password from stdin instead of interactive terminal") cmd.Flags().StringVar(&passwordFromFlag, "new-user-password", "", "Supply password from the command line flag") + cmd.Flags().BoolVar(&noPassword, "no-password", false, "Create a user without password (CN based auth only)") return &cmd } @@ -128,28 +131,37 @@ func userAddCommandFunc(cmd *cobra.Command, args []string) { var password string var user string - if passwordFromFlag != "" { - user = args[0] - password = passwordFromFlag - } else { - splitted := strings.SplitN(args[0], ":", 2) - if len(splitted) < 2 { + options := &clientv3.UserAddOptions{ + NoPassword: false, + } + + if !noPassword { + if passwordFromFlag != "" { user = args[0] - if !passwordInteractive { - fmt.Scanf("%s", &password) - } else { - password = readPasswordInteractive(args[0]) - } + password = passwordFromFlag } else { - user = splitted[0] - password = splitted[1] - if len(user) == 0 { - ExitWithError(ExitBadArgs, fmt.Errorf("empty user name is not allowed")) + splitted := strings.SplitN(args[0], ":", 2) + if len(splitted) < 2 { + user = args[0] + if !passwordInteractive { + fmt.Scanf("%s", &password) + } else { + password = readPasswordInteractive(args[0]) + } + } else { + user = splitted[0] + password = splitted[1] + if len(user) == 0 { + ExitWithError(ExitBadArgs, fmt.Errorf("empty user name is not allowed")) + } } } + } else { + user = args[0] + options.NoPassword = true } - resp, err := mustClientFromCmd(cmd).Auth.UserAdd(context.TODO(), user, password) + resp, err := mustClientFromCmd(cmd).Auth.UserAddWithOptions(context.TODO(), user, password, options) if err != nil { ExitWithError(ExitError, err) } diff --git a/etcdserver/etcdserverpb/rpc.pb.go b/etcdserver/etcdserverpb/rpc.pb.go index 3e15079e6f74..aa334501cee2 100644 --- a/etcdserver/etcdserverpb/rpc.pb.go +++ b/etcdserver/etcdserverpb/rpc.pb.go @@ -2681,8 +2681,9 @@ func (m *AuthenticateRequest) GetPassword() string { } type AuthUserAddRequest struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - Password string `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Password string `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty"` + Options *authpb.UserAddOptions `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"` } func (m *AuthUserAddRequest) Reset() { *m = AuthUserAddRequest{} } @@ -2704,6 +2705,13 @@ func (m *AuthUserAddRequest) GetPassword() string { return "" } +func (m *AuthUserAddRequest) GetOptions() *authpb.UserAddOptions { + if m != nil { + return m.Options + } + return nil +} + type AuthUserGetRequest struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` } @@ -7414,6 +7422,16 @@ func (m *AuthUserAddRequest) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintRpc(dAtA, i, uint64(len(m.Password))) i += copy(dAtA[i:], m.Password) } + if m.Options != nil { + dAtA[i] = 0x1a + i++ + i = encodeVarintRpc(dAtA, i, uint64(m.Options.Size())) + n43, err := m.Options.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n43 + } return i, nil } @@ -7688,11 +7706,11 @@ func (m *AuthRoleGrantPermissionRequest) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x12 i++ i = encodeVarintRpc(dAtA, i, uint64(m.Perm.Size())) - n43, err := m.Perm.MarshalTo(dAtA[i:]) + n44, err := m.Perm.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n43 + i += n44 } return i, nil } @@ -7752,11 +7770,11 @@ func (m *AuthEnableResponse) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0xa i++ i = encodeVarintRpc(dAtA, i, uint64(m.Header.Size())) - n44, err := m.Header.MarshalTo(dAtA[i:]) + n45, err := m.Header.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n44 + i += n45 } return i, nil } @@ -7780,11 +7798,11 @@ func (m *AuthDisableResponse) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0xa i++ i = encodeVarintRpc(dAtA, i, uint64(m.Header.Size())) - n45, err := m.Header.MarshalTo(dAtA[i:]) + n46, err := m.Header.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n45 + i += n46 } return i, nil } @@ -7808,11 +7826,11 @@ func (m *AuthenticateResponse) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0xa i++ i = encodeVarintRpc(dAtA, i, uint64(m.Header.Size())) - n46, err := m.Header.MarshalTo(dAtA[i:]) + n47, err := m.Header.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n46 + i += n47 } if len(m.Token) > 0 { dAtA[i] = 0x12 @@ -7842,11 +7860,11 @@ func (m *AuthUserAddResponse) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0xa i++ i = encodeVarintRpc(dAtA, i, uint64(m.Header.Size())) - n47, err := m.Header.MarshalTo(dAtA[i:]) + n48, err := m.Header.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n47 + i += n48 } return i, nil } @@ -7870,11 +7888,11 @@ func (m *AuthUserGetResponse) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0xa i++ i = encodeVarintRpc(dAtA, i, uint64(m.Header.Size())) - n48, err := m.Header.MarshalTo(dAtA[i:]) + n49, err := m.Header.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n48 + i += n49 } if len(m.Roles) > 0 { for _, s := range m.Roles { @@ -7913,11 +7931,11 @@ func (m *AuthUserDeleteResponse) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0xa i++ i = encodeVarintRpc(dAtA, i, uint64(m.Header.Size())) - n49, err := m.Header.MarshalTo(dAtA[i:]) + n50, err := m.Header.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n49 + i += n50 } return i, nil } @@ -7941,11 +7959,11 @@ func (m *AuthUserChangePasswordResponse) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0xa i++ i = encodeVarintRpc(dAtA, i, uint64(m.Header.Size())) - n50, err := m.Header.MarshalTo(dAtA[i:]) + n51, err := m.Header.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n50 + i += n51 } return i, nil } @@ -7969,11 +7987,11 @@ func (m *AuthUserGrantRoleResponse) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0xa i++ i = encodeVarintRpc(dAtA, i, uint64(m.Header.Size())) - n51, err := m.Header.MarshalTo(dAtA[i:]) + n52, err := m.Header.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n51 + i += n52 } return i, nil } @@ -7997,11 +8015,11 @@ func (m *AuthUserRevokeRoleResponse) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0xa i++ i = encodeVarintRpc(dAtA, i, uint64(m.Header.Size())) - n52, err := m.Header.MarshalTo(dAtA[i:]) + n53, err := m.Header.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n52 + i += n53 } return i, nil } @@ -8025,11 +8043,11 @@ func (m *AuthRoleAddResponse) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0xa i++ i = encodeVarintRpc(dAtA, i, uint64(m.Header.Size())) - n53, err := m.Header.MarshalTo(dAtA[i:]) + n54, err := m.Header.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n53 + i += n54 } return i, nil } @@ -8053,11 +8071,11 @@ func (m *AuthRoleGetResponse) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0xa i++ i = encodeVarintRpc(dAtA, i, uint64(m.Header.Size())) - n54, err := m.Header.MarshalTo(dAtA[i:]) + n55, err := m.Header.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n54 + i += n55 } if len(m.Perm) > 0 { for _, msg := range m.Perm { @@ -8093,11 +8111,11 @@ func (m *AuthRoleListResponse) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0xa i++ i = encodeVarintRpc(dAtA, i, uint64(m.Header.Size())) - n55, err := m.Header.MarshalTo(dAtA[i:]) + n56, err := m.Header.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n55 + i += n56 } if len(m.Roles) > 0 { for _, s := range m.Roles { @@ -8136,11 +8154,11 @@ func (m *AuthUserListResponse) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0xa i++ i = encodeVarintRpc(dAtA, i, uint64(m.Header.Size())) - n56, err := m.Header.MarshalTo(dAtA[i:]) + n57, err := m.Header.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n56 + i += n57 } if len(m.Users) > 0 { for _, s := range m.Users { @@ -8179,11 +8197,11 @@ func (m *AuthRoleDeleteResponse) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0xa i++ i = encodeVarintRpc(dAtA, i, uint64(m.Header.Size())) - n57, err := m.Header.MarshalTo(dAtA[i:]) + n58, err := m.Header.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n57 + i += n58 } return i, nil } @@ -8207,11 +8225,11 @@ func (m *AuthRoleGrantPermissionResponse) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0xa i++ i = encodeVarintRpc(dAtA, i, uint64(m.Header.Size())) - n58, err := m.Header.MarshalTo(dAtA[i:]) + n59, err := m.Header.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n58 + i += n59 } return i, nil } @@ -8235,11 +8253,11 @@ func (m *AuthRoleRevokePermissionResponse) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0xa i++ i = encodeVarintRpc(dAtA, i, uint64(m.Header.Size())) - n59, err := m.Header.MarshalTo(dAtA[i:]) + n60, err := m.Header.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n59 + i += n60 } return i, nil } @@ -9288,6 +9306,10 @@ func (m *AuthUserAddRequest) Size() (n int) { if l > 0 { n += 1 + l + sovRpc(uint64(l)) } + if m.Options != nil { + l = m.Options.Size() + n += 1 + l + sovRpc(uint64(l)) + } return n } @@ -16629,6 +16651,39 @@ func (m *AuthUserAddRequest) Unmarshal(dAtA []byte) error { } m.Password = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Options", 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 + } + if m.Options == nil { + m.Options = &authpb.UserAddOptions{} + } + if err := m.Options.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipRpc(dAtA[iNdEx:]) @@ -19305,245 +19360,247 @@ var ( func init() { proto.RegisterFile("rpc.proto", fileDescriptorRpc) } var fileDescriptorRpc = []byte{ - // 3836 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x5b, 0xdd, 0x6f, 0x23, 0xc9, - 0x71, 0xd7, 0x90, 0xe2, 0x57, 0xf1, 0x43, 0x54, 0xeb, 0x63, 0x29, 0xee, 0xae, 0x56, 0xd7, 0xbb, - 0x7b, 0xab, 0xdb, 0xbd, 0x13, 0x6d, 0xd9, 0x4e, 0x80, 0x4d, 0xe2, 0x58, 0x2b, 0xf1, 0x56, 0x3a, - 0x69, 0x45, 0xdd, 0x88, 0xda, 0xfb, 0x80, 0x11, 0x61, 0x44, 0xf6, 0x4a, 0x13, 0x91, 0x33, 0xf4, - 0xcc, 0x90, 0x2b, 0x5d, 0x82, 0x38, 0x30, 0x9c, 0x00, 0xc9, 0xa3, 0x0d, 0x04, 0xc9, 0x43, 0x9e, - 0x82, 0x20, 0xf0, 0x43, 0x80, 0xbc, 0x05, 0xc8, 0x5f, 0x90, 0xb7, 0x24, 0xc8, 0x3f, 0x10, 0x5c, - 0xfc, 0x92, 0xff, 0x22, 0xe8, 0xaf, 0x99, 0x9e, 0x2f, 0x69, 0x6d, 0xfa, 0xfc, 0x22, 0x4d, 0x57, - 0x57, 0x57, 0x55, 0x57, 0x77, 0x57, 0x55, 0xff, 0x66, 0x08, 0x25, 0x67, 0xd4, 0xdb, 0x18, 0x39, - 0xb6, 0x67, 0xa3, 0x0a, 0xf1, 0x7a, 0x7d, 0x97, 0x38, 0x13, 0xe2, 0x8c, 0xce, 0x9a, 0x8b, 0xe7, - 0xf6, 0xb9, 0xcd, 0x3a, 0x5a, 0xf4, 0x89, 0xf3, 0x34, 0x57, 0x28, 0x4f, 0x6b, 0x38, 0xe9, 0xf5, - 0xd8, 0x9f, 0xd1, 0x59, 0xeb, 0x72, 0x22, 0xba, 0xee, 0xb2, 0x2e, 0x63, 0xec, 0x5d, 0xb0, 0x3f, - 0xa3, 0x33, 0xf6, 0x4f, 0x74, 0xde, 0x3b, 0xb7, 0xed, 0xf3, 0x01, 0x69, 0x19, 0x23, 0xb3, 0x65, - 0x58, 0x96, 0xed, 0x19, 0x9e, 0x69, 0x5b, 0x2e, 0xef, 0xc5, 0x7f, 0xa1, 0x41, 0x4d, 0x27, 0xee, - 0xc8, 0xb6, 0x5c, 0xb2, 0x4b, 0x8c, 0x3e, 0x71, 0xd0, 0x7d, 0x80, 0xde, 0x60, 0xec, 0x7a, 0xc4, - 0x39, 0x35, 0xfb, 0x0d, 0x6d, 0x4d, 0x5b, 0x9f, 0xd5, 0x4b, 0x82, 0xb2, 0xd7, 0x47, 0x77, 0xa1, - 0x34, 0x24, 0xc3, 0x33, 0xde, 0x9b, 0x61, 0xbd, 0x45, 0x4e, 0xd8, 0xeb, 0xa3, 0x26, 0x14, 0x1d, - 0x32, 0x31, 0x5d, 0xd3, 0xb6, 0x1a, 0xd9, 0x35, 0x6d, 0x3d, 0xab, 0xfb, 0x6d, 0x3a, 0xd0, 0x31, - 0xde, 0x78, 0xa7, 0x1e, 0x71, 0x86, 0x8d, 0x59, 0x3e, 0x90, 0x12, 0xba, 0xc4, 0x19, 0xe2, 0x9f, - 0xe6, 0xa0, 0xa2, 0x1b, 0xd6, 0x39, 0xd1, 0xc9, 0x8f, 0xc6, 0xc4, 0xf5, 0x50, 0x1d, 0xb2, 0x97, - 0xe4, 0x9a, 0xa9, 0xaf, 0xe8, 0xf4, 0x91, 0x8f, 0xb7, 0xce, 0xc9, 0x29, 0xb1, 0xb8, 0xe2, 0x0a, - 0x1d, 0x6f, 0x9d, 0x93, 0xb6, 0xd5, 0x47, 0x8b, 0x90, 0x1b, 0x98, 0x43, 0xd3, 0x13, 0x5a, 0x79, - 0x23, 0x64, 0xce, 0x6c, 0xc4, 0x9c, 0x6d, 0x00, 0xd7, 0x76, 0xbc, 0x53, 0xdb, 0xe9, 0x13, 0xa7, - 0x91, 0x5b, 0xd3, 0xd6, 0x6b, 0x9b, 0x8f, 0x36, 0xd4, 0x85, 0xd8, 0x50, 0x0d, 0xda, 0x38, 0xb6, - 0x1d, 0xaf, 0x43, 0x79, 0xf5, 0x92, 0x2b, 0x1f, 0xd1, 0xc7, 0x50, 0x66, 0x42, 0x3c, 0xc3, 0x39, - 0x27, 0x5e, 0x23, 0xcf, 0xa4, 0x3c, 0xbe, 0x45, 0x4a, 0x97, 0x31, 0xeb, 0x4c, 0x3d, 0x7f, 0x46, - 0x18, 0x2a, 0x2e, 0x71, 0x4c, 0x63, 0x60, 0x7e, 0x65, 0x9c, 0x0d, 0x48, 0xa3, 0xb0, 0xa6, 0xad, - 0x17, 0xf5, 0x10, 0x8d, 0xce, 0xff, 0x92, 0x5c, 0xbb, 0xa7, 0xb6, 0x35, 0xb8, 0x6e, 0x14, 0x19, - 0x43, 0x91, 0x12, 0x3a, 0xd6, 0xe0, 0x9a, 0x2d, 0x9a, 0x3d, 0xb6, 0x3c, 0xde, 0x5b, 0x62, 0xbd, - 0x25, 0x46, 0x61, 0xdd, 0xeb, 0x50, 0x1f, 0x9a, 0xd6, 0xe9, 0xd0, 0xee, 0x9f, 0xfa, 0x0e, 0x01, - 0xe6, 0x90, 0xda, 0xd0, 0xb4, 0x5e, 0xd9, 0x7d, 0x5d, 0xba, 0x85, 0x72, 0x1a, 0x57, 0x61, 0xce, - 0xb2, 0xe0, 0x34, 0xae, 0x54, 0xce, 0x0d, 0x58, 0xa0, 0x32, 0x7b, 0x0e, 0x31, 0x3c, 0x12, 0x30, - 0x57, 0x18, 0xf3, 0xfc, 0xd0, 0xb4, 0xb6, 0x59, 0x4f, 0x88, 0xdf, 0xb8, 0x8a, 0xf1, 0x57, 0x05, - 0xbf, 0x71, 0x15, 0xe6, 0xc7, 0x1b, 0x50, 0xf2, 0x7d, 0x8e, 0x8a, 0x30, 0x7b, 0xd8, 0x39, 0x6c, - 0xd7, 0x67, 0x10, 0x40, 0x7e, 0xeb, 0x78, 0xbb, 0x7d, 0xb8, 0x53, 0xd7, 0x50, 0x19, 0x0a, 0x3b, - 0x6d, 0xde, 0xc8, 0xe0, 0x17, 0x00, 0x81, 0x77, 0x51, 0x01, 0xb2, 0xfb, 0xed, 0x2f, 0xea, 0x33, - 0x94, 0xe7, 0x75, 0x5b, 0x3f, 0xde, 0xeb, 0x1c, 0xd6, 0x35, 0x3a, 0x78, 0x5b, 0x6f, 0x6f, 0x75, - 0xdb, 0xf5, 0x0c, 0xe5, 0x78, 0xd5, 0xd9, 0xa9, 0x67, 0x51, 0x09, 0x72, 0xaf, 0xb7, 0x0e, 0x4e, - 0xda, 0xf5, 0x59, 0xfc, 0x73, 0x0d, 0xaa, 0x62, 0xbd, 0xf8, 0x99, 0x40, 0xdf, 0x85, 0xfc, 0x05, - 0x3b, 0x17, 0x6c, 0x2b, 0x96, 0x37, 0xef, 0x45, 0x16, 0x37, 0x74, 0x76, 0x74, 0xc1, 0x8b, 0x30, - 0x64, 0x2f, 0x27, 0x6e, 0x23, 0xb3, 0x96, 0x5d, 0x2f, 0x6f, 0xd6, 0x37, 0xf8, 0x81, 0xdd, 0xd8, - 0x27, 0xd7, 0xaf, 0x8d, 0xc1, 0x98, 0xe8, 0xb4, 0x13, 0x21, 0x98, 0x1d, 0xda, 0x0e, 0x61, 0x3b, - 0xb6, 0xa8, 0xb3, 0x67, 0xba, 0x8d, 0xd9, 0xa2, 0x89, 0xdd, 0xca, 0x1b, 0xf8, 0x17, 0x1a, 0xc0, - 0xd1, 0xd8, 0x4b, 0x3f, 0x1a, 0x8b, 0x90, 0x9b, 0x50, 0xc1, 0xe2, 0x58, 0xf0, 0x06, 0x3b, 0x13, - 0xc4, 0x70, 0x89, 0x7f, 0x26, 0x68, 0x03, 0xdd, 0x81, 0xc2, 0xc8, 0x21, 0x93, 0xd3, 0xcb, 0x09, - 0x53, 0x52, 0xd4, 0xf3, 0xb4, 0xb9, 0x3f, 0x41, 0xef, 0x41, 0xc5, 0x3c, 0xb7, 0x6c, 0x87, 0x9c, - 0x72, 0x59, 0x39, 0xd6, 0x5b, 0xe6, 0x34, 0x66, 0xb7, 0xc2, 0xc2, 0x05, 0xe7, 0x55, 0x96, 0x03, - 0x4a, 0xc2, 0x16, 0x94, 0x99, 0xa9, 0x53, 0xb9, 0xef, 0x83, 0xc0, 0xc6, 0x0c, 0x1b, 0x16, 0x77, - 0xa1, 0xb0, 0x1a, 0xff, 0x10, 0xd0, 0x0e, 0x19, 0x10, 0x8f, 0x4c, 0x13, 0x3d, 0x14, 0x9f, 0x64, - 0x55, 0x9f, 0xe0, 0x9f, 0x69, 0xb0, 0x10, 0x12, 0x3f, 0xd5, 0xb4, 0x1a, 0x50, 0xe8, 0x33, 0x61, - 0xdc, 0x82, 0xac, 0x2e, 0x9b, 0xe8, 0x19, 0x14, 0x85, 0x01, 0x6e, 0x23, 0x9b, 0xb2, 0x69, 0x0a, - 0xdc, 0x26, 0x17, 0xff, 0x22, 0x03, 0x25, 0x31, 0xd1, 0xce, 0x08, 0x6d, 0x41, 0xd5, 0xe1, 0x8d, - 0x53, 0x36, 0x1f, 0x61, 0x51, 0x33, 0x3d, 0x08, 0xed, 0xce, 0xe8, 0x15, 0x31, 0x84, 0x91, 0xd1, - 0xef, 0x41, 0x59, 0x8a, 0x18, 0x8d, 0x3d, 0xe1, 0xf2, 0x46, 0x58, 0x40, 0xb0, 0xff, 0x76, 0x67, - 0x74, 0x10, 0xec, 0x47, 0x63, 0x0f, 0x75, 0x61, 0x51, 0x0e, 0xe6, 0xb3, 0x11, 0x66, 0x64, 0x99, - 0x94, 0xb5, 0xb0, 0x94, 0xf8, 0x52, 0xed, 0xce, 0xe8, 0x48, 0x8c, 0x57, 0x3a, 0x55, 0x93, 0xbc, - 0x2b, 0x1e, 0xbc, 0x63, 0x26, 0x75, 0xaf, 0xac, 0xb8, 0x49, 0xdd, 0x2b, 0xeb, 0x45, 0x09, 0x0a, - 0xa2, 0x85, 0xff, 0x35, 0x03, 0x20, 0x57, 0xa3, 0x33, 0x42, 0x3b, 0x50, 0x73, 0x44, 0x2b, 0xe4, - 0xad, 0xbb, 0x89, 0xde, 0x12, 0x8b, 0x38, 0xa3, 0x57, 0xe5, 0x20, 0x6e, 0xdc, 0xf7, 0xa1, 0xe2, - 0x4b, 0x09, 0x1c, 0xb6, 0x92, 0xe0, 0x30, 0x5f, 0x42, 0x59, 0x0e, 0xa0, 0x2e, 0xfb, 0x0c, 0x96, - 0xfc, 0xf1, 0x09, 0x3e, 0x7b, 0xef, 0x06, 0x9f, 0xf9, 0x02, 0x17, 0xa4, 0x04, 0xd5, 0x6b, 0xaa, - 0x61, 0x81, 0xdb, 0x56, 0x12, 0xdc, 0x16, 0x37, 0x8c, 0x3a, 0x0e, 0x68, 0xbe, 0xe4, 0x4d, 0xfc, - 0x7f, 0x59, 0x28, 0x6c, 0xdb, 0xc3, 0x91, 0xe1, 0xd0, 0xd5, 0xc8, 0x3b, 0xc4, 0x1d, 0x0f, 0x3c, - 0xe6, 0xae, 0xda, 0xe6, 0xc3, 0xb0, 0x44, 0xc1, 0x26, 0xff, 0xeb, 0x8c, 0x55, 0x17, 0x43, 0xe8, - 0x60, 0x91, 0x1e, 0x33, 0xef, 0x30, 0x58, 0x24, 0x47, 0x31, 0x44, 0x1e, 0xe4, 0x6c, 0x70, 0x90, - 0x9b, 0x50, 0x98, 0x10, 0x27, 0x48, 0xe9, 0xbb, 0x33, 0xba, 0x24, 0xa0, 0x0f, 0x60, 0x2e, 0x9a, - 0x5e, 0x72, 0x82, 0xa7, 0xd6, 0x0b, 0x67, 0xa3, 0x87, 0x50, 0x09, 0xe5, 0xb8, 0xbc, 0xe0, 0x2b, - 0x0f, 0x95, 0x14, 0xb7, 0x2c, 0xe3, 0x2a, 0xcd, 0xc7, 0x95, 0xdd, 0x19, 0x19, 0x59, 0x97, 0x65, - 0x64, 0x2d, 0x8a, 0x51, 0x22, 0xb6, 0x86, 0x82, 0xcc, 0x0f, 0xc2, 0x41, 0x06, 0xff, 0x00, 0xaa, - 0x21, 0x07, 0xd1, 0xbc, 0xd3, 0xfe, 0xf4, 0x64, 0xeb, 0x80, 0x27, 0xa9, 0x97, 0x2c, 0x2f, 0xe9, - 0x75, 0x8d, 0xe6, 0xba, 0x83, 0xf6, 0xf1, 0x71, 0x3d, 0x83, 0xaa, 0x50, 0x3a, 0xec, 0x74, 0x4f, - 0x39, 0x57, 0x16, 0xbf, 0xf4, 0x25, 0x88, 0x24, 0xa7, 0xe4, 0xb6, 0x19, 0x25, 0xb7, 0x69, 0x32, - 0xb7, 0x65, 0x82, 0xdc, 0xc6, 0xd2, 0xdc, 0x41, 0x7b, 0xeb, 0xb8, 0x5d, 0x9f, 0x7d, 0x51, 0x83, - 0x0a, 0xf7, 0xef, 0xe9, 0xd8, 0xa2, 0xa9, 0xf6, 0x1f, 0x34, 0x80, 0xe0, 0x34, 0xa1, 0x16, 0x14, - 0x7a, 0x5c, 0x4f, 0x43, 0x63, 0xc1, 0x68, 0x29, 0x71, 0xc9, 0x74, 0xc9, 0x85, 0xbe, 0x0d, 0x05, - 0x77, 0xdc, 0xeb, 0x11, 0x57, 0xa6, 0xbc, 0x3b, 0xd1, 0x78, 0x28, 0xa2, 0x95, 0x2e, 0xf9, 0xe8, - 0x90, 0x37, 0x86, 0x39, 0x18, 0xb3, 0x04, 0x78, 0xf3, 0x10, 0xc1, 0x87, 0xff, 0x4e, 0x83, 0xb2, - 0xb2, 0x79, 0x7f, 0xcd, 0x20, 0x7c, 0x0f, 0x4a, 0xcc, 0x06, 0xd2, 0x17, 0x61, 0xb8, 0xa8, 0x07, - 0x04, 0xf4, 0x3b, 0x50, 0x92, 0x27, 0x40, 0x46, 0xe2, 0x46, 0xb2, 0xd8, 0xce, 0x48, 0x0f, 0x58, - 0xf1, 0x3e, 0xcc, 0x33, 0xaf, 0xf4, 0x68, 0x71, 0x2d, 0xfd, 0xa8, 0x96, 0x9f, 0x5a, 0xa4, 0xfc, - 0x6c, 0x42, 0x71, 0x74, 0x71, 0xed, 0x9a, 0x3d, 0x63, 0x20, 0xac, 0xf0, 0xdb, 0xf8, 0x13, 0x40, - 0xaa, 0xb0, 0x69, 0xa6, 0x8b, 0xab, 0x50, 0xde, 0x35, 0xdc, 0x0b, 0x61, 0x12, 0x7e, 0x06, 0x55, - 0xda, 0xdc, 0x7f, 0xfd, 0x0e, 0x36, 0xb2, 0xcb, 0x81, 0xe4, 0x9e, 0xca, 0xe7, 0x08, 0x66, 0x2f, - 0x0c, 0xf7, 0x82, 0x4d, 0xb4, 0xaa, 0xb3, 0x67, 0xf4, 0x01, 0xd4, 0x7b, 0x7c, 0x92, 0xa7, 0x91, - 0x2b, 0xc3, 0x9c, 0xa0, 0xfb, 0x95, 0xe0, 0xe7, 0x50, 0xe1, 0x73, 0xf8, 0x4d, 0x1b, 0x81, 0xe7, - 0x61, 0xee, 0xd8, 0x32, 0x46, 0xee, 0x85, 0x2d, 0xb3, 0x1b, 0x9d, 0x74, 0x3d, 0xa0, 0x4d, 0xa5, - 0xf1, 0x09, 0xcc, 0x39, 0x64, 0x68, 0x98, 0x96, 0x69, 0x9d, 0x9f, 0x9e, 0x5d, 0x7b, 0xc4, 0x15, - 0x17, 0xa6, 0x9a, 0x4f, 0x7e, 0x41, 0xa9, 0xd4, 0xb4, 0xb3, 0x81, 0x7d, 0x26, 0xc2, 0x1c, 0x7b, - 0xc6, 0x7f, 0x99, 0x81, 0xca, 0x67, 0x86, 0xd7, 0x93, 0x4b, 0x87, 0xf6, 0xa0, 0xe6, 0x07, 0x37, - 0x46, 0x11, 0xb6, 0x44, 0x52, 0x2c, 0x1b, 0x23, 0x4b, 0x69, 0x99, 0x1d, 0xab, 0x3d, 0x95, 0xc0, - 0x44, 0x19, 0x56, 0x8f, 0x0c, 0x7c, 0x51, 0x99, 0x74, 0x51, 0x8c, 0x51, 0x15, 0xa5, 0x12, 0x50, - 0x07, 0xea, 0x23, 0xc7, 0x3e, 0x77, 0x88, 0xeb, 0xfa, 0xc2, 0x78, 0x1a, 0xc3, 0x09, 0xc2, 0x8e, - 0x04, 0x6b, 0x20, 0x6e, 0x6e, 0x14, 0x26, 0xbd, 0x98, 0x0b, 0xea, 0x19, 0x1e, 0x9c, 0xfe, 0x2b, - 0x03, 0x28, 0x3e, 0xa9, 0x5f, 0xb5, 0xc4, 0x7b, 0x0c, 0x35, 0xd7, 0x33, 0x9c, 0xd8, 0x66, 0xab, - 0x32, 0xaa, 0x1f, 0xf1, 0x9f, 0x80, 0x6f, 0xd0, 0xa9, 0x65, 0x7b, 0xe6, 0x9b, 0x6b, 0x51, 0x25, - 0xd7, 0x24, 0xf9, 0x90, 0x51, 0x51, 0x1b, 0x0a, 0x6f, 0xcc, 0x81, 0x47, 0x1c, 0xb7, 0x91, 0x5b, - 0xcb, 0xae, 0xd7, 0x36, 0x9f, 0xdd, 0xb6, 0x0c, 0x1b, 0x1f, 0x33, 0xfe, 0xee, 0xf5, 0x88, 0xe8, - 0x72, 0xac, 0x5a, 0x79, 0xe6, 0x43, 0xd5, 0xf8, 0x0a, 0x14, 0xdf, 0x52, 0x11, 0xf4, 0x96, 0x5d, - 0xe0, 0xc5, 0x22, 0x6b, 0xf3, 0x4b, 0xf6, 0x1b, 0xc7, 0x38, 0x1f, 0x12, 0xcb, 0x93, 0xf7, 0x40, - 0xd9, 0xc6, 0x8f, 0x01, 0x02, 0x35, 0x34, 0xe4, 0x1f, 0x76, 0x8e, 0x4e, 0xba, 0xf5, 0x19, 0x54, - 0x81, 0xe2, 0x61, 0x67, 0xa7, 0x7d, 0xd0, 0xa6, 0xf9, 0x01, 0xb7, 0xa4, 0x4b, 0x43, 0x6b, 0xa9, - 0xea, 0xd4, 0x42, 0x3a, 0xf1, 0x32, 0x2c, 0x26, 0x2d, 0x20, 0xad, 0x45, 0xab, 0x62, 0x97, 0x4e, - 0x75, 0x54, 0x54, 0xd5, 0x99, 0xf0, 0x74, 0x1b, 0x50, 0xe0, 0xbb, 0xb7, 0x2f, 0x8a, 0x73, 0xd9, - 0xa4, 0x8e, 0xe0, 0x9b, 0x91, 0xf4, 0xc5, 0x2a, 0xf9, 0xed, 0xc4, 0xf0, 0x92, 0x4b, 0x0c, 0x2f, - 0xe8, 0x21, 0x54, 0xfd, 0xd3, 0x60, 0xb8, 0xa2, 0x16, 0x28, 0xe9, 0x15, 0xb9, 0xd1, 0x29, 0x2d, - 0xe4, 0xf4, 0x42, 0xd8, 0xe9, 0xe8, 0x31, 0xe4, 0xc9, 0x84, 0x58, 0x9e, 0xdb, 0x28, 0xb3, 0x8c, - 0x51, 0x95, 0xb5, 0x7b, 0x9b, 0x52, 0x75, 0xd1, 0x89, 0xbf, 0x07, 0xf3, 0xec, 0x8e, 0xf4, 0xd2, - 0x31, 0x2c, 0xf5, 0x32, 0xd7, 0xed, 0x1e, 0x08, 0x77, 0xd3, 0x47, 0x54, 0x83, 0xcc, 0xde, 0x8e, - 0x70, 0x42, 0x66, 0x6f, 0x07, 0xff, 0x44, 0x03, 0xa4, 0x8e, 0x9b, 0xca, 0xcf, 0x11, 0xe1, 0x52, - 0x7d, 0x36, 0x50, 0xbf, 0x08, 0x39, 0xe2, 0x38, 0xb6, 0xc3, 0x3c, 0x5a, 0xd2, 0x79, 0x03, 0x3f, - 0x12, 0x36, 0xe8, 0x64, 0x62, 0x5f, 0xfa, 0x67, 0x90, 0x4b, 0xd3, 0x7c, 0x53, 0xf7, 0x61, 0x21, - 0xc4, 0x35, 0x55, 0xe6, 0xfa, 0x18, 0xe6, 0x98, 0xb0, 0xed, 0x0b, 0xd2, 0xbb, 0x1c, 0xd9, 0xa6, - 0x15, 0xd3, 0x47, 0x57, 0x2e, 0x08, 0xb0, 0x74, 0x1e, 0x7c, 0x62, 0x15, 0x9f, 0xd8, 0xed, 0x1e, - 0xe0, 0x2f, 0x60, 0x39, 0x22, 0x47, 0x9a, 0xff, 0x87, 0x50, 0xee, 0xf9, 0x44, 0x57, 0xd4, 0x3a, - 0xf7, 0xc3, 0xc6, 0x45, 0x87, 0xaa, 0x23, 0x70, 0x07, 0xee, 0xc4, 0x44, 0x4f, 0x35, 0xe7, 0x27, - 0xb0, 0xc4, 0x04, 0xee, 0x13, 0x32, 0xda, 0x1a, 0x98, 0x93, 0x54, 0x4f, 0x8f, 0xc4, 0xa4, 0x14, - 0xc6, 0x6f, 0x76, 0x5f, 0xe0, 0xdf, 0x17, 0x1a, 0xbb, 0xe6, 0x90, 0x74, 0xed, 0x83, 0x74, 0xdb, - 0x68, 0x36, 0xbb, 0x24, 0xd7, 0xae, 0x28, 0x6b, 0xd8, 0x33, 0xfe, 0x47, 0x4d, 0xb8, 0x4a, 0x1d, - 0xfe, 0x0d, 0xef, 0xe4, 0x55, 0x80, 0x73, 0x7a, 0x64, 0x48, 0x9f, 0x76, 0x70, 0x44, 0x45, 0xa1, - 0xf8, 0x76, 0xd2, 0xf8, 0x5d, 0x11, 0x76, 0x2e, 0x8a, 0x7d, 0xce, 0xfe, 0xf8, 0x51, 0xee, 0x3e, - 0x94, 0x19, 0xe1, 0xd8, 0x33, 0xbc, 0xb1, 0x1b, 0x5b, 0x8c, 0x3f, 0x13, 0xdb, 0x5e, 0x0e, 0x9a, - 0x6a, 0x5e, 0xdf, 0x86, 0x3c, 0xbb, 0x4c, 0xc8, 0x52, 0x7a, 0x25, 0x61, 0x3f, 0x72, 0x3b, 0x74, - 0xc1, 0x88, 0x2f, 0x20, 0xff, 0x8a, 0x21, 0xb0, 0x8a, 0x65, 0xb3, 0x72, 0x29, 0x2c, 0x63, 0xc8, - 0x71, 0xa1, 0x92, 0xce, 0x9e, 0x59, 0xe5, 0x49, 0x88, 0x73, 0xa2, 0x1f, 0xf0, 0x0a, 0xb7, 0xa4, - 0xfb, 0x6d, 0xea, 0xb2, 0xde, 0xc0, 0x24, 0x96, 0xc7, 0x7a, 0x67, 0x59, 0xaf, 0x42, 0xc1, 0x1b, - 0x50, 0xe7, 0x9a, 0xb6, 0xfa, 0x7d, 0xa5, 0x82, 0xf4, 0xe5, 0x69, 0x61, 0x79, 0xf8, 0x9f, 0x34, - 0x98, 0x57, 0x06, 0x4c, 0xe5, 0x98, 0x0f, 0x21, 0xcf, 0x71, 0x66, 0x51, 0xac, 0x2c, 0x86, 0x47, - 0x71, 0x35, 0xba, 0xe0, 0x41, 0x1b, 0x50, 0xe0, 0x4f, 0xb2, 0x8c, 0x4f, 0x66, 0x97, 0x4c, 0xf8, - 0x31, 0x2c, 0x08, 0x12, 0x19, 0xda, 0x49, 0x7b, 0x9b, 0x39, 0x14, 0xff, 0x29, 0x2c, 0x86, 0xd9, - 0xa6, 0x9a, 0x92, 0x62, 0x64, 0xe6, 0x5d, 0x8c, 0xdc, 0x92, 0x46, 0x9e, 0x8c, 0xfa, 0x4a, 0x29, - 0x14, 0x5d, 0x75, 0x75, 0x45, 0x32, 0x91, 0x15, 0xf1, 0x27, 0x20, 0x45, 0xfc, 0x56, 0x27, 0xb0, - 0x20, 0xb7, 0xc3, 0x81, 0xe9, 0xfa, 0x15, 0xf7, 0x57, 0x80, 0x54, 0xe2, 0x6f, 0xdb, 0xa0, 0x1d, - 0x22, 0x13, 0xb9, 0x34, 0xe8, 0x13, 0x40, 0x2a, 0x71, 0xaa, 0x88, 0xde, 0x82, 0xf9, 0x57, 0xf6, - 0x84, 0x86, 0x06, 0x4a, 0x0d, 0x8e, 0x0c, 0xbf, 0x7f, 0xfb, 0xcb, 0xe6, 0xb7, 0xa9, 0x72, 0x75, - 0xc0, 0x54, 0xca, 0xff, 0x43, 0x83, 0xca, 0xd6, 0xc0, 0x70, 0x86, 0x52, 0xf1, 0xf7, 0x21, 0xcf, - 0x6f, 0x95, 0x02, 0xc8, 0x79, 0x3f, 0x2c, 0x46, 0xe5, 0xe5, 0x8d, 0x2d, 0x7e, 0x07, 0x15, 0xa3, - 0xa8, 0xe1, 0xe2, 0x5d, 0xcf, 0x4e, 0xe4, 0xdd, 0xcf, 0x0e, 0xfa, 0x08, 0x72, 0x06, 0x1d, 0xc2, - 0x42, 0x70, 0x2d, 0x7a, 0x9f, 0x67, 0xd2, 0x58, 0xed, 0xcb, 0xb9, 0xf0, 0x77, 0xa1, 0xac, 0x68, - 0x40, 0x05, 0xc8, 0xbe, 0x6c, 0x8b, 0x42, 0x75, 0x6b, 0xbb, 0xbb, 0xf7, 0x9a, 0x03, 0x19, 0x35, - 0x80, 0x9d, 0xb6, 0xdf, 0xce, 0xe0, 0xcf, 0xc5, 0x28, 0x11, 0xef, 0x54, 0x7b, 0xb4, 0x34, 0x7b, - 0x32, 0xef, 0x64, 0xcf, 0x15, 0x54, 0xc5, 0xf4, 0xa7, 0x0d, 0xdf, 0x4c, 0x5e, 0x4a, 0xf8, 0x56, - 0x8c, 0xd7, 0x05, 0x23, 0x9e, 0x83, 0xaa, 0x08, 0xe8, 0x62, 0xff, 0xfd, 0x4b, 0x06, 0x6a, 0x92, - 0x32, 0x2d, 0xe0, 0x2c, 0xb1, 0x32, 0x9e, 0x01, 0x7c, 0xa4, 0x6c, 0x19, 0xf2, 0xfd, 0xb3, 0x63, - 0xf3, 0x2b, 0xf9, 0x72, 0x40, 0xb4, 0x28, 0x7d, 0xc0, 0xf5, 0xf0, 0x37, 0x74, 0xa2, 0x85, 0xee, - 0xf1, 0x97, 0x77, 0x7b, 0x56, 0x9f, 0x5c, 0xb1, 0x3a, 0x7a, 0x56, 0x0f, 0x08, 0x0c, 0x44, 0x10, - 0x6f, 0xf2, 0x58, 0xf1, 0xac, 0xbc, 0xd9, 0x43, 0x4f, 0xa1, 0x4e, 0x9f, 0xb7, 0x46, 0xa3, 0x81, - 0x49, 0xfa, 0x5c, 0x40, 0x81, 0xf1, 0xc4, 0xe8, 0x54, 0x3b, 0x2b, 0x37, 0xdd, 0x46, 0x91, 0x85, - 0x2d, 0xd1, 0x42, 0x6b, 0x50, 0xe6, 0xf6, 0xed, 0x59, 0x27, 0x2e, 0x61, 0xaf, 0xb7, 0xb2, 0xba, - 0x4a, 0xa2, 0xe7, 0x78, 0x6b, 0xec, 0x5d, 0xb4, 0x2d, 0xe3, 0x6c, 0x20, 0xe3, 0x22, 0x4d, 0xe6, - 0x94, 0xb8, 0x63, 0xba, 0x2a, 0xb5, 0x0d, 0x0b, 0x94, 0x4a, 0x2c, 0xcf, 0xec, 0x29, 0x41, 0x54, - 0xa6, 0x4a, 0x2d, 0x92, 0x2a, 0x0d, 0xd7, 0x7d, 0x6b, 0x3b, 0x7d, 0xe1, 0x40, 0xbf, 0x8d, 0x77, - 0xb8, 0xf0, 0x13, 0x37, 0x94, 0x0c, 0x7f, 0x55, 0x29, 0xeb, 0x81, 0x94, 0x97, 0xc4, 0xbb, 0x41, - 0x0a, 0x7e, 0x06, 0x4b, 0x92, 0x53, 0x40, 0xbe, 0x37, 0x30, 0x77, 0xe0, 0xbe, 0x64, 0xde, 0xbe, - 0xa0, 0x57, 0xe0, 0x23, 0xa1, 0xf0, 0xd7, 0xb5, 0xf3, 0x05, 0x34, 0x7c, 0x3b, 0xd9, 0x35, 0xc4, - 0x1e, 0xa8, 0x06, 0x8c, 0x5d, 0xb1, 0x33, 0x4b, 0x3a, 0x7b, 0xa6, 0x34, 0xc7, 0x1e, 0xf8, 0x85, - 0x07, 0x7d, 0xc6, 0xdb, 0xb0, 0x22, 0x65, 0x88, 0x0b, 0x42, 0x58, 0x48, 0xcc, 0xa0, 0x24, 0x21, - 0xc2, 0x61, 0x74, 0xe8, 0xcd, 0x6e, 0x57, 0x39, 0xc3, 0xae, 0x65, 0x32, 0x35, 0x45, 0xe6, 0x12, - 0xdf, 0x11, 0xd4, 0x30, 0x35, 0x2f, 0x09, 0x32, 0x15, 0xa0, 0x92, 0xc5, 0x42, 0x50, 0x72, 0x6c, - 0x21, 0x62, 0xa2, 0x7f, 0x08, 0xab, 0xbe, 0x11, 0xd4, 0x6f, 0x47, 0xc4, 0x19, 0x9a, 0xae, 0xab, - 0x80, 0x84, 0x49, 0x13, 0x7f, 0x1f, 0x66, 0x47, 0x44, 0x44, 0xae, 0xf2, 0x26, 0xda, 0xe0, 0x6f, - 0xf5, 0x37, 0x94, 0xc1, 0xac, 0x1f, 0xf7, 0xe1, 0x81, 0x94, 0xce, 0x3d, 0x9a, 0x28, 0x3e, 0x6a, - 0x94, 0x84, 0x4e, 0x32, 0x29, 0xd0, 0x49, 0x36, 0x02, 0x5c, 0x7f, 0xc2, 0x1d, 0x29, 0xcf, 0xd6, - 0x54, 0x19, 0x69, 0x9f, 0xfb, 0xd4, 0x3f, 0x92, 0x53, 0x09, 0x3b, 0x83, 0xc5, 0xf0, 0x49, 0x9e, - 0x2a, 0x58, 0x2e, 0x42, 0xce, 0xb3, 0x2f, 0x89, 0x0c, 0x95, 0xbc, 0x21, 0x0d, 0xf6, 0x8f, 0xf9, - 0x54, 0x06, 0x1b, 0x81, 0x30, 0xb6, 0x25, 0xa7, 0xb5, 0x97, 0xae, 0xa6, 0x2c, 0xf1, 0x78, 0x03, - 0x1f, 0xc2, 0x72, 0x34, 0x4c, 0x4c, 0x65, 0xf2, 0x6b, 0xbe, 0x81, 0x93, 0x22, 0xc9, 0x54, 0x72, - 0x3f, 0x0d, 0x82, 0x81, 0x12, 0x50, 0xa6, 0x12, 0xa9, 0x43, 0x33, 0x29, 0xbe, 0xfc, 0x26, 0xf6, - 0xab, 0x1f, 0x6e, 0xa6, 0x12, 0xe6, 0x06, 0xc2, 0xa6, 0x5f, 0xfe, 0x20, 0x46, 0x64, 0x6f, 0x8c, - 0x11, 0xe2, 0x90, 0x04, 0x51, 0xec, 0x1b, 0xd8, 0x74, 0x42, 0x47, 0x10, 0x40, 0xa7, 0xd5, 0x41, - 0x73, 0x88, 0xaf, 0x83, 0x35, 0xe4, 0xc6, 0x56, 0xc3, 0xee, 0x54, 0x8b, 0xf1, 0x59, 0x10, 0x3b, - 0x63, 0x91, 0x79, 0x2a, 0xc1, 0x9f, 0xc3, 0x5a, 0x7a, 0x50, 0x9e, 0x46, 0xf2, 0xd3, 0x16, 0x94, - 0xfc, 0xb2, 0x55, 0xf9, 0x22, 0xa6, 0x0c, 0x85, 0xc3, 0xce, 0xf1, 0xd1, 0xd6, 0x76, 0x9b, 0x7f, - 0x12, 0xb3, 0xdd, 0xd1, 0xf5, 0x93, 0xa3, 0x6e, 0x3d, 0xb3, 0xf9, 0xcb, 0x2c, 0x64, 0xf6, 0x5f, - 0xa3, 0x2f, 0x20, 0xc7, 0xdf, 0x0f, 0xdf, 0xf0, 0x51, 0x40, 0xf3, 0xa6, 0x57, 0xe0, 0xf8, 0xce, - 0x4f, 0xfe, 0xfb, 0x97, 0x3f, 0xcf, 0xcc, 0xe3, 0x4a, 0x6b, 0xf2, 0x9d, 0xd6, 0xe5, 0xa4, 0xc5, - 0x72, 0xc3, 0x73, 0xed, 0x29, 0xfa, 0x14, 0xb2, 0x47, 0x63, 0x0f, 0xa5, 0x7e, 0x2c, 0xd0, 0x4c, - 0x7f, 0x2b, 0x8e, 0x97, 0x98, 0xd0, 0x39, 0x0c, 0x42, 0xe8, 0x68, 0xec, 0x51, 0x91, 0x3f, 0x82, - 0xb2, 0xfa, 0x4e, 0xfb, 0xd6, 0x2f, 0x08, 0x9a, 0xb7, 0xbf, 0x2f, 0xc7, 0xf7, 0x99, 0xaa, 0x3b, - 0x18, 0x09, 0x55, 0xfc, 0xad, 0xbb, 0x3a, 0x8b, 0xee, 0x95, 0x85, 0x52, 0xbf, 0x2f, 0x68, 0xa6, - 0xbf, 0x42, 0x8f, 0xcd, 0xc2, 0xbb, 0xb2, 0xa8, 0xc8, 0x3f, 0x16, 0x6f, 0xcf, 0x7b, 0x1e, 0x7a, - 0x90, 0xf0, 0xf6, 0x54, 0x7d, 0x4f, 0xd8, 0x5c, 0x4b, 0x67, 0x10, 0x4a, 0xee, 0x31, 0x25, 0xcb, - 0x78, 0x5e, 0x28, 0xe9, 0xf9, 0x2c, 0xcf, 0xb5, 0xa7, 0x9b, 0x3d, 0xc8, 0x31, 0x0c, 0x1e, 0x7d, - 0x29, 0x1f, 0x9a, 0x09, 0x2f, 0x23, 0x52, 0x16, 0x3a, 0x84, 0xde, 0xe3, 0x45, 0xa6, 0xa8, 0x86, - 0x4b, 0x54, 0x11, 0x43, 0xe0, 0x9f, 0x6b, 0x4f, 0xd7, 0xb5, 0x6f, 0x69, 0x9b, 0xff, 0x9c, 0x83, - 0x1c, 0x03, 0x9f, 0xd0, 0x25, 0x40, 0x80, 0x47, 0x47, 0x67, 0x17, 0x43, 0xb8, 0xa3, 0xb3, 0x8b, - 0x43, 0xd9, 0xb8, 0xc9, 0x94, 0x2e, 0xe2, 0x39, 0xaa, 0x94, 0x61, 0x5a, 0x2d, 0x06, 0xd3, 0x51, - 0x3f, 0xfe, 0x95, 0x26, 0xb0, 0x37, 0x7e, 0x96, 0x50, 0x92, 0xb4, 0x10, 0x28, 0x1d, 0xdd, 0x0e, - 0x09, 0x80, 0x34, 0xfe, 0x1e, 0x53, 0xd8, 0xc2, 0xf5, 0x40, 0xa1, 0xc3, 0x38, 0x9e, 0x6b, 0x4f, - 0xbf, 0x6c, 0xe0, 0x05, 0xe1, 0xe5, 0x48, 0x0f, 0xfa, 0x31, 0xd4, 0xc2, 0xa0, 0x2b, 0x7a, 0x98, - 0xa0, 0x2b, 0x8a, 0xdd, 0x36, 0x1f, 0xdd, 0xcc, 0x24, 0x6c, 0x5a, 0x65, 0x36, 0x09, 0xe5, 0x5c, - 0xf3, 0x25, 0x21, 0x23, 0x83, 0x32, 0x89, 0x35, 0x40, 0x7f, 0xaf, 0x09, 0x4c, 0x3c, 0x40, 0x51, - 0x51, 0x92, 0xf4, 0x18, 0x46, 0xdb, 0x7c, 0x7c, 0x0b, 0x97, 0x30, 0xe2, 0x0f, 0x98, 0x11, 0xbf, - 0x8b, 0x17, 0x03, 0x23, 0x3c, 0x73, 0x48, 0x3c, 0x5b, 0x58, 0xf1, 0xe5, 0x3d, 0x7c, 0x27, 0xe4, - 0x9c, 0x50, 0x6f, 0xb0, 0x58, 0x1c, 0x09, 0x4d, 0x5c, 0xac, 0x10, 0xb2, 0x9a, 0xb8, 0x58, 0x61, - 0x18, 0x35, 0x69, 0xb1, 0x38, 0xee, 0x99, 0xb4, 0x58, 0x7e, 0xcf, 0x26, 0xfb, 0x7e, 0x85, 0x7f, - 0xb5, 0x8a, 0x6c, 0x28, 0xf9, 0x28, 0x24, 0x5a, 0x4d, 0x42, 0x84, 0x82, 0xbb, 0x44, 0xf3, 0x41, - 0x6a, 0xbf, 0x30, 0xe8, 0x3d, 0x66, 0xd0, 0x5d, 0xbc, 0x4c, 0x35, 0x8b, 0x0f, 0x63, 0x5b, 0x1c, - 0x76, 0x68, 0x19, 0xfd, 0x3e, 0x75, 0xc4, 0x9f, 0x40, 0x45, 0x85, 0x09, 0xd1, 0x7b, 0x89, 0x28, - 0x94, 0x8a, 0x34, 0x36, 0xf1, 0x4d, 0x2c, 0x42, 0xf3, 0x23, 0xa6, 0x79, 0x15, 0xaf, 0x24, 0x68, - 0x76, 0x18, 0x6b, 0x48, 0x39, 0x87, 0xf8, 0x92, 0x95, 0x87, 0x10, 0xc4, 0x64, 0xe5, 0x61, 0x84, - 0xf0, 0x46, 0xe5, 0x63, 0xc6, 0x4a, 0x95, 0xbb, 0x00, 0x01, 0x98, 0x87, 0x12, 0x7d, 0xa9, 0x5c, - 0xa6, 0xa2, 0xc1, 0x21, 0x8e, 0x03, 0x62, 0xcc, 0xd4, 0x8a, 0x7d, 0x17, 0x51, 0x3b, 0x30, 0x5d, - 0x1a, 0x24, 0x36, 0xff, 0x3a, 0x0f, 0xe5, 0x57, 0x86, 0x69, 0x79, 0xc4, 0x32, 0xac, 0x1e, 0x41, - 0x67, 0x90, 0x63, 0x89, 0x32, 0x1a, 0x07, 0x55, 0x7c, 0x2b, 0x1a, 0x07, 0x43, 0xe0, 0x0f, 0x5e, - 0x63, 0x5a, 0x9b, 0x78, 0x89, 0x6a, 0x1d, 0x06, 0xa2, 0x5b, 0x0c, 0xb3, 0xa1, 0x13, 0x7d, 0x03, - 0x79, 0xf1, 0x3a, 0x20, 0x22, 0x28, 0x84, 0xe5, 0x34, 0xef, 0x25, 0x77, 0x26, 0x6d, 0x25, 0x55, - 0x8d, 0xcb, 0xf8, 0xa8, 0x9e, 0x09, 0x40, 0x00, 0x46, 0x46, 0x1d, 0x1a, 0xc3, 0x2e, 0x9b, 0x6b, - 0xe9, 0x0c, 0x42, 0xe7, 0x63, 0xa6, 0xf3, 0x01, 0x6e, 0x46, 0x75, 0xf6, 0x7d, 0x5e, 0xaa, 0xf7, - 0x8f, 0x60, 0x76, 0xd7, 0x70, 0x2f, 0x50, 0x24, 0xf5, 0x29, 0x1f, 0x93, 0x34, 0x9b, 0x49, 0x5d, - 0x42, 0xcb, 0x03, 0xa6, 0x65, 0x85, 0x47, 0x12, 0x55, 0xcb, 0x85, 0xe1, 0xd2, 0x9c, 0x82, 0xfa, - 0x90, 0xe7, 0xdf, 0x96, 0x44, 0xfd, 0x17, 0xfa, 0x3e, 0x25, 0xea, 0xbf, 0xf0, 0xe7, 0x28, 0xb7, - 0x6b, 0x19, 0x41, 0x51, 0x7e, 0xcc, 0x81, 0x22, 0x6f, 0xf6, 0x22, 0x1f, 0x7e, 0x34, 0x57, 0xd3, - 0xba, 0x85, 0xae, 0x87, 0x4c, 0xd7, 0x7d, 0xdc, 0x88, 0xad, 0x95, 0xe0, 0x7c, 0xae, 0x3d, 0xfd, - 0x96, 0x86, 0x7e, 0x0c, 0x10, 0xe0, 0xb7, 0xb1, 0x03, 0x10, 0x85, 0x82, 0x63, 0x07, 0x20, 0x06, - 0xfd, 0xe2, 0x0d, 0xa6, 0x77, 0x1d, 0x3f, 0x8c, 0xea, 0xf5, 0x1c, 0xc3, 0x72, 0xdf, 0x10, 0xe7, - 0x23, 0x8e, 0xd1, 0xb9, 0x17, 0xe6, 0x88, 0x1e, 0x86, 0x7f, 0x9b, 0x83, 0x59, 0x5a, 0x80, 0xd2, - 0x3c, 0x1d, 0xdc, 0xdb, 0xa3, 0x96, 0xc4, 0xd0, 0xb2, 0xa8, 0x25, 0xf1, 0x2b, 0x7f, 0x38, 0x4f, - 0xb3, 0x9f, 0x1b, 0x10, 0xc6, 0x40, 0x1d, 0x6d, 0x43, 0x59, 0xb9, 0xd8, 0xa3, 0x04, 0x61, 0x61, - 0x18, 0x2e, 0x1a, 0xf9, 0x13, 0x50, 0x01, 0x7c, 0x97, 0xe9, 0x5b, 0xe2, 0x91, 0x9f, 0xe9, 0xeb, - 0x73, 0x0e, 0xaa, 0xf0, 0x2d, 0x54, 0xd4, 0xcb, 0x3f, 0x4a, 0x90, 0x17, 0x81, 0xf8, 0xa2, 0x51, - 0x2e, 0x09, 0x3b, 0x08, 0x1f, 0x7c, 0xff, 0x27, 0x15, 0x92, 0x8d, 0x2a, 0x1e, 0x40, 0x41, 0xa0, - 0x01, 0x49, 0xb3, 0x0c, 0xe3, 0x81, 0x49, 0xb3, 0x8c, 0x40, 0x09, 0xe1, 0xda, 0x8e, 0x69, 0xa4, - 0x17, 0x1e, 0x99, 0x49, 0x84, 0xb6, 0x97, 0xc4, 0x4b, 0xd3, 0x16, 0x80, 0x5b, 0x69, 0xda, 0x94, - 0xcb, 0x66, 0x9a, 0xb6, 0x73, 0xe2, 0x89, 0xe3, 0x22, 0x2f, 0x71, 0x28, 0x45, 0x98, 0x1a, 0xbd, - 0xf1, 0x4d, 0x2c, 0x49, 0xa5, 0x77, 0xa0, 0x50, 0x84, 0x6e, 0x74, 0x05, 0x10, 0x60, 0x15, 0xd1, - 0x7a, 0x2a, 0x11, 0xf0, 0x8c, 0xd6, 0x53, 0xc9, 0x70, 0x47, 0x38, 0x34, 0x04, 0x7a, 0x79, 0xe5, - 0x4f, 0x35, 0xff, 0x4c, 0x03, 0x14, 0x87, 0x35, 0xd0, 0xb3, 0x64, 0xe9, 0x89, 0x30, 0x6a, 0xf3, - 0xc3, 0x77, 0x63, 0x4e, 0x8a, 0xf6, 0x81, 0x49, 0x3d, 0xc6, 0x3d, 0x7a, 0x4b, 0x8d, 0xfa, 0x73, - 0x0d, 0xaa, 0x21, 0x4c, 0x04, 0xbd, 0x9f, 0xb2, 0xa6, 0x11, 0x14, 0xb6, 0xf9, 0xe4, 0x56, 0xbe, - 0xa4, 0x42, 0x53, 0xd9, 0x01, 0xb2, 0xe2, 0xfe, 0xa9, 0x06, 0xb5, 0x30, 0x86, 0x82, 0x52, 0x64, - 0xc7, 0x50, 0xdc, 0xe6, 0xfa, 0xed, 0x8c, 0x37, 0x2f, 0x4f, 0x50, 0x6c, 0x0f, 0xa0, 0x20, 0x50, - 0x97, 0xa4, 0x8d, 0x1f, 0xc6, 0x7f, 0x93, 0x36, 0x7e, 0x04, 0xb2, 0x49, 0xd8, 0xf8, 0x8e, 0x3d, - 0x20, 0xca, 0x31, 0x13, 0xb0, 0x4c, 0x9a, 0xb6, 0x9b, 0x8f, 0x59, 0x04, 0xd3, 0x49, 0xd3, 0x16, - 0x1c, 0x33, 0x89, 0xc7, 0xa0, 0x14, 0x61, 0xb7, 0x1c, 0xb3, 0x28, 0x9c, 0x93, 0x70, 0xcc, 0x98, - 0x42, 0xe5, 0x98, 0x05, 0xc8, 0x49, 0xd2, 0x31, 0x8b, 0xc1, 0xd9, 0x49, 0xc7, 0x2c, 0x0e, 0xbe, - 0x24, 0xac, 0x23, 0xd3, 0x1b, 0x3a, 0x66, 0x0b, 0x09, 0x20, 0x0b, 0xfa, 0x30, 0xc5, 0x89, 0x89, - 0x28, 0x79, 0xf3, 0xa3, 0x77, 0xe4, 0x4e, 0xdd, 0xe3, 0xdc, 0xfd, 0x72, 0x8f, 0xff, 0x8d, 0x06, - 0x8b, 0x49, 0x00, 0x0d, 0x4a, 0xd1, 0x93, 0x82, 0xae, 0x37, 0x37, 0xde, 0x95, 0xfd, 0x66, 0x6f, - 0xf9, 0xbb, 0xfe, 0x45, 0xfd, 0xdf, 0xbf, 0x5e, 0xd5, 0xfe, 0xf3, 0xeb, 0x55, 0xed, 0x7f, 0xbe, - 0x5e, 0xd5, 0xfe, 0xf6, 0x7f, 0x57, 0x67, 0xce, 0xf2, 0xec, 0x87, 0x7a, 0xdf, 0xf9, 0xff, 0x00, - 0x00, 0x00, 0xff, 0xff, 0xc6, 0xc3, 0xa2, 0xb2, 0x2f, 0x38, 0x00, 0x00, + // 3857 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x5b, 0xdd, 0x6f, 0x1b, 0x49, + 0x72, 0xd7, 0x90, 0xe2, 0x57, 0xf1, 0x43, 0x54, 0xeb, 0xc3, 0x14, 0x6d, 0xcb, 0xda, 0xf6, 0x7a, + 0xad, 0xb5, 0x77, 0xc5, 0x3d, 0xdd, 0x5d, 0x02, 0x38, 0xc9, 0xe5, 0x64, 0x89, 0x6b, 0x69, 0x25, + 0x8b, 0xda, 0x11, 0xe5, 0xfd, 0xc0, 0x21, 0xc2, 0x88, 0x6c, 0x4b, 0x13, 0x91, 0x33, 0xbc, 0x99, + 0x21, 0x2d, 0x6d, 0x82, 0x5c, 0x70, 0xb8, 0x04, 0x48, 0x1e, 0xef, 0x80, 0x20, 0x79, 0xc8, 0x53, + 0x10, 0x04, 0xf7, 0x10, 0x20, 0x6f, 0x01, 0xf2, 0x17, 0xe4, 0x2d, 0x09, 0xf2, 0x0f, 0x04, 0x9b, + 0x7b, 0xc9, 0x7f, 0x11, 0xf4, 0xd7, 0x4c, 0xcf, 0x97, 0xe4, 0x3b, 0xde, 0xee, 0x8b, 0xcd, 0xae, + 0xae, 0xae, 0xaa, 0xae, 0xee, 0xae, 0xaa, 0xfe, 0xf5, 0x08, 0x4a, 0xce, 0xa8, 0xb7, 0x31, 0x72, + 0x6c, 0xcf, 0x46, 0x15, 0xe2, 0xf5, 0xfa, 0x2e, 0x71, 0x26, 0xc4, 0x19, 0x9d, 0x35, 0x17, 0xcf, + 0xed, 0x73, 0x9b, 0x75, 0xb4, 0xe8, 0x2f, 0xce, 0xd3, 0x5c, 0xa1, 0x3c, 0xad, 0xe1, 0xa4, 0xd7, + 0x63, 0xff, 0x8c, 0xce, 0x5a, 0x97, 0x13, 0xd1, 0x75, 0x97, 0x75, 0x19, 0x63, 0xef, 0x82, 0xfd, + 0x33, 0x3a, 0x63, 0xff, 0x89, 0xce, 0x7b, 0xe7, 0xb6, 0x7d, 0x3e, 0x20, 0x2d, 0x63, 0x64, 0xb6, + 0x0c, 0xcb, 0xb2, 0x3d, 0xc3, 0x33, 0x6d, 0xcb, 0xe5, 0xbd, 0xf8, 0x2f, 0x34, 0xa8, 0xe9, 0xc4, + 0x1d, 0xd9, 0x96, 0x4b, 0x76, 0x89, 0xd1, 0x27, 0x0e, 0xba, 0x0f, 0xd0, 0x1b, 0x8c, 0x5d, 0x8f, + 0x38, 0xa7, 0x66, 0xbf, 0xa1, 0xad, 0x69, 0xeb, 0xb3, 0x7a, 0x49, 0x50, 0xf6, 0xfa, 0xe8, 0x2e, + 0x94, 0x86, 0x64, 0x78, 0xc6, 0x7b, 0x33, 0xac, 0xb7, 0xc8, 0x09, 0x7b, 0x7d, 0xd4, 0x84, 0xa2, + 0x43, 0x26, 0xa6, 0x6b, 0xda, 0x56, 0x23, 0xbb, 0xa6, 0xad, 0x67, 0x75, 0xbf, 0x4d, 0x07, 0x3a, + 0xc6, 0x6b, 0xef, 0xd4, 0x23, 0xce, 0xb0, 0x31, 0xcb, 0x07, 0x52, 0x42, 0x97, 0x38, 0x43, 0xfc, + 0xb3, 0x1c, 0x54, 0x74, 0xc3, 0x3a, 0x27, 0x3a, 0xf9, 0xf1, 0x98, 0xb8, 0x1e, 0xaa, 0x43, 0xf6, + 0x92, 0x5c, 0x33, 0xf5, 0x15, 0x9d, 0xfe, 0xe4, 0xe3, 0xad, 0x73, 0x72, 0x4a, 0x2c, 0xae, 0xb8, + 0x42, 0xc7, 0x5b, 0xe7, 0xa4, 0x6d, 0xf5, 0xd1, 0x22, 0xe4, 0x06, 0xe6, 0xd0, 0xf4, 0x84, 0x56, + 0xde, 0x08, 0x99, 0x33, 0x1b, 0x31, 0x67, 0x1b, 0xc0, 0xb5, 0x1d, 0xef, 0xd4, 0x76, 0xfa, 0xc4, + 0x69, 0xe4, 0xd6, 0xb4, 0xf5, 0xda, 0xe6, 0xbb, 0x1b, 0xea, 0x42, 0x6c, 0xa8, 0x06, 0x6d, 0x1c, + 0xdb, 0x8e, 0xd7, 0xa1, 0xbc, 0x7a, 0xc9, 0x95, 0x3f, 0xd1, 0xc7, 0x50, 0x66, 0x42, 0x3c, 0xc3, + 0x39, 0x27, 0x5e, 0x23, 0xcf, 0xa4, 0x3c, 0xba, 0x45, 0x4a, 0x97, 0x31, 0xeb, 0x4c, 0x3d, 0xff, + 0x8d, 0x30, 0x54, 0x5c, 0xe2, 0x98, 0xc6, 0xc0, 0xfc, 0xca, 0x38, 0x1b, 0x90, 0x46, 0x61, 0x4d, + 0x5b, 0x2f, 0xea, 0x21, 0x1a, 0x9d, 0xff, 0x25, 0xb9, 0x76, 0x4f, 0x6d, 0x6b, 0x70, 0xdd, 0x28, + 0x32, 0x86, 0x22, 0x25, 0x74, 0xac, 0xc1, 0x35, 0x5b, 0x34, 0x7b, 0x6c, 0x79, 0xbc, 0xb7, 0xc4, + 0x7a, 0x4b, 0x8c, 0xc2, 0xba, 0xd7, 0xa1, 0x3e, 0x34, 0xad, 0xd3, 0xa1, 0xdd, 0x3f, 0xf5, 0x1d, + 0x02, 0xcc, 0x21, 0xb5, 0xa1, 0x69, 0xbd, 0xb4, 0xfb, 0xba, 0x74, 0x0b, 0xe5, 0x34, 0xae, 0xc2, + 0x9c, 0x65, 0xc1, 0x69, 0x5c, 0xa9, 0x9c, 0x1b, 0xb0, 0x40, 0x65, 0xf6, 0x1c, 0x62, 0x78, 0x24, + 0x60, 0xae, 0x30, 0xe6, 0xf9, 0xa1, 0x69, 0x6d, 0xb3, 0x9e, 0x10, 0xbf, 0x71, 0x15, 0xe3, 0xaf, + 0x0a, 0x7e, 0xe3, 0x2a, 0xcc, 0x8f, 0x37, 0xa0, 0xe4, 0xfb, 0x1c, 0x15, 0x61, 0xf6, 0xb0, 0x73, + 0xd8, 0xae, 0xcf, 0x20, 0x80, 0xfc, 0xd6, 0xf1, 0x76, 0xfb, 0x70, 0xa7, 0xae, 0xa1, 0x32, 0x14, + 0x76, 0xda, 0xbc, 0x91, 0xc1, 0xcf, 0x01, 0x02, 0xef, 0xa2, 0x02, 0x64, 0xf7, 0xdb, 0x5f, 0xd4, + 0x67, 0x28, 0xcf, 0xab, 0xb6, 0x7e, 0xbc, 0xd7, 0x39, 0xac, 0x6b, 0x74, 0xf0, 0xb6, 0xde, 0xde, + 0xea, 0xb6, 0xeb, 0x19, 0xca, 0xf1, 0xb2, 0xb3, 0x53, 0xcf, 0xa2, 0x12, 0xe4, 0x5e, 0x6d, 0x1d, + 0x9c, 0xb4, 0xeb, 0xb3, 0xf8, 0x17, 0x1a, 0x54, 0xc5, 0x7a, 0xf1, 0x33, 0x81, 0xbe, 0x07, 0xf9, + 0x0b, 0x76, 0x2e, 0xd8, 0x56, 0x2c, 0x6f, 0xde, 0x8b, 0x2c, 0x6e, 0xe8, 0xec, 0xe8, 0x82, 0x17, + 0x61, 0xc8, 0x5e, 0x4e, 0xdc, 0x46, 0x66, 0x2d, 0xbb, 0x5e, 0xde, 0xac, 0x6f, 0xf0, 0x03, 0xbb, + 0xb1, 0x4f, 0xae, 0x5f, 0x19, 0x83, 0x31, 0xd1, 0x69, 0x27, 0x42, 0x30, 0x3b, 0xb4, 0x1d, 0xc2, + 0x76, 0x6c, 0x51, 0x67, 0xbf, 0xe9, 0x36, 0x66, 0x8b, 0x26, 0x76, 0x2b, 0x6f, 0xe0, 0x5f, 0x6a, + 0x00, 0x47, 0x63, 0x2f, 0xfd, 0x68, 0x2c, 0x42, 0x6e, 0x42, 0x05, 0x8b, 0x63, 0xc1, 0x1b, 0xec, + 0x4c, 0x10, 0xc3, 0x25, 0xfe, 0x99, 0xa0, 0x0d, 0x74, 0x07, 0x0a, 0x23, 0x87, 0x4c, 0x4e, 0x2f, + 0x27, 0x4c, 0x49, 0x51, 0xcf, 0xd3, 0xe6, 0xfe, 0x04, 0xbd, 0x03, 0x15, 0xf3, 0xdc, 0xb2, 0x1d, + 0x72, 0xca, 0x65, 0xe5, 0x58, 0x6f, 0x99, 0xd3, 0x98, 0xdd, 0x0a, 0x0b, 0x17, 0x9c, 0x57, 0x59, + 0x0e, 0x28, 0x09, 0x5b, 0x50, 0x66, 0xa6, 0x4e, 0xe5, 0xbe, 0xf7, 0x03, 0x1b, 0x33, 0x6c, 0x58, + 0xdc, 0x85, 0xc2, 0x6a, 0xfc, 0x23, 0x40, 0x3b, 0x64, 0x40, 0x3c, 0x32, 0x4d, 0xf4, 0x50, 0x7c, + 0x92, 0x55, 0x7d, 0x82, 0x7f, 0xae, 0xc1, 0x42, 0x48, 0xfc, 0x54, 0xd3, 0x6a, 0x40, 0xa1, 0xcf, + 0x84, 0x71, 0x0b, 0xb2, 0xba, 0x6c, 0xa2, 0xa7, 0x50, 0x14, 0x06, 0xb8, 0x8d, 0x6c, 0xca, 0xa6, + 0x29, 0x70, 0x9b, 0x5c, 0xfc, 0xcb, 0x0c, 0x94, 0xc4, 0x44, 0x3b, 0x23, 0xb4, 0x05, 0x55, 0x87, + 0x37, 0x4e, 0xd9, 0x7c, 0x84, 0x45, 0xcd, 0xf4, 0x20, 0xb4, 0x3b, 0xa3, 0x57, 0xc4, 0x10, 0x46, + 0x46, 0xbf, 0x07, 0x65, 0x29, 0x62, 0x34, 0xf6, 0x84, 0xcb, 0x1b, 0x61, 0x01, 0xc1, 0xfe, 0xdb, + 0x9d, 0xd1, 0x41, 0xb0, 0x1f, 0x8d, 0x3d, 0xd4, 0x85, 0x45, 0x39, 0x98, 0xcf, 0x46, 0x98, 0x91, + 0x65, 0x52, 0xd6, 0xc2, 0x52, 0xe2, 0x4b, 0xb5, 0x3b, 0xa3, 0x23, 0x31, 0x5e, 0xe9, 0x54, 0x4d, + 0xf2, 0xae, 0x78, 0xf0, 0x8e, 0x99, 0xd4, 0xbd, 0xb2, 0xe2, 0x26, 0x75, 0xaf, 0xac, 0xe7, 0x25, + 0x28, 0x88, 0x16, 0xfe, 0xd7, 0x0c, 0x80, 0x5c, 0x8d, 0xce, 0x08, 0xed, 0x40, 0xcd, 0x11, 0xad, + 0x90, 0xb7, 0xee, 0x26, 0x7a, 0x4b, 0x2c, 0xe2, 0x8c, 0x5e, 0x95, 0x83, 0xb8, 0x71, 0x3f, 0x80, + 0x8a, 0x2f, 0x25, 0x70, 0xd8, 0x4a, 0x82, 0xc3, 0x7c, 0x09, 0x65, 0x39, 0x80, 0xba, 0xec, 0x33, + 0x58, 0xf2, 0xc7, 0x27, 0xf8, 0xec, 0x9d, 0x1b, 0x7c, 0xe6, 0x0b, 0x5c, 0x90, 0x12, 0x54, 0xaf, + 0xa9, 0x86, 0x05, 0x6e, 0x5b, 0x49, 0x70, 0x5b, 0xdc, 0x30, 0xea, 0x38, 0xa0, 0xf9, 0x92, 0x37, + 0xf1, 0xff, 0x65, 0xa1, 0xb0, 0x6d, 0x0f, 0x47, 0x86, 0x43, 0x57, 0x23, 0xef, 0x10, 0x77, 0x3c, + 0xf0, 0x98, 0xbb, 0x6a, 0x9b, 0x0f, 0xc3, 0x12, 0x05, 0x9b, 0xfc, 0x5f, 0x67, 0xac, 0xba, 0x18, + 0x42, 0x07, 0x8b, 0xf4, 0x98, 0x79, 0x8b, 0xc1, 0x22, 0x39, 0x8a, 0x21, 0xf2, 0x20, 0x67, 0x83, + 0x83, 0xdc, 0x84, 0xc2, 0x84, 0x38, 0x41, 0x4a, 0xdf, 0x9d, 0xd1, 0x25, 0x01, 0xbd, 0x0f, 0x73, + 0xd1, 0xf4, 0x92, 0x13, 0x3c, 0xb5, 0x5e, 0x38, 0x1b, 0x3d, 0x84, 0x4a, 0x28, 0xc7, 0xe5, 0x05, + 0x5f, 0x79, 0xa8, 0xa4, 0xb8, 0x65, 0x19, 0x57, 0x69, 0x3e, 0xae, 0xec, 0xce, 0xc8, 0xc8, 0xba, + 0x2c, 0x23, 0x6b, 0x51, 0x8c, 0x12, 0xb1, 0x35, 0x14, 0x64, 0x7e, 0x18, 0x0e, 0x32, 0xf8, 0x87, + 0x50, 0x0d, 0x39, 0x88, 0xe6, 0x9d, 0xf6, 0xa7, 0x27, 0x5b, 0x07, 0x3c, 0x49, 0xbd, 0x60, 0x79, + 0x49, 0xaf, 0x6b, 0x34, 0xd7, 0x1d, 0xb4, 0x8f, 0x8f, 0xeb, 0x19, 0x54, 0x85, 0xd2, 0x61, 0xa7, + 0x7b, 0xca, 0xb9, 0xb2, 0xf8, 0x85, 0x2f, 0x41, 0x24, 0x39, 0x25, 0xb7, 0xcd, 0x28, 0xb9, 0x4d, + 0x93, 0xb9, 0x2d, 0x13, 0xe4, 0x36, 0x96, 0xe6, 0x0e, 0xda, 0x5b, 0xc7, 0xed, 0xfa, 0xec, 0xf3, + 0x1a, 0x54, 0xb8, 0x7f, 0x4f, 0xc7, 0x16, 0x4d, 0xb5, 0xff, 0xa0, 0x01, 0x04, 0xa7, 0x09, 0xb5, + 0xa0, 0xd0, 0xe3, 0x7a, 0x1a, 0x1a, 0x0b, 0x46, 0x4b, 0x89, 0x4b, 0xa6, 0x4b, 0x2e, 0xf4, 0x1d, + 0x28, 0xb8, 0xe3, 0x5e, 0x8f, 0xb8, 0x32, 0xe5, 0xdd, 0x89, 0xc6, 0x43, 0x11, 0xad, 0x74, 0xc9, + 0x47, 0x87, 0xbc, 0x36, 0xcc, 0xc1, 0x98, 0x25, 0xc0, 0x9b, 0x87, 0x08, 0x3e, 0xfc, 0x77, 0x1a, + 0x94, 0x95, 0xcd, 0xfb, 0x1b, 0x06, 0xe1, 0x7b, 0x50, 0x62, 0x36, 0x90, 0xbe, 0x08, 0xc3, 0x45, + 0x3d, 0x20, 0xa0, 0xdf, 0x81, 0x92, 0x3c, 0x01, 0x32, 0x12, 0x37, 0x92, 0xc5, 0x76, 0x46, 0x7a, + 0xc0, 0x8a, 0xf7, 0x61, 0x9e, 0x79, 0xa5, 0x47, 0x8b, 0x6b, 0xe9, 0x47, 0xb5, 0xfc, 0xd4, 0x22, + 0xe5, 0x67, 0x13, 0x8a, 0xa3, 0x8b, 0x6b, 0xd7, 0xec, 0x19, 0x03, 0x61, 0x85, 0xdf, 0xc6, 0x9f, + 0x00, 0x52, 0x85, 0x4d, 0x33, 0x5d, 0x5c, 0x85, 0xf2, 0xae, 0xe1, 0x5e, 0x08, 0x93, 0xf0, 0x53, + 0xa8, 0xd2, 0xe6, 0xfe, 0xab, 0xb7, 0xb0, 0x91, 0x5d, 0x0e, 0x24, 0xf7, 0x54, 0x3e, 0x47, 0x30, + 0x7b, 0x61, 0xb8, 0x17, 0x6c, 0xa2, 0x55, 0x9d, 0xfd, 0x46, 0xef, 0x43, 0xbd, 0xc7, 0x27, 0x79, + 0x1a, 0xb9, 0x32, 0xcc, 0x09, 0xba, 0x5f, 0x09, 0x7e, 0x0e, 0x15, 0x3e, 0x87, 0xdf, 0xb6, 0x11, + 0x78, 0x1e, 0xe6, 0x8e, 0x2d, 0x63, 0xe4, 0x5e, 0xd8, 0x32, 0xbb, 0xd1, 0x49, 0xd7, 0x03, 0xda, + 0x54, 0x1a, 0x1f, 0xc3, 0x9c, 0x43, 0x86, 0x86, 0x69, 0x99, 0xd6, 0xf9, 0xe9, 0xd9, 0xb5, 0x47, + 0x5c, 0x71, 0x61, 0xaa, 0xf9, 0xe4, 0xe7, 0x94, 0x4a, 0x4d, 0x3b, 0x1b, 0xd8, 0x67, 0x22, 0xcc, + 0xb1, 0xdf, 0xf8, 0x2f, 0x33, 0x50, 0xf9, 0xcc, 0xf0, 0x7a, 0x72, 0xe9, 0xd0, 0x1e, 0xd4, 0xfc, + 0xe0, 0xc6, 0x28, 0xc2, 0x96, 0x48, 0x8a, 0x65, 0x63, 0x64, 0x29, 0x2d, 0xb3, 0x63, 0xb5, 0xa7, + 0x12, 0x98, 0x28, 0xc3, 0xea, 0x91, 0x81, 0x2f, 0x2a, 0x93, 0x2e, 0x8a, 0x31, 0xaa, 0xa2, 0x54, + 0x02, 0xea, 0x40, 0x7d, 0xe4, 0xd8, 0xe7, 0x0e, 0x71, 0x5d, 0x5f, 0x18, 0x4f, 0x63, 0x38, 0x41, + 0xd8, 0x91, 0x60, 0x0d, 0xc4, 0xcd, 0x8d, 0xc2, 0xa4, 0xe7, 0x73, 0x41, 0x3d, 0xc3, 0x83, 0xd3, + 0x7f, 0x65, 0x00, 0xc5, 0x27, 0xf5, 0xeb, 0x96, 0x78, 0x8f, 0xa0, 0xe6, 0x7a, 0x86, 0x13, 0xdb, + 0x6c, 0x55, 0x46, 0xf5, 0x23, 0xfe, 0x63, 0xf0, 0x0d, 0x3a, 0xb5, 0x6c, 0xcf, 0x7c, 0x7d, 0x2d, + 0xaa, 0xe4, 0x9a, 0x24, 0x1f, 0x32, 0x2a, 0x6a, 0x43, 0xe1, 0xb5, 0x39, 0xf0, 0x88, 0xe3, 0x36, + 0x72, 0x6b, 0xd9, 0xf5, 0xda, 0xe6, 0xd3, 0xdb, 0x96, 0x61, 0xe3, 0x63, 0xc6, 0xdf, 0xbd, 0x1e, + 0x11, 0x5d, 0x8e, 0x55, 0x2b, 0xcf, 0x7c, 0xa8, 0x1a, 0x5f, 0x81, 0xe2, 0x1b, 0x2a, 0x82, 0xde, + 0xb2, 0x0b, 0xbc, 0x58, 0x64, 0x6d, 0x7e, 0xc9, 0x7e, 0xed, 0x18, 0xe7, 0x43, 0x62, 0x79, 0xf2, + 0x1e, 0x28, 0xdb, 0xf8, 0x11, 0x40, 0xa0, 0x86, 0x86, 0xfc, 0xc3, 0xce, 0xd1, 0x49, 0xb7, 0x3e, + 0x83, 0x2a, 0x50, 0x3c, 0xec, 0xec, 0xb4, 0x0f, 0xda, 0x34, 0x3f, 0xe0, 0x96, 0x74, 0x69, 0x68, + 0x2d, 0x55, 0x9d, 0x5a, 0x48, 0x27, 0x5e, 0x86, 0xc5, 0xa4, 0x05, 0xa4, 0xb5, 0x68, 0x55, 0xec, + 0xd2, 0xa9, 0x8e, 0x8a, 0xaa, 0x3a, 0x13, 0x9e, 0x6e, 0x03, 0x0a, 0x7c, 0xf7, 0xf6, 0x45, 0x71, + 0x2e, 0x9b, 0xd4, 0x11, 0x7c, 0x33, 0x92, 0xbe, 0x58, 0x25, 0xbf, 0x9d, 0x18, 0x5e, 0x72, 0x89, + 0xe1, 0x05, 0x3d, 0x84, 0xaa, 0x7f, 0x1a, 0x0c, 0x57, 0xd4, 0x02, 0x25, 0xbd, 0x22, 0x37, 0x3a, + 0xa5, 0x85, 0x9c, 0x5e, 0x08, 0x3b, 0x1d, 0x3d, 0x82, 0x3c, 0x99, 0x10, 0xcb, 0x73, 0x1b, 0x65, + 0x96, 0x31, 0xaa, 0xb2, 0x76, 0x6f, 0x53, 0xaa, 0x2e, 0x3a, 0xf1, 0xf7, 0x61, 0x9e, 0xdd, 0x91, + 0x5e, 0x38, 0x86, 0xa5, 0x5e, 0xe6, 0xba, 0xdd, 0x03, 0xe1, 0x6e, 0xfa, 0x13, 0xd5, 0x20, 0xb3, + 0xb7, 0x23, 0x9c, 0x90, 0xd9, 0xdb, 0xc1, 0x3f, 0xd5, 0x00, 0xa9, 0xe3, 0xa6, 0xf2, 0x73, 0x44, + 0xb8, 0x54, 0x9f, 0x0d, 0xd4, 0x2f, 0x42, 0x8e, 0x38, 0x8e, 0xed, 0x30, 0x8f, 0x96, 0x74, 0xde, + 0xc0, 0xef, 0x0a, 0x1b, 0x74, 0x32, 0xb1, 0x2f, 0xfd, 0x33, 0xc8, 0xa5, 0x69, 0xbe, 0xa9, 0xfb, + 0xb0, 0x10, 0xe2, 0x9a, 0x2a, 0x73, 0x7d, 0x0c, 0x73, 0x4c, 0xd8, 0xf6, 0x05, 0xe9, 0x5d, 0x8e, + 0x6c, 0xd3, 0x8a, 0xe9, 0xa3, 0x2b, 0x17, 0x04, 0x58, 0x3a, 0x0f, 0x3e, 0xb1, 0x8a, 0x4f, 0xec, + 0x76, 0x0f, 0xf0, 0x17, 0xb0, 0x1c, 0x91, 0x23, 0xcd, 0xff, 0x43, 0x28, 0xf7, 0x7c, 0xa2, 0x2b, + 0x6a, 0x9d, 0xfb, 0x61, 0xe3, 0xa2, 0x43, 0xd5, 0x11, 0xb8, 0x03, 0x77, 0x62, 0xa2, 0xa7, 0x9a, + 0xf3, 0x63, 0x58, 0x62, 0x02, 0xf7, 0x09, 0x19, 0x6d, 0x0d, 0xcc, 0x49, 0xaa, 0xa7, 0x47, 0x62, + 0x52, 0x0a, 0xe3, 0x37, 0xbb, 0x2f, 0xf0, 0xef, 0x0b, 0x8d, 0x5d, 0x73, 0x48, 0xba, 0xf6, 0x41, + 0xba, 0x6d, 0x34, 0x9b, 0x5d, 0x92, 0x6b, 0x57, 0x94, 0x35, 0xec, 0x37, 0xfe, 0x47, 0x4d, 0xb8, + 0x4a, 0x1d, 0xfe, 0x0d, 0xef, 0xe4, 0x55, 0x80, 0x73, 0x7a, 0x64, 0x48, 0x9f, 0x76, 0x70, 0x44, + 0x45, 0xa1, 0xf8, 0x76, 0xd2, 0xf8, 0x5d, 0x11, 0x76, 0x2e, 0x8a, 0x7d, 0xce, 0xfe, 0xf1, 0xa3, + 0xdc, 0x7d, 0x28, 0x33, 0xc2, 0xb1, 0x67, 0x78, 0x63, 0x37, 0xb6, 0x18, 0x7f, 0x26, 0xb6, 0xbd, + 0x1c, 0x34, 0xd5, 0xbc, 0xbe, 0x03, 0x79, 0x76, 0x99, 0x90, 0xa5, 0xf4, 0x4a, 0xc2, 0x7e, 0xe4, + 0x76, 0xe8, 0x82, 0x11, 0x5f, 0x40, 0xfe, 0x25, 0x43, 0x60, 0x15, 0xcb, 0x66, 0xe5, 0x52, 0x58, + 0xc6, 0x90, 0xe3, 0x42, 0x25, 0x9d, 0xfd, 0x66, 0x95, 0x27, 0x21, 0xce, 0x89, 0x7e, 0xc0, 0x2b, + 0xdc, 0x92, 0xee, 0xb7, 0xa9, 0xcb, 0x7a, 0x03, 0x93, 0x58, 0x1e, 0xeb, 0x9d, 0x65, 0xbd, 0x0a, + 0x05, 0x6f, 0x40, 0x9d, 0x6b, 0xda, 0xea, 0xf7, 0x95, 0x0a, 0xd2, 0x97, 0xa7, 0x85, 0xe5, 0xe1, + 0x7f, 0xd2, 0x60, 0x5e, 0x19, 0x30, 0x95, 0x63, 0x3e, 0x80, 0x3c, 0xc7, 0x99, 0x45, 0xb1, 0xb2, + 0x18, 0x1e, 0xc5, 0xd5, 0xe8, 0x82, 0x07, 0x6d, 0x40, 0x81, 0xff, 0x92, 0x65, 0x7c, 0x32, 0xbb, + 0x64, 0xc2, 0x8f, 0x60, 0x41, 0x90, 0xc8, 0xd0, 0x4e, 0xda, 0xdb, 0xcc, 0xa1, 0xf8, 0x4f, 0x61, + 0x31, 0xcc, 0x36, 0xd5, 0x94, 0x14, 0x23, 0x33, 0x6f, 0x63, 0xe4, 0x96, 0x34, 0xf2, 0x64, 0xd4, + 0x57, 0x4a, 0xa1, 0xe8, 0xaa, 0xab, 0x2b, 0x92, 0x89, 0xac, 0x88, 0x3f, 0x01, 0x29, 0xe2, 0x5b, + 0x9d, 0xc0, 0x82, 0xdc, 0x0e, 0x07, 0xa6, 0xeb, 0x57, 0xdc, 0x5f, 0x01, 0x52, 0x89, 0xdf, 0xb6, + 0x41, 0x3b, 0x44, 0x26, 0x72, 0x69, 0xd0, 0x27, 0x80, 0x54, 0xe2, 0x54, 0x11, 0xbd, 0x05, 0xf3, + 0x2f, 0xed, 0x09, 0x0d, 0x0d, 0x94, 0x1a, 0x1c, 0x19, 0x7e, 0xff, 0xf6, 0x97, 0xcd, 0x6f, 0x53, + 0xe5, 0xea, 0x80, 0xa9, 0x94, 0xff, 0x87, 0x06, 0x95, 0xad, 0x81, 0xe1, 0x0c, 0xa5, 0xe2, 0x1f, + 0x40, 0x9e, 0xdf, 0x2a, 0x05, 0x90, 0xf3, 0x5e, 0x58, 0x8c, 0xca, 0xcb, 0x1b, 0x5b, 0xfc, 0x0e, + 0x2a, 0x46, 0x51, 0xc3, 0xc5, 0x5b, 0xcf, 0x4e, 0xe4, 0xed, 0x67, 0x07, 0x7d, 0x08, 0x39, 0x83, + 0x0e, 0x61, 0x21, 0xb8, 0x16, 0xbd, 0xcf, 0x33, 0x69, 0xac, 0xf6, 0xe5, 0x5c, 0xf8, 0x7b, 0x50, + 0x56, 0x34, 0xa0, 0x02, 0x64, 0x5f, 0xb4, 0x45, 0xa1, 0xba, 0xb5, 0xdd, 0xdd, 0x7b, 0xc5, 0x81, + 0x8c, 0x1a, 0xc0, 0x4e, 0xdb, 0x6f, 0x67, 0xf0, 0xe7, 0x62, 0x94, 0x88, 0x77, 0xaa, 0x3d, 0x5a, + 0x9a, 0x3d, 0x99, 0xb7, 0xb2, 0xe7, 0x0a, 0xaa, 0x62, 0xfa, 0xd3, 0x86, 0x6f, 0x26, 0x2f, 0x25, + 0x7c, 0x2b, 0xc6, 0xeb, 0x82, 0x11, 0xcf, 0x41, 0x55, 0x04, 0x74, 0xb1, 0xff, 0xfe, 0x25, 0x03, + 0x35, 0x49, 0x99, 0x16, 0x70, 0x96, 0x58, 0x19, 0xcf, 0x00, 0x3e, 0x52, 0xb6, 0x0c, 0xf9, 0xfe, + 0xd9, 0xb1, 0xf9, 0x95, 0x7c, 0x1c, 0x10, 0x2d, 0x4a, 0x1f, 0x70, 0x3d, 0xfc, 0x85, 0x4e, 0xb4, + 0xd0, 0x3d, 0xfe, 0x78, 0xb7, 0x67, 0xf5, 0xc9, 0x15, 0xab, 0xa3, 0x67, 0xf5, 0x80, 0xc0, 0x40, + 0x04, 0xf1, 0x92, 0xc7, 0x8a, 0x67, 0xe5, 0x65, 0x0f, 0x3d, 0x81, 0x3a, 0xfd, 0xbd, 0x35, 0x1a, + 0x0d, 0x4c, 0xd2, 0xe7, 0x02, 0x0a, 0x8c, 0x27, 0x46, 0xa7, 0xda, 0x59, 0xb9, 0xe9, 0x36, 0x8a, + 0x2c, 0x6c, 0x89, 0x16, 0x5a, 0x83, 0x32, 0xb7, 0x6f, 0xcf, 0x3a, 0x71, 0x09, 0x7b, 0xde, 0xca, + 0xea, 0x2a, 0x89, 0x9e, 0xe3, 0xad, 0xb1, 0x77, 0xd1, 0xb6, 0x8c, 0xb3, 0x81, 0x8c, 0x8b, 0x34, + 0x99, 0x53, 0xe2, 0x8e, 0xe9, 0xaa, 0xd4, 0x36, 0x2c, 0x50, 0x2a, 0xb1, 0x3c, 0xb3, 0xa7, 0x04, + 0x51, 0x99, 0x2a, 0xb5, 0x48, 0xaa, 0x34, 0x5c, 0xf7, 0x8d, 0xed, 0xf4, 0x85, 0x03, 0xfd, 0x36, + 0x9e, 0x70, 0xe1, 0x27, 0x6e, 0x28, 0x19, 0xfe, 0x9a, 0x52, 0xd0, 0x47, 0x50, 0xb0, 0x47, 0xec, + 0x41, 0x56, 0xdc, 0x9a, 0x97, 0x37, 0xf8, 0x13, 0xee, 0x86, 0x10, 0xdc, 0xe1, 0xbd, 0xba, 0x64, + 0xc3, 0xeb, 0x81, 0xde, 0x17, 0xc4, 0xbb, 0x41, 0x2f, 0x7e, 0x0a, 0x4b, 0x92, 0x53, 0x80, 0xc4, + 0x37, 0x30, 0x77, 0xe0, 0xbe, 0x64, 0xde, 0xbe, 0xa0, 0x97, 0xe6, 0x23, 0x61, 0xe2, 0x6f, 0xea, + 0x9f, 0xe7, 0xd0, 0xf0, 0xed, 0x64, 0x17, 0x17, 0x7b, 0xa0, 0x1a, 0x30, 0x76, 0xc5, 0x5e, 0x2e, + 0xe9, 0xec, 0x37, 0xa5, 0x39, 0xf6, 0xc0, 0x2f, 0x55, 0xe8, 0x6f, 0xbc, 0x0d, 0x2b, 0x52, 0x86, + 0xb8, 0x52, 0x84, 0x85, 0xc4, 0x0c, 0x4a, 0x12, 0x22, 0x1c, 0x46, 0x87, 0xde, 0xbc, 0x50, 0x2a, + 0x67, 0xd8, 0xb5, 0x4c, 0xa6, 0xa6, 0xc8, 0x5c, 0xe2, 0x7b, 0x88, 0x1a, 0xa6, 0x66, 0x32, 0x41, + 0xa6, 0x02, 0x54, 0xb2, 0x58, 0x08, 0x4a, 0x8e, 0x2d, 0x44, 0x4c, 0xf4, 0x8f, 0x60, 0xd5, 0x37, + 0x82, 0xfa, 0xed, 0x88, 0x38, 0x43, 0xd3, 0x75, 0x15, 0x58, 0x31, 0x69, 0xe2, 0xef, 0xc1, 0xec, + 0x88, 0x88, 0x58, 0x57, 0xde, 0x44, 0x72, 0x13, 0x29, 0x83, 0x59, 0x3f, 0xee, 0xc3, 0x03, 0x29, + 0x9d, 0x7b, 0x34, 0x51, 0x7c, 0xd4, 0x28, 0x09, 0xb6, 0x64, 0x52, 0xc0, 0x96, 0x6c, 0x04, 0xea, + 0xfe, 0x84, 0x3b, 0x52, 0x9e, 0xc6, 0xa9, 0x72, 0xd8, 0x3e, 0xf7, 0xa9, 0x7f, 0x88, 0xa7, 0x12, + 0x76, 0x06, 0x8b, 0xe1, 0xb3, 0x3f, 0x55, 0x78, 0x5d, 0x84, 0x9c, 0x67, 0x5f, 0x12, 0x19, 0x5c, + 0x79, 0x43, 0x1a, 0xec, 0x07, 0x86, 0xa9, 0x0c, 0x36, 0x02, 0x61, 0x6c, 0x4b, 0x4e, 0x6b, 0x2f, + 0x5d, 0x4d, 0x59, 0x14, 0xf2, 0x06, 0x3e, 0x84, 0xe5, 0x68, 0x98, 0x98, 0xca, 0xe4, 0x57, 0x7c, + 0x03, 0x27, 0x45, 0x92, 0xa9, 0xe4, 0x7e, 0x1a, 0x04, 0x03, 0x25, 0xa0, 0x4c, 0x25, 0x52, 0x87, + 0x66, 0x52, 0x7c, 0xf9, 0x6d, 0xec, 0x57, 0x3f, 0xdc, 0x4c, 0x25, 0xcc, 0x0d, 0x84, 0x4d, 0xbf, + 0xfc, 0x41, 0x8c, 0xc8, 0xde, 0x18, 0x23, 0xc4, 0x21, 0x09, 0xa2, 0xd8, 0x37, 0xb0, 0xe9, 0x84, + 0x8e, 0x20, 0x80, 0x4e, 0xab, 0x83, 0xe6, 0x10, 0x5f, 0x07, 0x6b, 0xc8, 0x8d, 0xad, 0x86, 0xdd, + 0xa9, 0x16, 0xe3, 0xb3, 0x20, 0x76, 0xc6, 0x22, 0xf3, 0x54, 0x82, 0x3f, 0x87, 0xb5, 0xf4, 0xa0, + 0x3c, 0x8d, 0xe4, 0x27, 0x2d, 0x28, 0xf9, 0x85, 0xae, 0xf2, 0x0d, 0x4d, 0x19, 0x0a, 0x87, 0x9d, + 0xe3, 0xa3, 0xad, 0xed, 0x36, 0xff, 0x88, 0x66, 0xbb, 0xa3, 0xeb, 0x27, 0x47, 0xdd, 0x7a, 0x66, + 0xf3, 0x57, 0x59, 0xc8, 0xec, 0xbf, 0x42, 0x5f, 0x40, 0x8e, 0xbf, 0x28, 0xdf, 0xf0, 0x19, 0x41, + 0xf3, 0xa6, 0x47, 0x73, 0x7c, 0xe7, 0xa7, 0xff, 0xfd, 0xab, 0x5f, 0x64, 0xe6, 0x71, 0xa5, 0x35, + 0xf9, 0x6e, 0xeb, 0x72, 0xd2, 0x62, 0xb9, 0xe1, 0x99, 0xf6, 0x04, 0x7d, 0x0a, 0xd9, 0xa3, 0xb1, + 0x87, 0x52, 0x3f, 0x2f, 0x68, 0xa6, 0xbf, 0xa3, 0xe3, 0x25, 0x26, 0x74, 0x0e, 0x83, 0x10, 0x3a, + 0x1a, 0x7b, 0x54, 0xe4, 0x8f, 0xa1, 0xac, 0xbe, 0x82, 0xdf, 0xfa, 0xcd, 0x41, 0xf3, 0xf6, 0x17, + 0x76, 0x7c, 0x9f, 0xa9, 0xba, 0x83, 0x91, 0x50, 0xc5, 0xdf, 0xe9, 0xd5, 0x59, 0x74, 0xaf, 0x2c, + 0x94, 0xfa, 0x45, 0x42, 0x33, 0xfd, 0xd1, 0x3d, 0x36, 0x0b, 0xef, 0xca, 0xa2, 0x22, 0xff, 0x58, + 0xbc, 0xb7, 0xf7, 0x3c, 0xf4, 0x20, 0xe1, 0xbd, 0x55, 0x7d, 0x59, 0x6c, 0xae, 0xa5, 0x33, 0x08, + 0x25, 0xf7, 0x98, 0x92, 0x65, 0x3c, 0x2f, 0x94, 0xf4, 0x7c, 0x96, 0x67, 0xda, 0x93, 0xcd, 0x1e, + 0xe4, 0x18, 0x6a, 0x8f, 0xbe, 0x94, 0x3f, 0x9a, 0x09, 0xcf, 0x17, 0x29, 0x0b, 0x1d, 0xc2, 0xfb, + 0xf1, 0x22, 0x53, 0x54, 0xc3, 0x25, 0xaa, 0x88, 0x61, 0xf6, 0xcf, 0xb4, 0x27, 0xeb, 0xda, 0x47, + 0xda, 0xe6, 0x3f, 0xe7, 0x20, 0xc7, 0xe0, 0x2a, 0x74, 0x09, 0x10, 0x20, 0xd8, 0xd1, 0xd9, 0xc5, + 0x30, 0xf1, 0xe8, 0xec, 0xe2, 0xe0, 0x37, 0x6e, 0x32, 0xa5, 0x8b, 0x78, 0x8e, 0x2a, 0x65, 0x28, + 0x58, 0x8b, 0x01, 0x7b, 0xd4, 0x8f, 0x7f, 0xa5, 0x09, 0xb4, 0x8e, 0x9f, 0x25, 0x94, 0x24, 0x2d, + 0x04, 0x63, 0x47, 0xb7, 0x43, 0x02, 0x84, 0x8d, 0xbf, 0xcf, 0x14, 0xb6, 0x70, 0x3d, 0x50, 0xe8, + 0x30, 0x8e, 0x67, 0xda, 0x93, 0x2f, 0x1b, 0x78, 0x41, 0x78, 0x39, 0xd2, 0x83, 0x7e, 0x02, 0xb5, + 0x30, 0x4c, 0x8b, 0x1e, 0x26, 0xe8, 0x8a, 0xa2, 0xbd, 0xcd, 0x77, 0x6f, 0x66, 0x12, 0x36, 0xad, + 0x32, 0x9b, 0x84, 0x72, 0xae, 0xf9, 0x92, 0x90, 0x91, 0x41, 0x99, 0xc4, 0x1a, 0xa0, 0xbf, 0xd7, + 0x04, 0x8a, 0x1e, 0xe0, 0xae, 0x28, 0x49, 0x7a, 0x0c, 0xd5, 0x6d, 0x3e, 0xba, 0x85, 0x4b, 0x18, + 0xf1, 0x07, 0xcc, 0x88, 0xdf, 0xc5, 0x8b, 0x81, 0x11, 0x9e, 0x39, 0x24, 0x9e, 0x2d, 0xac, 0xf8, + 0xf2, 0x1e, 0xbe, 0x13, 0x72, 0x4e, 0xa8, 0x37, 0x58, 0x2c, 0x8e, 0x9d, 0x26, 0x2e, 0x56, 0x08, + 0x8b, 0x4d, 0x5c, 0xac, 0x30, 0xf0, 0x9a, 0xb4, 0x58, 0x1c, 0x29, 0x4d, 0x5a, 0x2c, 0xbf, 0x67, + 0x93, 0x7d, 0xf1, 0xc2, 0xbf, 0x73, 0x45, 0x36, 0x94, 0x7c, 0xdc, 0x12, 0xad, 0x26, 0x61, 0x48, + 0xc1, 0x5d, 0xa2, 0xf9, 0x20, 0xb5, 0x5f, 0x18, 0xf4, 0x0e, 0x33, 0xe8, 0x2e, 0x5e, 0xa6, 0x9a, + 0xc5, 0xa7, 0xb4, 0x2d, 0x0e, 0x54, 0xb4, 0x8c, 0x7e, 0x9f, 0x3a, 0xe2, 0x4f, 0xa0, 0xa2, 0x02, + 0x8b, 0xe8, 0x9d, 0x44, 0xdc, 0x4a, 0xc5, 0x26, 0x9b, 0xf8, 0x26, 0x16, 0xa1, 0xf9, 0x5d, 0xa6, + 0x79, 0x15, 0xaf, 0x24, 0x68, 0x76, 0x18, 0x6b, 0x48, 0x39, 0x07, 0x05, 0x93, 0x95, 0x87, 0x30, + 0xc7, 0x64, 0xe5, 0x61, 0x4c, 0xf1, 0x46, 0xe5, 0x63, 0xc6, 0x4a, 0x95, 0xbb, 0x00, 0x01, 0xfc, + 0x87, 0x12, 0x7d, 0xa9, 0x5c, 0xa6, 0xa2, 0xc1, 0x21, 0x8e, 0x1c, 0x62, 0xcc, 0xd4, 0x8a, 0x7d, + 0x17, 0x51, 0x3b, 0x30, 0x5d, 0x1a, 0x24, 0x36, 0xff, 0x3a, 0x0f, 0xe5, 0x97, 0x86, 0x69, 0x79, + 0xc4, 0x32, 0xac, 0x1e, 0x41, 0x67, 0x90, 0x63, 0x89, 0x32, 0x1a, 0x07, 0x55, 0x44, 0x2c, 0x1a, + 0x07, 0x43, 0x70, 0x11, 0x5e, 0x63, 0x5a, 0x9b, 0x78, 0x89, 0x6a, 0x1d, 0x06, 0xa2, 0x5b, 0x0c, + 0xe5, 0xa1, 0x13, 0x7d, 0x0d, 0x79, 0xf1, 0x80, 0x10, 0x11, 0x14, 0x42, 0x7f, 0x9a, 0xf7, 0x92, + 0x3b, 0x93, 0xb6, 0x92, 0xaa, 0xc6, 0x65, 0x7c, 0x54, 0xcf, 0x04, 0x20, 0x80, 0x2f, 0xa3, 0x0e, + 0x8d, 0xa1, 0x9d, 0xcd, 0xb5, 0x74, 0x06, 0xa1, 0xf3, 0x11, 0xd3, 0xf9, 0x00, 0x37, 0xa3, 0x3a, + 0xfb, 0x3e, 0x2f, 0xd5, 0xfb, 0x47, 0x30, 0xbb, 0x6b, 0xb8, 0x17, 0x28, 0x92, 0xfa, 0x94, 0xcf, + 0x4f, 0x9a, 0xcd, 0xa4, 0x2e, 0xa1, 0xe5, 0x01, 0xd3, 0xb2, 0xc2, 0x23, 0x89, 0xaa, 0xe5, 0xc2, + 0x70, 0x69, 0x4e, 0x41, 0x7d, 0xc8, 0xf3, 0xaf, 0x51, 0xa2, 0xfe, 0x0b, 0x7d, 0xd1, 0x12, 0xf5, + 0x5f, 0xf8, 0x03, 0x96, 0xdb, 0xb5, 0x8c, 0xa0, 0x28, 0x3f, 0xff, 0x40, 0x91, 0xb7, 0xc0, 0xc8, + 0xa7, 0x22, 0xcd, 0xd5, 0xb4, 0x6e, 0xa1, 0xeb, 0x21, 0xd3, 0x75, 0x1f, 0x37, 0x62, 0x6b, 0x25, + 0x38, 0x9f, 0x69, 0x4f, 0x3e, 0xd2, 0xd0, 0x4f, 0x00, 0x02, 0xc4, 0x37, 0x76, 0x00, 0xa2, 0xe0, + 0x71, 0xec, 0x00, 0xc4, 0xc0, 0x62, 0xbc, 0xc1, 0xf4, 0xae, 0xe3, 0x87, 0x51, 0xbd, 0x9e, 0x63, + 0x58, 0xee, 0x6b, 0xe2, 0x7c, 0xc8, 0x51, 0x3d, 0xf7, 0xc2, 0x1c, 0xd1, 0xc3, 0xf0, 0x6f, 0x73, + 0x30, 0x4b, 0x0b, 0x50, 0x9a, 0xa7, 0x83, 0x7b, 0x7b, 0xd4, 0x92, 0x18, 0xbe, 0x16, 0xb5, 0x24, + 0x7e, 0xe5, 0x0f, 0xe7, 0x69, 0xf6, 0x07, 0x0a, 0x84, 0x31, 0x50, 0x47, 0xdb, 0x50, 0x56, 0x2e, + 0xf6, 0x28, 0x41, 0x58, 0x18, 0xb8, 0x8b, 0x46, 0xfe, 0x04, 0x54, 0x00, 0xdf, 0x65, 0xfa, 0x96, + 0x78, 0xe4, 0x67, 0xfa, 0xfa, 0x9c, 0x83, 0x2a, 0x7c, 0x03, 0x15, 0xf5, 0xf2, 0x8f, 0x12, 0xe4, + 0x45, 0x40, 0xc1, 0x68, 0x94, 0x4b, 0xc2, 0x0e, 0xc2, 0x07, 0xdf, 0xff, 0x23, 0x0c, 0xc9, 0x46, + 0x15, 0x0f, 0xa0, 0x20, 0xd0, 0x80, 0xa4, 0x59, 0x86, 0x11, 0xc4, 0xa4, 0x59, 0x46, 0xa0, 0x84, + 0x70, 0x6d, 0xc7, 0x34, 0xd2, 0x0b, 0x8f, 0xcc, 0x24, 0x42, 0xdb, 0x0b, 0xe2, 0xa5, 0x69, 0x0b, + 0xc0, 0xad, 0x34, 0x6d, 0xca, 0x65, 0x33, 0x4d, 0xdb, 0x39, 0xf1, 0xc4, 0x71, 0x91, 0x97, 0x38, + 0x94, 0x22, 0x4c, 0x8d, 0xde, 0xf8, 0x26, 0x96, 0xa4, 0xd2, 0x3b, 0x50, 0x28, 0x42, 0x37, 0xba, + 0x02, 0x08, 0xb0, 0x8a, 0x68, 0x3d, 0x95, 0x08, 0x78, 0x46, 0xeb, 0xa9, 0x64, 0xb8, 0x23, 0x1c, + 0x1a, 0x02, 0xbd, 0xbc, 0xf2, 0xa7, 0x9a, 0x7f, 0xae, 0x01, 0x8a, 0xc3, 0x1a, 0xe8, 0x69, 0xb2, + 0xf4, 0x44, 0x18, 0xb5, 0xf9, 0xc1, 0xdb, 0x31, 0x27, 0x45, 0xfb, 0xc0, 0xa4, 0x1e, 0xe3, 0x1e, + 0xbd, 0xa1, 0x46, 0xfd, 0xb9, 0x06, 0xd5, 0x10, 0x26, 0x82, 0xde, 0x4b, 0x59, 0xd3, 0x08, 0x0a, + 0xdb, 0x7c, 0x7c, 0x2b, 0x5f, 0x52, 0xa1, 0xa9, 0xec, 0x00, 0x59, 0x71, 0xff, 0x4c, 0x83, 0x5a, + 0x18, 0x43, 0x41, 0x29, 0xb2, 0x63, 0x28, 0x6e, 0x73, 0xfd, 0x76, 0xc6, 0x9b, 0x97, 0x27, 0x28, + 0xb6, 0x07, 0x50, 0x10, 0xa8, 0x4b, 0xd2, 0xc6, 0x0f, 0xe3, 0xbf, 0x49, 0x1b, 0x3f, 0x02, 0xd9, + 0x24, 0x6c, 0x7c, 0xc7, 0x1e, 0x10, 0xe5, 0x98, 0x09, 0x58, 0x26, 0x4d, 0xdb, 0xcd, 0xc7, 0x2c, + 0x82, 0xe9, 0xa4, 0x69, 0x0b, 0x8e, 0x99, 0xc4, 0x63, 0x50, 0x8a, 0xb0, 0x5b, 0x8e, 0x59, 0x14, + 0xce, 0x49, 0x38, 0x66, 0x4c, 0xa1, 0x72, 0xcc, 0x02, 0xe4, 0x24, 0xe9, 0x98, 0xc5, 0xe0, 0xec, + 0xa4, 0x63, 0x16, 0x07, 0x5f, 0x12, 0xd6, 0x91, 0xe9, 0x0d, 0x1d, 0xb3, 0x85, 0x04, 0x90, 0x05, + 0x7d, 0x90, 0xe2, 0xc4, 0x44, 0x94, 0xbc, 0xf9, 0xe1, 0x5b, 0x72, 0xa7, 0xee, 0x71, 0xee, 0x7e, + 0xb9, 0xc7, 0xff, 0x46, 0x83, 0xc5, 0x24, 0x80, 0x06, 0xa5, 0xe8, 0x49, 0x41, 0xd7, 0x9b, 0x1b, + 0x6f, 0xcb, 0x7e, 0xb3, 0xb7, 0xfc, 0x5d, 0xff, 0xbc, 0xfe, 0xef, 0x5f, 0xaf, 0x6a, 0xff, 0xf9, + 0xf5, 0xaa, 0xf6, 0x3f, 0x5f, 0xaf, 0x6a, 0x7f, 0xfb, 0xbf, 0xab, 0x33, 0x67, 0x79, 0xf6, 0xa7, + 0x7d, 0xdf, 0xfd, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xdd, 0xb6, 0xb1, 0x2f, 0x61, 0x38, 0x00, + 0x00, } diff --git a/etcdserver/etcdserverpb/rpc.proto b/etcdserver/etcdserverpb/rpc.proto index 8060ca0160f0..77b51c92c8f1 100644 --- a/etcdserver/etcdserverpb/rpc.proto +++ b/etcdserver/etcdserverpb/rpc.proto @@ -983,6 +983,7 @@ message AuthenticateRequest { message AuthUserAddRequest { string name = 1; string password = 2; + authpb.UserAddOptions options = 3; } message AuthUserGetRequest { diff --git a/integration/v3_auth_test.go b/integration/v3_auth_test.go index 76c73b0ec1c3..486691fe22fa 100644 --- a/integration/v3_auth_test.go +++ b/integration/v3_auth_test.go @@ -96,7 +96,7 @@ func TestV3AuthRevision(t *testing.T) { rev := presp.Header.Revision ctx, cancel = context.WithTimeout(context.Background(), 5*time.Second) - aresp, aerr := api.Auth.UserAdd(ctx, &pb.AuthUserAddRequest{Name: "root", Password: "123"}) + aresp, aerr := api.Auth.UserAdd(ctx, &pb.AuthUserAddRequest{Name: "root", Password: "123", Options: &authpb.UserAddOptions{NoPassword: false}}) cancel() if aerr != nil { t.Fatal(aerr) @@ -294,7 +294,7 @@ func TestV3AuthWithLeaseAttach(t *testing.T) { func authSetupUsers(t *testing.T, auth pb.AuthClient, users []user) { for _, user := range users { - if _, err := auth.UserAdd(context.TODO(), &pb.AuthUserAddRequest{Name: user.name, Password: user.password}); err != nil { + if _, err := auth.UserAdd(context.TODO(), &pb.AuthUserAddRequest{Name: user.name, Password: user.password, Options: &authpb.UserAddOptions{NoPassword: false}}); err != nil { t.Fatal(err) } if _, err := auth.RoleAdd(context.TODO(), &pb.AuthRoleAddRequest{Name: user.role}); err != nil { diff --git a/tests/e2e/v3_curl_test.go b/tests/e2e/v3_curl_test.go index 60f2baf1027f..f890f4fb9bea 100644 --- a/tests/e2e/v3_curl_test.go +++ b/tests/e2e/v3_curl_test.go @@ -22,6 +22,7 @@ import ( "strconv" "testing" + "go.etcd.io/coreos/etcd/auth/authpb" epb "go.etcd.io/etcd/etcdserver/api/v3election/v3electionpb" "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" pb "go.etcd.io/etcd/etcdserver/etcdserverpb" @@ -187,7 +188,7 @@ func testV3CurlAuth(cx ctlCtx) { p := cx.apiPrefix // create root user - rootuser, err := json.Marshal(&pb.AuthUserAddRequest{Name: string("root"), Password: string("toor")}) + rootuser, err := json.Marshal(&pb.AuthUserAddRequest{Name: string("root"), Password: string("toor"), Options: &authpb.UserAddOptions{NoPassword: false}}) testutil.AssertNil(cx.t, err) if err = cURLPost(cx.epc, cURLReq{endpoint: path.Join(p, "/auth/user/add"), value: string(rootuser), expected: "revision"}); err != nil { diff --git a/tools/etcd-dump-logs/etcd-dump-log_test.go b/tools/etcd-dump-logs/etcd-dump-log_test.go index f1b6b631c888..9c1d4fd40cfe 100644 --- a/tools/etcd-dump-logs/etcd-dump-log_test.go +++ b/tools/etcd-dump-logs/etcd-dump-log_test.go @@ -203,7 +203,7 @@ func appendNormalIRREnts(ents *[]raftpb.Entry) { irrauthenticate := &etcdserverpb.InternalAuthenticateRequest{Name: "myname", Password: "password", SimpleToken: "token"} - irrauthuseradd := &etcdserverpb.AuthUserAddRequest{Name: "name1", Password: "pass1"} + irrauthuseradd := &etcdserverpb.AuthUserAddRequest{Name: "name1", Password: "pass1", Options: &authpb.UserAddOptions{NoPassword: false}} irrauthuserdelete := &etcdserverpb.AuthUserDeleteRequest{Name: "name1"}