Let console proxy servlet use the same userId name in session variable

This commit is contained in:
Kelven Yang 2010-08-30 17:10:52 -07:00
parent 97e721b879
commit 35d9cadddd
1 changed files with 3 additions and 3 deletions

View File

@ -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");