wismna/modernkeepasslib
1
0
Fork 0
mirror of https://github.com/wismna/ModernKeePassLib.git synced 2025-10-03 15:40:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update Lib to version 2.44

Browse Source 
Update nuget packages
This commit is contained in:
Geoffroy BONNEVILLE
2020-03-16 15:28:05 +01:00
parent 3a85b60e58
commit b8240d482f
108 changed files with 1102 additions and 595 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ModernKeePassLib/Native/ClipboardU.cs
View File

@@ -1,6 +1,6 @@
/*
KeePass Password Safe - The Open-Source Password Manager
Copyright (C) 2003-2019 Dominik Reichl <dominik.reichl@t-online.de>
Copyright (C) 2003-2020 Dominik Reichl <dominik.reichl@t-online.de>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by

10
ModernKeePassLib/Native/Native.PCL.cs
View File

@@ -27,6 +27,16 @@ namespace ModernKeePassLib.Native
{
if (!string.IsNullOrEmpty(strApp)) return strApp;
return string.Empty;
}
internal static string EncodeDataToArgs(string v)
{
throw new NotImplementedException();
}
public static string DecodeArgsToData(string strApp)
{
throw new NotImplementedException();
}
}

193
ModernKeePassLib/Native/NativeLib.cs
View File

@@ -1,6 +1,6 @@
/*
KeePass Password Safe - The Open-Source Password Manager
Copyright (C) 2003-2019 Dominik Reichl <dominik.reichl@t-online.de>
Copyright (C) 2003-2020 Dominik Reichl <dominik.reichl@t-online.de>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -234,7 +234,7 @@ namespace ModernKeePassLib.Native
{
ProcessStartInfo psi = new ProcessStartInfo();
psi.FileName = EncodePath(strAppPath);
psi.FileName = strAppPath;
if(!string.IsNullOrEmpty(strParams)) psi.Arguments = strParams;
psi.CreateNoWindow = true;
@@ -244,7 +244,7 @@ namespace ModernKeePassLib.Native
psi.RedirectStandardOutput = bStdOut;
if(strStdInput != null) psi.RedirectStandardInput = true;
Process p = Process.Start(psi);
Process p = StartProcessEx(psi);
pToDispose = p;
if(strStdInput != null)
@@ -449,19 +449,18 @@ namespace ModernKeePassLib.Native
Marshal.FreeHGlobal(kvpPointers.Value);
}
internal static Type GetUwpType(string strType)
{
if(string.IsNullOrEmpty(strType)) { Debug.Assert(false); return null; }
// https://referencesource.microsoft.com/#mscorlib/system/runtime/interopservices/windowsruntime/winrtclassactivator.cs
return Type.GetType(strType + ", Windows, ContentType=WindowsRuntime", false);
}
// internal static Type GetUwpType(string strType)
// {
// if(string.IsNullOrEmpty(strType)) { Debug.Assert(false); return null; }
// // https://referencesource.microsoft.com/#mscorlib/system/runtime/interopservices/windowsruntime/winrtclassactivator.cs
// return Type.GetType(strType + ", Windows, ContentType=WindowsRuntime", false);
// }
// Cf. DecodeArgsToData
internal static string EncodeDataToArgs(string strData)
{
if(strData == null) { Debug.Assert(false); return string.Empty; }
// Cf. EncodePath and DecodeArgsToPath
if(MonoWorkarounds.IsRequired(3471228285U) && IsUnix())
{
string str = strData;
@@ -479,53 +478,165 @@ namespace ModernKeePassLib.Native
return str;
}
// See SHELLEXECUTEINFO structure documentation
return strData.Replace("\"", "\"\"\"");
// SHELLEXECUTEINFOW structure documentation:
// https://docs.microsoft.com/en-us/windows/desktop/api/shellapi/ns-shellapi-shellexecuteinfow
// return strData.Replace("\"", "\"\"\"");
// Microsoft C/C++ startup code:
// https://docs.microsoft.com/en-us/cpp/cpp/parsing-cpp-command-line-arguments
// CommandLineToArgvW function:
// https://docs.microsoft.com/en-us/windows/desktop/api/shellapi/nf-shellapi-commandlinetoargvw
StringBuilder sb = new StringBuilder();
int i = 0;
while(i < strData.Length)
{
char ch = strData[i++];
if(ch == '\\')
{
int cBackslashes = 1;
while((i < strData.Length) && (strData[i] == '\\'))
{
++cBackslashes;
++i;
}
if(i == strData.Length)
sb.Append('\\', cBackslashes); // Assume no quote follows
else if(strData[i] == '\"')
{
sb.Append('\\', (cBackslashes * 2) + 1);
sb.Append('\"');
++i;
}
else sb.Append('\\', cBackslashes);
}
else if(ch == '\"') sb.Append("\\\"");
else sb.Append(ch);
}
return sb.ToString();
}
/// <summary>
/// Encode a path for <c>Process.Start</c>.
/// </summary>
internal static string EncodePath(string strPath)
// Cf. EncodeDataToArgs
internal static string DecodeArgsToData(string strArgs)
{
if(strPath == null) { Debug.Assert(false); return string.Empty; }
if(strArgs == null) { Debug.Assert(false); return string.Empty; }
Debug.Assert(StrUtil.Count(strArgs, "\"") == StrUtil.Count(strArgs, "\\\""));
// Cf. EncodeDataToArgs and DecodeArgsToPath
if(MonoWorkarounds.IsRequired(3471228285U) && IsUnix())
{
string str = strPath;
string str = strArgs;
str = str.Replace("\\", "\\\\");
str = str.Replace("\"", "\\\"");
// '\'' must not be encoded in paths (only in args)
// str = str.Replace("\'", "\\\'");
str = str.Replace("\\\"", "\"");
str = str.Replace("\\\\", "\\");
return str;
}
return strPath; // '\"' is not allowed in paths on Windows
StringBuilder sb = new StringBuilder();
int i = 0;
while(i < strArgs.Length)
{
char ch = strArgs[i++];
if(ch == '\\')
{
int cBackslashes = 1;
while((i < strArgs.Length) && (strArgs[i] == '\\'))
{
++cBackslashes;
++i;
}
if(i == strArgs.Length)
sb.Append('\\', cBackslashes); // Assume no quote follows
else if(strArgs[i] == '\"')
{
Debug.Assert((cBackslashes & 1) == 1);
sb.Append('\\', (cBackslashes - 1) / 2);
sb.Append('\"');
++i;
}
else sb.Append('\\', cBackslashes);
}
else sb.Append(ch);
}
return sb.ToString();
}
/// <summary>
/// Decode command line arguments to a path for <c>Process.Start</c>.
/// </summary>
internal static string DecodeArgsToPath(string strArgs)
internal static void StartProcess(string strFile)
{
if(strArgs == null) { Debug.Assert(false); return string.Empty; }
StartProcess(strFile, null);
}
string str = strArgs;
internal static void StartProcess(string strFile, string strArgs)
{
ProcessStartInfo psi = new ProcessStartInfo();
if(!string.IsNullOrEmpty(strFile)) psi.FileName = strFile;
if(!string.IsNullOrEmpty(strArgs)) psi.Arguments = strArgs;
// Cf. EncodeDataToArgs and EncodePath
// if(MonoWorkarounds.IsRequired(3471228285U) && IsUnix())
// {
// string strPlh = Guid.NewGuid().ToString();
// str = str.Replace("\\\\", strPlh);
// str = str.Replace("\\\'", "\'");
// str = str.Replace(strPlh, "\\\\"); // Restore
// }
StartProcess(psi);
}
return str; // '\"' is not allowed in paths on Windows
internal static void StartProcess(ProcessStartInfo psi)
{
Process p = StartProcessEx(psi);
try { if(p != null) p.Dispose(); }
catch(Exception) { Debug.Assert(false); }
}
internal static Process StartProcessEx(ProcessStartInfo psi)
{
if(psi == null) { Debug.Assert(false); return null; }
string strFileOrg = psi.FileName;
if(string.IsNullOrEmpty(strFileOrg)) { Debug.Assert(false); return null; }
Process p;
try
{
string strFile = strFileOrg;
string[] vUrlEncSchemes = new string[] {
"file:", "ftp:", "ftps:", "http:", "https:",
"mailto:", "scp:", "sftp:"
};
foreach(string strPfx in vUrlEncSchemes)
{
if(strFile.StartsWith(strPfx, StrUtil.CaseIgnoreCmp))
{
Debug.Assert(string.IsNullOrEmpty(psi.Arguments));
strFile = strFile.Replace("\"", "%22");
strFile = strFile.Replace("\'", "%27");
strFile = strFile.Replace("\\", "%5C");
break;
}
}
if(IsUnix())
{
// Mono's Process.Start method replaces '\\' by '/',
// which may cause a different file to be executed;
// therefore, we refuse to start such files
if(strFile.Contains("\\") && MonoWorkarounds.IsRequired(190417))
throw new ArgumentException(KLRes.PathBackslash);
strFile = strFile.Replace("\\", "\\\\"); // If WA not required
strFile = strFile.Replace("\"", "\\\"");
}
psi.FileName = strFile;
p = Process.Start(psi);
}
finally { psi.FileName = strFileOrg; }
return p;
}
}
}

2
ModernKeePassLib/Native/NativeMethods.Unix.cs
View File

@@ -1,6 +1,6 @@
/*
KeePass Password Safe - The Open-Source Password Manager
Copyright (C) 2003-2019 Dominik Reichl <dominik.reichl@t-online.de>
Copyright (C) 2003-2020 Dominik Reichl <dominik.reichl@t-online.de>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by

2
ModernKeePassLib/Native/NativeMethods.cs
View File

@@ -1,6 +1,6 @@
/*
KeePass Password Safe - The Open-Source Password Manager
Copyright (C) 2003-2019 Dominik Reichl <dominik.reichl@t-online.de>
Copyright (C) 2003-2020 Dominik Reichl <dominik.reichl@t-online.de>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by

150
ModernKeePassLib/Native/SimpleStat.cs Normal file
View File

@@ -0,0 +1,150 @@
/*
KeePass Password Safe - The Open-Source Password Manager
Copyright (C) 2003-2020 Dominik Reichl <dominik.reichl@t-online.de>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Reflection;
using System.Text;
using System.Xml;
namespace ModernKeePassLib.Native
{
internal sealed class SimpleStat
{
private readonly object m_oPermissions;
private readonly long m_nUserId;
private readonly long m_nGroupId;
private SimpleStat(object oPermissions, long nUserId, long nGroupId)
{
if(oPermissions == null) throw new ArgumentNullException("oPermissions");
m_oPermissions = oPermissions;
m_nUserId = nUserId;
m_nGroupId = nGroupId;
}
public static SimpleStat Get(string strFilePath)
{
try
{
Type tUfsi, tUfi;
object oUfi = GetUnixFileInfo(strFilePath, out tUfsi, out tUfi);
if(oUfi == null) return null;
PropertyInfo piPerm = tUfsi.GetProperty("FileAccessPermissions",
BindingFlags.Public | BindingFlags.Instance);
if(piPerm == null) { Debug.Assert(false); return null; }
Debug.Assert(piPerm.PropertyType.IsEnum);
PropertyInfo piUser = tUfsi.GetProperty("OwnerUserId",
BindingFlags.Public | BindingFlags.Instance);
if(piUser == null) { Debug.Assert(false); return null; }
Debug.Assert(piUser.PropertyType == typeof(long));
PropertyInfo piGroup = tUfsi.GetProperty("OwnerGroupId",
BindingFlags.Public | BindingFlags.Instance);
if(piGroup == null) { Debug.Assert(false); return null; }
Debug.Assert(piGroup.PropertyType == typeof(long));
return new SimpleStat(piPerm.GetValue(oUfi, null),
(long)piUser.GetValue(oUfi, null),
(long)piGroup.GetValue(oUfi, null));
}
catch(Exception) { Debug.Assert(false); }
return null;
}
public static void Set(string strFilePath, SimpleStat s)
{
if(s == null) { Debug.Assert(false); return; }
try
{
Type tUfsi, tUfi;
object oUfi = GetUnixFileInfo(strFilePath, out tUfsi, out tUfi);
if(oUfi == null) return;
PropertyInfo piPerm = tUfsi.GetProperty("FileAccessPermissions",
BindingFlags.Public | BindingFlags.Instance);
if(piPerm == null) { Debug.Assert(false); return; }
piPerm.SetValue(oUfi, s.m_oPermissions, null);
MethodInfo miOwner = tUfsi.GetMethod("SetOwner",
new Type[] { typeof(long), typeof(long) });
if(miOwner == null) { Debug.Assert(false); return; }
miOwner.Invoke(oUfi, new object[] { s.m_nUserId, s.m_nGroupId });
}
catch(Exception) { Debug.Assert(false); }
}
private static bool GetTypes(out Type tUfsi, out Type tUfi)
{
tUfsi = null;
tUfi = null;
try
{
if(!NativeLib.IsUnix()) return false;
string strVer = typeof(XmlNode).Assembly.GetName().Version.ToString();
string strPosix = "Mono.Posix, Version=" + strVer;
Assembly asmPosix = Assembly.Load(strPosix);
if(asmPosix == null) { Debug.Assert(false); return false; }
tUfsi = asmPosix.GetType("Mono.Unix.UnixFileSystemInfo", false);
tUfi = asmPosix.GetType("Mono.Unix.UnixFileInfo", false);
bool b = ((tUfsi != null) && (tUfi != null));
Debug.Assert(b);
return b;
}
catch(Exception) { Debug.Assert(false); }
return false;
}
private static object GetUnixFileInfo(string strFilePath, Type tUfi)
{
if(string.IsNullOrEmpty(strFilePath)) { Debug.Assert(false); return null; }
try
{
if(!File.Exists(strFilePath)) { Debug.Assert(false); return null; }
return Activator.CreateInstance(tUfi, strFilePath);
}
catch(Exception) { Debug.Assert(false); }
return null;
}
private static object GetUnixFileInfo(string strFilePath,
out Type tUfsi, out Type tUfi)
{
if(!GetTypes(out tUfsi, out tUfi)) return null;
return GetUnixFileInfo(strFilePath, tUfi);
}
}
}