1
0
Fork 0
mirror of https://github.com/anyproto/any-sync.git synced 2025-06-08 05:57:03 +09:00

Update coordinator client, tests and new error

This commit is contained in:
mcrakhman 2023-10-20 19:11:27 +02:00
parent 20c967200a
commit e35e1e8668
No known key found for this signature in database
GPG key ID: DED12CFEF5B8396B
5 changed files with 214 additions and 112 deletions

View file

@ -4,14 +4,17 @@ package coordinatorclient
import (
"context"
"errors"
"storj.io/drpc"
"github.com/anyproto/any-sync/app"
"github.com/anyproto/any-sync/coordinator/coordinatorproto"
"github.com/anyproto/any-sync/net/peer"
"github.com/anyproto/any-sync/net/pool"
"github.com/anyproto/any-sync/net/rpc/rpcerr"
"github.com/anyproto/any-sync/nodeconf"
"github.com/anyproto/any-sync/util/cidutil"
"github.com/anyproto/any-sync/util/crypto"
"storj.io/drpc"
)
const CName = "common.coordinator.coordinatorclient"
@ -26,7 +29,9 @@ func New() CoordinatorClient {
}
type CoordinatorClient interface {
ChangeStatus(ctx context.Context, spaceId string, conf *coordinatorproto.DeletionConfirmPayloadWithSignature) (status *coordinatorproto.SpaceStatusPayload, err error)
SpaceDelete(ctx context.Context, spaceId string, conf *coordinatorproto.DeletionConfirmPayloadWithSignature) (err error)
AccountDelete(ctx context.Context, conf *coordinatorproto.AccountDeletionConfirmPayload) (timestamp int64, err error)
AccountRevertDeletion(ctx context.Context) (err error)
StatusCheckMany(ctx context.Context, spaceIds []string) (statuses []*coordinatorproto.SpaceStatusPayload, err error)
StatusCheck(ctx context.Context, spaceId string) (status *coordinatorproto.SpaceStatusPayload, err error)
SpaceSign(ctx context.Context, payload SpaceSignPayload) (receipt *coordinatorproto.SpaceReceiptWithSignature, err error)
@ -59,34 +64,64 @@ func (c *coordinatorClient) Name() (name string) {
return CName
}
func (c *coordinatorClient) ChangeStatus(ctx context.Context, spaceId string, conf *coordinatorproto.DeletionConfirmPayloadWithSignature) (status *coordinatorproto.SpaceStatusPayload, err error) {
var req *coordinatorproto.SpaceStatusChangeRequest
if conf != nil {
confMarshalled, err := conf.Marshal()
if err != nil {
return nil, err
}
req = &coordinatorproto.SpaceStatusChangeRequest{
SpaceId: spaceId,
DeletionPayload: confMarshalled,
DeletionPayloadType: coordinatorproto.DeletionPayloadType_Confirm,
}
} else {
req = &coordinatorproto.SpaceStatusChangeRequest{
SpaceId: spaceId,
}
func (c *coordinatorClient) SpaceDelete(ctx context.Context, spaceId string, conf *coordinatorproto.DeletionConfirmPayloadWithSignature) (err error) {
confMarshalled, err := conf.Marshal()
if err != nil {
return err
}
err = c.doClient(ctx, func(cl coordinatorproto.DRPCCoordinatorClient) error {
resp, err := cl.SpaceStatusChange(ctx, req)
id, err := cidutil.NewCidFromBytes(confMarshalled)
if err != nil {
return err
}
req := &coordinatorproto.SpaceDeleteRequest{
SpaceId: spaceId,
DeletionPayload: confMarshalled,
DeletionPayloadId: id,
}
return c.doClient(ctx, func(cl coordinatorproto.DRPCCoordinatorClient) error {
_, err := cl.SpaceDelete(ctx, req)
if err != nil {
return rpcerr.Unwrap(err)
}
status = resp.Payload
return nil
})
}
func (c *coordinatorClient) AccountDelete(ctx context.Context, conf *coordinatorproto.AccountDeletionConfirmPayload) (timestamp int64, err error) {
confMarshalled, err := conf.Marshal()
if err != nil {
return
}
id, err := cidutil.NewCidFromBytes(confMarshalled)
if err != nil {
return
}
req := &coordinatorproto.AccountDeleteRequest{
DeletionPayload: confMarshalled,
DeletionPayloadId: id,
}
err = c.doClient(ctx, func(cl coordinatorproto.DRPCCoordinatorClient) error {
resp, err := cl.AccountDelete(ctx, req)
if err != nil {
return rpcerr.Unwrap(err)
}
timestamp = resp.ToBeDeletedTimestamp
return nil
})
return
}
func (c *coordinatorClient) AccountRevertDeletion(ctx context.Context) (err error) {
req := &coordinatorproto.AccountRevertDeletionRequest{}
return c.doClient(ctx, func(cl coordinatorproto.DRPCCoordinatorClient) error {
_, err := cl.AccountRevertDeletion(ctx, req)
if err != nil {
return rpcerr.Unwrap(err)
}
return nil
})
}
func (c *coordinatorClient) DeletionLog(ctx context.Context, lastRecordId string, limit int) (records []*coordinatorproto.DeletionLogRecord, err error) {
err = c.doClient(ctx, func(cl coordinatorproto.DRPCCoordinatorClient) error {
resp, err := cl.DeletionLog(ctx, &coordinatorproto.DeletionLogRequest{

View file

@ -31,6 +31,7 @@ const (
ErrorCodes_SpaceCreated ErrorCodes = 3
ErrorCodes_SpaceNotExists ErrorCodes = 4
ErrorCodes_SpaceLimitReached ErrorCodes = 5
ErrorCodes_AccountDeleted ErrorCodes = 6
ErrorCodes_ErrorOffset ErrorCodes = 300
)
@ -41,6 +42,7 @@ var ErrorCodes_name = map[int32]string{
3: "SpaceCreated",
4: "SpaceNotExists",
5: "SpaceLimitReached",
6: "AccountDeleted",
300: "ErrorOffset",
}
@ -51,6 +53,7 @@ var ErrorCodes_value = map[string]int32{
"SpaceCreated": 3,
"SpaceNotExists": 4,
"SpaceLimitReached": 5,
"AccountDeleted": 6,
"ErrorOffset": 300,
}
@ -1803,95 +1806,96 @@ func init() {
}
var fileDescriptor_d94f6f99586adae2 = []byte{
// 1401 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xcb, 0x6f, 0x13, 0x47,
0x18, 0xf7, 0xac, 0x9d, 0x87, 0x3f, 0x07, 0xb3, 0x99, 0x3c, 0x70, 0x8d, 0x31, 0xe9, 0x40, 0xa9,
0x71, 0x2b, 0x40, 0x46, 0xad, 0x8a, 0xe8, 0x01, 0x08, 0x54, 0x0a, 0x8f, 0x10, 0x2d, 0x84, 0xaa,
0xe5, 0x50, 0x2d, 0xde, 0x49, 0xb2, 0x8a, 0xb3, 0xeb, 0xce, 0x8e, 0x81, 0x1c, 0xfa, 0x3f, 0xf4,
0x56, 0xf5, 0xd0, 0x7b, 0x0f, 0x3d, 0x54, 0xbd, 0x56, 0x6a, 0xaf, 0x3d, 0x72, 0xec, 0x11, 0xc1,
0x3f, 0x52, 0xcd, 0xec, 0xcc, 0xee, 0xec, 0x7a, 0xed, 0xa4, 0xe2, 0xc0, 0x25, 0xc9, 0xfc, 0xe6,
0x7b, 0xbf, 0xe6, 0xdb, 0xc0, 0x67, 0xfd, 0x30, 0x64, 0x9e, 0x1f, 0xb8, 0x3c, 0x64, 0x97, 0x8d,
0xbf, 0x87, 0x2c, 0xe4, 0xe1, 0x65, 0xf9, 0x33, 0x32, 0xf1, 0x4b, 0x12, 0xc2, 0x35, 0x03, 0x22,
0x7f, 0x21, 0xb0, 0x1f, 0x0d, 0xdd, 0x3e, 0x7d, 0xe4, 0xef, 0x06, 0x0e, 0xfd, 0x7e, 0x44, 0x23,
0x8e, 0x1b, 0x30, 0x17, 0x09, 0x6c, 0xc3, 0x6b, 0xa0, 0x35, 0xd4, 0xa9, 0x3a, 0xfa, 0x88, 0x57,
0x61, 0x76, 0x8f, 0xba, 0x1e, 0x65, 0x0d, 0x6b, 0x0d, 0x75, 0x16, 0x1c, 0x75, 0xc2, 0x6b, 0x50,
0x0b, 0x07, 0xde, 0x86, 0x47, 0x03, 0xee, 0xf3, 0xc3, 0x46, 0x59, 0x5e, 0x9a, 0x10, 0xee, 0xc1,
0x72, 0x40, 0x5f, 0xe8, 0xa3, 0xd0, 0xe6, 0xf2, 0x11, 0xa3, 0x8d, 0x8a, 0x24, 0x2d, 0xbc, 0xc3,
0x04, 0x16, 0x76, 0x42, 0xd6, 0xa7, 0xca, 0xae, 0xc6, 0xcc, 0x1a, 0xea, 0xcc, 0x3b, 0x19, 0x8c,
0x70, 0xc0, 0xb1, 0xfd, 0xdc, 0xe5, 0xa3, 0x68, 0xcb, 0x3d, 0x1c, 0x84, 0xae, 0x87, 0xaf, 0xc0,
0x6c, 0x24, 0x01, 0xe9, 0x40, 0xbd, 0xd7, 0xb8, 0x64, 0xc6, 0xc1, 0x60, 0x70, 0x14, 0x1d, 0xfe,
0x14, 0x16, 0x3d, 0x3a, 0xa0, 0xdc, 0x0f, 0x83, 0xc7, 0xfe, 0x01, 0x8d, 0xb8, 0x7b, 0x30, 0x94,
0x4e, 0x96, 0x9d, 0xf1, 0x0b, 0xb2, 0x0d, 0x8b, 0x46, 0xd4, 0xa2, 0x61, 0x18, 0x44, 0x14, 0xdf,
0x80, 0x39, 0x46, 0xfb, 0xd4, 0x1f, 0x72, 0xa9, 0xb5, 0xd6, 0xbb, 0x30, 0xae, 0xd5, 0x89, 0x09,
0xbe, 0xf6, 0xf9, 0x5e, 0xe2, 0xa7, 0xa3, 0xd9, 0xc8, 0x3e, 0x7c, 0x30, 0x91, 0x0a, 0x5f, 0x81,
0xa5, 0xc8, 0xb8, 0x54, 0xae, 0x4a, 0x55, 0x0b, 0x4e, 0xd1, 0x15, 0x6e, 0x41, 0x35, 0x4a, 0x02,
0x1d, 0x27, 0x2c, 0x05, 0xc8, 0xaf, 0x08, 0x16, 0x4c, 0x6d, 0xd3, 0xd3, 0x3e, 0xa4, 0x94, 0x6d,
0x78, 0x52, 0x4a, 0xd5, 0x51, 0x27, 0xdc, 0x81, 0x93, 0x6e, 0xbf, 0x1f, 0x8e, 0x02, 0x9e, 0x4b,
0x7d, 0x1e, 0x16, 0xa6, 0x04, 0x94, 0xbf, 0x08, 0xd9, 0xfe, 0x86, 0x27, 0x73, 0x5e, 0x75, 0x52,
0x00, 0xb7, 0x01, 0x9e, 0xbb, 0x03, 0xdf, 0xdb, 0x0e, 0xb8, 0x3f, 0x90, 0x69, 0xae, 0x38, 0x06,
0x42, 0x9e, 0xc2, 0xca, 0x57, 0xfe, 0x80, 0xde, 0xf7, 0x0f, 0x7c, 0xbe, 0xbe, 0x47, 0xfb, 0xfb,
0xba, 0x52, 0x0b, 0x0c, 0x40, 0xc5, 0x06, 0x18, 0xce, 0x59, 0x19, 0xe7, 0xc8, 0x26, 0xac, 0xe6,
0x85, 0xab, 0x84, 0x2e, 0xc3, 0xcc, 0x40, 0xa0, 0x52, 0x66, 0xc5, 0x89, 0x0f, 0xc2, 0xd8, 0x88,
0x87, 0xcc, 0xdd, 0xa5, 0xf7, 0xe8, 0xa1, 0x12, 0x66, 0x20, 0xe4, 0x2a, 0x9c, 0x32, 0x0a, 0x2c,
0x63, 0xee, 0xc4, 0x08, 0x93, 0x6d, 0x68, 0x8c, 0x33, 0x29, 0x33, 0xae, 0xc1, 0xdc, 0xd0, 0x48,
0x76, 0xad, 0x77, 0x76, 0x52, 0x35, 0xab, 0xc4, 0x3b, 0x9a, 0x9e, 0x5c, 0x83, 0xd3, 0x79, 0xb1,
0x0f, 0xdc, 0xe0, 0x50, 0xdb, 0xd3, 0x84, 0x79, 0x65, 0x80, 0x68, 0x94, 0x72, 0xa7, 0xea, 0x24,
0x67, 0xf2, 0x14, 0x5a, 0xc5, 0xac, 0xca, 0xaa, 0xeb, 0x30, 0xaf, 0xb4, 0xc4, 0xbc, 0xc7, 0x30,
0x2b, 0x61, 0x20, 0xaf, 0x51, 0xce, 0x5f, 0x37, 0xd8, 0xa5, 0x47, 0x8f, 0x1f, 0xa3, 0x49, 0x95,
0xcc, 0x24, 0x9d, 0xe3, 0x17, 0xa2, 0x38, 0x72, 0xa0, 0xae, 0xce, 0x1c, 0x8c, 0x1d, 0x58, 0xca,
0x41, 0x8f, 0x0f, 0x87, 0xf1, 0x6c, 0xaa, 0xf7, 0xd6, 0x32, 0x6e, 0xdd, 0x1e, 0xa7, 0x73, 0x8a,
0x98, 0xc9, 0x13, 0xd5, 0xcb, 0x59, 0x0f, 0xdf, 0x3d, 0xa5, 0xd7, 0xe1, 0xf4, 0x66, 0xdc, 0x38,
0xeb, 0x61, 0xb0, 0xe3, 0xef, 0x8e, 0x98, 0x2b, 0x54, 0xeb, 0xe0, 0xb5, 0xa0, 0xda, 0x1f, 0x31,
0x46, 0x45, 0xe9, 0xab, 0xf0, 0xa5, 0x00, 0xf9, 0x13, 0x41, 0xab, 0x98, 0x5b, 0x19, 0xd6, 0x81,
0x93, 0x7d, 0xf3, 0x22, 0x11, 0x92, 0x87, 0xb3, 0x1d, 0x6d, 0xe5, 0x3b, 0xfa, 0x63, 0x98, 0x09,
0x42, 0x8f, 0x46, 0x8d, 0xb2, 0x2c, 0x8d, 0xc5, 0x8c, 0x7b, 0x9b, 0xa1, 0x47, 0x9d, 0xf8, 0x1e,
0x77, 0xc1, 0xee, 0x33, 0xea, 0xea, 0xf1, 0xba, 0x1d, 0xf8, 0x2f, 0x65, 0xdc, 0x2b, 0xce, 0x18,
0x4e, 0x7c, 0xa8, 0x08, 0x56, 0x63, 0x1c, 0xa1, 0xcc, 0x38, 0x6a, 0x41, 0xd5, 0xf5, 0x3c, 0x46,
0xa3, 0x88, 0x46, 0x0d, 0x4b, 0xd6, 0x73, 0x0a, 0xe0, 0x4f, 0x60, 0x86, 0x1f, 0x0e, 0x95, 0x49,
0xf5, 0xde, 0xca, 0x98, 0x49, 0x32, 0x97, 0x31, 0x0d, 0x39, 0x80, 0x73, 0x3a, 0xd3, 0x32, 0x50,
0xec, 0x40, 0x25, 0x22, 0x3b, 0x93, 0x0b, 0x4a, 0x0c, 0x15, 0x97, 0xd8, 0xf4, 0x59, 0xfc, 0x3b,
0x82, 0xd5, 0x62, 0x7d, 0xef, 0x71, 0x2a, 0xb7, 0xa0, 0xca, 0x93, 0xa7, 0x70, 0x46, 0x3e, 0x85,
0x29, 0x40, 0x6e, 0x03, 0xd6, 0x16, 0xdf, 0x0f, 0x77, 0x8d, 0xde, 0x75, 0x77, 0xb8, 0x91, 0x1b,
0x7d, 0x4c, 0x87, 0xa9, 0x30, 0xf6, 0x84, 0x1a, 0xa6, 0xc4, 0x87, 0xa5, 0x8c, 0x14, 0x55, 0x86,
0x5f, 0xc8, 0xa7, 0x34, 0x64, 0xc9, 0x6c, 0x69, 0x17, 0x36, 0xa1, 0x64, 0x11, 0x64, 0x8e, 0x26,
0x17, 0x06, 0xec, 0xb9, 0xd1, 0x83, 0x50, 0x45, 0x79, 0xde, 0xd1, 0x47, 0xf2, 0x33, 0x82, 0xc5,
0x31, 0x46, 0x5c, 0x07, 0xcb, 0xd7, 0xb6, 0x5a, 0xbe, 0x37, 0xf9, 0x9d, 0xc0, 0x5f, 0x26, 0x3b,
0x45, 0x59, 0xce, 0x85, 0xf3, 0xd3, 0x4d, 0xca, 0xed, 0x17, 0x99, 0x60, 0x56, 0xf2, 0xc1, 0xfc,
0x03, 0xa9, 0x35, 0x46, 0x8a, 0x79, 0x8f, 0x93, 0xb0, 0x0b, 0xb6, 0x86, 0x6e, 0xab, 0x5e, 0x57,
0xd6, 0x8e, 0xe1, 0x64, 0x03, 0x96, 0x32, 0x36, 0xab, 0xdc, 0xf5, 0x60, 0x99, 0x87, 0xb7, 0x14,
0xea, 0xa5, 0xcb, 0x14, 0x92, 0x62, 0x0a, 0xef, 0x48, 0x00, 0xcb, 0x37, 0xe3, 0xda, 0xcc, 0x06,
0xa0, 0xd0, 0x4d, 0xf4, 0x3f, 0xdc, 0xb4, 0x0a, 0xdd, 0x24, 0xbf, 0x20, 0x38, 0x63, 0x2a, 0x1c,
0x6f, 0xbb, 0x49, 0x33, 0xa6, 0xa0, 0xb9, 0xac, 0x63, 0x34, 0x57, 0x79, 0x6a, 0x73, 0x8d, 0xd5,
0xc3, 0x3d, 0x58, 0xc9, 0xc5, 0xe3, 0x1d, 0x82, 0xdb, 0x86, 0x96, 0x12, 0xe6, 0xd0, 0xe7, 0x94,
0x25, 0x1e, 0xeb, 0x15, 0xfa, 0x6c, 0x12, 0x8b, 0xfc, 0x7d, 0xac, 0xb4, 0xfb, 0x13, 0x02, 0xb8,
0xc3, 0x58, 0xc8, 0xd6, 0xe5, 0xc8, 0xae, 0x03, 0x6c, 0x07, 0xf4, 0xe5, 0x90, 0xf6, 0x39, 0xf5,
0xec, 0x12, 0xb6, 0xd5, 0x1e, 0xa9, 0x14, 0xdb, 0x08, 0x37, 0x60, 0x39, 0x45, 0x44, 0xd8, 0x69,
0xe0, 0xf9, 0xc1, 0xae, 0x6d, 0x25, 0xb4, 0xeb, 0x62, 0xb6, 0x53, 0xcf, 0x2e, 0x63, 0x0c, 0x75,
0x89, 0x6c, 0x86, 0xfc, 0xce, 0x4b, 0x3f, 0xe2, 0x91, 0x5d, 0xc1, 0x2b, 0x6a, 0xbd, 0x96, 0x3b,
0x99, 0x43, 0xdd, 0xfe, 0x1e, 0xf5, 0xec, 0x19, 0x6c, 0x43, 0x4d, 0x9a, 0xf1, 0x70, 0x67, 0x27,
0xa2, 0xdc, 0xfe, 0xcd, 0xea, 0xfe, 0x00, 0x35, 0xe3, 0xad, 0xc4, 0xab, 0x99, 0x8f, 0x01, 0xad,
0xa3, 0x84, 0xdb, 0xd0, 0x34, 0x9f, 0xd4, 0xd8, 0x1a, 0x6d, 0x9c, 0x8d, 0x72, 0xf7, 0xfa, 0xe2,
0x11, 0x77, 0x99, 0xe0, 0xb7, 0x72, 0x72, 0xb5, 0x9f, 0xe5, 0xee, 0x5d, 0x98, 0xd7, 0x0f, 0x07,
0xae, 0xc1, 0xdc, 0x63, 0x46, 0xe9, 0xcd, 0xad, 0x0d, 0xbb, 0x24, 0x0e, 0x62, 0xa7, 0x14, 0x07,
0x24, 0x3c, 0x5c, 0x4f, 0x27, 0x85, 0xc0, 0x64, 0x1c, 0xd6, 0x45, 0x6c, 0x83, 0x68, 0x14, 0x09,
0xa4, 0xdc, 0xbd, 0x96, 0x4e, 0x42, 0x63, 0x8d, 0xc0, 0xf3, 0x50, 0x11, 0x62, 0x63, 0x99, 0xaa,
0x46, 0x6d, 0x24, 0x0e, 0x2a, 0x67, 0xb6, 0xd5, 0xbd, 0x01, 0xa7, 0x26, 0x8c, 0x1f, 0x3c, 0x0b,
0xd6, 0xc3, 0x7d, 0xbb, 0x84, 0x17, 0xe1, 0x84, 0x43, 0x0f, 0xc2, 0xe7, 0x74, 0x8b, 0xd1, 0xa1,
0xcb, 0xa8, 0x8d, 0x30, 0xc0, 0x6c, 0x0c, 0xd9, 0x56, 0xef, 0xef, 0x39, 0xa8, 0x19, 0x36, 0xe2,
0xbb, 0x50, 0x4d, 0xbe, 0x6f, 0xf0, 0x99, 0x82, 0xdd, 0x24, 0xfd, 0x5a, 0x6c, 0xb6, 0x27, 0x5d,
0xab, 0x92, 0xfd, 0x06, 0xea, 0xd9, 0xfd, 0x1a, 0x93, 0x0c, 0x47, 0xe1, 0x66, 0xdf, 0x3c, 0x37,
0x95, 0x46, 0x89, 0xfe, 0x4e, 0x7f, 0xbc, 0xa6, 0x3b, 0x2a, 0x3e, 0x3f, 0x69, 0x93, 0xca, 0x88,
0xff, 0xe8, 0x08, 0x2a, 0xa5, 0x60, 0x5f, 0x15, 0x72, 0x6e, 0x09, 0xc6, 0x9d, 0xa9, 0xec, 0xc6,
0x8a, 0xdd, 0xbc, 0x78, 0x0c, 0x4a, 0xa5, 0xec, 0x99, 0xfe, 0xa8, 0x34, 0x36, 0x46, 0x3c, 0xc5,
0x50, 0x63, 0x67, 0x6e, 0x5e, 0x38, 0x8a, 0x2c, 0x75, 0xa8, 0x68, 0xff, 0xcb, 0x39, 0x34, 0x65,
0xc1, 0xcc, 0x39, 0x34, 0x75, 0x99, 0xdc, 0x82, 0x9a, 0x51, 0x97, 0xf8, 0xec, 0xe4, 0x07, 0x33,
0x16, 0xbd, 0x36, 0x99, 0x20, 0x95, 0x68, 0x8c, 0x1a, 0x5c, 0xb0, 0x35, 0x67, 0xde, 0x8f, 0x9c,
0xc4, 0xa2, 0xd7, 0xea, 0x09, 0x9c, 0xc8, 0x4c, 0x5a, 0xfc, 0x61, 0x86, 0xa5, 0xe8, 0x55, 0x6a,
0x92, 0x69, 0x24, 0x4a, 0x6e, 0x90, 0x4c, 0xf0, 0xec, 0x50, 0xc5, 0x17, 0x8b, 0x98, 0x0b, 0x07,
0x73, 0xb3, 0x7b, 0x1c, 0xd2, 0x58, 0xdf, 0xad, 0xcf, 0xff, 0x79, 0xd3, 0x46, 0xaf, 0xde, 0xb4,
0xd1, 0xeb, 0x37, 0x6d, 0xf4, 0xe3, 0xdb, 0x76, 0xe9, 0xd5, 0xdb, 0x76, 0xe9, 0xdf, 0xb7, 0xed,
0xd2, 0xb7, 0xad, 0x69, 0xff, 0x26, 0x7a, 0x36, 0x2b, 0x7f, 0x5d, 0xfd, 0x2f, 0x00, 0x00, 0xff,
0xff, 0x8c, 0xaa, 0x0e, 0xe9, 0x4d, 0x12, 0x00, 0x00,
// 1411 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xcd, 0x6f, 0x13, 0x47,
0x14, 0xf7, 0xac, 0x9d, 0x0f, 0x3f, 0x07, 0xb3, 0x99, 0x7c, 0xe0, 0x1a, 0x63, 0xd2, 0x81, 0x52,
0xe3, 0x56, 0x80, 0x8c, 0x5a, 0x15, 0xd1, 0x03, 0x10, 0xa8, 0x14, 0x3e, 0x42, 0xb4, 0x10, 0xaa,
0x96, 0x43, 0xb5, 0x78, 0x27, 0xc9, 0x2a, 0xce, 0xae, 0x3b, 0x3b, 0x06, 0x72, 0xe8, 0xff, 0xd0,
0x6b, 0x0f, 0xbd, 0x57, 0x6a, 0x0f, 0x55, 0xaf, 0x95, 0xda, 0x6b, 0x8f, 0x1c, 0x7b, 0x44, 0xf0,
0x8f, 0x54, 0x33, 0x3b, 0xb3, 0x3b, 0xbb, 0x5e, 0x3b, 0xa9, 0x38, 0x70, 0x49, 0x32, 0xbf, 0x79,
0xef, 0xcd, 0xef, 0x7d, 0xcc, 0x9b, 0xb7, 0x81, 0xcf, 0xfa, 0x61, 0xc8, 0x3c, 0x3f, 0x70, 0x79,
0xc8, 0x2e, 0x1b, 0x7f, 0x0f, 0x59, 0xc8, 0xc3, 0xcb, 0xf2, 0x67, 0x64, 0xe2, 0x97, 0x24, 0x84,
0x6b, 0x06, 0x44, 0xfe, 0x42, 0x60, 0x3f, 0x1a, 0xba, 0x7d, 0xfa, 0xc8, 0xdf, 0x0d, 0x1c, 0xfa,
0xfd, 0x88, 0x46, 0x1c, 0x37, 0x60, 0x2e, 0x12, 0xd8, 0x86, 0xd7, 0x40, 0x6b, 0xa8, 0x53, 0x75,
0xf4, 0x12, 0xaf, 0xc2, 0xec, 0x1e, 0x75, 0x3d, 0xca, 0x1a, 0xd6, 0x1a, 0xea, 0x2c, 0x38, 0x6a,
0x85, 0xd7, 0xa0, 0x16, 0x0e, 0xbc, 0x0d, 0x8f, 0x06, 0xdc, 0xe7, 0x87, 0x8d, 0xb2, 0xdc, 0x34,
0x21, 0xdc, 0x83, 0xe5, 0x80, 0xbe, 0xd0, 0x4b, 0x71, 0x9a, 0xcb, 0x47, 0x8c, 0x36, 0x2a, 0x52,
0xb4, 0x70, 0x0f, 0x13, 0x58, 0xd8, 0x09, 0x59, 0x9f, 0x2a, 0x5e, 0x8d, 0x99, 0x35, 0xd4, 0x99,
0x77, 0x32, 0x18, 0xe1, 0x80, 0x63, 0xfe, 0xdc, 0xe5, 0xa3, 0x68, 0xcb, 0x3d, 0x1c, 0x84, 0xae,
0x87, 0xaf, 0xc0, 0x6c, 0x24, 0x01, 0xe9, 0x40, 0xbd, 0xd7, 0xb8, 0x64, 0xc6, 0xc1, 0x50, 0x70,
0x94, 0x1c, 0xfe, 0x14, 0x16, 0x3d, 0x3a, 0xa0, 0xdc, 0x0f, 0x83, 0xc7, 0xfe, 0x01, 0x8d, 0xb8,
0x7b, 0x30, 0x94, 0x4e, 0x96, 0x9d, 0xf1, 0x0d, 0xb2, 0x0d, 0x8b, 0x46, 0xd4, 0xa2, 0x61, 0x18,
0x44, 0x14, 0xdf, 0x80, 0x39, 0x46, 0xfb, 0xd4, 0x1f, 0x72, 0x79, 0x6a, 0xad, 0x77, 0x61, 0xfc,
0x54, 0x27, 0x16, 0xf8, 0xda, 0xe7, 0x7b, 0x89, 0x9f, 0x8e, 0x56, 0x23, 0xfb, 0xf0, 0xc1, 0x44,
0x29, 0x7c, 0x05, 0x96, 0x22, 0x63, 0x53, 0xb9, 0x2a, 0x8f, 0x5a, 0x70, 0x8a, 0xb6, 0x70, 0x0b,
0xaa, 0x51, 0x12, 0xe8, 0x38, 0x61, 0x29, 0x40, 0x7e, 0x41, 0xb0, 0x60, 0x9e, 0x36, 0x3d, 0xed,
0x43, 0x4a, 0xd9, 0x86, 0x27, 0xad, 0x54, 0x1d, 0xb5, 0xc2, 0x1d, 0x38, 0xe9, 0xf6, 0xfb, 0xe1,
0x28, 0xe0, 0xb9, 0xd4, 0xe7, 0x61, 0x41, 0x25, 0xa0, 0xfc, 0x45, 0xc8, 0xf6, 0x37, 0x3c, 0x99,
0xf3, 0xaa, 0x93, 0x02, 0xb8, 0x0d, 0xf0, 0xdc, 0x1d, 0xf8, 0xde, 0x76, 0xc0, 0xfd, 0x81, 0x4c,
0x73, 0xc5, 0x31, 0x10, 0xf2, 0x14, 0x56, 0xbe, 0xf2, 0x07, 0xf4, 0xbe, 0x7f, 0xe0, 0xf3, 0xf5,
0x3d, 0xda, 0xdf, 0xd7, 0x95, 0x5a, 0x40, 0x00, 0x15, 0x13, 0x30, 0x9c, 0xb3, 0x32, 0xce, 0x91,
0x4d, 0x58, 0xcd, 0x1b, 0x57, 0x09, 0x5d, 0x86, 0x99, 0x81, 0x40, 0xa5, 0xcd, 0x8a, 0x13, 0x2f,
0x04, 0xd9, 0x88, 0x87, 0xcc, 0xdd, 0xa5, 0xf7, 0xe8, 0xa1, 0x32, 0x66, 0x20, 0xe4, 0x2a, 0x9c,
0x32, 0x0a, 0x2c, 0x43, 0x77, 0x62, 0x84, 0xc9, 0x36, 0x34, 0xc6, 0x95, 0x14, 0x8d, 0x6b, 0x30,
0x37, 0x34, 0x92, 0x5d, 0xeb, 0x9d, 0x9d, 0x54, 0xcd, 0x2a, 0xf1, 0x8e, 0x96, 0x27, 0xd7, 0xe0,
0x74, 0xde, 0xec, 0x03, 0x37, 0x38, 0xd4, 0x7c, 0x9a, 0x30, 0xaf, 0x08, 0x88, 0x8b, 0x52, 0xee,
0x54, 0x9d, 0x64, 0x4d, 0x9e, 0x42, 0xab, 0x58, 0x55, 0xb1, 0xba, 0x0e, 0xf3, 0xea, 0x94, 0x58,
0xf7, 0x18, 0xb4, 0x12, 0x05, 0xf2, 0x1a, 0xe5, 0xfc, 0x75, 0x83, 0x5d, 0x7a, 0x74, 0xfb, 0x31,
0x2e, 0xa9, 0xb2, 0x99, 0xa4, 0x73, 0x7c, 0x43, 0x14, 0x47, 0x0e, 0xd4, 0xd5, 0x99, 0x83, 0xb1,
0x03, 0x4b, 0x39, 0xe8, 0xf1, 0xe1, 0x30, 0xee, 0x4d, 0xf5, 0xde, 0x5a, 0xc6, 0xad, 0xdb, 0xe3,
0x72, 0x4e, 0x91, 0x32, 0x79, 0xa2, 0xee, 0x72, 0xd6, 0xc3, 0x77, 0x4f, 0xe9, 0x75, 0x38, 0xbd,
0x19, 0x5f, 0x9c, 0xf5, 0x30, 0xd8, 0xf1, 0x77, 0x47, 0xcc, 0x15, 0x47, 0xeb, 0xe0, 0xb5, 0xa0,
0xda, 0x1f, 0x31, 0x46, 0x45, 0xe9, 0xab, 0xf0, 0xa5, 0x00, 0xf9, 0x13, 0x41, 0xab, 0x58, 0x5b,
0x11, 0xeb, 0xc0, 0xc9, 0xbe, 0xb9, 0x91, 0x18, 0xc9, 0xc3, 0xd9, 0x1b, 0x6d, 0xe5, 0x6f, 0xf4,
0xc7, 0x30, 0x13, 0x84, 0x1e, 0x8d, 0x1a, 0x65, 0x59, 0x1a, 0x8b, 0x19, 0xf7, 0x36, 0x43, 0x8f,
0x3a, 0xf1, 0x3e, 0xee, 0x82, 0xdd, 0x67, 0xd4, 0xd5, 0xed, 0x75, 0x3b, 0xf0, 0x5f, 0xca, 0xb8,
0x57, 0x9c, 0x31, 0x9c, 0xf8, 0x50, 0x11, 0xaa, 0x46, 0x3b, 0x42, 0x99, 0x76, 0xd4, 0x82, 0xaa,
0xeb, 0x79, 0x8c, 0x46, 0x11, 0x8d, 0x1a, 0x96, 0xac, 0xe7, 0x14, 0xc0, 0x9f, 0xc0, 0x0c, 0x3f,
0x1c, 0x2a, 0x4a, 0xf5, 0xde, 0xca, 0x18, 0x25, 0x99, 0xcb, 0x58, 0x86, 0x1c, 0xc0, 0x39, 0x9d,
0x69, 0x19, 0x28, 0x76, 0xa0, 0x12, 0x91, 0xed, 0xc9, 0x05, 0x25, 0x86, 0x8a, 0x4b, 0x6c, 0x7a,
0x2f, 0xfe, 0x1d, 0xc1, 0x6a, 0xf1, 0x79, 0xef, 0xb1, 0x2b, 0xb7, 0xa0, 0xca, 0x93, 0xa7, 0x70,
0x46, 0x3e, 0x85, 0x29, 0x40, 0x6e, 0x03, 0xd6, 0x8c, 0xef, 0x87, 0xbb, 0xc6, 0xdd, 0x75, 0x77,
0xb8, 0x91, 0x1b, 0xbd, 0x4c, 0x9b, 0xa9, 0x20, 0x7b, 0x42, 0x35, 0x53, 0xe2, 0xc3, 0x52, 0xc6,
0x8a, 0x2a, 0xc3, 0x2f, 0xe4, 0x53, 0x1a, 0xb2, 0xa4, 0xb7, 0xb4, 0x0b, 0x2f, 0xa1, 0x54, 0x11,
0x62, 0x8e, 0x16, 0x17, 0x04, 0xf6, 0xdc, 0xe8, 0x41, 0xa8, 0xa2, 0x3c, 0xef, 0xe8, 0x25, 0xf9,
0x09, 0xc1, 0xe2, 0x98, 0x22, 0xae, 0x83, 0xe5, 0x6b, 0xae, 0x96, 0xef, 0x4d, 0x7e, 0x27, 0xf0,
0x97, 0xc9, 0x4c, 0x51, 0x96, 0x7d, 0xe1, 0xfc, 0x74, 0x4a, 0xb9, 0xf9, 0x22, 0x13, 0xcc, 0x4a,
0x3e, 0x98, 0x7f, 0x20, 0x35, 0xc6, 0x48, 0x33, 0xef, 0xb1, 0x13, 0x76, 0xc1, 0xd6, 0xd0, 0x6d,
0x75, 0xd7, 0x15, 0xdb, 0x31, 0x9c, 0x6c, 0xc0, 0x52, 0x86, 0xb3, 0xca, 0x5d, 0x0f, 0x96, 0x79,
0x78, 0x4b, 0xa1, 0x5e, 0x3a, 0x4c, 0x21, 0x69, 0xa6, 0x70, 0x8f, 0x04, 0xb0, 0x7c, 0x33, 0xae,
0xcd, 0x6c, 0x00, 0x0a, 0xdd, 0x44, 0xff, 0xc3, 0x4d, 0xab, 0xd0, 0x4d, 0xf2, 0x33, 0x82, 0x33,
0xe6, 0x81, 0xe3, 0xd7, 0x6e, 0x52, 0x8f, 0x29, 0xb8, 0x5c, 0xd6, 0x31, 0x2e, 0x57, 0x79, 0xea,
0xe5, 0x1a, 0xab, 0x87, 0x7b, 0xb0, 0x92, 0x8b, 0xc7, 0x3b, 0x04, 0xb7, 0x0d, 0x2d, 0x65, 0xcc,
0xa1, 0xcf, 0x29, 0x4b, 0x3c, 0xd6, 0x23, 0xf4, 0xd9, 0x24, 0x16, 0xf9, 0xfd, 0xf8, 0xd0, 0xee,
0xaf, 0x08, 0xe0, 0x0e, 0x63, 0x21, 0x5b, 0x97, 0x2d, 0xbb, 0x0e, 0xb0, 0x1d, 0xd0, 0x97, 0x43,
0xda, 0xe7, 0xd4, 0xb3, 0x4b, 0xd8, 0x56, 0x73, 0xa4, 0x3a, 0xd8, 0x46, 0xb8, 0x01, 0xcb, 0x29,
0x22, 0xc2, 0x4e, 0x03, 0xcf, 0x0f, 0x76, 0x6d, 0x2b, 0x91, 0x5d, 0x17, 0xbd, 0x9d, 0x7a, 0x76,
0x19, 0x63, 0xa8, 0x4b, 0x64, 0x33, 0xe4, 0x77, 0x5e, 0xfa, 0x11, 0x8f, 0xec, 0x0a, 0x5e, 0x51,
0xe3, 0xb5, 0x9c, 0xc9, 0x1c, 0xea, 0xf6, 0xf7, 0xa8, 0x67, 0xcf, 0x08, 0xd1, 0x4c, 0x54, 0x3c,
0x7b, 0x16, 0xdb, 0x50, 0x93, 0xd4, 0x1e, 0xee, 0xec, 0x44, 0x94, 0xdb, 0xbf, 0x59, 0xdd, 0x1f,
0xa0, 0x66, 0xbc, 0x9f, 0x78, 0x35, 0xf3, 0x81, 0xa0, 0xcf, 0x2d, 0xe1, 0x36, 0x34, 0xcd, 0x67,
0x36, 0x66, 0xa8, 0x09, 0xdb, 0x28, 0xb7, 0xaf, 0x37, 0x1e, 0x71, 0x97, 0x09, 0x7d, 0x2b, 0x67,
0x57, 0x13, 0x2a, 0x77, 0xef, 0xc2, 0xbc, 0x7e, 0x4c, 0x70, 0x0d, 0xe6, 0x1e, 0x33, 0x4a, 0x6f,
0x6e, 0x6d, 0xd8, 0x25, 0xb1, 0x10, 0x73, 0xa6, 0x58, 0x20, 0xe1, 0xca, 0x7a, 0xda, 0x3d, 0x04,
0x26, 0x63, 0xb3, 0x2e, 0xe2, 0x1d, 0x44, 0xa3, 0x48, 0x20, 0xe5, 0xee, 0xb5, 0xb4, 0x3b, 0x1a,
0xa3, 0x05, 0x9e, 0x87, 0x8a, 0x30, 0x1b, 0xdb, 0x54, 0x75, 0x6b, 0x23, 0xb1, 0x50, 0xe1, 0xb1,
0xad, 0xee, 0x0d, 0x38, 0x35, 0xa1, 0x25, 0xe1, 0x59, 0xb0, 0x1e, 0xee, 0xdb, 0x25, 0xbc, 0x08,
0x27, 0x1c, 0x7a, 0x10, 0x3e, 0xa7, 0x5b, 0x8c, 0x0e, 0x5d, 0x46, 0x6d, 0x84, 0x01, 0x66, 0x63,
0xc8, 0xb6, 0x7a, 0x7f, 0xcf, 0x41, 0xcd, 0xe0, 0x88, 0xef, 0x42, 0x35, 0xf9, 0xe6, 0xc1, 0x67,
0x0a, 0xe6, 0x95, 0xf4, 0x0b, 0xb2, 0xd9, 0x9e, 0xb4, 0xad, 0xca, 0xf8, 0x1b, 0xa8, 0x67, 0x67,
0x6e, 0x4c, 0x32, 0x1a, 0x85, 0xd3, 0x7e, 0xf3, 0xdc, 0x54, 0x19, 0x65, 0xfa, 0x3b, 0xfd, 0x41,
0x9b, 0xce, 0xad, 0xf8, 0xfc, 0xa4, 0xe9, 0x2a, 0x63, 0xfe, 0xa3, 0x23, 0xa4, 0xd4, 0x01, 0xfb,
0xaa, 0xb8, 0x73, 0x83, 0x31, 0xee, 0x4c, 0x55, 0x37, 0xc6, 0xee, 0xe6, 0xc5, 0x63, 0x48, 0xaa,
0xc3, 0x9e, 0xe9, 0x0f, 0x4d, 0x63, 0x8a, 0xc4, 0x53, 0x88, 0x1a, 0x73, 0x74, 0xf3, 0xc2, 0x51,
0x62, 0xa9, 0x43, 0x45, 0x33, 0x61, 0xce, 0xa1, 0x29, 0x43, 0x67, 0xce, 0xa1, 0xa9, 0x03, 0xe6,
0x16, 0xd4, 0x8c, 0xba, 0xc4, 0x67, 0x27, 0x3f, 0xa2, 0xb1, 0xe9, 0xb5, 0xc9, 0x02, 0xa9, 0x45,
0xa3, 0xfd, 0xe0, 0x82, 0x49, 0x3a, 0xf3, 0xa6, 0xe4, 0x2c, 0x16, 0xbd, 0x60, 0x4f, 0xe0, 0x44,
0xa6, 0xcf, 0xe0, 0x0f, 0x33, 0x2a, 0x45, 0x2f, 0x55, 0x93, 0x4c, 0x13, 0x51, 0x76, 0x83, 0xa4,
0xab, 0x67, 0x1b, 0x2d, 0xbe, 0x58, 0xa4, 0x5c, 0xd8, 0xac, 0x9b, 0xdd, 0xe3, 0x88, 0xc6, 0xe7,
0xdd, 0xfa, 0xfc, 0x9f, 0x37, 0x6d, 0xf4, 0xea, 0x4d, 0x1b, 0xbd, 0x7e, 0xd3, 0x46, 0x3f, 0xbe,
0x6d, 0x97, 0x5e, 0xbd, 0x6d, 0x97, 0xfe, 0x7d, 0xdb, 0x2e, 0x7d, 0xdb, 0x9a, 0xf6, 0xaf, 0xa3,
0x67, 0xb3, 0xf2, 0xd7, 0xd5, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0xcb, 0xe3, 0xb8, 0x77, 0x61,
0x12, 0x00, 0x00,
}
func (m *SpaceSignRequest) Marshal() (dAtA []byte, err error) {

View file

@ -2,8 +2,9 @@ package coordinatorproto
import (
"bytes"
"github.com/anyproto/any-sync/util/crypto"
"time"
"github.com/anyproto/any-sync/util/crypto"
)
func PrepareDeleteConfirmation(privKey crypto.PrivKey, spaceId, peerId, networkId string) (signed *DeletionConfirmPayloadWithSignature, err error) {
@ -33,6 +34,58 @@ func PrepareDeleteConfirmation(privKey crypto.PrivKey, spaceId, peerId, networkI
return
}
func PrepareAccountDeleteConfirmation(privKey crypto.PrivKey, peerId, networkId string) (signed *DeletionConfirmPayloadWithSignature, err error) {
marshalledIdentity, err := privKey.GetPublic().Marshall()
if err != nil {
return
}
deleteConfirm := &AccountDeletionConfirmPayload{
PeerId: peerId,
AccountIdentity: marshalledIdentity,
NetworkId: networkId,
Timestamp: time.Now().Unix(),
}
marshalledDeleteConfirm, err := deleteConfirm.Marshal()
if err != nil {
return
}
signature, err := privKey.Sign(marshalledDeleteConfirm)
if err != nil {
return
}
signed = &DeletionConfirmPayloadWithSignature{
DeletionPayload: marshalledDeleteConfirm,
Signature: signature,
}
return
}
func ValidateAccountDeleteConfirmation(pubKey crypto.PubKey, spaceId, networkId string, deleteConfirm *DeletionConfirmPayloadWithSignature) (err error) {
res, err := pubKey.Verify(deleteConfirm.GetDeletionPayload(), deleteConfirm.GetSignature())
if err != nil {
return
}
if !res {
return errSignatureIncorrect
}
payload := &AccountDeletionConfirmPayload{}
err = payload.Unmarshal(deleteConfirm.GetDeletionPayload())
if err != nil {
return
}
if payload.NetworkId != networkId {
return errNetworkIsIncorrect
}
accountRaw, err := crypto.UnmarshalEd25519PublicKeyProto(payload.AccountIdentity)
if err != nil {
return
}
if !bytes.Equal(pubKey.Storage(), accountRaw.Storage()) {
return errAccountIncorrect
}
return
}
func ValidateDeleteConfirmation(pubKey crypto.PubKey, spaceId, networkId string, deleteConfirm *DeletionConfirmPayloadWithSignature) (err error) {
res, err := pubKey.Verify(deleteConfirm.GetDeletionPayload(), deleteConfirm.GetSignature())
if err != nil {

View file

@ -1,8 +1,9 @@
package coordinatorproto
import (
"github.com/stretchr/testify/require"
"testing"
"github.com/stretchr/testify/require"
)
func TestValidateDeleteConfirmation(t *testing.T) {
@ -12,3 +13,11 @@ func TestValidateDeleteConfirmation(t *testing.T) {
err = ValidateDeleteConfirmation(fx.accountKey, fx.spaceId, fx.networkKey.GetPublic().Network(), delConfirm)
require.NoError(t, err)
}
func TestValidateAccountDeleteConfirmation(t *testing.T) {
fx := newFixture(t)
delConfirm, err := PrepareAccountDeleteConfirmation(fx.accountPrivKey, fx.peerId, fx.networkKey.GetPublic().Network())
require.NoError(t, err)
err = ValidateAccountDeleteConfirmation(fx.accountKey, fx.spaceId, fx.networkKey.GetPublic().Network(), delConfirm)
require.NoError(t, err)
}

View file

@ -58,6 +58,7 @@ enum ErrorCodes {
SpaceCreated = 3;
SpaceNotExists = 4;
SpaceLimitReached = 5;
AccountDeleted = 6;
ErrorOffset = 300;
}