Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 65F4117309 for ; Thu, 26 Feb 2015 12:41:40 +0000 (UTC) Received: (qmail 41451 invoked by uid 500); 26 Feb 2015 12:41:40 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 41418 invoked by uid 500); 26 Feb 2015 12:41:40 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 41409 invoked by uid 99); 26 Feb 2015 12:41:40 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Feb 2015 12:41:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 163E8E0531; Thu, 26 Feb 2015 12:41:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: commits@cloudstack.apache.org Message-Id: <26e94b79884c4ea0a28887d1fcc9ca5b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.4 to 72d78e5 Date: Thu, 26 Feb 2015 12:41:40 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/4.4 14a00679b -> 72d78e57c CLOUDSTACK-7089: don't log VNC password Signed-off-by: Rohit Yadav (cherry picked from commit e287de9fd90a06ee7f86d31ba69a84481f0820f1) Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/72d78e57 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/72d78e57 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/72d78e57 Branch: refs/heads/4.4 Commit: 72d78e57c8338130b19192a9bdfd5839575d62e4 Parents: 14a0067 Author: Rohit Yadav Authored: Thu Feb 26 18:10:23 2015 +0530 Committer: Rohit Yadav Committed: Thu Feb 26 18:11:28 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/72d78e57/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 9dfffd4..e9fd4e5 100644 --- a/server/src/com/cloud/consoleproxy/AgentHookBase.java +++ b/server/src/com/cloud/consoleproxy/AgentHookBase.java @@ -145,7 +145,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/72d78e57/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 1053aa2..6b657d0 100644 --- a/server/src/com/cloud/servlet/ConsoleProxyServlet.java +++ b/server/src/com/cloud/servlet/ConsoleProxyServlet.java @@ -313,7 +313,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; }