Import Export of Ban IPs (Server Side)

Author: Matthew Bate

BHD-ServerManager/Classes/InstanceManagers/banInstanceManager.cs

@@ -98,7 +98,8 @@ public static OperationResult AddBlacklistNameRecord(
             DateTime? expireDate,
             banInstanceRecordType recordType,
             string notes,
-            int associatedIPID = 0)
+            int associatedIPID = 0, 
+            bool ignoreValidation = false)
         {
             try
             {
@@ -108,7 +109,7 @@ public static OperationResult AddBlacklistNameRecord(
 
                 if (recordType == banInstanceRecordType.Temporary && expireDate.HasValue)
                 {
-                    if (expireDate.Value <= DateTime.Now)
+                    if (expireDate.Value <= DateTime.Now && !ignoreValidation)
                         return new OperationResult(false, "Temporary ban end date must be in the future.");
                 }
 
@@ -153,7 +154,8 @@ public static OperationResult AddBlacklistIPRecord(
             DateTime? expireDate,
             banInstanceRecordType recordType,
             string notes,
-            int associatedNameID = 0)
+            int associatedNameID = 0,
+            bool ignorevalidation = false)
         {
             try
             {
@@ -166,7 +168,7 @@ public static OperationResult AddBlacklistIPRecord(
 
                 if (recordType == banInstanceRecordType.Temporary && expireDate.HasValue)
                 {
-                    if (expireDate.Value <= DateTime.Now)
+                    if (expireDate.Value <= DateTime.Now && !ignorevalidation)
                         return new OperationResult(false, "Temporary ban end date must be in the future.");
                 }
 
@@ -218,17 +220,18 @@ public static DualRecordResult AddBlacklistBothRecords(
             DateTime banDate,
             DateTime? expireDate,
             banInstanceRecordType recordType,
-            string notes)
+            string notes,
+            bool ignorevalidation = false)
         {
             try
             {
                 // Add name record first
-                var nameResult = AddBlacklistNameRecord(playerName, banDate, expireDate, recordType, notes);
+                var nameResult = AddBlacklistNameRecord(playerName, banDate, expireDate, recordType, notes, 0, ignorevalidation);
                 if (!nameResult.Success)
                     return new DualRecordResult(false, nameResult.Message, 0, 0, nameResult.Exception);
 
                 // Add IP record with association
-                var ipResult = AddBlacklistIPRecord(ipAddress, subnetMask, banDate, expireDate, recordType, notes, nameResult.RecordID);
+                var ipResult = AddBlacklistIPRecord(ipAddress, subnetMask, banDate, expireDate, recordType, notes, nameResult.RecordID, ignorevalidation);
                 if (!ipResult.Success)
                 {
                     // Rollback name record
@@ -510,7 +513,8 @@ public static OperationResult AddWhitelistNameRecord(
             DateTime? expireDate,
             banInstanceRecordType recordType,
             string notes,
-            int associatedIPID = 0)
+            int associatedIPID = 0,
+            bool ignorevalidation = false)
         {
             try
             {
@@ -519,7 +523,7 @@ public static OperationResult AddWhitelistNameRecord(
 
                 if (recordType == banInstanceRecordType.Temporary && expireDate.HasValue)
                 {
-                    if (expireDate.Value <= DateTime.Now)
+                    if (expireDate.Value <= DateTime.Now && !ignorevalidation)
                         return new OperationResult(false, "Temporary whitelist end date must be in the future.");
                 }
 
@@ -560,7 +564,8 @@ public static OperationResult AddWhitelistIPRecord(
             DateTime? expireDate,
             banInstanceRecordType recordType,
             string notes,
-            int associatedNameID = 0)
+            int associatedNameID = 0,
+            bool ignorevalidation = false)
         {
             try
             {
@@ -572,7 +577,7 @@ public static OperationResult AddWhitelistIPRecord(
 
                 if (recordType == banInstanceRecordType.Temporary && expireDate.HasValue)
                 {
-                    if (expireDate.Value <= DateTime.Now)
+                    if (expireDate.Value <= DateTime.Now && !ignorevalidation)
                         return new OperationResult(false, "Temporary whitelist end date must be in the future.");
                 }
 
@@ -614,15 +619,16 @@ public static DualRecordResult AddWhitelistBothRecords(
             DateTime exemptDate,
             DateTime? expireDate,
             banInstanceRecordType recordType,
-            string notes)
+            string notes,
+            bool ignorevalidation = false)
         {
             try
             {
-                var nameResult = AddWhitelistNameRecord(playerName, exemptDate, expireDate, recordType, notes);
+                var nameResult = AddWhitelistNameRecord(playerName, exemptDate, expireDate, recordType, notes, 0, ignorevalidation);
                 if (!nameResult.Success)
                     return new DualRecordResult(false, nameResult.Message, 0, 0, nameResult.Exception);
 
-                var ipResult = AddWhitelistIPRecord(ipAddress, subnetMask, exemptDate, expireDate, recordType, notes, nameResult.RecordID);
+                var ipResult = AddWhitelistIPRecord(ipAddress, subnetMask, exemptDate, expireDate, recordType, notes, nameResult.RecordID, ignorevalidation);
                 if (!ipResult.Success)
                 {
                     DeleteWhitelistNameRecord(nameResult.RecordID);

BHD-ServerManager/Classes/SupportClasses/DatabaseManager.cs

@@ -1,11 +1,13 @@
-using HawkSyncShared.Instances;
+using HawkSyncShared.DTOs;
+using HawkSyncShared.Instances;
 using HawkSyncShared.ObjectClasses;
 using HawkSyncShared.SupportClasses;
 using Microsoft.Data.Sqlite;
 using System;
 using System.Diagnostics;
 using System.Net;
 using System.Text;
+using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;