mirror of
https://github.com/status-im/status-protocol-go.git
synced 2025-03-03 12:00:33 +00:00
Remove deprecated bundle field
This commit is contained in:
Andrea Maria Piana
parent
8a6d5a6b49
commit
f51fd2e639
@ -330,7 +330,7 @@ func (s *EncryptionServiceMultiDeviceSuite) TestMaxDevicesRefreshedBundle() {
|
||||
msg2, err := alice1.BuildDirectMessage(aliceKey, &bobKey.PublicKey, []byte("test"))
|
||||
s.Require().NoError(err)
|
||||
|
||||
alice1Bundle = msg2.Message.GetBundle()
|
||||
alice1Bundle = msg2.Message.GetBundles()[0]
|
||||
|
||||
// Bob processes the bundle
|
||||
_, err = bob1.ProcessPublicBundle(bobKey, alice1Bundle)
|
||||
|
||||
@ -157,7 +157,7 @@ func (p *Protocol) Start(myIdentity *ecdsa.PrivateKey) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (p *Protocol) addBundle(myIdentityKey *ecdsa.PrivateKey, msg *ProtocolMessage, sendSingle bool) error {
|
||||
func (p *Protocol) addBundle(myIdentityKey *ecdsa.PrivateKey, msg *ProtocolMessage) error {
|
||||
logger := p.logger.With(zap.String("site", "addBundle"))
|
||||
|
||||
// Get a bundle
|
||||
@ -175,13 +175,7 @@ func (p *Protocol) addBundle(myIdentityKey *ecdsa.PrivateKey, msg *ProtocolMessa
|
||||
return err
|
||||
}
|
||||
|
||||
if sendSingle {
|
||||
// DEPRECATED: This is only for backward compatibility, remove once not
|
||||
// an issue anymore
|
||||
msg.Bundle = bundle
|
||||
} else {
|
||||
msg.Bundles = []*Bundle{bundle}
|
||||
}
|
||||
msg.Bundles = []*Bundle{bundle}
|
||||
|
||||
return nil
|
||||
}
|
||||
@ -194,7 +188,7 @@ func (p *Protocol) BuildPublicMessage(myIdentityKey *ecdsa.PrivateKey, payload [
|
||||
PublicMessage: payload,
|
||||
}
|
||||
|
||||
err := p.addBundle(myIdentityKey, message, false)
|
||||
err := p.addBundle(myIdentityKey, message)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@ -235,7 +229,7 @@ func (p *Protocol) BuildDirectMessage(myIdentityKey *ecdsa.PrivateKey, publicKey
|
||||
DirectMessage: directMessage,
|
||||
}
|
||||
|
||||
err = p.addBundle(myIdentityKey, message, true)
|
||||
err = p.addBundle(myIdentityKey, message)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@ -287,7 +281,7 @@ func (p *Protocol) BuildDHMessage(myIdentityKey *ecdsa.PrivateKey, destination *
|
||||
DirectMessage: encryptionResponse,
|
||||
}
|
||||
|
||||
err = p.addBundle(myIdentityKey, message, true)
|
||||
err = p.addBundle(myIdentityKey, message)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@ -425,17 +419,6 @@ func (p *Protocol) HandleMessage(
|
||||
return nil, errors.New("encryption service not initialized")
|
||||
}
|
||||
|
||||
// Process bundle, deprecated, here for backward compatibility
|
||||
if bundle := protocolMessage.GetBundle(); bundle != nil {
|
||||
// Should we stop processing if the bundle cannot be verified?
|
||||
addedBundles, err := p.ProcessPublicBundle(myIdentityKey, bundle)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
p.onAddedBundlesHandler(addedBundles)
|
||||
}
|
||||
|
||||
// Process bundles
|
||||
for _, bundle := range protocolMessage.GetBundles() {
|
||||
// Should we stop processing if the bundle cannot be verified?
|
||||
@ -468,8 +451,7 @@ func (p *Protocol) HandleMessage(
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Handle protocol negotiation for compatible clients
|
||||
bundles := append(protocolMessage.GetBundles(), protocolMessage.GetBundle())
|
||||
bundles := protocolMessage.GetBundles()
|
||||
version := getProtocolVersion(bundles, protocolMessage.GetInstallationId())
|
||||
logger.Debug("direct message version", zap.Uint32("version", version))
|
||||
if version >= sharedSecretNegotiationVersion {
|
||||
|
||||
@ -415,8 +415,6 @@ func (m *DirectMessageProtocol) GetPayload() []byte {
|
||||
|
||||
// Top-level protocol message
|
||||
type ProtocolMessage struct {
|
||||
// An optional bundle is exchanged with each message
|
||||
Bundle *Bundle `protobuf:"bytes,1,opt,name=bundle,proto3" json:"bundle,omitempty"`
|
||||
// The device id of the sender
|
||||
InstallationId string `protobuf:"bytes,2,opt,name=installation_id,json=installationId,proto3" json:"installation_id,omitempty"`
|
||||
// List of bundles
|
||||
@ -455,13 +453,6 @@ func (m *ProtocolMessage) XXX_DiscardUnknown() {
|
||||
|
||||
var xxx_messageInfo_ProtocolMessage proto.InternalMessageInfo
|
||||
|
||||
func (m *ProtocolMessage) GetBundle() *Bundle {
|
||||
if m != nil {
|
||||
return m.Bundle
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *ProtocolMessage) GetInstallationId() string {
|
||||
if m != nil {
|
||||
return m.InstallationId
|
||||
@ -506,41 +497,41 @@ func init() {
|
||||
func init() { proto.RegisterFile("protocol_message.proto", fileDescriptor_4e37b52004a72e16) }
|
||||
|
||||
var fileDescriptor_4e37b52004a72e16 = []byte{
|
||||
// 565 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x5d, 0x8b, 0xd3, 0x40,
|
||||
0x14, 0x25, 0xc9, 0xee, 0xb6, 0xbd, 0x4d, 0x3f, 0x18, 0x75, 0x09, 0x65, 0x1f, 0x6a, 0x70, 0xb1,
|
||||
0x8a, 0x04, 0x6c, 0x85, 0x15, 0x1f, 0xb5, 0x42, 0x5d, 0x59, 0x58, 0x46, 0x14, 0xf1, 0x25, 0x4c,
|
||||
0x3b, 0xe3, 0x3a, 0x98, 0x4e, 0x42, 0x66, 0x5a, 0xcc, 0x6f, 0xf0, 0xcf, 0xf9, 0x6f, 0x7c, 0x95,
|
||||
0x4c, 0x32, 0xed, 0xf4, 0x63, 0x1f, 0x7c, 0xcb, 0x9c, 0xb9, 0xf7, 0xdc, 0x7b, 0xce, 0x9d, 0x1b,
|
||||
0x38, 0xcf, 0xf2, 0x54, 0xa5, 0x8b, 0x34, 0x89, 0x97, 0x4c, 0x4a, 0x72, 0xc7, 0x22, 0x0d, 0x20,
|
||||
0x60, 0x62, 0x91, 0x17, 0x99, 0xe2, 0xa9, 0x08, 0x0b, 0xf0, 0x3f, 0xf1, 0x3b, 0xc1, 0xe8, 0x6d,
|
||||
0xce, 0x3e, 0xb2, 0x02, 0x3d, 0x81, 0xae, 0xd4, 0xe7, 0x38, 0xcb, 0x59, 0xfc, 0x93, 0x15, 0x81,
|
||||
0x33, 0x74, 0x46, 0x3e, 0xf6, 0xa5, 0x1d, 0x15, 0x40, 0x63, 0xcd, 0x72, 0xc9, 0x53, 0x11, 0xb8,
|
||||
0x43, 0x67, 0xd4, 0xc1, 0xe6, 0x88, 0x9e, 0x41, 0x7f, 0x53, 0xd5, 0x84, 0x78, 0x3a, 0xa4, 0x67,
|
||||
0xf0, 0x2f, 0x15, 0x1c, 0xfe, 0x76, 0xe1, 0xec, 0xed, 0x4a, 0xd0, 0x84, 0xa1, 0x01, 0x34, 0x39,
|
||||
0x65, 0x42, 0x71, 0x65, 0xea, 0x6d, 0xce, 0xe8, 0x06, 0x7a, 0xbb, 0x1d, 0xc9, 0xc0, 0x1d, 0x7a,
|
||||
0xa3, 0xf6, 0xf8, 0x32, 0xda, 0xea, 0x88, 0x2a, 0xa2, 0xc8, 0xd6, 0x22, 0xdf, 0x0b, 0x95, 0x17,
|
||||
0xb8, 0x63, 0x77, 0x2e, 0xd1, 0x05, 0xb4, 0x4a, 0x80, 0xa8, 0x55, 0xce, 0x82, 0x13, 0x5d, 0x6b,
|
||||
0x0b, 0x94, 0xb7, 0x8a, 0x2f, 0x99, 0x54, 0x64, 0x99, 0x05, 0xa7, 0x43, 0x67, 0xe4, 0xe1, 0x2d,
|
||||
0x30, 0xf8, 0x06, 0xe8, 0xb0, 0x00, 0xea, 0x83, 0x67, 0x7c, 0x6a, 0xe1, 0xf2, 0x13, 0x45, 0x70,
|
||||
0xba, 0x26, 0xc9, 0x8a, 0x69, 0x73, 0xda, 0xe3, 0xc0, 0x6e, 0xd4, 0x26, 0xc0, 0x55, 0xd8, 0x1b,
|
||||
0xf7, 0xb5, 0x13, 0xfe, 0x82, 0x5e, 0xa5, 0xe1, 0x5d, 0x2a, 0x14, 0xe1, 0x82, 0xe5, 0xe8, 0x39,
|
||||
0x9c, 0xcd, 0x35, 0xa4, 0xb9, 0xdb, 0x63, 0x74, 0x28, 0x18, 0xd7, 0x11, 0x68, 0x52, 0x4e, 0x9b,
|
||||
0xaf, 0x89, 0x62, 0xf1, 0xde, 0xfc, 0x5c, 0xad, 0xf1, 0x41, 0x7d, 0x6b, 0x97, 0xbf, 0x3e, 0x69,
|
||||
0x7a, 0xfd, 0x93, 0xf0, 0x1a, 0x9a, 0x53, 0x3c, 0x63, 0x84, 0xb2, 0xdc, 0xd6, 0xe2, 0x57, 0x5a,
|
||||
0x7c, 0x70, 0xcc, 0x90, 0x1d, 0x81, 0xba, 0xe0, 0x66, 0x66, 0xa0, 0x6e, 0xa6, 0xcf, 0x9c, 0xd6,
|
||||
0x36, 0xba, 0x9c, 0x86, 0x17, 0xd0, 0x9c, 0xce, 0xee, 0xe3, 0x0a, 0x5f, 0x01, 0x7c, 0x9d, 0xdc,
|
||||
0x7f, 0xbf, 0xcf, 0x56, 0xf7, 0xf7, 0xc7, 0x81, 0x47, 0x53, 0x9e, 0xb3, 0x85, 0xba, 0xa9, 0x9e,
|
||||
0xf1, 0x6d, 0xfd, 0x90, 0xd0, 0x15, 0xb4, 0x4b, 0xbe, 0xf8, 0x87, 0x26, 0xac, 0x5d, 0x3a, 0xb7,
|
||||
0x5d, 0xda, 0x96, 0xc3, 0x76, 0xe9, 0x97, 0xd0, 0x9a, 0x62, 0x93, 0x56, 0x0d, 0xe9, 0xa1, 0x9d,
|
||||
0x66, 0xfc, 0xc0, 0x5b, 0x67, 0xca, 0x94, 0x4d, 0x25, 0x76, 0x24, 0x65, 0xb6, 0x49, 0x31, 0x55,
|
||||
0x02, 0x68, 0x64, 0xa4, 0x48, 0x52, 0x42, 0xb5, 0x63, 0x3e, 0x36, 0xc7, 0xf0, 0xaf, 0x0b, 0x3d,
|
||||
0xa3, 0xa2, 0x16, 0xf5, 0x5f, 0xd3, 0x7e, 0x0a, 0x3d, 0x2e, 0xa4, 0x22, 0x49, 0x42, 0xca, 0xeb,
|
||||
0x98, 0x53, 0xad, 0xa2, 0x85, 0xbb, 0x36, 0xfc, 0x81, 0xa2, 0x17, 0xd0, 0xa8, 0x52, 0x64, 0xe0,
|
||||
0xe9, 0xa5, 0x39, 0xc6, 0x6a, 0x42, 0xd0, 0x67, 0xe8, 0x52, 0x6d, 0xb4, 0xf9, 0x61, 0x04, 0x4c,
|
||||
0x27, 0x45, 0x76, 0xd2, 0x5e, 0xdf, 0xd1, 0xce, 0x68, 0xea, 0x95, 0xa3, 0x36, 0x86, 0x2e, 0xa1,
|
||||
0x9b, 0xad, 0xe6, 0x09, 0x5f, 0x6c, 0x68, 0xbf, 0x6b, 0x3b, 0x3a, 0x15, 0x5a, 0x87, 0x0d, 0x16,
|
||||
0x80, 0x0e, 0xb9, 0x8e, 0x6c, 0xd7, 0xd5, 0xee, 0x76, 0x3d, 0xde, 0x99, 0xc2, 0xb1, 0x77, 0x62,
|
||||
0xad, 0xd9, 0xfc, 0x4c, 0xff, 0x85, 0x26, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0xb6, 0xd6, 0x74,
|
||||
0x9a, 0x1c, 0x05, 0x00, 0x00,
|
||||
// 563 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x54, 0xdd, 0x8e, 0xd3, 0x3c,
|
||||
0x10, 0x55, 0x92, 0xdd, 0xfe, 0x4c, 0xd3, 0x1f, 0xf9, 0xfb, 0x58, 0x45, 0xd5, 0x5e, 0x94, 0x88,
|
||||
0x15, 0x05, 0xa1, 0x48, 0xb4, 0x48, 0x8b, 0xb8, 0x84, 0x22, 0x95, 0x45, 0x2b, 0xad, 0x8c, 0x40,
|
||||
0x88, 0x9b, 0xc8, 0xad, 0xcd, 0x62, 0x91, 0x3a, 0x51, 0xec, 0x56, 0xe4, 0x19, 0x78, 0x34, 0x6e,
|
||||
0x78, 0x24, 0x14, 0x27, 0x6e, 0xdd, 0x9f, 0xbd, 0x8b, 0x8f, 0x67, 0xce, 0xcc, 0x39, 0xe3, 0x09,
|
||||
0x5c, 0x64, 0x79, 0xaa, 0xd2, 0x65, 0x9a, 0xc4, 0x2b, 0x26, 0x25, 0xb9, 0x67, 0x91, 0x06, 0x10,
|
||||
0x30, 0xb1, 0xcc, 0x8b, 0x4c, 0xf1, 0x54, 0x84, 0x05, 0xf8, 0x9f, 0xf8, 0xbd, 0x60, 0xf4, 0x2e,
|
||||
0x67, 0x1f, 0x59, 0x81, 0x9e, 0x40, 0x4f, 0xea, 0x73, 0x9c, 0xe5, 0x2c, 0xfe, 0xc9, 0x8a, 0xc0,
|
||||
0x19, 0x39, 0x63, 0x1f, 0xfb, 0xd2, 0x8e, 0x0a, 0xa0, 0xb9, 0x61, 0xb9, 0xe4, 0xa9, 0x08, 0xdc,
|
||||
0x91, 0x33, 0xee, 0x62, 0x73, 0x44, 0xcf, 0x60, 0xb0, 0xad, 0x6a, 0x42, 0x3c, 0x1d, 0xd2, 0x37,
|
||||
0xf8, 0x97, 0x0a, 0x0e, 0x7f, 0xbb, 0xd0, 0x78, 0xbb, 0x16, 0x34, 0x61, 0x68, 0x08, 0x2d, 0x4e,
|
||||
0x99, 0x50, 0x5c, 0x99, 0x7a, 0xdb, 0x33, 0xba, 0x85, 0xfe, 0x7e, 0x47, 0x32, 0x70, 0x47, 0xde,
|
||||
0xb8, 0x33, 0xb9, 0x8a, 0x76, 0x3a, 0xa2, 0x8a, 0x28, 0xb2, 0xb5, 0xc8, 0xf7, 0x42, 0xe5, 0x05,
|
||||
0xee, 0xda, 0x9d, 0x4b, 0x74, 0x09, 0xed, 0x12, 0x20, 0x6a, 0x9d, 0xb3, 0xe0, 0x4c, 0xd7, 0xda,
|
||||
0x01, 0xe5, 0xad, 0xe2, 0x2b, 0x26, 0x15, 0x59, 0x65, 0xc1, 0xf9, 0xc8, 0x19, 0x7b, 0x78, 0x07,
|
||||
0x0c, 0xbf, 0x01, 0x3a, 0x2e, 0x80, 0x06, 0xe0, 0x19, 0x9f, 0xda, 0xb8, 0xfc, 0x44, 0x11, 0x9c,
|
||||
0x6f, 0x48, 0xb2, 0x66, 0xda, 0x9c, 0xce, 0x24, 0xb0, 0x1b, 0xb5, 0x09, 0x70, 0x15, 0xf6, 0xc6,
|
||||
0x7d, 0xed, 0x84, 0xbf, 0xa0, 0x5f, 0x69, 0x78, 0x97, 0x0a, 0x45, 0xb8, 0x60, 0x39, 0x7a, 0x0e,
|
||||
0x8d, 0x85, 0x86, 0x34, 0x77, 0x67, 0x82, 0x8e, 0x05, 0xe3, 0x3a, 0x02, 0x4d, 0xcb, 0x69, 0xf3,
|
||||
0x0d, 0x51, 0x2c, 0x3e, 0x98, 0x9f, 0xab, 0x35, 0xfe, 0x57, 0xdf, 0xda, 0xe5, 0x6f, 0xce, 0x5a,
|
||||
0xde, 0xe0, 0x2c, 0xbc, 0x81, 0xd6, 0x0c, 0xcf, 0x19, 0xa1, 0x2c, 0xb7, 0xb5, 0xf8, 0x95, 0x16,
|
||||
0x1f, 0x1c, 0x33, 0x64, 0x47, 0xa0, 0x1e, 0xb8, 0x99, 0x19, 0xa8, 0x9b, 0xe9, 0x33, 0xa7, 0xb5,
|
||||
0x8d, 0x2e, 0xa7, 0xe1, 0x25, 0xb4, 0x66, 0xf3, 0x87, 0xb8, 0xc2, 0x57, 0x00, 0x5f, 0xa7, 0x0f,
|
||||
0xdf, 0x1f, 0xb2, 0xd5, 0xfd, 0xfd, 0x75, 0xe0, 0xd1, 0x8c, 0xe7, 0x6c, 0xa9, 0x6e, 0xab, 0x67,
|
||||
0x7c, 0x57, 0x3f, 0x24, 0x74, 0x0d, 0x9d, 0x92, 0x2f, 0xfe, 0xa1, 0x09, 0x6b, 0x97, 0x2e, 0x6c,
|
||||
0x97, 0x76, 0xe5, 0xb0, 0x5d, 0xfa, 0x25, 0xb4, 0x67, 0xd8, 0xa4, 0x55, 0x43, 0xfa, 0xdf, 0x4e,
|
||||
0x33, 0x7e, 0xe0, 0x9d, 0x33, 0x65, 0xca, 0xb6, 0x12, 0x3b, 0x91, 0x32, 0xdf, 0xa6, 0x98, 0x2a,
|
||||
0x01, 0x34, 0x33, 0x52, 0x24, 0x29, 0xa1, 0xda, 0x31, 0x1f, 0x9b, 0x63, 0xf8, 0xc7, 0x85, 0xbe,
|
||||
0x51, 0x51, 0x8b, 0x42, 0x4f, 0xa1, 0xcf, 0x85, 0x54, 0x24, 0x49, 0x48, 0x49, 0x18, 0x73, 0xaa,
|
||||
0x3b, 0x6b, 0xe3, 0x9e, 0x0d, 0x7f, 0xa0, 0xe8, 0x05, 0x34, 0xab, 0xa1, 0xcb, 0xc0, 0xd3, 0x8b,
|
||||
0x70, 0xea, 0x5d, 0x98, 0x10, 0xf4, 0x19, 0x7a, 0x54, 0x9b, 0x67, 0x7e, 0x02, 0x01, 0xd3, 0x49,
|
||||
0x91, 0x9d, 0x74, 0xd0, 0x4b, 0xb4, 0x67, 0x77, 0xbd, 0x46, 0xd4, 0xc6, 0xd0, 0x15, 0xf4, 0xb2,
|
||||
0xf5, 0x22, 0xe1, 0xcb, 0x2d, 0xed, 0x77, 0x2d, 0xb1, 0x5b, 0xa1, 0x75, 0xd8, 0x70, 0x09, 0xe8,
|
||||
0x98, 0xeb, 0xc4, 0xc6, 0x5c, 0xef, 0x6f, 0xcc, 0xe3, 0x3d, 0x67, 0x4f, 0xcd, 0xde, 0x5a, 0x9d,
|
||||
0x45, 0x43, 0xff, 0x59, 0xa6, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0xa3, 0x5b, 0x5f, 0x6b, 0xf0,
|
||||
0x04, 0x00, 0x00,
|
||||
}
|
||||
|
||||
@ -64,9 +64,6 @@ message DirectMessageProtocol {
|
||||
|
||||
// Top-level protocol message
|
||||
message ProtocolMessage {
|
||||
// An optional bundle is exchanged with each message
|
||||
Bundle bundle = 1;
|
||||
|
||||
// The device id of the sender
|
||||
string installation_id = 2;
|
||||
|
||||
|
||||
@ -104,7 +104,7 @@ func (s *ProtocolServiceTestSuite) TestBuildDirectMessage() {
|
||||
msg := msgSpec.Message
|
||||
s.NotNil(msg, "It creates a messages")
|
||||
|
||||
s.NotNilf(msg.GetBundle(), "It adds a bundle to the message")
|
||||
s.NotNilf(msg.GetBundles(), "It adds a bundle to the message")
|
||||
|
||||
directMessage := msg.GetDirectMessage()
|
||||
s.NotNilf(directMessage, "It sets the direct message")
|
||||
@ -156,7 +156,7 @@ func (s *ProtocolServiceTestSuite) TestSecretNegotiation() {
|
||||
s.NoError(err)
|
||||
s.NotNil(msgSpec, "It creates a message spec")
|
||||
|
||||
bundle := msgSpec.Message.GetBundle()
|
||||
bundle := msgSpec.Message.GetBundles()[0]
|
||||
s.Require().NotNil(bundle)
|
||||
|
||||
signedPreKeys := bundle.GetSignedPreKeys()
|
||||
|
||||
@ -152,7 +152,7 @@ func _000002_add_chatsUpDbSql() (*asset, error) {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
info := bindataFileInfo{name: "000002_add_chats.up.db.sql", size: 569, mode: os.FileMode(0644), modTime: time.Unix(1567170206, 0)}
|
||||
info := bindataFileInfo{name: "000002_add_chats.up.db.sql", size: 569, mode: os.FileMode(0644), modTime: time.Unix(1567414857, 0)}
|
||||
a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x89, 0xb, 0x12, 0x5, 0x4b, 0xda, 0xab, 0xb2, 0x47, 0x1b, 0x66, 0xe, 0x47, 0x8a, 0xb0, 0x9c, 0xa0, 0xe4, 0x12, 0xa4, 0xf9, 0xaa, 0x72, 0xba, 0xd9, 0x17, 0x8f, 0xac, 0x7f, 0xfd, 0x85, 0xa9}}
|
||||
return a, nil
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user