Reoder code and classes

Author: michaelmsonne

src/SignToolGUI/Class/CertificateMonitor.cs

@@ -9,6 +9,9 @@ namespace SignToolGUI.Class
 {
     public class CertificateMonitor
     {
+        private readonly int _warningThresholdDays;
+        private readonly int _criticalThresholdDays;
+
         public enum AlertLevel
         {
             None,
@@ -24,10 +27,7 @@ public class CertificateAlert
             public int DaysUntilExpiry { get; set; }
             public string Message { get; set; }
             public string CertificateName { get; set; }
-        }
-
-        private readonly int _warningThresholdDays;
-        private readonly int _criticalThresholdDays;
+        }        
 
         public CertificateMonitor(int warningThresholdDays = 90, int criticalThresholdDays = 30)
         {

src/SignToolGUI/Class/FileLogger.cs

@@ -27,7 +27,7 @@ internal class FileLogger
         // Get logfile path
         public static string GetLogPath(string df)
         {
-            return Files.LogFilePath + @"\" + Globals.ToolName.SignToolGui + " Log " + df + ".log";
+            return FileManager.LogFilePath + @"\" + Globals.ToolName.SignToolGui + " Log " + df + ".log";
         }
 
         // Get datetime
@@ -77,9 +77,9 @@ private static void AppendMessageToFile(string mess, EventType type, string dtf,
                 // Check if file exists else create it
                 try
                 {
-                    if (!Directory.Exists(Files.LogFilePath))
+                    if (!Directory.Exists(FileManager.LogFilePath))
                     {
-                        Directory.CreateDirectory(Files.LogFilePath);
+                        Directory.CreateDirectory(FileManager.LogFilePath);
                         //Console.WriteLine("Directory to log files created: " + Files.LogFilePath);
                     }
                 }
@@ -97,7 +97,7 @@ private static void AppendMessageToFile(string mess, EventType type, string dtf,
                 }
 
                 // Check if we have write access to the directory
-                if (!HasWriteAccessToDirectory(Files.LogFilePath))
+                if (!HasWriteAccessToDirectory(FileManager.LogFilePath))
                 {
                     if (WriteToEventLog)
                     {

src/SignToolGUI/Class/Files.cs src/SignToolGUI/Class/FileManager.cssrc/SignToolGUI/Class/Files.cs renamed to src/SignToolGUI/Class/FileManager.cs

@@ -2,7 +2,7 @@
 
 namespace SignToolGUI.Class
 {
-    class Files
+    class FileManager
     {
         public static string ConfigIniPath
         {

src/SignToolGUI/Class/Globals.cs

@@ -32,6 +32,12 @@ internal class ToolStates
             internal static string MichaelCodeSignThumbprintOffline = "D6A630B8F65C473C19F8B694491130073FCCDB32";
         }
 
+        internal class ToolStings
+        {
+            internal static string URLAzurePortalTrustedSigning = @"https://portal.azure.com/#browse/Microsoft.CodeSigning%2Fcodesigningaccounts";
+        }
+
+
         internal static async Task<string> FetchCurrentCertificateThumbprintAsync()
         {
             const string url = "https://raw.githubusercontent.com/michaelmsonne/michaelmsonne/main/Trusted_Publisher_Certificate/CurrentCertificateThumbprint.txt";

src/SignToolGUI/Class/SigningValidator.cs

@@ -0,0 +1,43 @@
+using System.Diagnostics;
+using static SignToolGUI.Class.FileLogger;
+
+namespace SignToolGUI.Class
+{
+    public class SigningValidator
+    {
+        public static string GetSigningTimestampFromFile(string filePath, string signToolExe)
+        {
+            var psi = new ProcessStartInfo
+            {
+                FileName = signToolExe,
+                Arguments = $"verify /v /all \"{filePath}\"",
+                RedirectStandardOutput = true,
+                UseShellExecute = false,
+                CreateNoWindow = true
+            };
+            using (var process = Process.Start(psi))
+            {
+                string output = process.StandardOutput.ReadToEnd();
+                process.WaitForExit();
+
+                // Try to match several possible timestamp lines
+                var match1 = System.Text.RegularExpressions.Regex.Match(output, @"Timestamp:\s*(.+)");
+                if (match1.Success)
+                    return match1.Groups[1].Value.Trim();
+
+                var match2 = System.Text.RegularExpressions.Regex.Match(output, @"Signed Time:\s*(.+)");
+                if (match2.Success)
+                    return match2.Groups[1].Value.Trim();
+
+                var match3 = System.Text.RegularExpressions.Regex.Match(output, @"The signature is timestamped:\s*(.+)");
+                if (match3.Success)
+                    return match3.Groups[1].Value.Trim();
+
+                // Optionally, log the output for debugging
+                Message("SignTool verify output for timestamp: " + output, EventType.Error, 9999);
+
+                return "N/A";
+            }
+        }
+    }
+}