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(community-requests): block community requests from rejected users

This commit is contained in:
Jonathan Rainville 2023-03-23 14:48:46 -04:00
parent ed639a9f4a
commit 79365ef576
1 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
protocol/communities/manager.go
View File

@ -51,7 +51,11 @@ const maxArchiveSizeInBytes = 30000000
var memberPermissionsCheckInterval = 1 * time.Hour var memberPermissionsCheckInterval = 1 * time.Hour
var ErrTorrentTimedout = errors.New("torrent has timed out") // errors
var (
ErrTorrentTimedout = errors.New("torrent has timed out")
ErrCommunityRequestAlreadyRejected = errors.New("that user was already rejected from the community")
)
type Manager struct { type Manager struct {
persistence *Persistence persistence *Persistence
@ -1275,6 +1279,20 @@ func (m *Manager) DeclineRequestToJoin(request *requests.DeclineRequestToJoinCom
return m.persistence.SetRequestToJoinState(dbRequest.PublicKey, dbRequest.CommunityID, RequestToJoinStateDeclined) return m.persistence.SetRequestToJoinState(dbRequest.PublicKey, dbRequest.CommunityID, RequestToJoinStateDeclined)
} }
func (m *Manager) isUserRejectedFromCommunity(signer *ecdsa.PublicKey, community *Community) (bool, error) {
declinedRequestsToJoin, err := m.persistence.DeclinedRequestsToJoinForCommunity(community.ID())
if err != nil {
return false, err
}
for _, req := range declinedRequestsToJoin {
if req.PublicKey == common.PubkeyToHex(signer) {
return true, nil
}
}
return false, nil
}
func (m *Manager) HandleCommunityCancelRequestToJoin(signer *ecdsa.PublicKey, request *protobuf.CommunityCancelRequestToJoin) (*RequestToJoin, error) { func (m *Manager) HandleCommunityCancelRequestToJoin(signer *ecdsa.PublicKey, request *protobuf.CommunityCancelRequestToJoin) (*RequestToJoin, error) {
community, err := m.persistence.GetByID(&m.identity.PublicKey, request.CommunityId) community, err := m.persistence.GetByID(&m.identity.PublicKey, request.CommunityId)
if err != nil { if err != nil {
@ -1284,6 +1302,14 @@ func (m *Manager) HandleCommunityCancelRequestToJoin(signer *ecdsa.PublicKey, re
return nil, ErrOrgNotFound return nil, ErrOrgNotFound
} }
isUserRejected, err := m.isUserRejectedFromCommunity(signer, community)
if err != nil {
return nil, err
}
if isUserRejected {
return nil, ErrCommunityRequestAlreadyRejected
}
err = m.markRequestToJoinAsCanceled(signer, community) err = m.markRequestToJoinAsCanceled(signer, community)
if err != nil { if err != nil {
return nil, err return nil, err
@ -1306,6 +1332,14 @@ func (m *Manager) HandleCommunityRequestToJoin(signer *ecdsa.PublicKey, request
return nil, ErrOrgNotFound return nil, ErrOrgNotFound
} }
isUserRejected, err := m.isUserRejectedFromCommunity(signer, community)
if err != nil {
return nil, err
}
if isUserRejected {
return nil, ErrCommunityRequestAlreadyRejected
}
if err := community.ValidateRequestToJoin(signer, request); err != nil { if err := community.ValidateRequestToJoin(signer, request); err != nil {
return nil, err return nil, err
} }