Repository: cloudstack Updated Branches: refs/heads/master 4dde4106c -> d8e1bf150
CLOUDSTACK-7089: don't log VNC password Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> (cherry picked from commit e287de9fd90a06ee7f86d31ba69a84481f0820f1) Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d8e1bf15 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d8e1bf15 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d8e1bf15 Branch: refs/heads/master Commit: d8e1bf15062bb2d4bbd4dd3ae1d32697ce1053b5 Parents: 4dde410 Author: Rohit Yadav <rohit.ya...@shapeblue.com> Authored: Thu Feb 26 18:10:23 2015 +0530 Committer: Rohit Yadav <rohit.ya...@shapeblue.com> Committed: Thu Feb 26 18:11:12 2015 +0530 ---------------------------------------------------------------------- server/src/com/cloud/consoleproxy/AgentHookBase.java | 2 +- server/src/com/cloud/servlet/ConsoleProxyServlet.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d8e1bf15/server/src/com/cloud/consoleproxy/AgentHookBase.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/consoleproxy/AgentHookBase.java b/server/src/com/cloud/consoleproxy/AgentHookBase.java index 8a5bae5..b61ba13 100644 --- a/server/src/com/cloud/consoleproxy/AgentHookBase.java +++ b/server/src/com/cloud/consoleproxy/AgentHookBase.java @@ -146,7 +146,7 @@ public abstract class AgentHookBase implements AgentHook { String sid = cmd.getSid(); if (sid == null || !sid.equals(vm.getVncPassword())) { - s_logger.warn("sid " + sid + " in url does not match stored sid " + vm.getVncPassword()); + s_logger.warn("sid " + sid + " in url does not match stored sid."); return new ConsoleAccessAuthenticationAnswer(cmd, false); } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d8e1bf15/server/src/com/cloud/servlet/ConsoleProxyServlet.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/servlet/ConsoleProxyServlet.java b/server/src/com/cloud/servlet/ConsoleProxyServlet.java index d08bcdb..3389d92 100644 --- a/server/src/com/cloud/servlet/ConsoleProxyServlet.java +++ b/server/src/com/cloud/servlet/ConsoleProxyServlet.java @@ -317,7 +317,7 @@ public class ConsoleProxyServlet extends HttpServlet { String sid = req.getParameter("sid"); if (sid == null || !sid.equals(vm.getVncPassword())) { - s_logger.warn("sid " + sid + " in url does not match stored sid " + vm.getVncPassword()); + s_logger.warn("sid " + sid + " in url does not match stored sid."); sendResponse(resp, "failed"); return; }
