You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by de...@apache.org on 2014/04/08 10:39:56 UTC
[2/2] git commit: updated refs/heads/4.3-forward to 53724bc
CLOUDSTACK-6326: Fixed password visible in plain text in some of commands
in Hyper-v Agent logs.
Signed-off-by: Devdeep Singh <de...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/53724bcb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/53724bcb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/53724bcb
Branch: refs/heads/4.3-forward
Commit: 53724bcbf51a1751bc0df9f0642eead2c28edb21
Parents: d042a81
Author: Anshul Gangwar <an...@citrix.com>
Authored: Tue Apr 8 12:21:31 2014 +0530
Committer: Devdeep Singh <de...@gmail.com>
Committed: Tue Apr 8 12:31:43 2014 +0530
----------------------------------------------------------------------
.../HypervResource/HypervResourceController.cs | 44 ++++++++++----------
.../ServerResource/HypervResource/Utils.cs | 4 +-
2 files changed, 24 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/53724bcb/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
index 5d9f2af..d7d8126 100644
--- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
+++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
@@ -173,7 +173,7 @@ namespace HypervResource
{
using (log4net.NDC.Push(Guid.NewGuid().ToString()))
{
- logger.Info(CloudStackTypes.SetupCommand + cmd.ToString());
+ logger.Info(CloudStackTypes.SetupCommand + Utils.CleanString(cmd.ToString()));
string details = null;
bool result = false;
@@ -323,7 +323,7 @@ namespace HypervResource
{
using (log4net.NDC.Push(Guid.NewGuid().ToString()))
{
- logger.Info(CloudStackTypes.RebootCommand + cmd.ToString());
+ logger.Info(CloudStackTypes.RebootCommand + Utils.CleanString(cmd.ToString()));
string details = null;
bool result = false;
@@ -367,7 +367,7 @@ namespace HypervResource
{
using (log4net.NDC.Push(Guid.NewGuid().ToString()))
{
- logger.Info(CloudStackTypes.DestroyCommand + cmd.ToString());
+ logger.Info(CloudStackTypes.DestroyCommand + Utils.CleanString(cmd.ToString()));
string details = null;
bool result = false;
@@ -375,7 +375,7 @@ namespace HypervResource
try
{
// Assert
- String errMsg = "No 'volume' details in " + CloudStackTypes.DestroyCommand + " " + cmd.ToString();
+ String errMsg = "No 'volume' details in " + CloudStackTypes.DestroyCommand + " " + Utils.CleanString(cmd.ToString());
if (cmd.volume == null)
{
logger.Error(errMsg);
@@ -430,7 +430,7 @@ namespace HypervResource
{
using (log4net.NDC.Push(Guid.NewGuid().ToString()))
{
- logger.Info(CloudStackTypes.DestroyCommand + cmd.ToString());
+ logger.Info(CloudStackTypes.DestroyCommand + Utils.CleanString(cmd.ToString()));
string details = null;
bool result = false;
@@ -756,7 +756,7 @@ namespace HypervResource
{
using (log4net.NDC.Push(Guid.NewGuid().ToString()))
{
- logger.Info(CloudStackTypes.CheckHealthCommand + cmd.ToString());
+ logger.Info(CloudStackTypes.CheckHealthCommand + Utils.CleanString(cmd.ToString()));
object ansContent = new
{
result = true,
@@ -774,7 +774,7 @@ namespace HypervResource
{
using (log4net.NDC.Push(Guid.NewGuid().ToString()))
{
- logger.Info(CloudStackTypes.CheckOnHostCommand + cmd.ToString());
+ logger.Info(CloudStackTypes.CheckOnHostCommand + Utils.CleanString(cmd.ToString()));
object ansContent = new
{
result = true,
@@ -793,7 +793,7 @@ namespace HypervResource
{
using (log4net.NDC.Push(Guid.NewGuid().ToString()))
{
- logger.Info(CloudStackTypes.CheckSshCommand + cmd.ToString());
+ logger.Info(CloudStackTypes.CheckSshCommand + Utils.CleanString(cmd.ToString()));
object ansContent = new
{
result = true,
@@ -811,7 +811,7 @@ namespace HypervResource
{
using (log4net.NDC.Push(Guid.NewGuid().ToString()))
{
- logger.Info(CloudStackTypes.CheckVirtualMachineCommand + cmd.ToString());
+ logger.Info(CloudStackTypes.CheckVirtualMachineCommand + Utils.CleanString(cmd.ToString()));
string details = null;
bool result = false;
string vmName = cmd.vmName;
@@ -848,7 +848,7 @@ namespace HypervResource
{
using (log4net.NDC.Push(Guid.NewGuid().ToString()))
{
- logger.Info(CloudStackTypes.DeleteStoragePoolCommand + cmd.ToString());
+ logger.Info(CloudStackTypes.DeleteStoragePoolCommand + Utils.CleanString(cmd.ToString()));
object ansContent = new
{
result = true,
@@ -992,7 +992,7 @@ namespace HypervResource
{
using (log4net.NDC.Push(Guid.NewGuid().ToString()))
{
- logger.Info(CloudStackTypes.CleanupNetworkRulesCmd + cmd.ToString());
+ logger.Info(CloudStackTypes.CleanupNetworkRulesCmd + Utils.CleanString(cmd.ToString()));
object ansContent = new
{
result = false,
@@ -1010,7 +1010,7 @@ namespace HypervResource
{
using (log4net.NDC.Push(Guid.NewGuid().ToString()))
{
- logger.Info(CloudStackTypes.CheckNetworkCommand + cmd.ToString());
+ logger.Info(CloudStackTypes.CheckNetworkCommand + Utils.CleanString(cmd.ToString()));
object ansContent = new
{
result = true,
@@ -1028,7 +1028,7 @@ namespace HypervResource
{
using (log4net.NDC.Push(Guid.NewGuid().ToString()))
{
- logger.Info(CloudStackTypes.ReadyCommand + cmd.ToString());
+ logger.Info(CloudStackTypes.ReadyCommand + Utils.CleanString(cmd.ToString()));
object ansContent = new
{
result = true,
@@ -1113,7 +1113,7 @@ namespace HypervResource
{
using (log4net.NDC.Push(Guid.NewGuid().ToString()))
{
- logger.Info(CloudStackTypes.StopCommand + cmd.ToString());
+ logger.Info(CloudStackTypes.StopCommand + Utils.CleanString(cmd.ToString()));
string details = null;
bool result = false;
@@ -1209,7 +1209,7 @@ namespace HypervResource
{
using (log4net.NDC.Push(Guid.NewGuid().ToString()))
{
- logger.Info(CloudStackTypes.MaintainCommand + cmd.ToString());
+ logger.Info(CloudStackTypes.MaintainCommand + Utils.CleanString(cmd.ToString()));
object ansContent = new
{
@@ -1232,7 +1232,7 @@ namespace HypervResource
{
using (log4net.NDC.Push(Guid.NewGuid().ToString()))
{
- logger.Info(CloudStackTypes.PingRoutingCommand + cmd.ToString());
+ logger.Info(CloudStackTypes.PingRoutingCommand + Utils.CleanString(cmd.ToString()));
object ansContent = new
{
@@ -1254,7 +1254,7 @@ namespace HypervResource
{
using (log4net.NDC.Push(Guid.NewGuid().ToString()))
{
- logger.Info(CloudStackTypes.PingCommand + cmd.ToString());
+ logger.Info(CloudStackTypes.PingCommand + Utils.CleanString(cmd.ToString()));
object ansContent = new
{
@@ -1275,7 +1275,7 @@ namespace HypervResource
{
using (log4net.NDC.Push(Guid.NewGuid().ToString()))
{
- logger.Info(CloudStackTypes.GetVmStatsCommand + cmd.ToString());
+ logger.Info(CloudStackTypes.GetVmStatsCommand + Utils.CleanString(cmd.ToString()));
bool result = false;
JArray vmNamesJson = cmd.vmNames;
string[] vmNames = vmNamesJson.ToObject<string[]>();
@@ -1786,7 +1786,7 @@ namespace HypervResource
{
using (log4net.NDC.Push(Guid.NewGuid().ToString()))
{
- logger.Info(CloudStackTypes.GetHostStatsCommand + cmd.ToString());
+ logger.Info(CloudStackTypes.GetHostStatsCommand + Utils.CleanString(cmd.ToString()));
bool result = false;
string details = null;
object hostStats = null;
@@ -1848,7 +1848,7 @@ namespace HypervResource
{
using (log4net.NDC.Push(Guid.NewGuid().ToString()))
{
- logger.Info(CloudStackTypes.PrepareForMigrationCommand + cmd.ToString());
+ logger.Info(CloudStackTypes.PrepareForMigrationCommand + Utils.CleanString(cmd.ToString()));
string details = null;
bool result = true;
@@ -1882,7 +1882,7 @@ namespace HypervResource
{
using (log4net.NDC.Push(Guid.NewGuid().ToString()))
{
- logger.Info(CloudStackTypes.MigrateCommand + cmd.ToString());
+ logger.Info(CloudStackTypes.MigrateCommand + Utils.CleanString(cmd.ToString()));
string details = null;
bool result = false;
@@ -2033,7 +2033,7 @@ namespace HypervResource
{
using (log4net.NDC.Push(Guid.NewGuid().ToString()))
{
- logger.Info(CloudStackTypes.GetVncPortCommand + cmd.ToString());
+ logger.Info(CloudStackTypes.GetVncPortCommand + Utils.CleanString(cmd.ToString()));
string details = null;
bool result = false;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/53724bcb/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/Utils.cs
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/Utils.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/Utils.cs
index 6ebc5bf..5ddcbef 100644
--- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/Utils.cs
+++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/Utils.cs
@@ -167,8 +167,8 @@ namespace HypervResource
public static string CleanString(string stringToClean)
{
string cleanString = null;
- string regexQueryString = "(&|%26)?(password|accesskey|secretkey)(=|%3D).*?(?=(%26|[&'\"]))";
- string regexJson = "\"(password|accesskey|secretkey)\":\".*?\",?";
+ string regexQueryString = "(&|%26)?(password|accesskey|secretkey|Password)(=|%3D).*?(?=(%26|[&'\"]))";
+ string regexJson = "\"(password|accesskey|secretkey|Password)\":\\s?\".*?\",?";
cleanString = System.Text.RegularExpressions.Regex.Replace(stringToClean, regexQueryString, "");
cleanString = System.Text.RegularExpressions.Regex.Replace(cleanString, regexJson, "");
return cleanString;