Merge pull request #1500 from daniel-beck/JENKINS-25897

[FIXED JENKINS-25897] Add range check for H(X-Y) syntax
jenkinsci · Dec 23, 2014 · a89bcdd · a89bcdd
2 parents 546e0cf + b090751
commit a89bcdd
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/core/src/main/grammar/crontab.g b/core/src/main/grammar/crontab.g
@@ -110,7 +110,7 @@ throws ANTLRException
   }
   | ("H" "(")=> "H" "(" s=token "-" e=token ")" ( "/" d=token )?
   {
-    bits = doHash(s,e,d);
+    bits = doHash(s,e,d,field);
   }
   | "H" ( "/" d=token )?
   {

diff --git a/core/src/main/java/hudson/scheduler/BaseParser.java b/core/src/main/java/hudson/scheduler/BaseParser.java
@@ -96,10 +96,12 @@ protected long doHash(int step, int field) throws ANTLRException {
         int u = UPPER_BOUNDS[field];
         if (field==2) u = 28;   // day of month can vary depending on month, so to make life simpler, just use [1,28] that's always safe
         if (field==4) u = 6;   // Both 0 and 7 of day of week are Sunday. For better distribution, limit upper bound to 6
-        return doHash(LOWER_BOUNDS[field], u, step);
+        return doHash(LOWER_BOUNDS[field], u, step, field);
     }
 
-    protected long doHash(int s, int e, int step) throws ANTLRException {
+    protected long doHash(int s, int e, int step, int field) throws ANTLRException {
+        rangeCheck(s, field);
+        rangeCheck(e, field);
         if (step > e - s + 1) {
             error(Messages.BaseParser_OutOfRange(step, 1, e - s + 1));
             throw new AssertionError();

diff --git a/core/src/test/java/hudson/scheduler/CronTabTest.java b/core/src/test/java/hudson/scheduler/CronTabTest.java
@@ -280,4 +280,25 @@ public int next(int n) {
         assertEquals("[35, 56]", times.toString());
     }
 
+    @Test public void rangeBoundsCheckOK() throws Exception {
+        new CronTab("H(0-59) H(0-23) H(1-31) H(1-12) H(0-7)");
+    }
+
+    @Test public void rangeBoundsCheckFailHour() throws Exception {
+        try {
+            new CronTab("H H(12-24) * * *");
+            fail();
+        } catch (ANTLRException e) {
+            // ok
+        }
+    }
+
+    @Test public void rangeBoundsCheckFailMinute() throws Exception {
+        try {
+            new CronTab("H(33-66) * * * *");
+            fail();
+        } catch (ANTLRException e) {
+            // ok
+        }
+    }
 }