Merge pull request #290 from cmu-sei/v8

adds logging for redemption
cmu-sei · Mar 18, 2024 · 58f4661 · 58f4661
2 parents cc77e8f + 468e11b
commit 58f4661
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 12 deletions.
diff --git a/src/Ghosts.Client/Handlers/Outlook.cs b/src/Ghosts.Client/Handlers/Outlook.cs
@@ -451,10 +451,19 @@ private bool SendEmailViaOutlook(EmailConfiguration emailConfig)
             }
 
             Log.Trace("Attempting new Redemtion SafeMailItem...");
-            var rdoMail = new SafeMailItem
+
+            SafeMailItem rdoMail = new SafeMailItem();
+
+            Log.Trace($"Redemtion SafeMailItem {rdoMail.Version} instance created, now loading the outlook email into the safemailitem...");
+
+            try
             {
-                Item = mailItem
-            };
+                rdoMail.Item = mailItem;
+            }
+            catch (Exception e)
+            {
+                Log.Error(e);
+            }
 
             Log.Trace($"Email configuration from timeline is currently: {JsonConvert.SerializeObject(emailConfig)}...");
             Log.Trace($"Attempting add of To addresses...");

diff --git a/src/Ghosts.Client/Properties/AssemblyInfo.cs b/src/Ghosts.Client/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("8.0.0.0")]
 [assembly: AssemblyInformationalVersion("8.0.0.0")]
-[assembly: AssemblyFileVersion("8.0.7.45")]
+[assembly: AssemblyFileVersion("8.0.7.70")]
diff --git a/src/Ghosts.Client/TimelineManager/Orchestrator.cs b/src/Ghosts.Client/TimelineManager/Orchestrator.cs
@@ -14,6 +14,7 @@
 using System.Security.Permissions;
 using Ghosts.Domain.Code;
 using Ghosts.Domain.Models;
+using Microsoft.VisualBasic.Logging;
 using Quartz;
 // ReSharper disable RedundantAssignment
 
@@ -442,7 +443,14 @@ private void ThreadLaunchEx(Timeline timeline, TimelineHandler handler)
                         _log.Trace("Launching thread for outlook - note we're not checking if outlook installed, just going for it");
                         t = new Thread(() =>
                         {
-                            _ = new Outlook(handler);
+                            try
+                            {
+                                _ = new Outlook(handler);
+                            }
+                            catch (Exception e)
+                            {
+                                _log.Error("Outlook thread error:", e);
+                            }
                         });
                         break;
                     case HandlerType.Outlookv2:

diff --git a/src/ghosts.windows.sln b/src/ghosts.windows.sln
@@ -1,15 +1,12 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28010.2036
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.33414.496
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ghosts.Domain", "Ghosts.Domain\Ghosts.Domain.csproj", "{2667ECE7-34FA-456A-8877-BB9EEB40E9F7}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ghosts.Client", "Ghosts.Client\Ghosts.Client.csproj", "{9B185127-C1A8-479C-B48F-3BC51B97023D}"
 EndProject
 Global
-	GlobalSection(Performance) = preSolution
-		HasPerformanceSessions = true
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
@@ -19,8 +16,8 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{2667ECE7-34FA-456A-8877-BB9EEB40E9F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2667ECE7-34FA-456A-8877-BB9EEB40E9F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2667ECE7-34FA-456A-8877-BB9EEB40E9F7}.Debug|x64.ActiveCfg = Debug|x64
-		{2667ECE7-34FA-456A-8877-BB9EEB40E9F7}.Debug|x64.Build.0 = Debug|x64
+		{2667ECE7-34FA-456A-8877-BB9EEB40E9F7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2667ECE7-34FA-456A-8877-BB9EEB40E9F7}.Debug|x64.Build.0 = Debug|Any CPU
 		{2667ECE7-34FA-456A-8877-BB9EEB40E9F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2667ECE7-34FA-456A-8877-BB9EEB40E9F7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2667ECE7-34FA-456A-8877-BB9EEB40E9F7}.Release|x64.ActiveCfg = Release|x64
@@ -43,4 +40,7 @@ Global
 	GlobalSection(Performance) = preSolution
 		HasPerformanceSessions = true
 	EndGlobalSection
+	GlobalSection(Performance) = preSolution
+		HasPerformanceSessions = true
+	EndGlobalSection
 EndGlobal