Merge pull request aptible#78 from krallin/fix-out-of-order-expr

Update cronexpr to reject out-of-order ranges

Author: krallin

crontab/crontab.go

@@ -34,12 +34,15 @@ func parseJobLine(line string) (*CrontabLine, error) {
 		scheduleEnds := indices[count-1][1]
 		commandStarts := indices[count][0]
 
+		toParse := line[:scheduleEnds]
+
 		// TODO: Should receive a logger?
-		logrus.Debugf("try parse(%d): %s[0:%d] = %s", count, line, scheduleEnds, line[0:scheduleEnds])
+		logrus.Debugf("try parse (%d fields): '%s'", count, toParse)
 
-		expr, err := cronexpr.ParseStrict(line[:scheduleEnds])
+		expr, err := cronexpr.ParseStrict(toParse)
 
 		if err != nil {
+			logrus.Debugf("failed to parse (%d fields): '%s': failed: %v", count, toParse, err)
 			continue
 		}
 
@@ -49,7 +52,8 @@ func parseJobLine(line string) (*CrontabLine, error) {
 			Command:    line[commandStarts:],
 		}, nil
 	}
-	return nil, fmt.Errorf("bad crontab line: %s", line)
+
+	return nil, fmt.Errorf("bad crontab line: '%s' (use -debug for details)", line)
 }
 
 func ParseCrontab(reader io.Reader) (*Crontab, error) {

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/getsentry/raven-go v0.2.0 // indirect
 	github.com/golang/protobuf v1.4.0 // indirect
 	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
-	github.com/krallin/cronexpr v0.0.0-20180801141017-b648cc9a908c
+	github.com/krallin/cronexpr v0.0.0-20201114145102-0373391ef0a2
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.5.1
 	github.com/prometheus/procfs v0.0.11 // indirect

go.sum

@@ -51,6 +51,8 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/krallin/cronexpr v0.0.0-20180801141017-b648cc9a908c h1:YCO+ApTSaAknMmQAl81m/kwJxbQSbwcx6AX+urZtrg0=
 github.com/krallin/cronexpr v0.0.0-20180801141017-b648cc9a908c/go.mod h1:O6noZ1hsovtyM/h0UBv7rU5ps+Y11b+LN9lQ04gWdII=
+github.com/krallin/cronexpr v0.0.0-20201114145102-0373391ef0a2 h1:cKXKJnIBL1TmRj7gAcC7fVARLt6JCT97J4+Rjq5DybQ=
+github.com/krallin/cronexpr v0.0.0-20201114145102-0373391ef0a2/go.mod h1:3yrSVIYbnN5lC4MIuhQCKpnY02Z0FaHoNJ2E0YYM04g=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=