Skip to content

Commit 4b8c5a3

Browse files
committed
Implement wildcard permissions
1 parent e02e0f4 commit 4b8c5a3

1 file changed

Lines changed: 9 additions & 11 deletions

File tree

cloudbot/permissions.py

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -75,17 +75,15 @@ def has_perm_mask(self, user_mask, perm, notice=True):
7575
if fnmatch(user_mask.lower(), backdoor.lower()):
7676
return True
7777

78-
if not perm.lower() in self.perm_users:
79-
# no one has access
80-
return False
81-
82-
allowed_users = self.perm_users[perm.lower()]
83-
84-
for allowed_mask in allowed_users:
85-
if fnmatch(user_mask.lower(), allowed_mask):
86-
if notice:
87-
logger.info("[{}|permissions] Allowed user {} access to {}".format(self.name, user_mask, perm))
88-
return True
78+
perm = perm.lower()
79+
80+
for user_perm, allowed_users in self.perm_users.items():
81+
if fnmatch(perm, user_perm):
82+
for allowed_mask in allowed_users:
83+
if fnmatch(user_mask.lower(), allowed_mask):
84+
if notice:
85+
logger.info("[{}|permissions] Allowed user {} access to {}".format(self.name, user_mask, perm))
86+
return True
8987

9088
return False
9189

0 commit comments

Comments
 (0)