SED-3140 fix cron validator to accept all valid expressions

exense · May 23, 2024 · eb266d5 · eb266d5
1 parent 5ddbb13
commit eb266d5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/projects/step-core/src/lib/modules/cron/types/cron/_cron-validators-factory.ts b/projects/step-core/src/lib/modules/cron/types/cron/_cron-validators-factory.ts
@@ -36,7 +36,10 @@ export class CronValidatorsFactory {
       new NoSpecificValidator(
         new LWValidator(
           new ArrayValidator(
-            new MultipleValidator(new IncrementValidator(this.daysOfMonths), new RangeValidator(this.daysOfMonths))
+            new MultipleValidator(
+              new IncrementValidator(new RangeValidator(this.daysOfMonths)),
+              new RangeValidator(this.daysOfMonths)
+            )
           )
         )
       )
@@ -53,7 +56,7 @@ export class CronValidatorsFactory {
         new LWValidator(
           new ArrayValidator(
             new MultipleValidator(
-              new IncrementValidator(this.weekDays),
+              new IncrementValidator(new RangeValidator(this.weekDays)),
               new RangeValidator(this.weekDays),
               new NextDayValidator(this.weekDays)
             )
@@ -69,7 +72,9 @@ export class CronValidatorsFactory {
 
   private createValidatorWithCommonRules(validator: BaseCronValidator): BaseCronValidator {
     return new AllValidator(
-      new ArrayValidator(new MultipleValidator(new IncrementValidator(validator), new RangeValidator(validator)))
+      new ArrayValidator(
+        new MultipleValidator(new IncrementValidator(new RangeValidator(validator)), new RangeValidator(validator))
+      )
     );
   }
 }
diff --git a/projects/step-core/src/lib/modules/cron/types/cron/increment-validator.ts b/projects/step-core/src/lib/modules/cron/types/cron/increment-validator.ts
@@ -1,5 +1,7 @@
 import { BaseCronValidator } from './_base-cron-validator';
 
+const REGEX_NUM = /^\d+$/;
+
 export class IncrementValidator extends BaseCronValidator {
   override validate(source: unknown): boolean {
     if (typeof source !== 'string' || !source.includes('/')) {
@@ -19,7 +21,7 @@ export class IncrementValidator extends BaseCronValidator {
       return false;
     }
 
-    if (isNaN(parseInt(parts[1])) || parseInt(parts[1]) <= 0) {
+    if (!REGEX_NUM.test(parts[1]) || parseInt(parts[1]) <= 0) {
       return false;
     }