From 0b2b8e31d8035db5c5a7b8029438fada0fb7aad6 Mon Sep 17 00:00:00 2001 From: alena Date: Thu, 18 Nov 2010 17:05:01 -0800 Subject: [PATCH] Fixed updateUser command - didn't work correctly via 8096 port (user account info was taken from UserContext instead of User object). --- server/src/com/cloud/api/commands/ListUsersCmd.java | 1 - server/src/com/cloud/user/AccountManagerImpl.java | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/api/commands/ListUsersCmd.java b/server/src/com/cloud/api/commands/ListUsersCmd.java index cbae53d74ae..36759da3305 100644 --- a/server/src/com/cloud/api/commands/ListUsersCmd.java +++ b/server/src/com/cloud/api/commands/ListUsersCmd.java @@ -25,7 +25,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiConstants; import com.cloud.api.ApiResponseHelper; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java index 91141ea9af9..e44e22f42e2 100755 --- a/server/src/com/cloud/user/AccountManagerImpl.java +++ b/server/src/com/cloud/user/AccountManagerImpl.java @@ -1081,6 +1081,7 @@ public class AccountManagerImpl implements AccountManager, AccountService { String timeZone = cmd.getTimezone(); String userName = cmd.getUsername(); + //Input validation UserVO user = _userDao.getUser(id); @@ -1093,7 +1094,7 @@ public class AccountManagerImpl implements AccountManager, AccountService { } // If the account is an admin type, return an error. We do not allow this - Account account = UserContext.current().getAccount(); + Account account = _accountDao.findById(user.getAccountId()); if (account != null && (account.getId() == Account.ACCOUNT_ID_SYSTEM)) { throw new PermissionDeniedException("user id : " + id + " is system account, update is not allowed");