From 22f2ce661e64c1998d676292b871a32e71d8bcfa Mon Sep 17 00:00:00 2001 From: ShareVB Date: Sun, 23 Feb 2025 10:48:29 +0100 Subject: [PATCH] fix(Cron Generator): better cron validation Double check with cron-parser and cronstrue for cron expresson validity Fix #26 --- src/tools/crontab-generator/crontab-generator.service.test.ts | 1 + src/tools/crontab-generator/crontab-generator.service.ts | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/tools/crontab-generator/crontab-generator.service.test.ts b/src/tools/crontab-generator/crontab-generator.service.test.ts index d45fadfe..b66afca8 100644 --- a/src/tools/crontab-generator/crontab-generator.service.test.ts +++ b/src/tools/crontab-generator/crontab-generator.service.test.ts @@ -33,6 +33,7 @@ describe('crontab-generator', () => { it('should return false for all invalid formats', () => { expect(isCronValid('aert')).toBe(false); expect(isCronValid('40 *')).toBe(false); + expect(isCronValid('* * * *')).toBe(false); }); }); diff --git a/src/tools/crontab-generator/crontab-generator.service.ts b/src/tools/crontab-generator/crontab-generator.service.ts index 8e4b7b7e..0d97e2c7 100644 --- a/src/tools/crontab-generator/crontab-generator.service.ts +++ b/src/tools/crontab-generator/crontab-generator.service.ts @@ -1,4 +1,5 @@ import { parseExpression } from 'cron-parser'; +import cronstrue from 'cronstrue'; import EventCronParser from 'event-cron-parser'; export type CronType = 'standard' | 'aws'; @@ -32,6 +33,7 @@ export function isCronValid(cronExpression: string, cronType: CronType | 'any' = export function getCronType(cronExpression: string) { try { parseExpression(cronExpression); + cronstrue.toString(cronExpression, { throwExceptionOnParseError: true }); return 'standard'; } catch (_) {