Merge pull request #1 from MattMofDoom/dev

Include properties for integration with other Seq apps

Author: MattMofDoom

Seq.Client.WindowsLogins/App.config

@@ -16,5 +16,12 @@
     <add key="HeartbeatInterval" value="600" />
     <!-- Set IsDebug to true for additional heartbeat logging -->
     <add key="IsDebug" value="false" />
+    <add key="ProjectKey" value="PROJECT" />
+    <add key="Priority" value="Medium" />
+    <add key="Responders" value="JSmith" />
+    <add key="Tags" value="Secuurity" />
+    <add key="InitialTimeEstimate" value="1h" />
+    <add key="RemainingTimeEstimate" value="1h" />
+    <add key="DueDate" value="1d" />
   </appSettings>
 </configuration>

Seq.Client.WindowsLogins/Config.cs

@@ -1,7 +1,11 @@
 using System;
+using System.Collections;
+using System.Collections.Generic;
 using System.Configuration;
 using System.IO;
+using System.Linq;
 using System.Reflection;
+using System.ServiceModel.Channels;
 
 namespace Seq.Client.WindowsLogins
 {
@@ -15,6 +19,14 @@ static Config()
             LogFolder = ConfigurationManager.AppSettings["LogFolder"];
             HeartbeatInterval = GetInt(ConfigurationManager.AppSettings["HeartbeatInterval"]);
             IsDebug = GetBool(ConfigurationManager.AppSettings["IsDebug"]);
+            ProjectKey = ConfigurationManager.AppSettings["ProjectKey"];
+            Responders = ConfigurationManager.AppSettings["Responders"];
+            Priority = ConfigurationManager.AppSettings["Priority"];
+            Tags = GetArray(ConfigurationManager.AppSettings["Tags"]);
+            InitialTimeEstimate = ConfigurationManager.AppSettings["InitialTimeEstimate"];
+            RemainingTimeEstimate = ConfigurationManager.AppSettings["RemainingTimeEstimate"];
+            DueDate = ConfigurationManager.AppSettings["DueDate"];
+
             //Must be between 0 and 1 hour in seconds
             if (HeartbeatInterval < 0 || HeartbeatInterval > 3600)
                 HeartbeatInterval = 600000;
@@ -60,6 +72,13 @@ static Config()
         public static string LogFolder { get; }
         public static int HeartbeatInterval { get; }
         public static bool IsDebug { get; }
+        public static string ProjectKey { get; }
+        public static string Priority { get; }
+        public static string Responders { get; }
+        public static IEnumerable<string> Tags { get; }
+        public static string InitialTimeEstimate { get; }
+        public static string RemainingTimeEstimate { get; }
+        public static string DueDate { get; }
 
         /// <summary>
         ///     Convert the supplied <see cref="object" /> to an <see cref="int" />
@@ -95,5 +114,13 @@ private static bool GetBool(object sourceObject, bool trueIfEmpty = false)
 
             return bool.TryParse(sourceString, out var destBool) ? destBool : trueIfEmpty;
         }
+
+        private static IEnumerable<string> GetArray(string value)
+        {
+            return (value ?? "")
+                .Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries)
+                .Select(t => t.Trim())
+                .ToArray();
+        }
     }
 }

Seq.Client.WindowsLogins/EventLogListener.cs

@@ -183,12 +183,22 @@ private static void HandleEventLogEntry(EventRecord entry)
 
                 _logonsDetected++;
 
+                var eventTimeLong = string.Empty;
+                var eventTimeShort = string.Empty;
+                if (entry.TimeCreated != null)
+                {
+                    eventTimeLong = ((DateTime) entry.TimeCreated).ToString("F");
+                    eventTimeShort = ((DateTime) entry.TimeCreated).ToString("G");
+                }
+
                 Log.Level(Extensions.MapLogLevel(EventLogEntryType.SuccessAudit))
 #pragma warning disable 618
                     .AddProperty("EventId", (long) entry.Id)
 #pragma warning restore 618
                     .AddProperty("InstanceId", entry.Id)
                     .AddProperty("EventTime", entry.TimeCreated)
+                    .AddProperty("EventTimeLong", eventTimeLong)
+                    .AddProperty("EventTimeShort", eventTimeShort)
                     .AddProperty("Source", entry.ProviderName)
                     .AddProperty("Category", entry.LevelDisplayName)
                     .AddProperty("EventLogName", entry.LogName)
@@ -215,8 +225,16 @@ private static void HandleEventLogEntry(EventRecord entry)
                     .AddProperty("IpAddress", eventProperties[18])
                     .AddProperty("IpPort", eventProperties[19])
                     .AddProperty("ImpersonationLevel", eventProperties[20])
+                    .AddProperty(nameof(Config.ProjectKey), Config.ProjectKey)
+                    .AddProperty(nameof(Config.Priority), Config.Priority)
+                    .AddProperty(nameof(Config.Responders), Config.Responders)
+                    .AddProperty(nameof(Config.Tags), Config.Tags)
+                    .AddProperty(nameof(Config.InitialTimeEstimate), Config.InitialTimeEstimate)
+                    .AddProperty(nameof(Config.RemainingTimeEstimate), Config.RemainingTimeEstimate)
+                    .AddProperty(nameof(Config.DueDate), Config.DueDate)
                     .Add(
                         "[{AppName:l}] New login detected on {MachineName:l} - {TargetDomainName:l}\\{TargetUserName:l} at {EventTime:F}");
+
             }
             catch (Exception ex)
             {

Seq.Client.WindowsLogins/Seq.Client.WindowsLogins.csproj

@@ -37,7 +37,8 @@
   <PropertyGroup>
     <StartupObject />
     <Authors>Matt Marlor</Authors>
-    <Version>1.1.2</Version>
+    <Version>1.1.3</Version>
+    <ApplicationIcon>login.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -64,7 +65,7 @@
     </EmbeddedResource>
   </ItemGroup>-->
   <ItemGroup>
-    <PackageReference Include="Lurgle.Logging" Version="1.1.15" />
+    <PackageReference Include="Lurgle.Logging" Version="1.2.3" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
     <PackageReference Include="Newtonsoft.Json">
       <Version>13.0.1</Version>