Send fail logins to delegate always

jjxtra · jjxtra · commit b197a94e1aa7 · 2022-08-30T13:32:13.000-06:00
Added another string as well
diff --git a/IPBanCore/Core/IPBan/IPBanService_Private.cs b/IPBanCore/Core/IPBan/IPBanService_Private.cs
@@ -228,6 +228,12 @@ private async Task ProcessPendingFailedLogins(IReadOnlyList<IPAddressLogEvent> i
                         if (IsWhitelisted(ipAddress))
                         {
                             Logger.Log(failedLogin.LogLevel, "Login failure, ignoring whitelisted ip address {0}, {1}, {2}", ipAddress, userName, source);
+
+                            // if delegate is not null and not an external event, send the event to the delegate
+                            if (IPBanDelegate != null && !failedLogin.External)
+                            {
+                                await IPBanDelegate.LoginAttemptFailed(ipAddress, source, userName, MachineGuid, OSName, OSVersion, 0, UtcNow);
+                            }
                         }
                         else
                         {
diff --git a/IPBanCore/Core/IPBan/IPBanService_Types.cs b/IPBanCore/Core/IPBan/IPBanService_Types.cs
@@ -153,6 +153,11 @@ public enum IPAddressEventFlags
         /// <summary>
         /// Send monthly report of all ip addresses
         /// </summary>
-        MonthlyReport = 128
+        MonthlyReport = 128,
+
+        /// <summary>
+        /// Successful login to web admin
+        /// </summary>
+        SuccessfulWebAdminLogin = 256
     }
 }
diff --git a/IPBanCore/IPBanResources.Designer.cs b/IPBanCore/IPBanResources.Designer.cs
diff --git a/IPBanCore/IPBanResources.resx b/IPBanCore/IPBanResources.resx
@@ -993,4 +993,7 @@
   <data name="IPAddressEventFlags_WeeklyReport" xml:space="preserve">
     <value>Weekly Report</value>
   </data>
+  <data name="IPAddressEventFlags_SuccessfulWebAdminLogin" xml:space="preserve">
+    <value>Web Admin Successful Logins</value>
+  </data>
 </root>

Original file line number	Diff line number	Diff line change
`@@ -228,6 +228,12 @@ private async Task ProcessPendingFailedLogins(IReadOnlyList<IPAddressLogEvent> i`
`228`	`228`	`if (IsWhitelisted(ipAddress))`
`229`	`229`	`{`
`230`	`230`	`Logger.Log(failedLogin.LogLevel, "Login failure, ignoring whitelisted ip address {0}, {1}, {2}", ipAddress, userName, source);`
	`231`	`+`
	`232`	`+ // if delegate is not null and not an external event, send the event to the delegate`
	`233`	`+ if (IPBanDelegate != null && !failedLogin.External)`
	`234`	`+ {`
	`235`	`+ await IPBanDelegate.LoginAttemptFailed(ipAddress, source, userName, MachineGuid, OSName, OSVersion, 0, UtcNow);`
	`236`	`+ }`
`231`	`237`	`}`
`232`	`238`	`else`
`233`	`239`	`{`
Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,11 @@ public enum IPAddressEventFlags`
`153`	`153`	`/// <summary>`
`154`	`154`	`/// Send monthly report of all ip addresses`
`155`	`155`	`/// </summary>`
`156`		`- MonthlyReport = 128`
	`156`	`+ MonthlyReport = 128,`
	`157`	`+`
	`158`	`+ /// <summary>`
	`159`	`+ /// Successful login to web admin`
	`160`	`+ /// </summary>`
	`161`	`+ SuccessfulWebAdminLogin = 256`
`157`	`162`	`}`
`158`	`163`	`}`