Merge pull request #68 from BornToBeRoot/credentialmanager-lockui

Lock credential interface

Author: BornToBeRoot

Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml

@@ -319,6 +319,8 @@
     <system:String x:Key="String_Multicast">Multicast</system:String>
     <system:String x:Key="String_CredentialSecuritySupportProvider">Aktiviere Credential Security Support Provider</system:String>
     <system:String x:Key="String_AuthenticationLevel">Authentifizierungsebene</system:String>
+    <system:String x:Key="String_RemainingTime">Verbleibende Zeit</system:String>
+    <system:String x:Key="String_UserInterfaceLocked">Benutzeroberfläche gesperrt!</system:String>
 
     <!-- Help message -->
     <system:String x:Key="String_HelpMessage_ParameterHelp">Zeigt diesen Dialog an.</system:String>

Source/NETworkManager/Resources/Localization/Resources.en-US.xaml

@@ -319,7 +319,9 @@
     <system:String x:Key="String_Multicast">Multicast</system:String>
     <system:String x:Key="String_CredentialSecuritySupportProvider">Enable Credential Security Support Provider</system:String>
     <system:String x:Key="String_AuthenticationLevel">Authentication level</system:String>
-
+    <system:String x:Key="String_RemainingTime">Remaining time</system:String>
+    <system:String x:Key="String_UserInterfaceLocked">User interface locked!</system:String>
+    
     <!-- Help message -->
     <system:String x:Key="String_HelpMessage_ParameterHelp">Displays this dialog.</system:String>
     <system:String x:Key="String_HelpMessage_ParameterResetSettings">Reset all settings.</system:String>

Source/NETworkManager/ViewModels/Settings/CredentialsViewModel.cs

@@ -7,8 +7,6 @@
 using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.ViewModels.Dialogs;
 using NETworkManager.Views.Dialogs;
-using System.Diagnostics;
-using NETworkManager.Helpers;
 using System;
 using System.Windows.Threading;
 
@@ -18,6 +16,7 @@ public class CredentialsViewModel : ViewModelBase
     {
         #region Variables
         private IDialogCoordinator dialogCoordinator;
+        DispatcherTimer _dispatcherTimer;
 
         private bool _credentialsFileExists;
         public bool CredentialsFileExists
@@ -47,6 +46,35 @@ public bool CredentialsLoaded
             }
         }
 
+        // Indicates that the UI is locked
+        private bool _locked = true;
+        public bool Locked
+        {
+            get { return _locked; }
+            set
+            {
+                if (value == _locked)
+                    return;
+
+                _locked = value;
+                OnPropertyChanged();
+            }
+        }
+
+        private TimeSpan _timeRemaining;
+        public TimeSpan TimeRemaining
+        {
+            get { return _timeRemaining; }
+            set
+            {
+                if (value == _timeRemaining)
+                    return;
+
+                _timeRemaining = value;
+                OnPropertyChanged();
+            }
+        }
+
         ICollectionView _credentials;
         public ICollectionView Credentials
         {
@@ -106,12 +134,31 @@ public CredentialsViewModel(IDialogCoordinator instance)
             };
 
             CheckCredentialsLoaded();
+
+            // Set up dispatcher timer
+            _dispatcherTimer = new DispatcherTimer();
+            _dispatcherTimer.Tick += _dispatcherTimer_Tick;
+            _dispatcherTimer.Interval = new TimeSpan(0, 0, 1);
         }
 
-        private void CheckCredentialsLoaded()
+        private void _dispatcherTimer_Tick(object sender, EventArgs e)
         {
-            CredentialsFileExists = File.Exists(CredentialManager.GetCredentialsFilePath());
-            CredentialsLoaded = CredentialManager.Loaded;
+            if (TimeRemaining == TimeSpan.Zero)
+                TimerLockUIStop();
+
+            TimeRemaining = TimeRemaining.Add(TimeSpan.FromSeconds(-1));
+        }
+
+        public void CheckCredentialsLoaded()
+        {
+            if (!CredentialsLoaded)
+            {
+                // If file exists, view to decrypt the file is shown
+                CredentialsFileExists = File.Exists(CredentialManager.GetCredentialsFilePath());
+            
+                // IF credentials are loaded, view to add/edit/remove is shown
+                CredentialsLoaded = CredentialManager.Loaded;
+            }
         }
         #endregion
 
@@ -137,6 +184,8 @@ private async void SetMasterPasswordAction()
                     CredentialManager.CredentialsChanged = true; // Save to file when application is closed 
 
                 CheckCredentialsLoaded();
+
+                TimerLockUIStart();
             }, instance =>
             {
                 dialogCoordinator.HideMetroDialogAsync(this, customDialog);
@@ -170,6 +219,8 @@ private async void DecryptAndLoadAction()
                     await dialogCoordinator.ShowMessageAsync(this, Application.Current.Resources["String_Header_WrongPassword"] as string, Application.Current.Resources["String_WrongPasswordDecryptionFailed"] as string, MessageDialogStyle.Affirmative, AppearanceManager.MetroDialog);
 
                 CheckCredentialsLoaded();
+
+                TimerLockUIStart();
             }, instance =>
             {
                 dialogCoordinator.HideMetroDialogAsync(this, customDialog);
@@ -190,58 +241,28 @@ public ICommand ChangeMasterPasswordCommand
 
         private async void ChangeMasterPasswordAction()
         {
-            CustomDialog customDialogMasterPassword = new CustomDialog()
+            CustomDialog customDialogSetMasterPassword = new CustomDialog()
             {
-                Title = Application.Current.Resources["String_Header_MasterPassword"] as string
+                Title = Application.Current.Resources["String_Header_SetMasterPassword"] as string
             };
 
-            CredentialsMasterPasswordViewModel credentialsMasterPasswordViewModel = new CredentialsMasterPasswordViewModel(async instance =>
+            CredentialsSetMasterPasswordViewModel credentialsSetMasterPasswordViewModel = new CredentialsSetMasterPasswordViewModel(instance =>
             {
-                await dialogCoordinator.HideMetroDialogAsync(this, customDialogMasterPassword);
+                dialogCoordinator.HideMetroDialogAsync(this, customDialogSetMasterPassword);
 
-                if (CredentialManager.VerifyMasterPasword(instance.Password))
-                {
-                    CustomDialog customDialogSetMasterPassword = new CustomDialog()
-                    {
-                        Title = Application.Current.Resources["String_Header_SetMasterPassword"] as string
-                    };
-
-                    CredentialsSetMasterPasswordViewModel credentialsSetMasterPasswordViewModel = new CredentialsSetMasterPasswordViewModel(instance2 =>
-                    {
-                        dialogCoordinator.HideMetroDialogAsync(this, customDialogSetMasterPassword);
-
-                        // Set the new master password
-                        CredentialManager.SetMasterPassword(instance2.Password);
-
-                        // Save to file
-                        CredentialManager.Save();
-                    }, instance2 =>
-                    {
-                        dialogCoordinator.HideMetroDialogAsync(this, customDialogSetMasterPassword);
-                    });
-
-                    customDialogSetMasterPassword.Content = new CredentialsSetMasterPasswordDialog
-                    {
-                        DataContext = credentialsSetMasterPasswordViewModel
-                    };
-
-                    await dialogCoordinator.ShowMetroDialogAsync(this, customDialogSetMasterPassword);
-                }
-                else
-                {
-                    await dialogCoordinator.ShowMessageAsync(this, Application.Current.Resources["String_Header_WrongPassword"] as string, Application.Current.Resources["String_WrongPassword"] as string, MessageDialogStyle.Affirmative, AppearanceManager.MetroDialog);
-                }
+                // Set the new master password
+                CredentialManager.SetMasterPassword(instance.Password);
             }, instance =>
             {
-                dialogCoordinator.HideMetroDialogAsync(this, customDialogMasterPassword);
+                dialogCoordinator.HideMetroDialogAsync(this, customDialogSetMasterPassword);
             });
 
-            customDialogMasterPassword.Content = new CredentialsMasterPasswordDialog
+            customDialogSetMasterPassword.Content = new CredentialsSetMasterPasswordDialog
             {
-                DataContext = credentialsMasterPasswordViewModel
+                DataContext = credentialsSetMasterPasswordViewModel
             };
 
-            await dialogCoordinator.ShowMetroDialogAsync(this, customDialogMasterPassword);
+            await dialogCoordinator.ShowMetroDialogAsync(this, customDialogSetMasterPassword);
         }
 
         public ICommand AddCommand
@@ -269,6 +290,8 @@ private async void AddAction()
                 };
 
                 CredentialManager.AddCredential(credentialInfo);
+
+                TimerLockUIStart(); // Reset timer
             }, instance =>
             {
                 dialogCoordinator.HideMetroDialogAsync(this, customDialog);
@@ -310,7 +333,7 @@ private async void EditAction()
 
                 CredentialManager.AddCredential(credentialInfo);
 
-                Debug.WriteLine(SecureStringHelper.ConvertToString(instance.Password));
+                TimerLockUIStart(); // Reset timer
             }, instance =>
             {
                 dialogCoordinator.HideMetroDialogAsync(this, customDialog);
@@ -341,6 +364,8 @@ private async void DeleteAction()
                 dialogCoordinator.HideMetroDialogAsync(this, customDialog);
 
                 CredentialManager.RemoveCredential(SelectedCredential);
+
+                TimerLockUIStart(); // Reset timer
             }, instance =>
             {
                 dialogCoordinator.HideMetroDialogAsync(this, customDialog);
@@ -353,6 +378,64 @@ private async void DeleteAction()
 
             await dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
         }
+
+        public ICommand LockUnlockCommand
+        {
+            get { return new RelayCommand(p => LockUnlockAction()); }
+        }
+
+        private async void LockUnlockAction()
+        {
+            if (Locked)
+            {
+                CustomDialog customDialogMasterPassword = new CustomDialog()
+                {
+                    Title = Application.Current.Resources["String_Header_MasterPassword"] as string
+                };
+
+                CredentialsMasterPasswordViewModel credentialsMasterPasswordViewModel = new CredentialsMasterPasswordViewModel(async instance =>
+                {
+                    await dialogCoordinator.HideMetroDialogAsync(this, customDialogMasterPassword);
+
+                    if (CredentialManager.VerifyMasterPasword(instance.Password))
+                        TimerLockUIStart();
+                    else
+                        await dialogCoordinator.ShowMessageAsync(this, Application.Current.Resources["String_Header_WrongPassword"] as string, Application.Current.Resources["String_WrongPassword"] as string, MessageDialogStyle.Affirmative, AppearanceManager.MetroDialog);
+                }, instance =>
+                {
+                    dialogCoordinator.HideMetroDialogAsync(this, customDialogMasterPassword);
+                });
+
+                customDialogMasterPassword.Content = new CredentialsMasterPasswordDialog
+                {
+                    DataContext = credentialsMasterPasswordViewModel
+                };
+
+                await dialogCoordinator.ShowMetroDialogAsync(this, customDialogMasterPassword);
+            }
+            else
+            {
+                TimerLockUIStop();
+            }
+        }
+        #endregion
+
+        #region Methods
+        private void TimerLockUIStart()
+        {
+            Locked = false;
+
+            TimeRemaining = TimeSpan.FromSeconds(10);
+
+            _dispatcherTimer.Start();
+        }
+
+        private void TimerLockUIStop()
+        {
+            _dispatcherTimer.Stop();
+
+            Locked = true;
+        }
         #endregion
     }
 }