fix: Cron Validation (#4842)

* Add Cron Next Time Validation The cron job can't be created if the year is more than 100 years in the future. Getting the next valid time will return null if this is the case. * add next cron validation to api * add next cron validation to job settings page * Add Missing Import
Ombi-app · May 2, 2023 · 97cc42f · 97cc42f
1 parent ca947bd
commit 97cc42f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Ombi.Settings/Settings/Models/JobSettingsHelper.cs b/src/Ombi.Settings/Settings/Models/JobSettingsHelper.cs
@@ -1,5 +1,6 @@
 using Ombi.Helpers;
 using Quartz;
+using System;
 
 namespace Ombi.Settings.Settings.Models
 {
@@ -104,7 +105,9 @@ private static string Get(string settings, string defaultCron)
 
         private static string ValidateCron(string cron)
         {
-            if (CronExpression.IsValidExpression(cron))
+            CronExpression expression = new CronExpression(cron);
+            DateTimeOffset? nextFireUTCTime = expression.GetNextValidTimeAfter(DateTime.Now);
+            if (CronExpression.IsValidExpression(cron) && nextFireUTCTime != null)
             {
                 return cron;
             }

diff --git a/src/Ombi/Controllers/V1/SettingsController.cs b/src/Ombi/Controllers/V1/SettingsController.cs
@@ -652,7 +652,9 @@ public async Task<JobSettingsViewModel> JobSettings([FromBody]JobSettings settin
                 try
                 {
                     var isValid = CronExpression.IsValidExpression(expression);
-                    if (!isValid)
+                    CronExpression cron = new CronExpression(expression);
+                    DateTimeOffset? nextFireUTCTime = cron.GetNextValidTimeAfter(DateTime.Now);
+                    if (!isValid || nextFireUTCTime == null)
                     {
                         return new JobSettingsViewModel
                         {