Add safeguards for corrupted jobs

Closes #904

Author: openbullet

OpenBullet2.Core.Tests/Services/DataPoolFactoryServiceTests.cs

@@ -1,4 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
+using Newtonsoft.Json;
 using OpenBullet2.Core.Entities;
 using OpenBullet2.Core.Models.Data;
 using OpenBullet2.Core.Repositories;
@@ -56,6 +57,24 @@ public async Task FromOptionsAsync_FileOptions_ReturnsFileDataPool()
         Assert.Equal(["one", "two"], filePool.DataList.ToArray());
     }
 
+    [Fact]
+    public async Task FromOptionsAsync_FileOptions_WithNullFileName_FallsBackToInfiniteDataPool()
+    {
+        var options = JsonConvert.DeserializeObject<FileDataPoolOptions>(
+            """
+            {
+              "FileName": null,
+              "WordlistType": "Default"
+            }
+            """)!;
+
+        var service = CreateService();
+        var pool = await service.FromOptionsAsync(options);
+
+        Assert.IsType<InfiniteDataPool>(pool);
+        Assert.Equal(string.Empty, options.FileName);
+    }
+
     [Fact]
     public async Task FromOptionsAsync_WordlistOptions_ReturnsWordlistDataPool()
     {

OpenBullet2.Core.Tests/Services/JobManagerServiceTests.cs

@@ -61,6 +61,19 @@ public async Task SaveMultiRunJobOptionsAsync_WhenJobCompleted_ResetsPersistedSk
         Assert.Equal(0, options.Skip);
     }
 
+    [Fact]
+    public async Task Constructor_WhenPersistedJobOptionsAreMalformed_DoesNotThrow()
+    {
+        using var database = new TestDatabase();
+        await database.AddRawJobEntityAsync("{ this is not valid json }");
+
+        var exception = Record.Exception(() => new JobManagerService(
+            database.Services.GetRequiredService<IServiceScopeFactory>(),
+            (JobFactoryService)RuntimeHelpers.GetUninitializedObject(typeof(JobFactoryService))));
+
+        Assert.Null(exception);
+    }
+
     private static RuriLibSettingsService CreateSettingsService()
         => new(Path.Combine(Path.GetTempPath(), $"ob2-jobmanager-settings-{Guid.NewGuid():N}"));
 
@@ -103,6 +116,21 @@ public async Task<JobEntity> AddJobEntityAsync(MultiRunJobOptions options)
             return entity;
         }
 
+        public async Task<JobEntity> AddRawJobEntityAsync(string jobOptions)
+        {
+            using var scope = Services.CreateScope();
+            var context = scope.ServiceProvider.GetRequiredService<ApplicationDbContext>();
+            var entity = new JobEntity
+            {
+                JobType = JobType.MultiRun,
+                JobOptions = jobOptions
+            };
+
+            context.Jobs.Add(entity);
+            await context.SaveChangesAsync(TestContext.Current.CancellationToken);
+            return entity;
+        }
+
         public async Task<JobEntity> GetJobEntityAsync(int id)
         {
             using var scope = Services.CreateScope();

OpenBullet2.Core/Models/Data/FileDataPoolOptions.cs

@@ -18,17 +18,19 @@ public string FileName
         get => fileName;
         set
         {
+            var safeValue = value ?? string.Empty;
+
             // Double quotes in file names are not allowed in Windows, but they are included
             // at the start and end of the file path if you copy/paste it from some programs,
             // so we need to remove them, otherwise it will not find the file.
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
                 // Remove the double quotes from the file
-                fileName = value.Replace("\"", "");
+                fileName = safeValue.Replace("\"", "");
             }
             else
             {
-                fileName = value;
+                fileName = safeValue;
             }
         }
     }

OpenBullet2.Core/Services/JobManagerService.cs

@@ -46,25 +46,32 @@ public JobManagerService(IServiceScopeFactory scopeFactory, JobFactoryService jo
                 continue;
             }
 
-            // Convert old namespaces to support old databases
-            if (entity.JobOptions.Contains("OpenBullet2.Models") || entity.JobOptions.Contains(", OpenBullet2\""))
+            try
             {
-                entity.JobOptions = entity.JobOptions
-                    .Replace("OpenBullet2.Models", "OpenBullet2.Core.Models")
-                    .Replace(", OpenBullet2\"", ", OpenBullet2.Core\"");
+                // Convert old namespaces to support old databases
+                if (entity.JobOptions.Contains("OpenBullet2.Models") || entity.JobOptions.Contains(", OpenBullet2\""))
+                {
+                    entity.JobOptions = entity.JobOptions
+                        .Replace("OpenBullet2.Models", "OpenBullet2.Core.Models")
+                        .Replace(", OpenBullet2\"", ", OpenBullet2.Core\"");
 
-                jobRepo.UpdateAsync(entity).Wait();
-            }
+                    jobRepo.UpdateAsync(entity).Wait();
+                }
+
+                var wrapper = JsonConvert.DeserializeObject<JobOptionsWrapper>(entity.JobOptions, jsonSettings);
+                if (wrapper?.Options is null)
+                {
+                    continue;
+                }
 
-            var wrapper = JsonConvert.DeserializeObject<JobOptionsWrapper>(entity.JobOptions, jsonSettings);
-            if (wrapper?.Options is null)
+                var options = wrapper.Options;
+                var job = jobFactory.FromOptions(entity.Id, entity.Owner == null ? 0 : entity.Owner.Id, options);
+                AddJob(job);
+            }
+            catch (Exception ex)
             {
-                continue;
+                Console.WriteLine($"Skipped restoring job {entity.Id}: {ex.Message}");
             }
-
-            var options = wrapper.Options;
-            var job = jobFactory.FromOptions(entity.Id, entity.Owner == null ? 0 : entity.Owner.Id, options);
-            AddJob(job);
         }
 
         _scopeFactory = scopeFactory;