Skip to content

Commit

Permalink
Change in aaa mode should be reflected in runtime auth pipeline.
Browse files Browse the repository at this point in the history
Avoid using deprecated multi_tenancy flag. Instead peek at API
server object to manipulate the pipeline

Change-Id: Iea5ca7652ffd5c89102cb2639f7888db651a9fbb
Closes-Bug: #1650417
  • Loading branch information
Deepinder Setia committed Dec 21, 2016
1 parent 0b98777 commit c38d160
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
12 changes: 4 additions & 8 deletions src/config/api-server/vnc_auth_keystone.py
Expand Up @@ -82,17 +82,14 @@ def start_http_server(self):

class AuthPreKeystone(object):

def __init__(self, app, conf, multi_tenancy, server_mgr):
def __init__(self, app, conf, server_mgr):
self.app = app
self.conf = conf
self.mt = multi_tenancy
self.server_mgr = server_mgr

def get_mt(self):
return self.mt

def set_mt(self, value):
self.mt = value
@property
def mt(self):
return self.server_mgr.is_multi_tenancy_set()

def path_in_white_list(self, path):
for pattern in self.server_mgr.white_list:
Expand Down Expand Up @@ -217,7 +214,6 @@ def get_middleware_app(self):
app = AuthPreKeystone(
auth_middleware,
None,
self._multi_tenancy,
self._server_mgr)

return app
Expand Down
5 changes: 3 additions & 2 deletions src/config/api-server/vnc_cfg_api_server.py
Expand Up @@ -1837,7 +1837,7 @@ def obj_perms_http_get(self):
'token_info': None,
'is_cloud_admin_role': False,
'is_global_read_only_role': False,
'permissions': PERMS_RWX
'permissions': 'RWX'
}
return result

Expand Down Expand Up @@ -3556,8 +3556,9 @@ def set_mt(self, multi_tenancy):
self._args.multi_tenancy = multi_tenancy
# end

# check if token validatation needed
def is_multi_tenancy_set(self):
return self._args.multi_tenancy or self.aaa_mode != 'no-auth'
return self.aaa_mode != 'no-auth'

def is_rbac_enabled(self):
return self.aaa_mode == 'rbac'
Expand Down

0 comments on commit c38d160

Please sign in to comment.