From f4fa679e9cc5740716bf0fca847a01915a9db72c Mon Sep 17 00:00:00 2001 From: Goffi Date: Sun, 15 May 2022 14:15:24 +0200 Subject: [PATCH] comp file sharing: handle `admins` in quotas --- sat/plugins/plugin_comp_file_sharing.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sat/plugins/plugin_comp_file_sharing.py b/sat/plugins/plugin_comp_file_sharing.py index a6fc4b4d..1093d1c7 100644 --- a/sat/plugins/plugin_comp_file_sharing.py +++ b/sat/plugins/plugin_comp_file_sharing.py @@ -410,13 +410,14 @@ class FileSharing: def getQuota(self, client, entity): """Return maximum size allowed for all files for entity""" - # TODO: handle special entities like admins quotas = self.host.memory.getConfig("component file-sharing", "quotas_json", {}) - entity_bare_s = entity.userhost() - try: - quota = quotas["jids"][entity_bare_s] - except KeyError: - quota = quotas.get("users") + if self.host.memory.isAdminJID(entity): + quota = quotas.get("admins") + else: + try: + quota = quotas["jids"][entity.userhost()] + except KeyError: + quota = quotas.get("users") return None if quota is None else utils.parseSize(quota) async def generate_thumbnails(self, extra: dict, image_path: Path):