qwe/keepass2android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2464 from PhilippC/2396--webdav-password-in-logs

Browse Source 
avoid passwords appearing in logfiles (#2396)
This commit is contained in:
PhilippC
2024-01-02 21:08:51 +01:00
committed by GitHub
parent 8ee13acdde 98e31942e1
commit 9c50d2d98a
5 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/KeePassLib2Android/Serialization/FileLock.cs
View File

@@ -185,7 +185,7 @@ namespace KeePassLib.Serialization
byte[] pbFile = StrUtil.Utf8.GetBytes(sb.ToString()); byte[] pbFile = StrUtil.Utf8.GetBytes(sb.ToString());
s = IOConnection.OpenWrite(iocLockFile); 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); s.Write(pbFile, 0, pbFile.Length);
} }
finally { if(s != null) s.Close(); } finally { if(s != null) s.Close(); }
@@ -205,8 +205,7 @@ namespace KeePassLib.Serialization
if(lfiEx != null) if(lfiEx != null)
{ {
m_iocLockFile = null; // Otherwise Dispose deletes the existing one m_iocLockFile = null; // Otherwise Dispose deletes the existing one
throw new FileLockException(iocBaseFile.GetDisplayName(), throw new FileLockException(UrlUtil.GetFileName(iocBaseFile.Path), lfiEx.GetOwner());
lfiEx.GetOwner());
} }
LockFileInfo.Create(m_iocLockFile); LockFileInfo.Create(m_iocLockFile);

5
src/KeePassLib2Android/Utility/MessageService.cs
View File

@@ -28,6 +28,7 @@ using System.Diagnostics;
using KeePassLib.Resources; using KeePassLib.Resources;
using KeePassLib.Serialization; using KeePassLib.Serialization;
using Android.Webkit;
namespace KeePassLib.Utility namespace KeePassLib.Utility
{ {
@@ -411,7 +412,7 @@ Clipboard.SetText(ObjectsToMessage(vLines, true));*/
public static void ShowLoadWarning(IOConnectionInfo ioConnection, Exception ex) public static void ShowLoadWarning(IOConnectionInfo ioConnection, Exception ex)
{ {
if (ioConnection != null) if (ioConnection != null)
ShowLoadWarning(ioConnection.GetDisplayName(), ex, false); ShowLoadWarning(UrlUtil.GetFileName(ioConnection.Path), ex, false);
else ShowWarning(ex); else ShowWarning(ex);
} }
@@ -444,7 +445,7 @@ Clipboard.SetText(ObjectsToMessage(vLines, true));*/
bool bCorruptionWarning) bool bCorruptionWarning)
{ {
if (ioConnection != null) if (ioConnection != null)
ShowSaveWarning(ioConnection.GetDisplayName(), ex, bCorruptionWarning); ShowSaveWarning(UrlUtil.GetFileName(ioConnection.Path), ex, bCorruptionWarning);
else ShowWarning(ex); else ShowWarning(ex);
} }

7
src/Kp2aBusinessLogic/Io/CachingFileStorage.cs
View File

@@ -124,7 +124,7 @@ namespace keepass2android.Io
&& File.Exists(VersionFilePath(ioc)) && File.Exists(VersionFilePath(ioc))
&& File.Exists(BaseVersionFilePath(ioc)); && File.Exists(BaseVersionFilePath(ioc));
Kp2aLog.Log(ioc.GetDisplayName() + " isCached = " + result); Kp2aLog.Log(GetDisplayName(ioc) + " isCached = " + result);
return result; return result;
} }
@@ -598,13 +598,14 @@ namespace keepass2android.Io
public string GetBaseVersionHash(IOConnectionInfo ioc) public string GetBaseVersionHash(IOConnectionInfo ioc)
{ {
string hash = File.ReadAllText(BaseVersionFilePath(ioc)); string hash = File.ReadAllText(BaseVersionFilePath(ioc));
Kp2aLog.Log(ioc.GetDisplayName() + " baseVersionHash = " + hash); Kp2aLog.Log(GetDisplayName(ioc) + " baseVersionHash = " + hash);
return hash; return hash;
} }
public string GetLocalVersionHash(IOConnectionInfo ioc) public string GetLocalVersionHash(IOConnectionInfo ioc)
{ {
string hash = File.ReadAllText(VersionFilePath(ioc)); string hash = File.ReadAllText(VersionFilePath(ioc));
Kp2aLog.Log(ioc.GetDisplayName() + " localVersionHash = " + hash);
Kp2aLog.Log(GetDisplayName(ioc) + " localVersionHash = " + hash);
return hash; return hash;
} }
public bool HasLocalChanges(IOConnectionInfo ioc) public bool HasLocalChanges(IOConnectionInfo ioc)

2
src/Kp2aBusinessLogic/Io/JavaFileStorage.cs
View File

@@ -348,7 +348,7 @@ namespace keepass2android.Io
} }
catch (Exception e) catch (Exception e)
{ {
throw new Exception("Error finding " + filename + " in " + folderPath.GetDisplayName(), e); throw new Exception("Error finding " + filename + " in " + GetDisplayName(folderPath), e);
} }
} }

2
src/keepass2android/addons/OtpKeyProv/OathHotpKeyProv.cs
View File

@@ -129,7 +129,7 @@ namespace OtpKeyProv
if(!OtpInfo.Save(auxFileIoc, otpInfo)) if(!OtpInfo.Save(auxFileIoc, otpInfo))
{ {
MessageService.ShowWarning("Failed to save auxiliary OTP info file:", MessageService.ShowWarning("Failed to save auxiliary OTP info file:",
auxFileIoc.GetDisplayName()); UrlUtil.GetFileName(auxFileIoc.Path));
return false; return false;
} }