From 35d9cadddd0742bd8b86af3a23bdd15b1042deba Mon Sep 17 00:00:00 2001 From: Kelven Yang Date: Mon, 30 Aug 2010 17:10:52 -0700 Subject: [PATCH] Let console proxy servlet use the same userId name in session variable --- server/src/com/cloud/servlet/ConsoleProxyServlet.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/src/com/cloud/servlet/ConsoleProxyServlet.java b/server/src/com/cloud/servlet/ConsoleProxyServlet.java index 0ed772a960e..db75f1b385e 100644 --- a/server/src/com/cloud/servlet/ConsoleProxyServlet.java +++ b/server/src/com/cloud/servlet/ConsoleProxyServlet.java @@ -78,7 +78,7 @@ public class ConsoleProxyServlet extends HttpServlet { HttpSession session = req.getSession(false); if(session == null) { if(verifyRequest(params)) { - userId = (String)params.get(BaseCmd.Properties.USER_ID.getName())[0]; + userId = (String)params.get("userId")[0]; account = (String)params.get(BaseCmd.Properties.ACCOUNT.getName())[0]; accountObj = (Account)params.get(BaseCmd.Properties.ACCOUNT_OBJ.getName())[0]; } else { @@ -87,11 +87,11 @@ public class ConsoleProxyServlet extends HttpServlet { return; } } else { - userId = (String)session.getAttribute(BaseCmd.Properties.USER_ID.getName()); + userId = (String)session.getAttribute("userId"); account = (String)session.getAttribute(BaseCmd.Properties.ACCOUNT.getName()); accountObj = (Account)session.getAttribute(BaseCmd.Properties.ACCOUNT_OBJ.getName()); } - + // Do a sanity check here to make sure the user hasn't already been deleted if ((userId == null) || (account == null) || (accountObj == null) || !verifyUser(Long.valueOf(userId))) { s_logger.info("Invalid user/account, reject console/thumbnail access");