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

fix: ensure CommunityDescription msg kept in db is signed 

closes: status-im/status-desktop#11859
This commit is contained in:
Patryk Osmaczko 2023-08-10 13:36:26 +02:00 committed by osmaczko
parent 6ee7038809
commit 400ba52289
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
protocol/communities/community_event.go
View File

@ -9,7 +9,6 @@ import (
"github.com/status-im/status-go/protocol/common"
"github.com/status-im/status-go/protocol/protobuf"
"github.com/status-im/status-go/protocol/v1"
)
func (o *Community) ToCreateChannelCommunityEvent(channelID string, channel *protobuf.CommunityChat) *CommunityEvent {
@ -202,6 +201,7 @@ func (o *Community) UpdateCommunityByEvents(communityEventMessage *CommunityEven
o.mergeCommunityEvents(communityEventMessage)
copy.config.CommunityDescription = description
copy.config.CommunityDescriptionProtocolMessage = communityEventMessage.EventsBaseCommunityDescription
copy.config.EventsData = o.config.EventsData
// Update the copy of the CommunityDescription by community events
@ -213,32 +213,23 @@ func (o *Community) UpdateCommunityByEvents(communityEventMessage *CommunityEven
// Evaluate `CommunityChanges` data by searching a difference between `CommunityDescription`
// from the DB and `CommunityDescription` patched by community events
changes := EvaluateCommunityChanges(o.config.CommunityDescription, copy.config.CommunityDescription)
// TODO: need to figure out is it ok to save marshaledCommunityDescription without the signature
marshaledCommDescr, err := proto.Marshal(copy.config.CommunityDescription)
if err != nil {
return nil, err
}
rawMessage, err := protocol.WrapMessageV1(marshaledCommDescr, protobuf.ApplicationMetadataMessage_COMMUNITY_DESCRIPTION, copy.PrivateKey())
if err != nil {
return nil, err
}
copy.config.CommunityDescriptionProtocolMessage = rawMessage
changes.Community = copy
return changes, nil
}
func (o *Community) updateCommunityDescriptionByEvents() error {
if o.config.EventsData == nil {
return nil
}
for _, event := range o.config.EventsData.Events {
err := o.updateCommunityDescriptionByCommunityEvent(event)
if err != nil {
return err
}
}
return nil
}

17
protocol/communities/manager.go
View File

@ -2966,7 +2966,17 @@ func (m *Manager) BanUserFromCommunity(request *requests.BanUserFromCommunity) (
}
func (m *Manager) GetByID(id []byte) (*Community, error) {
return m.persistence.GetByID(&m.identity.PublicKey, id)
community, err := m.persistence.GetByID(&m.identity.PublicKey, id)
if err != nil {
return nil, err
}
err = community.updateCommunityDescriptionByEvents()
if err != nil {
return nil, err
}
return community, nil
}
func (m *Manager) GetByIDString(idString string) (*Community, error) {
@ -2993,6 +3003,11 @@ func (m *Manager) CreateRequestToJoin(requester *ecdsa.PublicKey, request *reque
return nil, nil, err
}
err = community.updateCommunityDescriptionByEvents()
if err != nil {
return nil, nil, err
}
// We don't allow requesting access if already joined
if community.Joined() {
return nil, nil, ErrAlreadyJoined