benjamyn/any-sync
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add peerId to space receipt

Browse Source
This commit is contained in:
Sergey Cherepanov authored and Mikhail Iudin committed 2023-02-23 14:13:11 +03:00
1 parent 33e1065e4d
commit 6eb84043f0
2 files changed
+93 -36
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

coordinator/coordinatorproto/coordinator.pb.go
+87 -33
View File
@@ -165,13 +165,16 @@ func (m *SpaceReceiptWithSignature) GetSignature() []byte {
// SpaceReceipt contains permission to SpacePush operation
type SpaceReceipt struct {
// spaceId
SpaceId string `protobuf:"bytes,1,opt,name=spaceId,proto3" json:"spaceId,omitempty"`
// peerId of receipt requester
PeerId string `protobuf:"bytes,2,opt,name=peerId,proto3" json:"peerId,omitempty"`
// identity of space owner
AccountIdentity []byte `protobuf:"bytes,2,opt,name=accountIdentity,proto3" json:"accountIdentity,omitempty"`
AccountIdentity []byte `protobuf:"bytes,3,opt,name=accountIdentity,proto3" json:"accountIdentity,omitempty"`
// identity of control node
ControlNodeIdentity []byte `protobuf:"bytes,3,opt,name=controlNodeIdentity,proto3" json:"controlNodeIdentity,omitempty"`
ControlNodeIdentity []byte `protobuf:"bytes,4,opt,name=controlNodeIdentity,proto3" json:"controlNodeIdentity,omitempty"`
// unix-timestamp with a deadline time of receipt validity
ValidUntil uint64 `protobuf:"varint,4,opt,name=validUntil,proto3" json:"validUntil,omitempty"`
ValidUntil uint64 `protobuf:"varint,5,opt,name=validUntil,proto3" json:"validUntil,omitempty"`
}
func (m *SpaceReceipt) Reset() { *m = SpaceReceipt{} }
@@ -214,6 +217,13 @@ func (m *SpaceReceipt) GetSpaceId() string {
return ""
}
func (m *SpaceReceipt) GetPeerId() string {
if m != nil {
return m.PeerId
}
return ""
}
func (m *SpaceReceipt) GetAccountIdentity() []byte {
if m != nil {
return m.AccountIdentity
@@ -348,32 +358,33 @@ func init() {
}
var fileDescriptor_d94f6f99586adae2 = []byte{
// 390 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x53, 0xdd, 0x4e, 0xc2, 0x30,
0x18, 0xa5, 0x88, 0x12, 0x3e, 0x88, 0x3f, 0xf5, 0x27, 0x93, 0x60, 0x43, 0x66, 0x62, 0xb8, 0x30,
0x60, 0x30, 0x7a, 0x6d, 0x24, 0x31, 0xc1, 0x18, 0x63, 0x46, 0x88, 0x51, 0xaf, 0xe6, 0xd6, 0x48,
0xc3, 0x5c, 0xe7, 0x56, 0x4c, 0x78, 0x0b, 0x1f, 0xc2, 0x47, 0xf0, 0x21, 0xbc, 0xe4, 0xd2, 0x4b,
0x03, 0x2f, 0x62, 0xd6, 0x31, 0x28, 0x38, 0xb8, 0xd9, 0xd6, 0xf3, 0x9d, 0xf3, 0x7d, 0xa7, 0x3b,
0x2d, 0x9c, 0x59, 0x9c, 0xfb, 0x36, 0x73, 0x4d, 0xc1, 0xfd, 0x9a, 0xf2, 0xed, 0xf9, 0x5c, 0xf0,
0x9a, 0x7c, 0x06, 0x2a, 0x5e, 0x95, 0x10, 0xce, 0x2b, 0x90, 0x7e, 0x0c, 0x9b, 0x2d, 0xcf, 0xb4,
0x68, 0x8b, 0xbd, 0xb8, 0x06, 0x7d, 0xeb, 0xd1, 0x40, 0x60, 0x0d, 0xb2, 0x41, 0x88, 0x35, 0x6d,
0x0d, 0x95, 0x51, 0x25, 0x67, 0xc4, 0x4b, 0xbd, 0x0d, 0x5b, 0x0a, 0x3b, 0xf0, 0xb8, 0x1b, 0x50,
0x7c, 0x01, 0x59, 0x9f, 0x5a, 0x94, 0x79, 0x42, 0xd2, 0xf3, 0xf5, 0xa3, 0xaa, 0x3a, 0x54, 0x0a,
0x8c, 0x88, 0x70, 0xcf, 0x44, 0x27, 0xd4, 0x9a, 0xa2, 0xe7, 0x53, 0x23, 0x96, 0xe9, 0x5d, 0xd8,
0x5f, 0xc8, 0xc2, 0x27, 0xb0, 0x1d, 0x28, 0xc5, 0x3b, 0xb3, 0xef, 0x70, 0x33, 0x72, 0x56, 0x30,
0x92, 0x4a, 0xb8, 0x04, 0xb9, 0x20, 0x96, 0x6b, 0x69, 0xc9, 0x9b, 0x02, 0xfa, 0x27, 0x82, 0x82,
0x3a, 0x6d, 0xf1, 0x76, 0x71, 0x05, 0x36, 0x4c, 0xcb, 0xe2, 0x3d, 0x57, 0x34, 0x6d, 0xea, 0x0a,
0x26, 0xfa, 0xe3, 0x76, 0xf3, 0x70, 0x68, 0xd2, 0xe2, 0xae, 0xf0, 0xb9, 0x73, 0xcb, 0x6d, 0x3a,
0x61, 0xaf, 0x44, 0x26, 0x13, 0x4a, 0x98, 0x00, 0xbc, 0x9b, 0x0e, 0xb3, 0xdb, 0xae, 0x60, 0x8e,
0x96, 0x29, 0xa3, 0x4a, 0xc6, 0x50, 0x10, 0xfd, 0x09, 0x76, 0xaf, 0x98, 0x43, 0x6f, 0xd8, 0x2b,
0x13, 0x8d, 0x0e, 0xb5, 0xba, 0x71, 0x3a, 0x09, 0xa6, 0x50, 0xb2, 0x29, 0x65, 0x63, 0xe9, 0xd9,
0x1c, 0xab, 0xb0, 0x37, 0xdf, 0x7c, 0x1c, 0xe6, 0x0e, 0xac, 0x3a, 0x21, 0x2a, 0x7b, 0x66, 0x8c,
0x68, 0x51, 0xff, 0x42, 0x90, 0x6f, 0x4c, 0x33, 0xc5, 0xd7, 0x90, 0x9b, 0x9c, 0x03, 0x7c, 0xf0,
0x3f, 0x6e, 0xe5, 0x34, 0x15, 0xc9, 0xa2, 0xf2, 0x78, 0xe2, 0x03, 0xac, 0xcf, 0x7a, 0xc1, 0xfa,
0x8c, 0x22, 0xf1, 0x2f, 0x14, 0x0f, 0x97, 0x72, 0xa2, 0xd6, 0x97, 0xe7, 0xdf, 0x43, 0x82, 0x06,
0x43, 0x82, 0x7e, 0x87, 0x04, 0x7d, 0x8c, 0x48, 0x6a, 0x30, 0x22, 0xa9, 0x9f, 0x11, 0x49, 0x3d,
0x96, 0x96, 0x5d, 0x9d, 0xe7, 0x35, 0xf9, 0x3a, 0xfd, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x99, 0x06,
0x09, 0x83, 0x61, 0x03, 0x00, 0x00,
// 409 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x53, 0xdd, 0x6a, 0xe2, 0x40,
0x14, 0x76, 0x5c, 0x7f, 0xc8, 0x51, 0xf6, 0x67, 0x76, 0x57, 0xb2, 0xe2, 0x0e, 0x92, 0x85, 0xc5,
0x8b, 0x45, 0x17, 0x97, 0xdd, 0xeb, 0xa5, 0x42, 0xc1, 0x52, 0x4a, 0x19, 0x91, 0xd2, 0xf6, 0x2a,
0x4d, 0x86, 0x3a, 0x98, 0x66, 0xd2, 0x64, 0x2c, 0xf8, 0x16, 0x7d, 0x98, 0x5e, 0xf6, 0x01, 0x7a,
0xe9, 0x65, 0x2f, 0x8b, 0xbe, 0x48, 0xc9, 0xc4, 0xe8, 0x68, 0xa3, 0x37, 0x49, 0xce, 0x77, 0xbe,
0xef, 0x9c, 0x6f, 0x72, 0xce, 0xc0, 0x5f, 0x47, 0x88, 0xd0, 0xe5, 0xbe, 0x2d, 0x45, 0xd8, 0xd1,
0xbe, 0x83, 0x50, 0x48, 0xd1, 0x51, 0xcf, 0x48, 0xc7, 0xdb, 0x0a, 0xc2, 0x15, 0x0d, 0xb2, 0x7e,
0xc1, 0xc7, 0x41, 0x60, 0x3b, 0x6c, 0xc0, 0xaf, 0x7d, 0xca, 0x6e, 0x27, 0x2c, 0x92, 0xd8, 0x84,
0x72, 0x14, 0x63, 0x7d, 0xd7, 0x44, 0x4d, 0xd4, 0x32, 0x68, 0x1a, 0x5a, 0x43, 0xf8, 0xa4, 0xb1,
0xa3, 0x40, 0xf8, 0x11, 0xc3, 0xff, 0xa1, 0x1c, 0x32, 0x87, 0xf1, 0x40, 0x2a, 0x7a, 0xa5, 0xfb,
0xb3, 0xad, 0x37, 0x55, 0x02, 0x9a, 0x10, 0xce, 0xb8, 0x1c, 0xc5, 0x5a, 0x5b, 0x4e, 0x42, 0x46,
0x53, 0x99, 0x35, 0x86, 0x6f, 0x3b, 0x59, 0xf8, 0x37, 0x7c, 0x8e, 0xb4, 0xe4, 0xa9, 0x3d, 0xf5,
0x84, 0x9d, 0x38, 0xab, 0xd2, 0xac, 0x14, 0x6e, 0x80, 0x11, 0xa5, 0x72, 0x33, 0xaf, 0x78, 0x6b,
0xc0, 0x7a, 0x44, 0x50, 0xd5, 0xbb, 0xed, 0x3e, 0x2e, 0xae, 0x41, 0x29, 0x60, 0x2c, 0xec, 0xbb,
0xaa, 0x8a, 0x41, 0x97, 0x11, 0x6e, 0xc1, 0x07, 0xdb, 0x71, 0xc4, 0xc4, 0x97, 0x7d, 0x97, 0xf9,
0x92, 0xcb, 0xa9, 0xf9, 0x4e, 0xb5, 0xd9, 0x86, 0x63, 0xf3, 0x8e, 0xf0, 0x65, 0x28, 0xbc, 0x13,
0xe1, 0xb2, 0x15, 0xbb, 0x90, 0x98, 0xcf, 0x48, 0x61, 0x02, 0x70, 0x67, 0x7b, 0xdc, 0x1d, 0xfa,
0x92, 0x7b, 0x66, 0xb1, 0x89, 0x5a, 0x05, 0xaa, 0x21, 0xd6, 0x25, 0x7c, 0x3d, 0xe4, 0x1e, 0x3b,
0xe6, 0x37, 0x5c, 0xf6, 0x46, 0xcc, 0x19, 0xa7, 0x53, 0xcb, 0x30, 0x85, 0xb2, 0x4d, 0x69, 0x07,
0xce, 0x6f, 0xce, 0xb7, 0x0d, 0xb5, 0xed, 0xe2, 0xcb, 0x21, 0x7f, 0x81, 0xa2, 0x17, 0xa3, 0xaa,
0x66, 0x81, 0x26, 0x41, 0xf7, 0x01, 0x41, 0xa5, 0xb7, 0x9e, 0x35, 0x3e, 0x02, 0x63, 0xb5, 0x1f,
0xf8, 0xfb, 0xdb, 0x35, 0xd0, 0xb6, 0xac, 0x4e, 0x76, 0xa5, 0x97, 0x1d, 0xcf, 0xe1, 0xfd, 0xa6,
0x17, 0x6c, 0x6d, 0x28, 0x32, 0xff, 0x42, 0xfd, 0xc7, 0x5e, 0x4e, 0x52, 0xfa, 0xe0, 0xdf, 0xd3,
0x9c, 0xa0, 0xd9, 0x9c, 0xa0, 0x97, 0x39, 0x41, 0xf7, 0x0b, 0x92, 0x9b, 0x2d, 0x48, 0xee, 0x79,
0x41, 0x72, 0x17, 0x8d, 0x7d, 0x57, 0xea, 0xaa, 0xa4, 0x5e, 0x7f, 0x5e, 0x03, 0x00, 0x00, 0xff,
0xff, 0x77, 0x20, 0x0a, 0xe9, 0x79, 0x03, 0x00, 0x00,
}
func (m *SpaceSignRequest) Marshal() (dAtA []byte, err error) {
@@ -501,20 +512,27 @@ func (m *SpaceReceipt) MarshalToSizedBuffer(dAtA []byte) (int, error) {
if m.ValidUntil != 0 {
i = encodeVarintCoordinator(dAtA, i, uint64(m.ValidUntil))
i--
dAtA[i] = 0x20
dAtA[i] = 0x28
}
if len(m.ControlNodeIdentity) > 0 {
i -= len(m.ControlNodeIdentity)
copy(dAtA[i:], m.ControlNodeIdentity)
i = encodeVarintCoordinator(dAtA, i, uint64(len(m.ControlNodeIdentity)))
i--
dAtA[i] = 0x1a
dAtA[i] = 0x22
}
if len(m.AccountIdentity) > 0 {
i -= len(m.AccountIdentity)
copy(dAtA[i:], m.AccountIdentity)
i = encodeVarintCoordinator(dAtA, i, uint64(len(m.AccountIdentity)))
i--
dAtA[i] = 0x1a
}
if len(m.PeerId) > 0 {
i -= len(m.PeerId)
copy(dAtA[i:], m.PeerId)
i = encodeVarintCoordinator(dAtA, i, uint64(len(m.PeerId)))
i--
dAtA[i] = 0x12
}
if len(m.SpaceId) > 0 {
@@ -656,6 +674,10 @@ func (m *SpaceReceipt) Size() (n int) {
if l > 0 {
n += 1 + l + sovCoordinator(uint64(l))
}
l = len(m.PeerId)
if l > 0 {
n += 1 + l + sovCoordinator(uint64(l))
}
l = len(m.AccountIdentity)
if l > 0 {
n += 1 + l + sovCoordinator(uint64(l))
@@ -1053,6 +1075,38 @@ func (m *SpaceReceipt) Unmarshal(dAtA []byte) error {
m.SpaceId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 2:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field PeerId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowCoordinator
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := dAtA[iNdEx]
iNdEx++
stringLen |= uint64(b&0x7F) << shift
if b < 0x80 {
break
}
}
intStringLen := int(stringLen)
if intStringLen < 0 {
return ErrInvalidLengthCoordinator
}
postIndex := iNdEx + intStringLen
if postIndex < 0 {
return ErrInvalidLengthCoordinator
}
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.PeerId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 3:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field AccountIdentity", wireType)
}
@@ -1086,7 +1140,7 @@ func (m *SpaceReceipt) Unmarshal(dAtA []byte) error {
m.AccountIdentity = []byte{}
}
iNdEx = postIndex
case 3:
case 4:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ControlNodeIdentity", wireType)
}
@@ -1120,7 +1174,7 @@ func (m *SpaceReceipt) Unmarshal(dAtA []byte) error {
m.ControlNodeIdentity = []byte{}
}
iNdEx = postIndex
case 4:
case 5:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field ValidUntil", wireType)
}
coordinator/coordinatorproto/protos/coordinator.proto
+6 -3
View File
@@ -30,13 +30,16 @@ message SpaceReceiptWithSignature {
// SpaceReceipt contains permission to SpacePush operation
message SpaceReceipt {
// spaceId
string spaceId = 1;
// peerId of receipt requester
string peerId = 2;
// identity of space owner
bytes accountIdentity = 2;
bytes accountIdentity = 3;
// identity of control node
bytes controlNodeIdentity = 3;
bytes controlNodeIdentity = 4;
// unix-timestamp with a deadline time of receipt validity
uint64 validUntil = 4;
uint64 validUntil = 5;
}
// FileLimitCheckRequest contains an account identity and spaceId