Ver Fonte

HUE-8925 [fb] Give S3 access to default group when IDBroker enabled.

Jean-Francois Desjeans Gauthier há 6 anos atrás
pai
commit
dad396718d
1 ficheiros alterados com 2 adições e 1 exclusões
  1. 2 1
      apps/useradmin/src/useradmin/models.py

+ 2 - 1
apps/useradmin/src/useradmin/models.py

@@ -61,6 +61,7 @@ import django.utils.timezone as dtz
 
 
 from desktop import appmanager
 from desktop import appmanager
 from desktop.lib.exceptions_renderable import PopupException
 from desktop.lib.exceptions_renderable import PopupException
+from desktop.lib.idbroker.conf import is_idbroker_enabled
 from hadoop import cluster
 from hadoop import cluster
 
 
 import useradmin.conf
 import useradmin.conf
@@ -279,7 +280,7 @@ def update_app_permissions(**kwargs):
            not (new_dp.app == 'metastore' and new_dp.action == 'write') and \
            not (new_dp.app == 'metastore' and new_dp.action == 'write') and \
            not (new_dp.app == 'hbase' and new_dp.action == 'write') and \
            not (new_dp.app == 'hbase' and new_dp.action == 'write') and \
            not (new_dp.app == 'security' and new_dp.action == 'impersonate') and \
            not (new_dp.app == 'security' and new_dp.action == 'impersonate') and \
-           not (new_dp.app == 'filebrowser' and new_dp.action == 's3_access') and \
+           not (new_dp.app == 'filebrowser' and new_dp.action == 's3_access' and not is_idbroker_enabled('s3a')) and \
            not (new_dp.app == 'filebrowser' and new_dp.action == 'adls_access') and \
            not (new_dp.app == 'filebrowser' and new_dp.action == 'adls_access') and \
            not (new_dp.app == 'filebrowser' and new_dp.action == 'abfs_access') and \
            not (new_dp.app == 'filebrowser' and new_dp.action == 'abfs_access') and \
            not (new_dp.app == 'oozie' and new_dp.action == 'disable_editor_access'):
            not (new_dp.app == 'oozie' and new_dp.action == 'disable_editor_access'):