status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use separate flag for allowonlyfromcontacst

This commit is contained in:
Andrea Maria Piana 2020-07-20 10:06:24 +02:00
parent bec8fbb855
commit 58817aad5b
No known key found for this signature in database
GPG Key ID: AA6CCA6DE0E06424
7 changed files with 188 additions and 262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
protocol/messenger.go
View File

@ -1978,6 +1978,18 @@ func (m *Messenger) handleRetrievedMessages(chatWithMessages map[transport.Filte
}
// We continue in any case, no changes to messenger
continue
case protobuf.PushNotificationResponse:
logger.Debug("Received PushNotificationResponse")
if m.pushNotificationClient == nil {
continue
}
logger.Debug("Handling PushNotificationResponse")
// TODO: Compare DST with Identity
if err := m.pushNotificationClient.HandlePushNotificationResponse(publicKey, msg.ParsedMessage.(protobuf.PushNotificationResponse)); err != nil {
logger.Warn("failed to handle PushNotificationResponse", zap.Error(err))
}
// We continue in any case, no changes to messenger
continue
case protobuf.PushNotificationQueryResponse:
logger.Debug("Received PushNotificationQueryResponse")

146
protocol/protobuf/push_notifications.pb.go
View File

@ -114,19 +114,20 @@ func (PushNotificationReport_ErrorType) EnumDescriptor() ([]byte, []int) {
}
type PushNotificationRegistration struct {
TokenType PushNotificationRegistration_TokenType `protobuf:"varint,1,opt,name=token_type,json=tokenType,proto3,enum=protobuf.PushNotificationRegistration_TokenType" json:"token_type,omitempty"`
Token string `protobuf:"bytes,2,opt,name=token,proto3" json:"token,omitempty"`
InstallationId string `protobuf:"bytes,3,opt,name=installation_id,json=installationId,proto3" json:"installation_id,omitempty"`
AccessToken string `protobuf:"bytes,4,opt,name=access_token,json=accessToken,proto3" json:"access_token,omitempty"`
Enabled bool `protobuf:"varint,5,opt,name=enabled,proto3" json:"enabled,omitempty"`
Version uint64 `protobuf:"varint,6,opt,name=version,proto3" json:"version,omitempty"`
AllowedUserList [][]byte `protobuf:"bytes,7,rep,name=allowed_user_list,json=allowedUserList,proto3" json:"allowed_user_list,omitempty"`
BlockedChatList [][]byte `protobuf:"bytes,8,rep,name=blocked_chat_list,json=blockedChatList,proto3" json:"blocked_chat_list,omitempty"`
Unregister bool `protobuf:"varint,9,opt,name=unregister,proto3" json:"unregister,omitempty"`
Grant []byte `protobuf:"bytes,10,opt,name=grant,proto3" json:"grant,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
TokenType PushNotificationRegistration_TokenType `protobuf:"varint,1,opt,name=token_type,json=tokenType,proto3,enum=protobuf.PushNotificationRegistration_TokenType" json:"token_type,omitempty"`
Token string `protobuf:"bytes,2,opt,name=token,proto3" json:"token,omitempty"`
InstallationId string `protobuf:"bytes,3,opt,name=installation_id,json=installationId,proto3" json:"installation_id,omitempty"`
AccessToken string `protobuf:"bytes,4,opt,name=access_token,json=accessToken,proto3" json:"access_token,omitempty"`
Enabled bool `protobuf:"varint,5,opt,name=enabled,proto3" json:"enabled,omitempty"`
Version uint64 `protobuf:"varint,6,opt,name=version,proto3" json:"version,omitempty"`
AllowedUserList [][]byte `protobuf:"bytes,7,rep,name=allowed_user_list,json=allowedUserList,proto3" json:"allowed_user_list,omitempty"`
BlockedChatList [][]byte `protobuf:"bytes,8,rep,name=blocked_chat_list,json=blockedChatList,proto3" json:"blocked_chat_list,omitempty"`
Unregister bool `protobuf:"varint,9,opt,name=unregister,proto3" json:"unregister,omitempty"`
Grant []byte `protobuf:"bytes,10,opt,name=grant,proto3" json:"grant,omitempty"`
AllowFromContactsOnly bool `protobuf:"varint,11,opt,name=allow_from_contacts_only,json=allowFromContactsOnly,proto3" json:"allow_from_contacts_only,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *PushNotificationRegistration) Reset() { *m = PushNotificationRegistration{} }
@ -224,6 +225,13 @@ func (m *PushNotificationRegistration) GetGrant() []byte {
return nil
}
func (m *PushNotificationRegistration) GetAllowFromContactsOnly() bool {
if m != nil {
return m.AllowFromContactsOnly
}
return false
}
type PushNotificationRegistrationResponse struct {
Success bool `protobuf:"varint,1,opt,name=success,proto3" json:"success,omitempty"`
Error PushNotificationRegistrationResponse_ErrorType `protobuf:"varint,2,opt,name=error,proto3,enum=protobuf.PushNotificationRegistrationResponse_ErrorType" json:"error,omitempty"`
@ -794,59 +802,61 @@ func init() {
func init() { proto.RegisterFile("push_notifications.proto", fileDescriptor_200acd86044eaa5d) }
var fileDescriptor_200acd86044eaa5d = []byte{
// 858 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x51, 0x6f, 0xe3, 0x44,
0x10, 0x66, 0x9d, 0xb4, 0x89, 0xa7, 0xa1, 0xcd, 0xad, 0x7a, 0x3d, 0x73, 0xe2, 0x20, 0x67, 0x90,
0x88, 0x0e, 0x29, 0x42, 0x45, 0x82, 0x13, 0x4f, 0x84, 0xd6, 0x2d, 0x56, 0x1b, 0x3b, 0x6c, 0x5c,
0x4e, 0x48, 0x48, 0x96, 0x13, 0x6f, 0x5b, 0xab, 0x39, 0xdb, 0xec, 0xae, 0x8b, 0xf2, 0x80, 0xc4,
0x2f, 0x40, 0xe2, 0x95, 0x5f, 0x81, 0xf8, 0x3b, 0xbc, 0xf1, 0x4b, 0x90, 0xd7, 0x76, 0x70, 0x1c,
0x37, 0xcd, 0x03, 0x4f, 0xf1, 0xcc, 0xce, 0xcc, 0xee, 0x7c, 0xdf, 0xcc, 0x17, 0xd0, 0xe2, 0x84,
0xdf, 0xba, 0x61, 0x24, 0x82, 0xeb, 0x60, 0xe6, 0x89, 0x20, 0x0a, 0xf9, 0x20, 0x66, 0x91, 0x88,
0x70, 0x5b, 0xfe, 0x4c, 0x93, 0x6b, 0xfd, 0xef, 0x06, 0xbc, 0x3f, 0x4e, 0xf8, 0xad, 0x55, 0x8a,
0x22, 0xf4, 0x26, 0xe0, 0x82, 0xc9, 0x6f, 0x6c, 0x03, 0x88, 0xe8, 0x8e, 0x86, 0xae, 0x58, 0xc4,
0x54, 0x43, 0x3d, 0xd4, 0xdf, 0x3f, 0xfe, 0x6c, 0x50, 0xe4, 0x0f, 0x36, 0xe5, 0x0e, 0x9c, 0x34,
0xd1, 0x59, 0xc4, 0x94, 0xa8, 0xa2, 0xf8, 0xc4, 0x87, 0xb0, 0x23, 0x0d, 0x4d, 0xe9, 0xa1, 0xbe,
0x4a, 0x32, 0x03, 0x7f, 0x02, 0x07, 0x41, 0xc8, 0x85, 0x37, 0x9f, 0xcb, 0x54, 0x37, 0xf0, 0xb5,
0x86, 0x3c, 0xdf, 0x2f, 0xbb, 0x4d, 0x1f, 0xbf, 0x84, 0x8e, 0x37, 0x9b, 0x51, 0xce, 0xdd, 0xac,
0x4a, 0x53, 0x46, 0xed, 0x65, 0x3e, 0x79, 0x21, 0xd6, 0xa0, 0x45, 0x43, 0x6f, 0x3a, 0xa7, 0xbe,
0xb6, 0xd3, 0x43, 0xfd, 0x36, 0x29, 0xcc, 0xf4, 0xe4, 0x9e, 0x32, 0x1e, 0x44, 0xa1, 0xb6, 0xdb,
0x43, 0xfd, 0x26, 0x29, 0x4c, 0xfc, 0x0a, 0x9e, 0x78, 0xf3, 0x79, 0xf4, 0x33, 0xf5, 0xdd, 0x84,
0x53, 0xe6, 0xce, 0x03, 0x2e, 0xb4, 0x56, 0xaf, 0xd1, 0xef, 0x90, 0x83, 0xfc, 0xe0, 0x8a, 0x53,
0x76, 0x19, 0x70, 0x91, 0xc6, 0x4e, 0xe7, 0xd1, 0xec, 0x8e, 0xfa, 0xee, 0xec, 0xd6, 0x13, 0x59,
0x6c, 0x3b, 0x8b, 0xcd, 0x0f, 0x4e, 0x6e, 0x3d, 0x21, 0x63, 0x3f, 0x00, 0x48, 0x42, 0x26, 0x41,
0xa1, 0x4c, 0x53, 0xe5, 0x73, 0x4a, 0x9e, 0x14, 0x8d, 0x1b, 0xe6, 0x85, 0x42, 0x83, 0x1e, 0xea,
0x77, 0x48, 0x66, 0xe8, 0x67, 0xa0, 0x2e, 0xb1, 0xc3, 0x47, 0x80, 0xaf, 0xac, 0x0b, 0xcb, 0x7e,
0x63, 0xb9, 0x8e, 0x7d, 0x61, 0x58, 0xae, 0xf3, 0xc3, 0xd8, 0xe8, 0xbe, 0x83, 0xdf, 0x05, 0x75,
0x38, 0xce, 0x7d, 0x5d, 0x84, 0x31, 0xec, 0x9f, 0x99, 0xc4, 0xf8, 0x66, 0x38, 0x31, 0x72, 0x9f,
0xa2, 0xff, 0xa5, 0xc0, 0xc7, 0x9b, 0x18, 0x22, 0x94, 0xc7, 0x51, 0xc8, 0x69, 0x0a, 0x0c, 0x4f,
0x24, 0x84, 0x92, 0xe2, 0x36, 0x29, 0x4c, 0x6c, 0xc1, 0x0e, 0x65, 0x2c, 0x62, 0x92, 0xae, 0xfd,
0xe3, 0xd7, 0xdb, 0x51, 0x5f, 0x14, 0x1e, 0x18, 0x69, 0xae, 0x1c, 0x81, 0xac, 0x0c, 0x7e, 0x01,
0xc0, 0xe8, 0x4f, 0x09, 0xe5, 0xa2, 0xe0, 0xb8, 0x43, 0xd4, 0xdc, 0x63, 0xfa, 0xfa, 0xaf, 0x08,
0xd4, 0x65, 0x4e, 0xb9, 0x75, 0x83, 0x10, 0x9b, 0x14, 0xad, 0x3f, 0x85, 0x27, 0xa3, 0xe1, 0xe5,
0x99, 0x4d, 0x46, 0xc6, 0xa9, 0x3b, 0x32, 0x26, 0x93, 0xe1, 0xb9, 0xd1, 0x45, 0xf8, 0x10, 0xba,
0xdf, 0x1b, 0x64, 0x62, 0xda, 0x96, 0x3b, 0x32, 0x27, 0xa3, 0xa1, 0x73, 0xf2, 0x6d, 0x57, 0xc1,
0xcf, 0xe1, 0xe8, 0xca, 0x9a, 0x5c, 0x8d, 0xc7, 0x36, 0x71, 0x8c, 0xd3, 0x32, 0x86, 0x8d, 0x14,
0x34, 0xd3, 0x72, 0x0c, 0x62, 0x0d, 0x2f, 0xb3, 0x1b, 0xba, 0x4d, 0xfd, 0x37, 0x04, 0x2f, 0xab,
0xbd, 0x0d, 0xfd, 0x7b, 0xca, 0x44, 0xc0, 0xe9, 0x5b, 0x1a, 0x0a, 0x33, 0xbc, 0x8e, 0xd2, 0x3e,
0xe2, 0x64, 0x3a, 0x0f, 0x66, 0xee, 0x1d, 0x5d, 0x48, 0xd0, 0x3a, 0x44, 0xcd, 0x3c, 0x17, 0x74,
0xb1, 0x36, 0xa6, 0xca, 0xfa, 0x98, 0x6e, 0x3b, 0xf2, 0xfa, 0x2f, 0xa0, 0x9d, 0x44, 0xa1, 0xf0,
0x66, 0xe2, 0x24, 0xf2, 0xe9, 0xca, 0x53, 0xb0, 0x07, 0x47, 0x6b, 0x5b, 0xee, 0x06, 0xe1, 0x75,
0xa4, 0xa1, 0x5e, 0xa3, 0xbf, 0x77, 0xfc, 0xe9, 0xc3, 0x7c, 0xad, 0xf5, 0x44, 0x0e, 0xe3, 0x4a,
0x48, 0xea, 0xd5, 0x5f, 0xc3, 0xd3, 0x6a, 0xea, 0x77, 0x09, 0x65, 0x0b, 0xfc, 0x21, 0xec, 0xfd,
0x07, 0x01, 0x97, 0x17, 0x76, 0x08, 0x2c, 0x31, 0xe0, 0xfa, 0x3f, 0x08, 0xde, 0xab, 0x4d, 0x95,
0x08, 0x56, 0x21, 0x42, 0x5b, 0x41, 0xa4, 0xd4, 0xaa, 0xc2, 0x2a, 0x1b, 0x8d, 0x2a, 0x1b, 0xb5,
0xdb, 0xdd, 0xac, 0xdf, 0xee, 0xe5, 0x46, 0xee, 0x94, 0x36, 0xf2, 0x61, 0xe5, 0xd0, 0x7f, 0x47,
0xf0, 0xa2, 0xb6, 0xc9, 0xe5, 0x72, 0x7d, 0x09, 0xcd, 0x12, 0x23, 0x1f, 0x3d, 0xcc, 0xc8, 0x12,
0x1b, 0x22, 0x13, 0xd2, 0xae, 0xde, 0x52, 0xce, 0xbd, 0x1b, 0x5a, 0x74, 0xde, 0x21, 0x6a, 0xee,
0x31, 0xfd, 0xf2, 0xd2, 0x36, 0x56, 0x96, 0x56, 0xff, 0x13, 0x41, 0xb7, 0x5a, 0x7c, 0x1b, 0xbc,
0x9f, 0x41, 0x4b, 0x2a, 0xda, 0x12, 0xe7, 0xdd, 0xd4, 0x7c, 0x1c, 0xdf, 0x1a, 0x9e, 0x9a, 0xb5,
0x3c, 0x69, 0xd0, 0xca, 0xdf, 0x9f, 0xc3, 0x5b, 0x98, 0x7a, 0x0c, 0xcf, 0xd6, 0x05, 0x45, 0xaa,
0x02, 0xfe, 0x02, 0xda, 0xb9, 0x40, 0xf0, 0x1c, 0xc3, 0xe7, 0x1b, 0x54, 0x68, 0x19, 0xfb, 0x08,
0x7c, 0xfa, 0x1f, 0x0a, 0x1c, 0xad, 0x5f, 0x19, 0x47, 0x4c, 0x6c, 0x90, 0xc3, 0xaf, 0x57, 0xe5,
0xf0, 0xd5, 0x26, 0x39, 0x4c, 0x4b, 0xd5, 0x0a, 0xe0, 0xff, 0x01, 0xa5, 0xfe, 0xe3, 0x36, 0x42,
0x79, 0x00, 0x7b, 0x6f, 0x88, 0x6d, 0x9d, 0x97, 0xff, 0x25, 0x2a, 0x82, 0xa7, 0xa4, 0x3e, 0xcb,
0x76, 0x5c, 0x62, 0x9c, 0x9b, 0x13, 0xc7, 0x20, 0xc6, 0x69, 0xb7, 0xa1, 0x27, 0xa0, 0xad, 0x37,
0x94, 0xcf, 0xf3, 0x2a, 0xae, 0xa8, 0x3a, 0x96, 0x5f, 0x41, 0x8b, 0xc9, 0xde, 0xb9, 0xa6, 0x48,
0xb6, 0x7a, 0x8f, 0x81, 0x44, 0x8a, 0x84, 0xe9, 0xae, 0x8c, 0xfc, 0xfc, 0xdf, 0x00, 0x00, 0x00,
0xff, 0xff, 0x04, 0xbd, 0xc3, 0x50, 0xbb, 0x08, 0x00, 0x00,
// 891 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0xdd, 0x6e, 0xe3, 0x44,
0x14, 0xc7, 0xb1, 0x93, 0xb6, 0xf1, 0x49, 0x68, 0xb3, 0xa3, 0xb6, 0x6b, 0x56, 0x2c, 0x64, 0x0d,
0x12, 0xd1, 0x22, 0x45, 0xa8, 0x48, 0xec, 0x8a, 0x2b, 0x42, 0xeb, 0x16, 0xab, 0x8d, 0x1d, 0x26,
0x2e, 0x2b, 0x24, 0x24, 0xcb, 0x89, 0x27, 0xad, 0x55, 0xd7, 0x63, 0x66, 0xc6, 0x8b, 0x72, 0x81,
0xc4, 0x13, 0x20, 0x21, 0x71, 0xc5, 0x53, 0x20, 0x1e, 0x89, 0x27, 0x41, 0x1e, 0xdb, 0xc1, 0xf9,
0x68, 0x9a, 0x8b, 0xbd, 0x8a, 0xcf, 0x99, 0x73, 0x66, 0xe6, 0xfc, 0xce, 0x99, 0x7f, 0x40, 0x4f,
0x52, 0x7e, 0xeb, 0xc5, 0x54, 0x84, 0xd3, 0x70, 0xe2, 0x8b, 0x90, 0xc6, 0xbc, 0x97, 0x30, 0x2a,
0x28, 0x6a, 0xc8, 0x9f, 0x71, 0x3a, 0x35, 0xfe, 0xac, 0xc3, 0x87, 0xc3, 0x94, 0xdf, 0xda, 0x95,
0x28, 0x4c, 0x6e, 0x42, 0x2e, 0x98, 0xfc, 0x46, 0x0e, 0x80, 0xa0, 0x77, 0x24, 0xf6, 0xc4, 0x2c,
0x21, 0xba, 0xd2, 0x51, 0xba, 0xfb, 0x27, 0x5f, 0xf4, 0xca, 0xfc, 0xde, 0xa6, 0xdc, 0x9e, 0x9b,
0x25, 0xba, 0xb3, 0x84, 0x60, 0x4d, 0x94, 0x9f, 0xe8, 0x10, 0x76, 0xa4, 0xa1, 0xab, 0x1d, 0xa5,
0xab, 0xe1, 0xdc, 0x40, 0x9f, 0xc1, 0x41, 0x18, 0x73, 0xe1, 0x47, 0x91, 0x4c, 0xf5, 0xc2, 0x40,
0xaf, 0xc9, 0xf5, 0xfd, 0xaa, 0xdb, 0x0a, 0xd0, 0x0b, 0x68, 0xf9, 0x93, 0x09, 0xe1, 0xdc, 0xcb,
0x77, 0xa9, 0xcb, 0xa8, 0x66, 0xee, 0x93, 0x07, 0x22, 0x1d, 0xf6, 0x48, 0xec, 0x8f, 0x23, 0x12,
0xe8, 0x3b, 0x1d, 0xa5, 0xdb, 0xc0, 0xa5, 0x99, 0xad, 0xbc, 0x25, 0x8c, 0x87, 0x34, 0xd6, 0x77,
0x3b, 0x4a, 0xb7, 0x8e, 0x4b, 0x13, 0xbd, 0x84, 0x27, 0x7e, 0x14, 0xd1, 0x5f, 0x48, 0xe0, 0xa5,
0x9c, 0x30, 0x2f, 0x0a, 0xb9, 0xd0, 0xf7, 0x3a, 0xb5, 0x6e, 0x0b, 0x1f, 0x14, 0x0b, 0xd7, 0x9c,
0xb0, 0xab, 0x90, 0x8b, 0x2c, 0x76, 0x1c, 0xd1, 0xc9, 0x1d, 0x09, 0xbc, 0xc9, 0xad, 0x2f, 0xf2,
0xd8, 0x46, 0x1e, 0x5b, 0x2c, 0x9c, 0xde, 0xfa, 0x42, 0xc6, 0x7e, 0x04, 0x90, 0xc6, 0x4c, 0x42,
0x21, 0x4c, 0xd7, 0xe4, 0x75, 0x2a, 0x9e, 0x8c, 0xc6, 0x0d, 0xf3, 0x63, 0xa1, 0x43, 0x47, 0xe9,
0xb6, 0x70, 0x6e, 0xa0, 0x57, 0xa0, 0xcb, 0x43, 0xbd, 0x29, 0xa3, 0xf7, 0xde, 0x84, 0xc6, 0xc2,
0x9f, 0x08, 0xee, 0xd1, 0x38, 0x9a, 0xe9, 0x4d, 0xb9, 0xc7, 0x91, 0x5c, 0x3f, 0x67, 0xf4, 0xfe,
0xb4, 0x58, 0x75, 0xe2, 0x68, 0x66, 0x9c, 0x83, 0x36, 0x87, 0x8e, 0x8e, 0x01, 0x5d, 0xdb, 0x97,
0xb6, 0xf3, 0xc6, 0xf6, 0x5c, 0xe7, 0xd2, 0xb4, 0x3d, 0xf7, 0xc7, 0xa1, 0xd9, 0x7e, 0x0f, 0xbd,
0x0f, 0x5a, 0x7f, 0x58, 0xf8, 0xda, 0x0a, 0x42, 0xb0, 0x7f, 0x6e, 0x61, 0xf3, 0xdb, 0xfe, 0xc8,
0x2c, 0x7c, 0xaa, 0xf1, 0x8f, 0x0a, 0x9f, 0x6e, 0x6a, 0x2d, 0x26, 0x3c, 0xa1, 0x31, 0x27, 0x19,
0x51, 0x9e, 0x4a, 0xf6, 0x72, 0x36, 0x1a, 0xb8, 0x34, 0x91, 0x0d, 0x3b, 0x84, 0x31, 0xca, 0x64,
0x9f, 0xf7, 0x4f, 0x5e, 0x6f, 0x37, 0x33, 0xe5, 0xc6, 0x3d, 0x33, 0xcb, 0x95, 0xb3, 0x93, 0x6f,
0x83, 0x9e, 0x03, 0x30, 0xf2, 0x73, 0x4a, 0xb8, 0x28, 0x87, 0xa3, 0x85, 0xb5, 0xc2, 0x63, 0x05,
0xc6, 0x6f, 0x0a, 0x68, 0xf3, 0x9c, 0x6a, 0xe9, 0x26, 0xc6, 0x0e, 0x2e, 0x4b, 0x3f, 0x82, 0x27,
0x83, 0xfe, 0xd5, 0xb9, 0x83, 0x07, 0xe6, 0x99, 0x37, 0x30, 0x47, 0xa3, 0xfe, 0x85, 0xd9, 0x56,
0xd0, 0x21, 0xb4, 0x7f, 0x30, 0xf1, 0xc8, 0x72, 0x6c, 0x6f, 0x60, 0x8d, 0x06, 0x7d, 0xf7, 0xf4,
0xbb, 0xb6, 0x8a, 0x9e, 0xc1, 0xf1, 0xb5, 0x3d, 0xba, 0x1e, 0x0e, 0x1d, 0xec, 0x9a, 0x67, 0x55,
0x86, 0xb5, 0x0c, 0x9a, 0x65, 0xbb, 0x26, 0xb6, 0xfb, 0x57, 0xf9, 0x09, 0xed, 0xba, 0xf1, 0xbb,
0x02, 0x2f, 0x96, 0x6b, 0xeb, 0x07, 0x6f, 0x09, 0x13, 0x21, 0x27, 0xf7, 0x24, 0x16, 0x56, 0x3c,
0xa5, 0x59, 0x1d, 0x49, 0x3a, 0x8e, 0xc2, 0x89, 0x77, 0x47, 0x66, 0x12, 0x5a, 0x0b, 0x6b, 0xb9,
0xe7, 0x92, 0xcc, 0x56, 0xe6, 0x5b, 0x5d, 0x9d, 0xef, 0x6d, 0xdf, 0x8a, 0xf1, 0x2b, 0xe8, 0xc5,
0x74, 0x9c, 0xd2, 0x80, 0x2c, 0x5c, 0x05, 0xf9, 0x70, 0xbc, 0x22, 0x0f, 0x5e, 0x18, 0x4f, 0xa9,
0xae, 0x74, 0x6a, 0xdd, 0xe6, 0xc9, 0xe7, 0x0f, 0xf7, 0x6b, 0xa5, 0x26, 0x7c, 0x98, 0x2c, 0x85,
0x64, 0x5e, 0xe3, 0x35, 0x1c, 0x2d, 0xa7, 0x7e, 0x9f, 0x12, 0x36, 0x43, 0x1f, 0x43, 0xf3, 0x7f,
0x04, 0x5c, 0x1e, 0xd8, 0xc2, 0x30, 0x67, 0xc0, 0x8d, 0x7f, 0x15, 0xf8, 0x60, 0x6d, 0xaa, 0x24,
0xb8, 0x8c, 0x48, 0xd9, 0x0a, 0x91, 0xba, 0x56, 0x4e, 0x16, 0xbb, 0x51, 0x5b, 0xee, 0xc6, 0x5a,
0x59, 0xa8, 0xaf, 0x97, 0x85, 0xf9, 0x53, 0xde, 0xa9, 0x3e, 0xe5, 0x07, 0x25, 0xc7, 0xf8, 0x43,
0x81, 0xe7, 0x6b, 0x8b, 0x9c, 0x3f, 0xae, 0x57, 0x50, 0xaf, 0x74, 0xe4, 0x93, 0x87, 0x3b, 0x32,
0x67, 0x83, 0x65, 0x42, 0x56, 0xd5, 0x3d, 0xe1, 0xdc, 0xbf, 0x21, 0x65, 0xe5, 0x2d, 0xac, 0x15,
0x1e, 0x2b, 0xa8, 0x3e, 0xda, 0xda, 0xc2, 0xa3, 0x35, 0xfe, 0x56, 0xa0, 0xbd, 0xbc, 0xf9, 0x36,
0xbc, 0x9f, 0xc2, 0x9e, 0x94, 0xc2, 0x39, 0xe7, 0xdd, 0xcc, 0x7c, 0x9c, 0xef, 0x9a, 0x3e, 0xd5,
0xd7, 0xf6, 0x49, 0x87, 0xbd, 0xe2, 0xfe, 0x05, 0xde, 0xd2, 0x34, 0x12, 0x78, 0xba, 0x2a, 0x28,
0x52, 0x15, 0xd0, 0x57, 0xd0, 0x28, 0x04, 0x82, 0x17, 0x0c, 0x9f, 0x6d, 0x50, 0xa1, 0x79, 0xec,
0x23, 0xf8, 0x8c, 0xbf, 0x54, 0x38, 0x5e, 0x3d, 0x32, 0xa1, 0x4c, 0x6c, 0x90, 0xc3, 0x6f, 0x16,
0xe5, 0xf0, 0xe5, 0x26, 0x39, 0xcc, 0xb6, 0x5a, 0x2b, 0x80, 0xef, 0x02, 0xa5, 0xf1, 0xd3, 0x36,
0x42, 0x79, 0x00, 0xcd, 0x37, 0xd8, 0xb1, 0x2f, 0xaa, 0xff, 0x12, 0x4b, 0x82, 0xa7, 0x66, 0x3e,
0xdb, 0x71, 0x3d, 0x6c, 0x5e, 0x58, 0x23, 0xd7, 0xc4, 0xe6, 0x59, 0xbb, 0x66, 0xa4, 0xa0, 0xaf,
0x16, 0x54, 0xcc, 0xf3, 0x22, 0x57, 0x65, 0x79, 0x2c, 0xbf, 0x86, 0x3d, 0x26, 0x6b, 0xe7, 0xba,
0x2a, 0xbb, 0xd5, 0x79, 0x0c, 0x12, 0x2e, 0x13, 0xc6, 0xbb, 0x32, 0xf2, 0xcb, 0xff, 0x02, 0x00,
0x00, 0xff, 0xff, 0x90, 0x90, 0x1b, 0xe9, 0xf4, 0x08, 0x00, 0x00,
}

1
protocol/protobuf/push_notifications.proto
View File

@ -18,6 +18,7 @@ message PushNotificationRegistration {
repeated bytes blocked_chat_list = 8;
bool unregister = 9;
bytes grant = 10;
bool allow_from_contacts_only = 11;
}
message PushNotificationRegistrationResponse {

19
protocol/push_notification_client/client.go
View File

@ -466,14 +466,15 @@ func (c *Client) buildPushNotificationRegistrationMessage(contactIDs []*ecdsa.Pu
}
options := &protobuf.PushNotificationRegistration{
AccessToken: token,
TokenType: c.config.TokenType,
Version: c.getVersion(),
InstallationId: c.config.InstallationID,
Token: c.deviceToken,
Enabled: c.config.RemoteNotificationsEnabled,
BlockedChatList: c.mutedChatIDsHashes(mutedChatIDs),
AllowedUserList: allowedUserList,
AccessToken: token,
TokenType: c.config.TokenType,
Version: c.getVersion(),
InstallationId: c.config.InstallationID,
Token: c.deviceToken,
AllowFromContactsOnly: c.config.allowFromContactsOnly,
Enabled: c.config.RemoteNotificationsEnabled,
BlockedChatList: c.mutedChatIDsHashes(mutedChatIDs),
AllowedUserList: allowedUserList,
}
return options, nil
}
@ -847,7 +848,7 @@ func (c *Client) HandlePushNotificationQueryResponse(serverPublicKey *ecdsa.Publ
}
// HandlePushNotificationResponse should set the request as processed
func (p *Client) HandlePushNotificationResponse(ack *protobuf.PushNotificationResponse) error {
func (p *Client) HandlePushNotificationResponse(serverKey *ecdsa.PublicKey, response protobuf.PushNotificationResponse) error {
return nil
}

2
protocol/push_notification_server/server.go
View File

@ -161,7 +161,7 @@ func (s *Server) HandlePushNotificationQuery(query *protobuf.PushNotificationQue
InstallationId: registration.InstallationId,
}
if len(registration.AllowedUserList) > 0 {
if len(registration.AllowedUserList) > 0 && registration.AllowFromContactsOnly {
info.AllowedUserList = registration.AllowedUserList
} else {
info.AccessToken = registration.AccessToken

15
protocol/push_notification_server/server_test.go
View File

@ -549,13 +549,14 @@ func (s *ServerSuite) TestHandlePushNotificationQueryWithFiltering() {
// Successful
registration := &protobuf.PushNotificationRegistration{
Token: "abc",
AccessToken: s.accessToken,
Grant: s.grant,
TokenType: protobuf.PushNotificationRegistration_APN_TOKEN,
InstallationId: s.installationID,
AllowedUserList: allowedUserList,
Version: 1,
Token: "abc",
AccessToken: s.accessToken,
Grant: s.grant,
TokenType: protobuf.PushNotificationRegistration_APN_TOKEN,
InstallationId: s.installationID,
AllowFromContactsOnly: true,
AllowedUserList: allowedUserList,
Version: 1,
}
payload, err := proto.Marshal(registration)
s.Require().NoError(err)

255
protocol/push_notification_test.go
View File

@ -7,7 +7,6 @@ import (
"io/ioutil"
"os"
"testing"
"time"
"github.com/google/uuid"
"github.com/stretchr/testify/suite"
@ -129,36 +128,16 @@ func (s *MessengerPushNotificationSuite) TestReceivePushNotification() {
err = bob1.RegisterForPushNotifications(context.Background(), bob1DeviceToken)
// Receive message, reply
// TODO: find a better way to handle this waiting
time.Sleep(500 * time.Millisecond)
_, err = server.RetrieveAll()
s.Require().NoError(err)
time.Sleep(500 * time.Millisecond)
_, err = server.RetrieveAll()
s.Require().NoError(err)
time.Sleep(500 * time.Millisecond)
_, err = server.RetrieveAll()
s.Require().NoError(err)
// Check reply
// TODO: find a better way to handle this waiting
time.Sleep(500 * time.Millisecond)
_, err = bob1.RetrieveAll()
s.Require().NoError(err)
time.Sleep(500 * time.Millisecond)
_, err = bob1.RetrieveAll()
s.Require().NoError(err)
time.Sleep(500 * time.Millisecond)
_, err = bob1.RetrieveAll()
s.Require().NoError(err)
// Pull servers and check we registered
err = tt.RetryWithBackOff(func() error {
_, err = server.RetrieveAll()
if err != nil {
return err
}
_, err = bob1.RetrieveAll()
if err != nil {
return err
}
registered, err := bob1.RegisteredForPushNotifications()
if err != nil {
return err
@ -180,35 +159,16 @@ func (s *MessengerPushNotificationSuite) TestReceivePushNotification() {
err = bob2.RegisterForPushNotifications(context.Background(), bob2DeviceToken)
s.Require().NoError(err)
// Receive message, reply
// TODO: find a better way to handle this waiting
time.Sleep(500 * time.Millisecond)
_, err = server.RetrieveAll()
s.Require().NoError(err)
time.Sleep(500 * time.Millisecond)
_, err = server.RetrieveAll()
s.Require().NoError(err)
time.Sleep(500 * time.Millisecond)
_, err = server.RetrieveAll()
s.Require().NoError(err)
// Check reply
// TODO: find a better way to handle this waiting
time.Sleep(500 * time.Millisecond)
_, err = bob2.RetrieveAll()
s.Require().NoError(err)
time.Sleep(500 * time.Millisecond)
_, err = bob2.RetrieveAll()
s.Require().NoError(err)
time.Sleep(500 * time.Millisecond)
_, err = bob2.RetrieveAll()
s.Require().NoError(err)
err = tt.RetryWithBackOff(func() error {
_, err = server.RetrieveAll()
if err != nil {
return err
}
_, err = bob2.RetrieveAll()
if err != nil {
return err
}
registered, err := bob2.RegisteredForPushNotifications()
if err != nil {
return err
@ -226,42 +186,32 @@ func (s *MessengerPushNotificationSuite) TestReceivePushNotification() {
err = alice.pushNotificationClient.QueryPushNotificationInfo(&bob2.identity.PublicKey)
s.Require().NoError(err)
// Receive push notification query
// TODO: find a better way to handle this waiting
time.Sleep(500 * time.Millisecond)
_, err = server.RetrieveAll()
var info []*push_notification_client.PushNotificationInfo
err = tt.RetryWithBackOff(func() error {
_, err = server.RetrieveAll()
if err != nil {
return err
}
_, err = alice.RetrieveAll()
if err != nil {
return err
}
info, err = alice.pushNotificationClient.GetPushNotificationInfo(&bob1.identity.PublicKey, bobInstallationIDs)
if err != nil {
return err
}
// Check we have replies for both bob1 and bob2
if len(info) != 2 {
return errors.New("info not fetched")
}
return nil
})
s.Require().NoError(err)
time.Sleep(500 * time.Millisecond)
_, err = server.RetrieveAll()
s.Require().NoError(err)
time.Sleep(500 * time.Millisecond)
_, err = server.RetrieveAll()
s.Require().NoError(err)
// Receive push notification query response
// TODO: find a better way to handle this waiting
time.Sleep(500 * time.Millisecond)
_, err = alice.RetrieveAll()
s.Require().NoError(err)
time.Sleep(500 * time.Millisecond)
_, err = alice.RetrieveAll()
s.Require().NoError(err)
time.Sleep(500 * time.Millisecond)
_, err = alice.RetrieveAll()
s.Require().NoError(err)
// Here we should poll, as we don't know whether they are already there
info, err := alice.pushNotificationClient.GetPushNotificationInfo(&bob1.identity.PublicKey, bobInstallationIDs)
s.Require().NoError(err)
// Check we have replies for both bob1 and bob2
s.Require().NotNil(info)
s.Require().Len(info, 2)
var bob1Info, bob2Info *push_notification_client.PushNotificationInfo
if info[0].AccessToken == bob1Servers[0].AccessToken {
@ -305,37 +255,18 @@ func (s *MessengerPushNotificationSuite) TestReceivePushNotificationFromContactO
s.Require().NoError(err)
err = bob1.RegisterForPushNotifications(context.Background(), bob1DeviceToken)
// Receive message, reply
// TODO: find a better way to handle this waiting
time.Sleep(500 * time.Millisecond)
_, err = server.RetrieveAll()
s.Require().NoError(err)
time.Sleep(500 * time.Millisecond)
_, err = server.RetrieveAll()
s.Require().NoError(err)
time.Sleep(500 * time.Millisecond)
_, err = server.RetrieveAll()
s.Require().NoError(err)
// Check reply
// TODO: find a better way to handle this waiting
time.Sleep(500 * time.Millisecond)
_, err = bob1.RetrieveAll()
s.Require().NoError(err)
time.Sleep(500 * time.Millisecond)
_, err = bob1.RetrieveAll()
s.Require().NoError(err)
time.Sleep(500 * time.Millisecond)
_, err = bob1.RetrieveAll()
s.Require().NoError(err)
// Pull servers and check we registered
err = tt.RetryWithBackOff(func() error {
_, err = server.RetrieveAll()
if err != nil {
return err
}
_, err = bob1.RetrieveAll()
if err != nil {
return err
}
registered, err := bob1.RegisteredForPushNotifications()
if err != nil {
return err
@ -357,35 +288,17 @@ func (s *MessengerPushNotificationSuite) TestReceivePushNotificationFromContactO
err = bob2.RegisterForPushNotifications(context.Background(), bob2DeviceToken)
s.Require().NoError(err)
// Receive message, reply
// TODO: find a better way to handle this waiting
time.Sleep(500 * time.Millisecond)
_, err = server.RetrieveAll()
s.Require().NoError(err)
time.Sleep(500 * time.Millisecond)
_, err = server.RetrieveAll()
s.Require().NoError(err)
time.Sleep(500 * time.Millisecond)
_, err = server.RetrieveAll()
s.Require().NoError(err)
// Check reply
// TODO: find a better way to handle this waiting
time.Sleep(500 * time.Millisecond)
_, err = bob2.RetrieveAll()
s.Require().NoError(err)
time.Sleep(500 * time.Millisecond)
_, err = bob2.RetrieveAll()
s.Require().NoError(err)
time.Sleep(500 * time.Millisecond)
_, err = bob2.RetrieveAll()
s.Require().NoError(err)
err = tt.RetryWithBackOff(func() error {
// Fetch server messages, for the registration
_, err = server.RetrieveAll()
if err != nil {
return err
}
// Fetch bob messages, for the response
_, err = bob2.RetrieveAll()
if err != nil {
return err
}
registered, err := bob2.RegisteredForPushNotifications()
if err != nil {
return err
@ -403,42 +316,30 @@ func (s *MessengerPushNotificationSuite) TestReceivePushNotificationFromContactO
err = alice.pushNotificationClient.QueryPushNotificationInfo(&bob2.identity.PublicKey)
s.Require().NoError(err)
// Receive push notification query
// TODO: find a better way to handle this waiting
time.Sleep(500 * time.Millisecond)
_, err = server.RetrieveAll()
s.Require().NoError(err)
var info []*push_notification_client.PushNotificationInfo
err = tt.RetryWithBackOff(func() error {
_, err = server.RetrieveAll()
if err != nil {
return err
}
_, err = alice.RetrieveAll()
if err != nil {
return err
}
time.Sleep(500 * time.Millisecond)
_, err = server.RetrieveAll()
s.Require().NoError(err)
info, err = alice.pushNotificationClient.GetPushNotificationInfo(&bob1.identity.PublicKey, bobInstallationIDs)
if err != nil {
return err
}
// Check we have replies for both bob1 and bob2
if len(info) != 2 {
return errors.New("info not fetched")
}
return nil
time.Sleep(500 * time.Millisecond)
_, err = server.RetrieveAll()
})
s.Require().NoError(err)
// Receive push notification query response
// TODO: find a better way to handle this waiting
time.Sleep(500 * time.Millisecond)
_, err = alice.RetrieveAll()
s.Require().NoError(err)
time.Sleep(500 * time.Millisecond)
_, err = alice.RetrieveAll()
s.Require().NoError(err)
time.Sleep(500 * time.Millisecond)
_, err = alice.RetrieveAll()
s.Require().NoError(err)
// Here we should poll, as we don't know whether they are already there
info, err := alice.pushNotificationClient.GetPushNotificationInfo(&bob1.identity.PublicKey, bobInstallationIDs)
s.Require().NoError(err)
// Check we have replies for both bob1 and bob2
s.Require().NotNil(info)
s.Require().Len(info, 2)
var bob1Info, bob2Info *push_notification_client.PushNotificationInfo
if info[0].AccessToken == bob1Servers[0].AccessToken {