fix acl update error (#766)

microsoft · Jan 14, 2020 · 0740283 · 0740283
1 parent 3b3951d
commit 0740283
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/RestAPI/dlwsrestapi.py b/src/RestAPI/dlwsrestapi.py
@@ -48,7 +48,7 @@
     logger.info("===========Init Admin Access===============")
     global_vars["initAdminAccess"] = True
     logger.info('setting admin access!')
-    ACLManager.UpdateAce("Administrator", AuthorizationManager.GetResourceAclPath("", ResourceType.Cluster), Permission.Admin, False)
+    ACLManager.UpdateAce("Administrator", AuthorizationManager.GetResourceAclPath("", ResourceType.Cluster), Permission.Admin, 0)
     logger.info('admin access given!')
 
 

diff --git a/src/utils/JobRestAPIUtils.py b/src/utils/JobRestAPIUtils.py
@@ -507,7 +507,7 @@ def UpdateAce(userName, identityName, resourceType, resourceName, permissions):
     ret = None
     resourceAclPath = AuthorizationManager.GetResourceAclPath(resourceName, resourceType)
     if AuthorizationManager.HasAccess(userName, resourceType, resourceName, Permission.Admin):
-        ret =  ACLManager.UpdateAce(identityName, resourceAclPath, permissions, False)
+        ret =  ACLManager.UpdateAce(identityName, resourceAclPath, permissions, 0)
     else:
         ret = "Access Denied!"
     return ret

diff --git a/src/utils/authorization.py b/src/utils/authorization.py
@@ -221,8 +221,8 @@ def GetAllAcl():
                 identities[identityKey].append(ace)
 
             with acl_cache_lock:
-                acl_cache.update((resources))
-                acl_cache.update((identities))
+                acl_cache.update(resources)
+                acl_cache.update(identities)
 
         except Exception as e:
             logger.warn("Fail to get ACL for user %s, ex: %s" , userName, str(e))
@@ -253,7 +253,7 @@ def GetResourceAcl(resource):
 
             with acl_cache_lock:
                 acl_cache[resourceKeyPrefix + resource] = ret
-                acl_cache.update((identities))
+                acl_cache.update(identities)
         except Exception as e:
             logger.error("Get resoure acl error for resource: %s, ex: %s", resource, str(e))
         finally:
@@ -334,4 +334,4 @@ def UpdateIdentityInfo(identityName, uid, gid, groups):
                 logger.error("update identity info error for identity: %s, ex: %s", identityName, str(e))
         finally:
             dataHandler.Close()
-        return ret
+        return ret