From f35e579226d81e9eb7ba840d82ab52427de452a7 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Thu, 17 Mar 2022 15:58:27 +0800
Subject: [PATCH] Return empty if decrypt failed.

Resolve #9422
---
 .../Volo/Abp/Settings/SettingEncryptionService.cs  | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingEncryptionService.cs b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingEncryptionService.cs
index c44f5f7974..9f59f57910 100644
--- a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingEncryptionService.cs
+++ b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingEncryptionService.cs
@@ -1,4 +1,6 @@
 using System;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Security.Encryption;
 
@@ -7,10 +9,12 @@ namespace Volo.Abp.Settings;
 public class SettingEncryptionService : ISettingEncryptionService, ITransientDependency
 {
     protected IStringEncryptionService StringEncryptionService { get; }
+    public ILogger<SettingEncryptionService> Logger { get; set; }
 
     public SettingEncryptionService(IStringEncryptionService stringEncryptionService)
     {
         StringEncryptionService = stringEncryptionService;
+        Logger = NullLogger<SettingEncryptionService>.Instance;
     }
 
     public virtual string Encrypt(SettingDefinition settingDefinition, string plainValue)
@@ -30,6 +34,14 @@ public class SettingEncryptionService : ISettingEncryptionService, ITransientDep
             return encryptedValue;
         }
 
-        return StringEncryptionService.Decrypt(encryptedValue);
+        try
+        {
+            return StringEncryptionService.Decrypt(encryptedValue);
+        }
+        catch (Exception e)
+        {
+            Logger.LogException(e);
+            return string.Empty;
+        }
     }
 }