Use duration for WindowLength

caddyfile.go

@@ -16,6 +16,7 @@ package ratelimit
 
 import (
 	"fmt"
+	"github.com/caddyserver/caddy/v2"
 	"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
 	"github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile"
 	"github.com/caddyserver/caddy/v2/modules/caddyhttp"
@@ -33,21 +34,28 @@ func (rl *RateLimit) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
 		for d.NextBlock(0) {
 			switch d.Val() {
 			case "by_header":
-				d.NextArg()
+				if !d.NextArg() {
+					return d.ArgErr()
+				}
 				rl.ByHeader = d.Val()
 			case "max_requests":
-				d.NextArg()
+				if !d.NextArg() {
+					return d.ArgErr()
+				}
 				if num, err := strconv.Atoi(d.Val()); err != nil {
-					return fmt.Errorf("max requests unit %v could not be parsed as a number", d.Val())
+					return fmt.Errorf("max requests %v could not be parsed as a number", d.Val())
 				} else {
 					rl.MaxRequests = int64(num)
 				}
 			case "window_length":
-				d.NextArg()
-				if num, err := strconv.Atoi(d.Val()); err != nil {
-					return fmt.Errorf("window_length unit %v could not be parsed as a number", d.Val())
+				if !d.NextArg() {
+					return d.ArgErr()
+				}
+				duration, err := caddy.ParseDuration(d.Val())
+				if err != nil {
+					return fmt.Errorf("window_length %v could not be parsed as a duration", d.Val())
 				} else {
-					rl.WindowLength = int64(num)
+					rl.WindowLength = caddy.Duration(duration)
 				}
 			default:
 				return d.Errf("unrecognized servers option '%s'", d.Val())

ratelimit.go

@@ -24,11 +24,11 @@ func init() {
 type RateLimit struct {
 	ByHeader string `json:"by_header,omitempty"`
 
-	// window length for request rate checking (>= 1 minute)
-	WindowLength int64 `json:"window_length"`
+	// window length for request rate checking (better >= 2 minutes)
+	WindowLength caddy.Duration `json:"window_length,omitempty"`
 
 	// max request that should be processed per key in a given windowDuration
-	MaxRequests int64 `json:"max_requests"`
+	MaxRequests int64 `json:"max_requests,omitempty"`
 
 	// current window's request count per key
 	currentWindow *RequestCountTracker
@@ -53,7 +53,7 @@ func (rl *RateLimit) Provision(_ctx caddy.Context) error {
 }
 
 func (rl *RateLimit) windowDuration() time.Duration {
-	return time.Duration(rl.WindowLength) * time.Second
+	return time.Duration(rl.WindowLength)
 }
 
 // CaddyModule returns the Caddy module information.