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

fix(permissions): TMs can also bypass permission to join 

Fixes #13644

reverted better
This commit is contained in:
Jonathan Rainville 2024-02-22 14:44:38 -05:00
parent 0a42bd0742
commit ed6c2d9c46
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/modules/main/chat_section/module.nim
View File

@ -829,6 +829,9 @@ proc updateTokenPermissionModel*(self: Module, permissions: Table[string, CheckP
let adminPermissions = filter(tokenPermissionsItems, tokenPermissionsItem => let adminPermissions = filter(tokenPermissionsItems, tokenPermissionsItem =>
tokenPermissionsItem.getType() == TokenPermissionType.BecomeAdmin.int) tokenPermissionsItem.getType() == TokenPermissionType.BecomeAdmin.int)
let tokenMasterPermissions = filter(tokenPermissionsItems, tokenPermissionsItem =>
tokenPermissionsItem.getType() == TokenPermissionType.BecomeTokenMaster.int)
# multiple permissions of the same type act as logical OR # multiple permissions of the same type act as logical OR
# so if at least one of them is fulfilled we can mark the view # so if at least one of them is fulfilled we can mark the view
# as all lights green # as all lights green
@ -837,8 +840,14 @@ proc updateTokenPermissionModel*(self: Module, permissions: Table[string, CheckP
let adminRequirementMet = adminPermissions.len() > 0 and any(adminPermissions, proc (item: TokenPermissionItem): bool = item.tokenCriteriaMet) let adminRequirementMet = adminPermissions.len() > 0 and any(adminPermissions, proc (item: TokenPermissionItem): bool = item.tokenCriteriaMet)
let requiresPermissionToJoin = (adminPermissions.len() > 0 and adminRequirementMet) or memberPermissions.len() > 0 let tmRequirementMet = tokenMasterPermissions.len() > 0 and any(tokenMasterPermissions, proc (item: TokenPermissionItem): bool = item.tokenCriteriaMet)
let tokenRequirementsMet = if requiresPermissionToJoin: adminRequirementMet or memberRequirementMet else: false
let requiresPermissionToJoin = not (tokenMasterPermissions.len() > 0 and tmRequirementMet) and
((adminPermissions.len() > 0 and adminRequirementMet) or memberPermissions.len() > 0)
let tokenRequirementsMet = if requiresPermissionToJoin:
tmRequirementMet or adminRequirementMet or memberRequirementMet
else:
false
self.view.setAllTokenRequirementsMet(tokenRequirementsMet) self.view.setAllTokenRequirementsMet(tokenRequirementsMet)
self.view.setRequiresTokenPermissionToJoin(requiresPermissionToJoin) self.view.setRequiresTokenPermissionToJoin(requiresPermissionToJoin)