浏览代码

HUE-8530 [organization] Port S3 proxy user lookup

Romain 6 年之前
父节点
当前提交
7d0f0da2d9
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      desktop/core/src/desktop/lib/fs/proxyfs.py

+ 2 - 1
desktop/core/src/desktop/lib/fs/proxyfs.py

@@ -81,7 +81,8 @@ class ProxyFS(object):
       #if not filebrowser_action (hdfs) then handle permission via doas else check permission in hue
       #if not filebrowser_action (hdfs) then handle permission via doas else check permission in hue
       if not filebrowser_action:
       if not filebrowser_action:
         return True
         return True
-      user = rewrite_user(User.objects.get(username=self.getuser()))
+      lookup = {'email' if ENABLE_ORGANIZATIONS.get() else 'username': self.getuser()}
+      user = rewrite_user(User.objects.get(**lookup))
       return user.is_authenticated() and user.is_active and (is_admin(user) or not filebrowser_action or user.has_hue_permission(action=filebrowser_action, app="filebrowser"))
       return user.is_authenticated() and user.is_active and (is_admin(user) or not filebrowser_action or user.has_hue_permission(action=filebrowser_action, app="filebrowser"))
     except User.DoesNotExist:
     except User.DoesNotExist:
       LOG.exception('proxyfs.has_access()')
       LOG.exception('proxyfs.has_access()')