Added CreateKeyFile

Author: shugaoye

KPCLib.xunit/pass_d_E8f4pEk.xyz

@@ -326,6 +326,74 @@ public void Open(PassXYZLib.User user)
 			Open(ioc, cmpKey, logger);
 		}
 
+		/// <summary>
+		/// Create a database with user information.
+		/// If the device lock is enabled, we need to set DefaultFolder first.
+		/// </summary>
+		/// <param name="user">an instance of PassXYZLib.User</param>
+		public void New(PassXYZLib.User user)
+		{
+			if (user == null) { Debug.Assert(false); throw new ArgumentNullException("PassXYZLib.User"); }
+
+			if (user.IsDeviceLockEnabled)
+			{
+				if(!CreateKeyFile(user))
+                {
+					throw new KeePassLib.Keys.InvalidCompositeKeyException();
+				}
+			}
+
+			IOConnectionInfo ioc = IOConnectionInfo.FromPath(user.Path);
+			CompositeKey cmpKey = new CompositeKey();
+			cmpKey.AddUserKey(new KcpPassword(user.Password));
+
+			if (user.IsDeviceLockEnabled)
+			{
+				PassXYZ.Utils.Settings.DefaultFolder = PxDataFile.KeyFilePath;
+				var pxKeyProvider = new PassXYZ.Services.PxKeyProvider(user.Username, false);
+				if (pxKeyProvider.IsInitialized)
+				{
+					KeyProviderQueryContext ctxKP = new KeyProviderQueryContext(new IOConnectionInfo(), false, false);
+					byte[] pbProvKey = pxKeyProvider.GetKey(ctxKP);
+					cmpKey.AddUserKey(new KcpCustomKey(pxKeyProvider.Name, pbProvKey, true));
+				}
+				else
+				{
+					throw new KeePassLib.Keys.InvalidCompositeKeyException();
+				}
+			}
+			New(ioc, cmpKey);
+
+			// Set the database name to the current user name
+			Name = user.Username;
+
+			// Set the name of root group to the user name
+			RootGroup.Name = user.Username;
+		}
+
+		/// <summary>
+		/// Create a key file from an PxKeyProvider instance or from the system
+		/// </summary>
+		/// <param name="kp">a key provider instance. If it is null, the key file is created from the 
+		/// current system.</param>
+		/// <returns>true - created key file, false - failed to create key file.</returns>
+		private bool CreateKeyFile(PassXYZLib.User user, PassXYZ.Services.PxKeyProvider kp = null)
+		{
+			PassXYZ.Utils.Settings.DefaultFolder = PxDataFile.KeyFilePath;
+			PassXYZ.Utils.Settings.User.Username = user.Username;
+			PassXYZ.Services.PxKeyProvider pxKeyProvider;
+			if (kp == null)
+			{
+				pxKeyProvider = new PassXYZ.Services.PxKeyProvider();
+				return pxKeyProvider.CreateKeyFile(true);
+			}
+			else
+			{
+				pxKeyProvider = kp;
+				return pxKeyProvider.CreateKeyFile(false);
+			}
+		}
+
 		private void EnsureRecycleBin(ref PwGroup pgRecycleBin)
 		{
 			if (pgRecycleBin == this.RootGroup)
@@ -688,7 +756,7 @@ public IEnumerable<PwEntry> GetAllEntries()
 	/// <summary>
 	/// PasswordDb is a sub-class of PxDatabase. It is a singleton class.
 	/// </summary>
-	public sealed class PasswordDb : PxDatabase 
+	public sealed class PasswordDb : PxDatabase
 	{
 		private static PasswordDb instance = null;
 

PassXYZLib/PxDatabase.cs

@@ -75,21 +75,28 @@ public static string GetUserName(string fileName)
     public class User
     {
         private string _username;
-        public string Username 
+        public string Username
         {
             get => _username;
-            set 
+            set
             {
                 _username = value;
 
-                // Check whether Device Lock is enabled, but key file may not exist.
-                if (System.IO.File.Exists(System.IO.Path.Combine(PxDataFile.DataFilePath, GetFileName(true))))
+                if(_username == null)
                 {
-                    IsDeviceLockEnabled = true;
+                    IsDeviceLockEnabled = false;
                 }
-                else
+                else 
                 {
-                    IsDeviceLockEnabled = false;
+                    // Check whether Device Lock is enabled, but key file may not exist.
+                    if (System.IO.File.Exists(System.IO.Path.Combine(PxDataFile.DataFilePath, GetFileName(true))))
+                    {
+                        IsDeviceLockEnabled = true;
+                    }
+                    else
+                    {
+                        IsDeviceLockEnabled = false;
+                    }
                 }
             }
         }
@@ -100,7 +107,31 @@ public string Username
         /// Check whether Device Lock is enabled for this user.
         /// <c>true</c> - key file is enabled, <c>false</c> - key file is not enabled
         /// </summary>
-        public bool IsDeviceLockEnabled { get; set; }
+        public bool IsDeviceLockEnabled { get; set; } = false;
+
+        /// <summary>
+        /// Check whether the key file is existed.
+        /// true - key file is available, false - key file is not available
+        /// </summary>
+        public bool IsUserExist
+        {
+            get
+            {
+                if (_username == null)
+                {
+                    return false;
+                }
+
+                if (System.IO.File.Exists(Path))
+                {
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+        }
 
         /// <summary>
         /// Check whether the key file is existed.
@@ -110,10 +141,14 @@ public bool IsKeyFileExist
         {
             get
             {
+                if (_username == null)
+                {
+                    return false;
+                }
+
                 if (IsDeviceLockEnabled)
                 {
-                    var keyFilePath = System.IO.Path.Combine(PxDataFile.KeyFilePath, KeyFileName);
-                    if (System.IO.File.Exists(keyFilePath))
+                    if (System.IO.File.Exists(System.IO.Path.Combine(PxDataFile.KeyFilePath, KeyFileName)))
                     {
                         return true;
                     }
@@ -141,6 +176,10 @@ public string Path
         {
             get
             {
+                if (_username == null)
+                {
+                    return null;
+                }
                 return System.IO.Path.Combine(PxDataFile.DataFilePath, FileName);
             }
         }
@@ -153,7 +192,12 @@ public string KeyFileName
         {
             get 
             {
-                if(IsDeviceLockEnabled) 
+                if (_username == null)
+                {
+                    return string.Empty;
+                }
+
+                if (IsDeviceLockEnabled) 
                 {
                     return PxDefs.head_k4xyz + Base58CheckEncoding.ToBase58String(Username) + PxDefs.k4xyz;
                 }
@@ -172,6 +216,11 @@ public string KeyFileName
         /// <returns>Data file name</returns>
         private string GetFileName(bool isDeviceLockEnabled = false)
         {
+            if (_username == null)
+            {
+                return null;
+            }
+
             if (isDeviceLockEnabled)
             {
                 return PxDefs.head_data + Base58CheckEncoding.ToBase58String(_username) + PxDefs.xyz;