From d252a7298e742d3776d83b05dedef721286fa7bb Mon Sep 17 00:00:00 2001 From: Martin Mirchev Date: Wed, 18 Nov 2026 21:50:20 +0800 Subject: [PATCH] Reject day-of-week ordinals above 5 in Quartz cron expressions QuartzCronField only rejects '#' ordinals that are not positive, so an expression such as "0 0 0 ? * MON#6" parses without error but never fires: no month has a sixth Monday, and the adjuster always returns null. The mistake is only noticed when the task never runs. Accept ordinals from 1 to 5 only, as Quartz's own CronExpression does. Signed-off-by: Martin Mirchev --- .../springframework/scheduling/support/QuartzCronField.java | 4 ++-- .../scheduling/support/QuartzCronFieldTests.java | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/QuartzCronField.java b/spring-context/src/main/java/org/springframework/scheduling/support/QuartzCronField.java index 67c194cd221f..7d132b4da33d 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/support/QuartzCronField.java +++ b/spring-context/src/main/java/org/springframework/scheduling/support/QuartzCronField.java @@ -163,9 +163,9 @@ else if (idx == value.length() - 1) { // "[0-7]#[0-9]+" DayOfWeek dayOfWeek = parseDayOfWeek(value.substring(0, idx)); int ordinal = Integer.parseInt(value, idx + 1, value.length(), 10); - if (ordinal <= 0) { + if (ordinal < 1 || ordinal > 5) { throw new IllegalArgumentException("Ordinal '" + ordinal + "' in '" + value + - "' must be positive number "); + "' must be between 1 and 5"); } TemporalAdjuster adjuster = dayOfWeekInMonth(ordinal, dayOfWeek); return new QuartzCronField(Type.DAY_OF_WEEK, Type.DAY_OF_MONTH, adjuster, value); diff --git a/spring-context/src/test/java/org/springframework/scheduling/support/QuartzCronFieldTests.java b/spring-context/src/test/java/org/springframework/scheduling/support/QuartzCronFieldTests.java index b084e2ed3a0e..ba5f0d840a01 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/support/QuartzCronFieldTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/support/QuartzCronFieldTests.java @@ -140,6 +140,9 @@ void invalidValues() { assertThatIllegalArgumentException().isThrownBy(() -> QuartzCronField.parseDaysOfWeek("8#1")); assertThatIllegalArgumentException().isThrownBy(() -> QuartzCronField.parseDaysOfWeek("2#1,2#3,2#5")); assertThatIllegalArgumentException().isThrownBy(() -> QuartzCronField.parseDaysOfWeek("FRI#-1")); + assertThatIllegalArgumentException().isThrownBy(() -> QuartzCronField.parseDaysOfWeek("1#0")); + assertThatIllegalArgumentException().isThrownBy(() -> QuartzCronField.parseDaysOfWeek("1#6")); + assertThatIllegalArgumentException().isThrownBy(() -> QuartzCronField.parseDaysOfWeek("MON#6")); } }