replace usage of IoConnectionInfo::GetDisplayName() to avoid passwords (as part of the URL) appearing in logfiles
This commit is contained in:
@@ -185,7 +185,7 @@ namespace KeePassLib.Serialization
|
||||
byte[] pbFile = StrUtil.Utf8.GetBytes(sb.ToString());
|
||||
|
||||
s = IOConnection.OpenWrite(iocLockFile);
|
||||
if(s == null) throw new IOException(iocLockFile.GetDisplayName());
|
||||
if(s == null) throw new IOException(UrlUtil.GetFileName(iocLockFile.Path));
|
||||
s.Write(pbFile, 0, pbFile.Length);
|
||||
}
|
||||
finally { if(s != null) s.Close(); }
|
||||
@@ -205,7 +205,7 @@ namespace KeePassLib.Serialization
|
||||
if(lfiEx != null)
|
||||
{
|
||||
m_iocLockFile = null; // Otherwise Dispose deletes the existing one
|
||||
throw new FileLockException(iocBaseFile.GetDisplayName(),
|
||||
throw new FileLockException(UrlUtil.GetFileName(iocBaseFile.Path),
|
||||
lfiEx.GetOwner());
|
||||
}
|
||||
|
||||
|
||||
@@ -28,6 +28,7 @@ using System.Diagnostics;
|
||||
|
||||
using KeePassLib.Resources;
|
||||
using KeePassLib.Serialization;
|
||||
using Android.Webkit;
|
||||
|
||||
namespace KeePassLib.Utility
|
||||
{
|
||||
@@ -411,7 +412,7 @@ Clipboard.SetText(ObjectsToMessage(vLines, true));*/
|
||||
public static void ShowLoadWarning(IOConnectionInfo ioConnection, Exception ex)
|
||||
{
|
||||
if (ioConnection != null)
|
||||
ShowLoadWarning(ioConnection.GetDisplayName(), ex, false);
|
||||
ShowLoadWarning(UrlUtil.GetFileName(ioConnection.Path), ex, false);
|
||||
else ShowWarning(ex);
|
||||
}
|
||||
|
||||
@@ -444,7 +445,7 @@ Clipboard.SetText(ObjectsToMessage(vLines, true));*/
|
||||
bool bCorruptionWarning)
|
||||
{
|
||||
if (ioConnection != null)
|
||||
ShowSaveWarning(ioConnection.GetDisplayName(), ex, bCorruptionWarning);
|
||||
ShowSaveWarning(UrlUtil.GetFileName(ioConnection.Path), ex, bCorruptionWarning);
|
||||
else ShowWarning(ex);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user