cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject git commit: updated refs/heads/4.5 to e287de9
Date Thu, 26 Feb 2015 12:41:05 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.5 cb08707ad -> e287de9fd


CLOUDSTACK-7089: don't log VNC password

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e287de9f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e287de9f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e287de9f

Branch: refs/heads/4.5
Commit: e287de9fd90a06ee7f86d31ba69a84481f0820f1
Parents: cb08707
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Thu Feb 26 18:10:23 2015 +0530
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Thu Feb 26 18:10:23 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/e287de9f/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/e287de9f/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 4694a47..23f25c5 100644
--- a/server/src/com/cloud/servlet/ConsoleProxyServlet.java
+++ b/server/src/com/cloud/servlet/ConsoleProxyServlet.java
@@ -311,7 +311,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;
         }


Mime
View raw message