OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Moved the nifty MySQLEstateData connectionstring password-stripper out into the Util project

0.6.3-post-fixes
lbsa71 2009-02-17 14:12:57 +00:00
parent 3130784934
commit 93465df5e3
2 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Data/MySQL/MySQLEstateData.cs
View File

@ -58,31 +58,15 @@ namespace OpenSim.Data.MySQL
{ {
m_connectionString = connectionString; m_connectionString = connectionString;
int passPosition = 0;
int passEndPosition = 0;
string displayConnectionString = null;
try try
{ // hide the password in the connection string {
passPosition = m_connectionString.IndexOf("password", StringComparison.OrdinalIgnoreCase); m_log.Info("[REGION DB]: MySql - connecting: " + Util.GetDisplayConnectionString(m_connectionString));
passPosition = m_connectionString.IndexOf("=", passPosition);
if (passPosition < m_connectionString.Length)
passPosition += 1;
passEndPosition = m_connectionString.IndexOf(";", passPosition);
displayConnectionString = m_connectionString.Substring(0, passPosition);
displayConnectionString += "***";
displayConnectionString += m_connectionString.Substring(passEndPosition, m_connectionString.Length - passEndPosition);
} }
catch (Exception e) catch (Exception e)
{ {
m_log.Debug("Exception: password not found in connection string\n" + e.ToString()); m_log.Debug("Exception: password not found in connection string\n" + e.ToString());
} }
m_log.Info("[REGION DB]: MySql - connecting: " + displayConnectionString);
//m_log.Info("[ESTATE DB]: MySql - connecting: "+m_connectionString);
m_connection = new MySqlConnection(m_connectionString); m_connection = new MySqlConnection(m_connectionString);
m_connection.Open(); m_connection.Open();

20
OpenSim/Framework/Util.cs
View File

@ -898,5 +898,25 @@ namespace OpenSim.Framework
{ {
return UUIDPattern.IsMatch(s); return UUIDPattern.IsMatch(s);
} }
public static string GetDisplayConnectionString(string connectionString)
{
int passPosition = 0;
int passEndPosition = 0;
string displayConnectionString = null;
// hide the password in the connection string
passPosition = connectionString.IndexOf("password", StringComparison.OrdinalIgnoreCase);
passPosition = connectionString.IndexOf("=", passPosition);
if (passPosition < connectionString.Length)
passPosition += 1;
passEndPosition = connectionString.IndexOf(";", passPosition);
displayConnectionString = connectionString.Substring(0, passPosition);
displayConnectionString += "***";
displayConnectionString += connectionString.Substring(passEndPosition, connectionString.Length - passEndPosition);
return displayConnectionString;
}
} }
} }