etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Retrieve the session parameters (userId, accountId, account) properly since UserContext is not the place to get those values.

This commit is contained in:
Kris McQueen 2010-09-21 18:25:05 -07:00
parent 8101ffb636
commit e6d6ccb72e
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/src/com/cloud/servlet/ConsoleProxyServlet.java
View File

@ -31,7 +31,6 @@ import com.cloud.host.HostVO;
import com.cloud.server.ManagementServer;
import com.cloud.user.Account;
import com.cloud.user.User;
import com.cloud.user.UserContext;
import com.cloud.utils.component.ComponentLocator;
import com.cloud.vm.UserVmVO;
import com.cloud.vm.VMInstanceVO;
@ -65,9 +64,13 @@ public class ConsoleProxyServlet extends HttpServlet {
}
// FIXME: are these set up correctly from ApiServer?
Long userId = UserContext.current().getUserId();
String account = UserContext.current().getAccountName();
Account accountObj = (Account)UserContext.current().getAccountObject();
String userIdStr = (String)session.getAttribute("userid");
String account = (String)session.getAttribute("account");
Object accountObj = session.getAttribute("accountobj");
Long userId = null;
if (userIdStr != null) {
userId = Long.parseLong(userIdStr);
}
// Do a sanity check here to make sure the user hasn't already been deleted
if ((userId == null) || (account == null) || (accountObj == null) || !verifyUser(userId)) {