Fixes data type bug in get-user call
Additionally, fixes a bug in the fake guestagent causing grant permissions to persist after a user is deleted. Partially addresses bug #1132975 Change-Id: I2b6951d1569224661747b3a889c8840ce2b205fa
This commit is contained in:
parent
460aa6abde
commit
bf30ea8a81
@ -26,7 +26,7 @@ class UserView(object):
|
||||
"name": self.user.name,
|
||||
"databases": self.user.databases
|
||||
}
|
||||
return user_dict
|
||||
return {"user": user_dict}
|
||||
|
||||
|
||||
class UsersView(object):
|
||||
@ -35,12 +35,11 @@ class UsersView(object):
|
||||
self.users = users
|
||||
|
||||
def data(self):
|
||||
data = []
|
||||
# These are model instances
|
||||
for user in self.users:
|
||||
data.append(UserView(user).data())
|
||||
userlist = [{"name": user.name,
|
||||
"databases": user.databases}
|
||||
for user in self.users]
|
||||
|
||||
return {"users": data}
|
||||
return {"users": userlist}
|
||||
|
||||
|
||||
class UserAccessView(object):
|
||||
|
@ -64,6 +64,8 @@ class FakeGuest(object):
|
||||
|
||||
def _create_user(self, user):
|
||||
self.users[user['_name']] = user
|
||||
databases = [db['_name'] for db in user['_databases']]
|
||||
self.grant_access(user['_name'], databases)
|
||||
return user
|
||||
|
||||
def delete_database(self, database):
|
||||
@ -82,8 +84,10 @@ class FakeGuest(object):
|
||||
})
|
||||
|
||||
def delete_user(self, user):
|
||||
if user['_name'] in self.users:
|
||||
del self.users[user['_name']]
|
||||
username = user['_name']
|
||||
self.grants[(username, '%')] = set()
|
||||
if username in self.users:
|
||||
del self.users[username]
|
||||
|
||||
def is_root_enabled(self):
|
||||
return self.root_was_enabled
|
||||
|
Loading…
x
Reference in New Issue
Block a user