Remove password parameter from strings sent to log since it is unnecessary (#731)

claudiamurialdo · web-flow · commit 1f003a6121bd · 2022-12-05T17:46:29.000-03:00
diff --git a/dotnet/src/dotnetframework/GxClasses/Data/GXDataCommon.cs b/dotnet/src/dotnetframework/GxClasses/Data/GXDataCommon.cs
@@ -949,7 +949,7 @@ public virtual string DataSource
 		}
 
 		public virtual int MaxNumberOfValuesInList => int.MaxValue;
-
+		protected const string NaV = "xxxxx";
 		public string ConnectionStringForLog()
 		{
 			string result="";
@@ -1584,7 +1584,7 @@ public override GxAbstractConnectionWrapper GetConnection(bool showPrompt, strin
 					m_connectionString=BuildConnectionString(datasourceName, userId, userPassword, databaseName, port, schema, extra);
 			}
 
-			GXLogging.Debug(log, "Setting connectionString property ", ConnectionStringForLog);
+			GXLogging.Debug(log, "Setting connectionString property ", ()=> BuildConnectionString(datasourceName, userId, NaV, databaseName, port, schema, extra));
 			MssqlConnectionWrapper connection=new MssqlConnectionWrapper(m_connectionString,connectionCache, isolationLevel);
 
 			m_FailedConnections = 0;
diff --git a/dotnet/src/dotnetframework/GxClasses/Data/GXDataDb2.cs b/dotnet/src/dotnetframework/GxClasses/Data/GXDataDb2.cs
@@ -166,7 +166,7 @@ public override GxAbstractConnectionWrapper GetConnection(bool showPrompt, strin
 		{
 			if (m_connectionString == null)
 				m_connectionString=BuildConnectionString(datasourceName, userId, userPassword, databaseName, port, schema, extra);
-			GXLogging.Debug(log, "Setting connectionString property ", ConnectionStringForLog);
+			GXLogging.Debug(log, "Setting connectionString property ", () => BuildConnectionString(datasourceName, userId, NaV, databaseName, port, schema, extra));
 
 			return new Db2ConnectionWrapper(m_connectionString,connectionCache, isolationLevel);
 		}
diff --git a/dotnet/src/dotnetframework/GxClasses/Data/GXDataDb2400.cs b/dotnet/src/dotnetframework/GxClasses/Data/GXDataDb2400.cs
@@ -223,7 +223,7 @@ public override GxAbstractConnectionWrapper GetConnection(bool showPrompt, strin
 		{
 			if (m_connectionString == null)
 				m_connectionString=BuildConnectionString(datasourceName, userId, userPassword, databaseName, port, schema, extra);
-			GXLogging.Debug(log, "Setting connectionString property ", ConnectionStringForLog);
+			GXLogging.Debug(log, "Setting connectionString property ", () => BuildConnectionString(datasourceName, userId, NaV, databaseName, port, schema, extra));
 
 			return new Db2ISeriesConnectionWrapper(m_connectionString,connectionCache, isolationLevel);
 		}
@@ -854,7 +854,7 @@ public override GxAbstractConnectionWrapper GetConnection(bool showPrompt, strin
 		{
 			if (m_connectionString == null)
 				m_connectionString = BuildConnectionString(datasourceName, userId, userPassword, databaseName, port, schema, extra);
-			GXLogging.Debug(log, "Setting connectionString property ", ConnectionStringForLog);
+			GXLogging.Debug(log, "Setting connectionString property ", ()=> BuildConnectionString(datasourceName, userId, NaV, databaseName, port, schema, extra));
 
 			return new Db2ISeriesHISConnectionWrapper(m_connectionString, connectionCache, isolationLevel);
 		}
diff --git a/dotnet/src/dotnetframework/GxClasses/Data/GXDataHana.cs b/dotnet/src/dotnetframework/GxClasses/Data/GXDataHana.cs
@@ -60,7 +60,7 @@ public override GxAbstractConnectionWrapper GetConnection(bool showPrompt, strin
         {
             if (m_connectionString == null)
                 m_connectionString = BuildConnectionString(datasourceName, userId, userPassword, databaseName, port, schema, extra);
-			GXLogging.Debug(log, "Setting connectionString property ", ConnectionStringForLog);
+			GXLogging.Debug(log, "Setting connectionString property ", () => BuildConnectionString(datasourceName, userId, NaV, databaseName, port, schema, extra));
 
             return new HanaConnectionWrapper(m_connectionString, connectionCache, isolationLevel);
         }
diff --git a/dotnet/src/dotnetframework/GxClasses/Data/GXDataInformix.cs b/dotnet/src/dotnetframework/GxClasses/Data/GXDataInformix.cs
@@ -142,7 +142,7 @@ public override GxAbstractConnectionWrapper GetConnection(bool showPrompt, strin
 		{
 			if (m_connectionString == null)
 				m_connectionString = BuildConnectionString(datasourceName, userId, userPassword, databaseName, port, schema, extra);
-			GXLogging.Debug(log, "Setting connectionString property ", ConnectionStringForLog);
+			GXLogging.Debug(log, "Setting connectionString property ", () => BuildConnectionString(datasourceName, userId, NaV, databaseName, port, schema, extra));
 
 			return new InformixConnectionWrapper(m_connectionString, connectionCache, isolationLevel);
 		}
diff --git a/dotnet/src/dotnetframework/GxClasses/Data/GXDataMysqlConnector.cs b/dotnet/src/dotnetframework/GxClasses/Data/GXDataMysqlConnector.cs
@@ -44,7 +44,7 @@ public override GxAbstractConnectionWrapper GetConnection(bool showPrompt, strin
 		{
 			if (m_connectionString == null)
 				m_connectionString = BuildConnectionString(datasourceName, userId, userPassword, databaseName, port, schema, extra);
-			GXLogging.Debug(log, "Setting connectionString property ", ConnectionStringForLog);
+			GXLogging.Debug(log, "Setting connectionString property ", () => BuildConnectionString(datasourceName, userId, NaV, databaseName, port, schema, extra));
 			m_FailedConnections = 0;
 			return new MySqlConnectorConnectionWrapper(m_connectionString, connectionCache, isolationLevel);
 		}
diff --git a/dotnet/src/dotnetframework/GxClasses/Data/GXDataMysqlDriverCS.cs b/dotnet/src/dotnetframework/GxClasses/Data/GXDataMysqlDriverCS.cs
@@ -32,7 +32,7 @@ public override GxAbstractConnectionWrapper GetConnection(bool showPrompt, strin
 		{
 			if (m_connectionString == null)
 				m_connectionString = BuildConnectionString(datasourceName, userId, userPassword, databaseName, port, schema, extra);
-			GXLogging.Debug(log, "Setting connectionString property ", ConnectionStringForLog);
+			GXLogging.Debug(log, "Setting connectionString property ", () => BuildConnectionString(datasourceName, userId, NaV, databaseName, port, schema, extra));
 			m_FailedConnections = 0;
 			return new MySqlDriverCSConnectionWrapper(m_connectionString, connectionCache, isolationLevel);
 		}
diff --git a/dotnet/src/dotnetframework/GxClasses/Data/GXDataNTierService.cs b/dotnet/src/dotnetframework/GxClasses/Data/GXDataNTierService.cs
@@ -116,7 +116,7 @@ public override GxAbstractConnectionWrapper GetConnection(bool showPrompt, strin
 		{
 			if (string.IsNullOrEmpty(m_connectionString))
 				m_connectionString = BuildConnectionString(datasourceName, userId, userPassword, databaseName, port, schema, extra);
-			GXLogging.Debug(log, "Setting connectionString property ", ConnectionStringForLog);
+			GXLogging.Debug(log, "Setting connectionString property ", () => BuildConnectionString(datasourceName, userId, NaV, databaseName, port, schema, extra));
 
 			return new ServiceConnectionWrapper(m_ServiceType, m_connectionString, connectionCache, isolationLevel, DataSource);
 		}
diff --git a/dotnet/src/dotnetframework/GxClasses/Data/GXDataOracle.cs b/dotnet/src/dotnetframework/GxClasses/Data/GXDataOracle.cs
@@ -289,7 +289,7 @@ public override GxAbstractConnectionWrapper GetConnection(bool showPrompt, strin
 				if (m_connectionString == null)
 					m_connectionString = BuildConnectionString(datasourceName, userId, userPassword, databaseName, port, schema, extra);
 			}
-			GXLogging.Debug(log, "Setting connectionString property ", ConnectionStringForLog);
+			GXLogging.Debug(log, "Setting connectionString property ", () => BuildConnectionString(datasourceName, userId, NaV, databaseName, port, schema, extra));
 			return new OracleConnectionWrapper(m_connectionString, connectionCache, isolationLevel);
 		}
 		protected override string BuildConnectionString(string datasourceName, string userId,
@@ -609,7 +609,7 @@ public override GxAbstractConnectionWrapper GetConnection(bool showPrompt, strin
 				if (m_connectionString == null)
 					m_connectionString = BuildConnectionString(datasourceName, userId, userPassword, databaseName, port, schema, extra);
 			}
-			GXLogging.Debug(log, "Setting connectionString property ", ConnectionStringForLog);
+			GXLogging.Debug(log, "Setting connectionString property ", () => BuildConnectionString(datasourceName, userId, NaV, databaseName, port, schema, extra));
 			return new OracleManagedConnectionWrapper(m_connectionString, connectionCache, isolationLevel);
 		}
 
@@ -873,7 +873,7 @@ public override GxAbstractConnectionWrapper GetConnection(bool showPrompt, strin
 				if (m_connectionString == null)
 					m_connectionString = BuildConnectionString(datasourceName, userId, userPassword, databaseName, port, schema, extra);
 			}
-			GXLogging.Debug(log, "Setting connectionString property ", ConnectionStringForLog);
+			GXLogging.Debug(log, "Setting connectionString property ", ()=> BuildConnectionString(datasourceName, userId, NaV, databaseName, port, schema, extra));
 			return new MSOracleConnectionWrapper(m_connectionString, connectionCache, isolationLevel);
 		}
 #else
diff --git a/dotnet/src/dotnetframework/GxClasses/Data/GXDataPostgreSQL.cs b/dotnet/src/dotnetframework/GxClasses/Data/GXDataPostgreSQL.cs
@@ -73,7 +73,7 @@ public override GxAbstractConnectionWrapper GetConnection(bool showPrompt, strin
 		{
 			if (m_connectionString == null)
 				m_connectionString = BuildConnectionString(datasourceName, userId, userPassword, databaseName, port, schema, extra);
-			GXLogging.Debug(log, "Setting connectionString property ", ConnectionStringForLog);
+			GXLogging.Debug(log, "Setting connectionString property ", () => BuildConnectionString(datasourceName, userId, NaV, databaseName, port, schema, extra));
 			return new PostgresqlConnectionWrapper(m_connectionString, connectionCache, isolationLevel);
 		}
 		string convertToSqlCall(string stmt, GxParameterCollection parameters)
diff --git a/dotnet/src/dotnetframework/GxClasses/Data/GXDataSqlite.cs b/dotnet/src/dotnetframework/GxClasses/Data/GXDataSqlite.cs
@@ -32,7 +32,7 @@ public override GxAbstractConnectionWrapper GetConnection(bool showPrompt, strin
 		{
 			if (m_connectionString == null)
 				m_connectionString = BuildConnectionString(datasourceName, userId, userPassword, databaseName, port, schema, extra);
-			GXLogging.Debug(log, "Setting connectionString property ", ConnectionStringForLog);
+			GXLogging.Debug(log, "Setting connectionString property ", () => BuildConnectionString(datasourceName, userId, NaV, databaseName, port, schema, extra));
 			SQLiteConnectionWrapper connection = new SQLiteConnectionWrapper(m_connectionString, connectionCache, isolationLevel);
 			m_FailedConnections = 0;
 			return connection;

Original file line number	Diff line number	Diff line change
`@@ -949,7 +949,7 @@ public virtual string DataSource`
`949`	`949`	`}`
`950`	`950`
`951`	`951`	`public virtual int MaxNumberOfValuesInList => int.MaxValue;`
`952`		`-`
	`952`	`+ protected const string NaV = "xxxxx";`
`953`	`953`	`public string ConnectionStringForLog()`
`954`	`954`	`{`
`955`	`955`	`string result="";`
`@@ -1584,7 +1584,7 @@ public override GxAbstractConnectionWrapper GetConnection(bool showPrompt, strin`
`1584`	`1584`	`m_connectionString=BuildConnectionString(datasourceName, userId, userPassword, databaseName, port, schema, extra);`
`1585`	`1585`	`}`
`1586`	`1586`
`1587`		`- GXLogging.Debug(log, "Setting connectionString property ", ConnectionStringForLog);`
	`1587`	`+ GXLogging.Debug(log, "Setting connectionString property ", ()=> BuildConnectionString(datasourceName, userId, NaV, databaseName, port, schema, extra));`
`1588`	`1588`	`MssqlConnectionWrapper connection=new MssqlConnectionWrapper(m_connectionString,connectionCache, isolationLevel);`
`1589`	`1589`
`1590`	`1590`	`m_FailedConnections = 0;`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ public override GxAbstractConnectionWrapper GetConnection(bool showPrompt, strin`
`166`	`166`	`{`
`167`	`167`	`if (m_connectionString == null)`
`168`	`168`	`m_connectionString=BuildConnectionString(datasourceName, userId, userPassword, databaseName, port, schema, extra);`
`169`		`- GXLogging.Debug(log, "Setting connectionString property ", ConnectionStringForLog);`
	`169`	`+ GXLogging.Debug(log, "Setting connectionString property ", () => BuildConnectionString(datasourceName, userId, NaV, databaseName, port, schema, extra));`
`170`	`170`
`171`	`171`	`return new Db2ConnectionWrapper(m_connectionString,connectionCache, isolationLevel);`
`172`	`172`	`}`
Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ public override GxAbstractConnectionWrapper GetConnection(bool showPrompt, strin`
`223`	`223`	`{`
`224`	`224`	`if (m_connectionString == null)`
`225`	`225`	`m_connectionString=BuildConnectionString(datasourceName, userId, userPassword, databaseName, port, schema, extra);`
`226`		`- GXLogging.Debug(log, "Setting connectionString property ", ConnectionStringForLog);`
	`226`	`+ GXLogging.Debug(log, "Setting connectionString property ", () => BuildConnectionString(datasourceName, userId, NaV, databaseName, port, schema, extra));`
`227`	`227`
`228`	`228`	`return new Db2ISeriesConnectionWrapper(m_connectionString,connectionCache, isolationLevel);`
`229`	`229`	`}`
`@@ -854,7 +854,7 @@ public override GxAbstractConnectionWrapper GetConnection(bool showPrompt, strin`
`854`	`854`	`{`
`855`	`855`	`if (m_connectionString == null)`
`856`	`856`	`m_connectionString = BuildConnectionString(datasourceName, userId, userPassword, databaseName, port, schema, extra);`
`857`		`- GXLogging.Debug(log, "Setting connectionString property ", ConnectionStringForLog);`
	`857`	`+ GXLogging.Debug(log, "Setting connectionString property ", ()=> BuildConnectionString(datasourceName, userId, NaV, databaseName, port, schema, extra));`
`858`	`858`
`859`	`859`	`return new Db2ISeriesHISConnectionWrapper(m_connectionString, connectionCache, isolationLevel);`
`860`	`860`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public override GxAbstractConnectionWrapper GetConnection(bool showPrompt, strin`
`60`	`60`	`{`
`61`	`61`	`if (m_connectionString == null)`
`62`	`62`	`m_connectionString = BuildConnectionString(datasourceName, userId, userPassword, databaseName, port, schema, extra);`
`63`		`- GXLogging.Debug(log, "Setting connectionString property ", ConnectionStringForLog);`
	`63`	`+ GXLogging.Debug(log, "Setting connectionString property ", () => BuildConnectionString(datasourceName, userId, NaV, databaseName, port, schema, extra));`
`64`	`64`
`65`	`65`	`return new HanaConnectionWrapper(m_connectionString, connectionCache, isolationLevel);`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ public override GxAbstractConnectionWrapper GetConnection(bool showPrompt, strin`
`142`	`142`	`{`
`143`	`143`	`if (m_connectionString == null)`
`144`	`144`	`m_connectionString = BuildConnectionString(datasourceName, userId, userPassword, databaseName, port, schema, extra);`
`145`		`- GXLogging.Debug(log, "Setting connectionString property ", ConnectionStringForLog);`
	`145`	`+ GXLogging.Debug(log, "Setting connectionString property ", () => BuildConnectionString(datasourceName, userId, NaV, databaseName, port, schema, extra));`
`146`	`146`
`147`	`147`	`return new InformixConnectionWrapper(m_connectionString, connectionCache, isolationLevel);`
`148`	`148`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public override GxAbstractConnectionWrapper GetConnection(bool showPrompt, strin`
`44`	`44`	`{`
`45`	`45`	`if (m_connectionString == null)`
`46`	`46`	`m_connectionString = BuildConnectionString(datasourceName, userId, userPassword, databaseName, port, schema, extra);`
`47`		`- GXLogging.Debug(log, "Setting connectionString property ", ConnectionStringForLog);`
	`47`	`+ GXLogging.Debug(log, "Setting connectionString property ", () => BuildConnectionString(datasourceName, userId, NaV, databaseName, port, schema, extra));`
`48`	`48`	`m_FailedConnections = 0;`
`49`	`49`	`return new MySqlConnectorConnectionWrapper(m_connectionString, connectionCache, isolationLevel);`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public override GxAbstractConnectionWrapper GetConnection(bool showPrompt, strin`
`32`	`32`	`{`
`33`	`33`	`if (m_connectionString == null)`
`34`	`34`	`m_connectionString = BuildConnectionString(datasourceName, userId, userPassword, databaseName, port, schema, extra);`
`35`		`- GXLogging.Debug(log, "Setting connectionString property ", ConnectionStringForLog);`
	`35`	`+ GXLogging.Debug(log, "Setting connectionString property ", () => BuildConnectionString(datasourceName, userId, NaV, databaseName, port, schema, extra));`
`36`	`36`	`m_FailedConnections = 0;`
`37`	`37`	`return new MySqlDriverCSConnectionWrapper(m_connectionString, connectionCache, isolationLevel);`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ public override GxAbstractConnectionWrapper GetConnection(bool showPrompt, strin`
`116`	`116`	`{`
`117`	`117`	`if (string.IsNullOrEmpty(m_connectionString))`
`118`	`118`	`m_connectionString = BuildConnectionString(datasourceName, userId, userPassword, databaseName, port, schema, extra);`
`119`		`- GXLogging.Debug(log, "Setting connectionString property ", ConnectionStringForLog);`
	`119`	`+ GXLogging.Debug(log, "Setting connectionString property ", () => BuildConnectionString(datasourceName, userId, NaV, databaseName, port, schema, extra));`
`120`	`120`
`121`	`121`	`return new ServiceConnectionWrapper(m_ServiceType, m_connectionString, connectionCache, isolationLevel, DataSource);`
`122`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ public override GxAbstractConnectionWrapper GetConnection(bool showPrompt, strin`
`289`	`289`	`if (m_connectionString == null)`
`290`	`290`	`m_connectionString = BuildConnectionString(datasourceName, userId, userPassword, databaseName, port, schema, extra);`
`291`	`291`	`}`
`292`		`- GXLogging.Debug(log, "Setting connectionString property ", ConnectionStringForLog);`
	`292`	`+ GXLogging.Debug(log, "Setting connectionString property ", () => BuildConnectionString(datasourceName, userId, NaV, databaseName, port, schema, extra));`
`293`	`293`	`return new OracleConnectionWrapper(m_connectionString, connectionCache, isolationLevel);`
`294`	`294`	`}`
`295`	`295`	`protected override string BuildConnectionString(string datasourceName, string userId,`
`@@ -609,7 +609,7 @@ public override GxAbstractConnectionWrapper GetConnection(bool showPrompt, strin`
`609`	`609`	`if (m_connectionString == null)`
`610`	`610`	`m_connectionString = BuildConnectionString(datasourceName, userId, userPassword, databaseName, port, schema, extra);`
`611`	`611`	`}`
`612`		`- GXLogging.Debug(log, "Setting connectionString property ", ConnectionStringForLog);`
	`612`	`+ GXLogging.Debug(log, "Setting connectionString property ", () => BuildConnectionString(datasourceName, userId, NaV, databaseName, port, schema, extra));`
`613`	`613`	`return new OracleManagedConnectionWrapper(m_connectionString, connectionCache, isolationLevel);`
`614`	`614`	`}`
`615`	`615`
`@@ -873,7 +873,7 @@ public override GxAbstractConnectionWrapper GetConnection(bool showPrompt, strin`
`873`	`873`	`if (m_connectionString == null)`
`874`	`874`	`m_connectionString = BuildConnectionString(datasourceName, userId, userPassword, databaseName, port, schema, extra);`
`875`	`875`	`}`
`876`		`- GXLogging.Debug(log, "Setting connectionString property ", ConnectionStringForLog);`
	`876`	`+ GXLogging.Debug(log, "Setting connectionString property ", ()=> BuildConnectionString(datasourceName, userId, NaV, databaseName, port, schema, extra));`
`877`	`877`	`return new MSOracleConnectionWrapper(m_connectionString, connectionCache, isolationLevel);`
`878`	`878`	`}`
`879`	`879`	`#else`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public override GxAbstractConnectionWrapper GetConnection(bool showPrompt, strin`
`73`	`73`	`{`
`74`	`74`	`if (m_connectionString == null)`
`75`	`75`	`m_connectionString = BuildConnectionString(datasourceName, userId, userPassword, databaseName, port, schema, extra);`
`76`		`- GXLogging.Debug(log, "Setting connectionString property ", ConnectionStringForLog);`
	`76`	`+ GXLogging.Debug(log, "Setting connectionString property ", () => BuildConnectionString(datasourceName, userId, NaV, databaseName, port, schema, extra));`
`77`	`77`	`return new PostgresqlConnectionWrapper(m_connectionString, connectionCache, isolationLevel);`
`78`	`78`	`}`
`79`	`79`	`string convertToSqlCall(string stmt, GxParameterCollection parameters)`