SoupAPI Action password Encryption

Ginger/Ginger/Run/RunSetActions/RunSetActionDeliveryMethodConfigPage.xaml.cs

@@ -20,6 +20,7 @@ limitations under the License.
 using Amdocs.Ginger.Common;
 using GingerCore;
 using GingerCore.GeneralLib;
+using System;
 using System.Windows;
 using System.Windows.Controls;
 using CheckBox = System.Windows.Controls.CheckBox;
@@ -139,7 +140,14 @@ private void xSMTPPassTextBox_LostFocus(object sender, RoutedEventArgs e)
         /// </summary>
         private void CertificatePasswordUCValueExpression_LostKeyboardFocus(object sender, System.Windows.Input.KeyboardFocusChangedEventArgs e)
         {
-            EncryptPasswordIfNeeded();
+            try
+            {
+                EncryptPasswordIfNeeded();
+            }
+            catch (Exception ex)
+            {
+                Reporter.ToLog(eLogLevel.ERROR, "Failed to encrypt certificate password", ex);
+            }
         }
 
         /// <summary>
@@ -148,18 +156,29 @@ private void CertificatePasswordUCValueExpression_LostKeyboardFocus(object sende
         /// <returns>True if it is a value expression, otherwise false.</returns>
         private bool IsPasswordValueExpression()
         {
-            return ValueExpression.IsThisAValueExpression(CertificatePasswordUCValueExpression.ValueTextBox.Text);
+            return CertificatePasswordUCValueExpression?.ValueTextBox?.Text != null && ValueExpression.IsThisAValueExpression(CertificatePasswordUCValueExpression.ValueTextBox.Text);
         }
 
         /// <summary>
         /// Encrypts the password in CertificatePasswordUCValueExpression if it is not already encrypted.
         /// </summary>
         private void EncryptPasswordIfNeeded()
         {
-            string password = CertificatePasswordUCValueExpression.ValueTextBox.Text;
-            if (!string.IsNullOrEmpty(password) && !IsPasswordValueExpression() && !EncryptionHandler.IsStringEncrypted(password))
+            try
+            {
+                if (string.IsNullOrEmpty(CertificatePasswordUCValueExpression.ValueTextBox.Text))
+                {
+                    return;
+                }
+                string password = CertificatePasswordUCValueExpression.ValueTextBox.Text;
+                if (!string.IsNullOrEmpty(password) && !IsPasswordValueExpression() && !EncryptionHandler.IsStringEncrypted(password))
+                {
+                    CertificatePasswordUCValueExpression.ValueTextBox.Text = EncryptionHandler.EncryptwithKey(password);
+                }
+            }
+            catch (Exception ex)
             {
-                CertificatePasswordUCValueExpression.ValueTextBox.Text = EncryptionHandler.EncryptwithKey(password);
+                Reporter.ToLog(eLogLevel.ERROR, "Failed to encrypt certificate password", ex);
             }
         }
     }

Ginger/GingerCoreCommon/Actions/Act.cs

@@ -2119,5 +2119,32 @@ public bool AreEqual(object obj)
             return AreEqual(obj as Act);
         }
 
+        /// <summary>
+        /// Decrypts the given password. If the password is a value expression, it evaluates the expression before decryption.
+        /// </summary>
+        /// <param name="password">The password to decrypt.</param>
+        /// <param name="isPasswordValueExpression">Indicates if the password is a value expression.</param>
+        /// <param name="act">The Act instance containing the value expression.</param>
+        /// <returns>The decrypted password.</returns>
+        public static string DecryptPassword(string password, bool isPasswordValueExpression, Act act)
+        {
+            if (password == null)
+            {
+                return null;
+            }
+
+            string decryptedPassword = string.Empty;
+            string evaluatedValue = password;
+
+            if (isPasswordValueExpression)
+            {
+                act.ValueExpression.Value = password;
+                evaluatedValue = act.ValueExpression.ValueCalculated;
+            }
+
+            decryptedPassword = EncryptionHandler.IsStringEncrypted(evaluatedValue) ? EncryptionHandler.DecryptwithKey(evaluatedValue) : evaluatedValue;
+
+            return decryptedPassword;
+        }
     }
 }

Ginger/GingerCoreCommon/Actions/Webservices/ActSoapUI.cs

@@ -199,29 +199,6 @@ public bool isActionExecuted
                 return (System.IO.Directory.Exists(LastExecutionFolderPath));
             }
         }
-        /// <summary>
-        /// Decrypts the given password. If the password is a value expression, it evaluates the expression first.
-        /// </summary>
-        /// <param name="password">The password to decrypt.</param>
-        /// <param name="isPasswordValueExpression">Indicates if the password is a value expression.</param>
-        /// <returns>The decrypted password.</returns>
-        public string DecryptPassword(string password, bool isPasswordValueExpression)
-        {
-            string decryptedPassword = string.Empty;
-
-            if (isPasswordValueExpression)
-            {
-                this.ValueExpression.Value = password;
-                string evaluatedValue = this.ValueExpression.ValueCalculated;
-
-                decryptedPassword = EncryptionHandler.IsStringEncrypted(evaluatedValue) ? EncryptionHandler.DecryptwithKey(evaluatedValue) : evaluatedValue;
-            }
-            else
-            {
-                decryptedPassword = EncryptionHandler.IsStringEncrypted(password) ? EncryptionHandler.DecryptwithKey(password) : password;
-            }
 
-            return decryptedPassword;
-        }
     }
 }

Ginger/GingerCoreNET/ActionsLib/Webservices/ActWebAPIBase.cs

@@ -405,29 +405,6 @@ public void ParseOutput()
             ParseNodesToReturnParams(this, ResponseMessage);
         }
 
-        /// <summary>  
-        /// Decrypts the given password. If the password is an expression, it evaluates the expression first.  
-        /// </summary>  
-        /// <param name="password">The password to decrypt.</param>  
-        /// <param name="isPasswordValueExpression">Indicates if the password is an expression that needs to be evaluated.</param>  
-        /// <returns>The decrypted password.</returns>  
-        public string DecryptPassword(string password, bool isPasswordValueExpression)
-        {
-            string decryptedPassword = string.Empty;
-
-            if (isPasswordValueExpression)
-            {
-                this.ValueExpression.Value = password;
-                string evaluatedValue = this.ValueExpression.ValueCalculated;
 
-                decryptedPassword = EncryptionHandler.IsStringEncrypted(evaluatedValue) ? EncryptionHandler.DecryptwithKey(evaluatedValue) : evaluatedValue;
-            }
-            else
-            {
-                decryptedPassword = EncryptionHandler.IsStringEncrypted(password) ? EncryptionHandler.DecryptwithKey(password) : password;
-            }
-
-            return decryptedPassword;
-        }
     }
 }

Ginger/GingerCoreNET/Drivers/WebServicesDriver/HttpWebClientUtils.cs

@@ -250,7 +250,7 @@ private bool SetCertificates(HttpClientHandler handler)
                 {
                     string certificateKey = mAct.GetInputParamCalculatedValue(ActWebAPIBase.Fields.CertificatePassword);
 
-                    certificateKey = mAct.DecryptPassword(certificateKey, ValueExpression.IsThisAValueExpression(certificateKey));
+                    certificateKey = Act.DecryptPassword(certificateKey, ValueExpression.IsThisAValueExpression(certificateKey), mAct);
                     if (!string.IsNullOrEmpty(path))
                     {
                         if (string.IsNullOrEmpty(certificateKey))

Ginger/GingerCoreNET/Drivers/WebServicesDriver/SoapUIUtils.cs

@@ -153,7 +153,7 @@ public bool Command(ref string commandParam)
                 string password = mAct.GetInputParamCalculatedValue(ActSoapUI.Fields.Password);
                 if (!string.IsNullOrEmpty(password))
                 {
-                    var decryptedPassword = mAct.DecryptPassword(password, ValueExpression.IsThisAValueExpression(password));
+                    var decryptedPassword = Act.DecryptPassword(password, ValueExpression.IsThisAValueExpression(password), mAct);
                     commandParam = commandParam + " -p" + Quotationmark + decryptedPassword + Quotationmark;
                 }
 

Ginger/GingerCoreNET/GeneralLib/EmailOperations.cs

@@ -150,7 +150,7 @@ public bool Send_SMTP()
                     string CertificateKey = Email.CertificatePasswordUCValueExpression;
                     if (!string.IsNullOrEmpty(CertificateKey))
                     {
-                        var decryptedPassword = DecryptPassword(CertificateKey, ValueExpression.IsThisAValueExpression(CertificateKey));
+                        CertificateKey = DecryptPassword(CertificateKey, ValueExpression.IsThisAValueExpression(CertificateKey));
                     }
                     string targetPath = System.IO.Path.Combine(WorkSpace.Instance.Solution.Folder, @"Documents\EmailCertificates");//certificate is present in this folder //used this since relative path cannot be used during execution
                     string Certificatepath = Path.Combine(targetPath, CertificateName);