From 1de861f2d61903f7cdc99e6a3f5ab0d68631e670 Mon Sep 17 00:00:00 2001 From: Sebastian Spaink Date: Mon, 13 Apr 2026 15:20:51 -0500 Subject: [PATCH] Add support for days, weeks and years in parse_duration_ns (#8463) Signed-off-by: Sebastian Spaink --- builtin_metadata.json | 2 +- docs/docs/policy-reference/builtins/time.mdx | 14 + main.go | 1 + v1/ast/builtins.go | 2 +- .../testdata/v0/time/test-time-0950.yaml | 110 +- v1/topdown/durationparser/duration.peg | 34 + v1/topdown/durationparser/duration_parser.go | 1549 +++++++++++++++++ v1/topdown/durationparser/types.go | 13 + v1/topdown/time.go | 88 +- v1/topdown/time_test.go | 173 ++ 10 files changed, 1981 insertions(+), 5 deletions(-) create mode 100644 v1/topdown/durationparser/duration.peg create mode 100644 v1/topdown/durationparser/duration_parser.go create mode 100644 v1/topdown/durationparser/types.go diff --git a/builtin_metadata.json b/builtin_metadata.json index d349b951f9..4c761273e5 100644 --- a/builtin_metadata.json +++ b/builtin_metadata.json @@ -24453,7 +24453,7 @@ "time.parse_duration_ns": { "args": [ { - "description": "a duration like \"3m\"; see the [Go `time` package documentation](https://golang.org/pkg/time/#ParseDuration) for more details", + "description": "a duration like \"3m\"; see the [OPA `Duration Parsing` documentation](https://www.openpolicyagent.org/docs/latest/policy-reference/builtins/time#duration-parsing) for more details", "name": "duration", "type": "string" } diff --git a/docs/docs/policy-reference/builtins/time.mdx b/docs/docs/policy-reference/builtins/time.mdx index 4c50f810a0..e832326b43 100644 --- a/docs/docs/policy-reference/builtins/time.mdx +++ b/docs/docs/policy-reference/builtins/time.mdx @@ -18,6 +18,20 @@ Timezones can be specified as Note that OPA will use the `time/tzdata` data if none is present on the runtime filesystem (see the [Go `time.LoadLocation()`](https://pkg.go.dev/time#LoadLocation) documentation for more information). +#### Duration Parsing + +OPA supports the following time units for `time.parse_duration_ns`: + +* `ns` - NanoSeconds +* `us` (or `µs`) - MicroSeconds +* `ms` - MilliSeconds +* `s` - Seconds +* `m` - Minutes (ignoring leap seconds) +* `h` - Hours +* `d` - Days (ignoring so-called daylight saving time) +* `w` - Weeks +* `y` - Years (ignoring leap days) + #### Timestamp Parsing OPA can parse timestamps of nearly arbitrary formats, and currently accepts the same inputs as Go's `time.Parse()` utility. diff --git a/main.go b/main.go index eaa60b3a37..7600efb34e 100644 --- a/main.go +++ b/main.go @@ -29,6 +29,7 @@ func main() { } } +//go:generate build/gen-run-go.sh github.com/mna/pigeon@v1.3.0 -o v1/topdown/durationparser/duration_parser.go v1/topdown/durationparser/duration.peg //go:generate build/gen-run-go.sh internal/cmd/genopacapabilities/main.go capabilities.json //go:generate build/gen-run-go.sh internal/cmd/genbuiltinmetadata/main.go builtin_metadata.json //go:generate build/gen-run-go.sh internal/cmd/genversionindex/main.go v1/ast/version_index.json diff --git a/v1/ast/builtins.go b/v1/ast/builtins.go index 7e30a8051c..8dfac5bc46 100644 --- a/v1/ast/builtins.go +++ b/v1/ast/builtins.go @@ -2416,7 +2416,7 @@ var ParseDurationNanos = &Builtin{ Description: "Returns the duration in nanoseconds represented by a string.", Decl: types.NewFunction( types.Args( - types.Named("duration", types.S).Description("a duration like \"3m\"; see the [Go `time` package documentation](https://golang.org/pkg/time/#ParseDuration) for more details"), + types.Named("duration", types.S).Description("a duration like \"3m\"; see the [OPA `Duration Parsing` documentation](https://www.openpolicyagent.org/docs/latest/policy-reference/builtins/time#duration-parsing) for more details"), ), types.Named("ns", types.N).Description("the `duration` in nanoseconds"), ), diff --git a/v1/test/cases/testdata/v0/time/test-time-0950.yaml b/v1/test/cases/testdata/v0/time/test-time-0950.yaml index 30ea7b5ed7..4fd1f0be46 100644 --- a/v1/test/cases/testdata/v0/time/test-time-0950.yaml +++ b/v1/test/cases/testdata/v0/time/test-time-0950.yaml @@ -1,6 +1,30 @@ --- cases: - data: {} + modules: + - | + package generated + + p = ns { + time.parse_duration_ns("100ns", ns) + } + note: time/parse duration nanos, nanoseconds + query: data.generated.p = x + want_result: + - x: 100 + - data: { } + modules: + - | + package generated + + p = ns { + time.parse_duration_ns("100us", ns) + } + note: time/parse duration nanos, microseconds + query: data.generated.p = x + want_result: + - x: 100000 + - data: { } modules: - | package generated @@ -8,7 +32,91 @@ cases: p = ns { time.parse_duration_ns("100ms", ns) } - note: time/parse duration nanos + note: time/parse duration nanos, milliseconds query: data.generated.p = x want_result: - x: 100000000 + - data: { } + modules: + - | + package generated + + p = ns { + time.parse_duration_ns("100s", ns) + } + note: time/parse duration nanos, seconds + query: data.generated.p = x + want_result: + - x: 100000000000 + - data: { } + modules: + - | + package generated + + p = ns { + time.parse_duration_ns("100m", ns) + } + note: time/parse duration nanos, minutes + query: data.generated.p = x + want_result: + - x: 6000000000000 + - data: { } + modules: + - | + package generated + + p = ns { + time.parse_duration_ns("100h", ns) + } + note: time/parse duration nanos, hours + query: data.generated.p = x + want_result: + - x: 360000000000000 + - data: { } + modules: + - | + package generated + + p = ns { + time.parse_duration_ns("365d", ns) + } + note: time/parse duration nanos, days + query: data.generated.p = x + want_result: + - x: 31536000000000000 + - data: { } + modules: + - | + package generated + + p = ns { + time.parse_duration_ns("1w", ns) + } + note: time/parse duration nanos, weeks + query: data.generated.p = x + want_result: + - x: 604800000000000 + - data: { } + modules: + - | + package generated + + p = ns { + time.parse_duration_ns("1y", ns) + } + note: time/parse duration nanos, years + query: data.generated.p = x + want_result: + - x: 31536000000000000 + - data: { } + modules: + - | + package generated + + p = ns { + time.parse_duration_ns("1d2h", ns) + } + note: time/parse duration nanos, multiple-units + query: data.generated.p = x + want_result: + - x: 93600000000000 diff --git a/v1/topdown/durationparser/duration.peg b/v1/topdown/durationparser/duration.peg new file mode 100644 index 0000000000..339fe3bbe7 --- /dev/null +++ b/v1/topdown/durationparser/duration.peg @@ -0,0 +1,34 @@ +{ +package durationparser +} + +Duration <- sign:Sign? segments:Segment+ EOF { + signStr := "" + if sign != nil { + signStr = sign.(string) + } + raw := segments.([]any) + segs := make([]Segment, len(raw)) + for i, s := range raw { + segs[i] = s.(Segment) + } + return Result{Sign: signStr, Segments: segs}, nil +} + +Sign <- [-+] { + return string(c.text), nil +} + +Segment <- digits:Digits unit:Unit { + return Segment{Digits: digits.(string), Unit: unit.(string)}, nil +} + +Digits <- [0-9.]+ { + return string(c.text), nil +} + +Unit <- ("ms" / "us" / "µs" / "ns" / [a-z]) { + return string(c.text), nil +} + +EOF <- !. diff --git a/v1/topdown/durationparser/duration_parser.go b/v1/topdown/durationparser/duration_parser.go new file mode 100644 index 0000000000..0bef955f2d --- /dev/null +++ b/v1/topdown/durationparser/duration_parser.go @@ -0,0 +1,1549 @@ +// Code generated by pigeon; DO NOT EDIT. + +package durationparser + +import ( + "bytes" + "errors" + "fmt" + "io" + "math" + "os" + "sort" + "strconv" + "strings" + "sync" + "unicode" + "unicode/utf8" +) + +var g = &grammar{ + rules: []*rule{ + { + name: "Duration", + pos: position{line: 5, col: 1, offset: 28}, + expr: &actionExpr{ + pos: position{line: 5, col: 13, offset: 40}, + run: (*parser).callonDuration1, + expr: &seqExpr{ + pos: position{line: 5, col: 13, offset: 40}, + exprs: []any{ + &labeledExpr{ + pos: position{line: 5, col: 13, offset: 40}, + label: "sign", + expr: &zeroOrOneExpr{ + pos: position{line: 5, col: 18, offset: 45}, + expr: &ruleRefExpr{ + pos: position{line: 5, col: 18, offset: 45}, + name: "Sign", + }, + }, + }, + &labeledExpr{ + pos: position{line: 5, col: 24, offset: 51}, + label: "segments", + expr: &oneOrMoreExpr{ + pos: position{line: 5, col: 33, offset: 60}, + expr: &ruleRefExpr{ + pos: position{line: 5, col: 33, offset: 60}, + name: "Segment", + }, + }, + }, + &ruleRefExpr{ + pos: position{line: 5, col: 42, offset: 69}, + name: "EOF", + }, + }, + }, + }, + }, + { + name: "Sign", + pos: position{line: 18, col: 1, offset: 303}, + expr: &actionExpr{ + pos: position{line: 18, col: 9, offset: 311}, + run: (*parser).callonSign1, + expr: &charClassMatcher{ + pos: position{line: 18, col: 9, offset: 311}, + val: "[-+]", + chars: []rune{'-', '+'}, + ignoreCase: false, + inverted: false, + }, + }, + }, + { + name: "Segment", + pos: position{line: 22, col: 1, offset: 349}, + expr: &actionExpr{ + pos: position{line: 22, col: 12, offset: 360}, + run: (*parser).callonSegment1, + expr: &seqExpr{ + pos: position{line: 22, col: 12, offset: 360}, + exprs: []any{ + &labeledExpr{ + pos: position{line: 22, col: 12, offset: 360}, + label: "digits", + expr: &ruleRefExpr{ + pos: position{line: 22, col: 19, offset: 367}, + name: "Digits", + }, + }, + &labeledExpr{ + pos: position{line: 22, col: 26, offset: 374}, + label: "unit", + expr: &ruleRefExpr{ + pos: position{line: 22, col: 31, offset: 379}, + name: "Unit", + }, + }, + }, + }, + }, + }, + { + name: "Digits", + pos: position{line: 26, col: 1, offset: 456}, + expr: &actionExpr{ + pos: position{line: 26, col: 11, offset: 466}, + run: (*parser).callonDigits1, + expr: &oneOrMoreExpr{ + pos: position{line: 26, col: 11, offset: 466}, + expr: &charClassMatcher{ + pos: position{line: 26, col: 11, offset: 466}, + val: "[0-9.]", + chars: []rune{'.'}, + ranges: []rune{'0', '9'}, + ignoreCase: false, + inverted: false, + }, + }, + }, + }, + { + name: "Unit", + pos: position{line: 30, col: 1, offset: 507}, + expr: &actionExpr{ + pos: position{line: 30, col: 9, offset: 515}, + run: (*parser).callonUnit1, + expr: &choiceExpr{ + pos: position{line: 30, col: 10, offset: 516}, + alternatives: []any{ + &litMatcher{ + pos: position{line: 30, col: 10, offset: 516}, + val: "ms", + ignoreCase: false, + want: "\"ms\"", + }, + &litMatcher{ + pos: position{line: 30, col: 17, offset: 523}, + val: "us", + ignoreCase: false, + want: "\"us\"", + }, + &litMatcher{ + pos: position{line: 30, col: 24, offset: 530}, + val: "µs", + ignoreCase: false, + want: "\"µs\"", + }, + &litMatcher{ + pos: position{line: 30, col: 31, offset: 538}, + val: "ns", + ignoreCase: false, + want: "\"ns\"", + }, + &charClassMatcher{ + pos: position{line: 30, col: 38, offset: 545}, + val: "[a-z]", + ranges: []rune{'a', 'z'}, + ignoreCase: false, + inverted: false, + }, + }, + }, + }, + }, + { + name: "EOF", + pos: position{line: 34, col: 1, offset: 585}, + expr: ¬Expr{ + pos: position{line: 34, col: 8, offset: 592}, + expr: &anyMatcher{ + line: 34, col: 9, offset: 593, + }, + }, + }, + }, +} + +func (c *current) onDuration1(sign, segments any) (any, error) { + signStr := "" + if sign != nil { + signStr = sign.(string) + } + raw := segments.([]any) + segs := make([]Segment, len(raw)) + for i, s := range raw { + segs[i] = s.(Segment) + } + return Result{Sign: signStr, Segments: segs}, nil +} + +func (p *parser) callonDuration1() (any, error) { + stack := p.vstack[len(p.vstack)-1] + _ = stack + return p.cur.onDuration1(stack["sign"], stack["segments"]) +} + +func (c *current) onSign1() (any, error) { + return string(c.text), nil +} + +func (p *parser) callonSign1() (any, error) { + stack := p.vstack[len(p.vstack)-1] + _ = stack + return p.cur.onSign1() +} + +func (c *current) onSegment1(digits, unit any) (any, error) { + return Segment{Digits: digits.(string), Unit: unit.(string)}, nil +} + +func (p *parser) callonSegment1() (any, error) { + stack := p.vstack[len(p.vstack)-1] + _ = stack + return p.cur.onSegment1(stack["digits"], stack["unit"]) +} + +func (c *current) onDigits1() (any, error) { + return string(c.text), nil +} + +func (p *parser) callonDigits1() (any, error) { + stack := p.vstack[len(p.vstack)-1] + _ = stack + return p.cur.onDigits1() +} + +func (c *current) onUnit1() (any, error) { + return string(c.text), nil +} + +func (p *parser) callonUnit1() (any, error) { + stack := p.vstack[len(p.vstack)-1] + _ = stack + return p.cur.onUnit1() +} + +var ( + // errNoRule is returned when the grammar to parse has no rule. + errNoRule = errors.New("grammar has no rule") + + // errInvalidEntrypoint is returned when the specified entrypoint rule + // does not exit. + errInvalidEntrypoint = errors.New("invalid entrypoint") + + // errInvalidEncoding is returned when the source is not properly + // utf8-encoded. + errInvalidEncoding = errors.New("invalid encoding") + + // errMaxExprCnt is used to signal that the maximum number of + // expressions have been parsed. + errMaxExprCnt = errors.New("max number of expressions parsed") +) + +// Option is a function that can set an option on the parser. It returns +// the previous setting as an Option. +type Option func(*parser) Option + +// MaxExpressions creates an Option to stop parsing after the provided +// number of expressions have been parsed, if the value is 0 then the parser will +// parse for as many steps as needed (possibly an infinite number). +// +// The default for maxExprCnt is 0. +func MaxExpressions(maxExprCnt uint64) Option { + return func(p *parser) Option { + oldMaxExprCnt := p.maxExprCnt + p.maxExprCnt = maxExprCnt + return MaxExpressions(oldMaxExprCnt) + } +} + +// Entrypoint creates an Option to set the rule name to use as entrypoint. +// The rule name must have been specified in the -alternate-entrypoints +// if generating the parser with the -optimize-grammar flag, otherwise +// it may have been optimized out. Passing an empty string sets the +// entrypoint to the first rule in the grammar. +// +// The default is to start parsing at the first rule in the grammar. +func Entrypoint(ruleName string) Option { + return func(p *parser) Option { + oldEntrypoint := p.entrypoint + p.entrypoint = ruleName + if ruleName == "" { + p.entrypoint = g.rules[0].name + } + return Entrypoint(oldEntrypoint) + } +} + +// Statistics adds a user provided Stats struct to the parser to allow +// the user to process the results after the parsing has finished. +// Also the key for the "no match" counter is set. +// +// Example usage: +// +// input := "input" +// stats := Stats{} +// _, err := Parse("input-file", []byte(input), Statistics(&stats, "no match")) +// if err != nil { +// log.Panicln(err) +// } +// b, err := json.MarshalIndent(stats.ChoiceAltCnt, "", " ") +// if err != nil { +// log.Panicln(err) +// } +// fmt.Println(string(b)) +func Statistics(stats *Stats, choiceNoMatch string) Option { + return func(p *parser) Option { + oldStats := p.Stats + p.Stats = stats + oldChoiceNoMatch := p.choiceNoMatch + p.choiceNoMatch = choiceNoMatch + if p.Stats.ChoiceAltCnt == nil { + p.Stats.ChoiceAltCnt = make(map[string]map[string]int) + } + return Statistics(oldStats, oldChoiceNoMatch) + } +} + +// Debug creates an Option to set the debug flag to b. When set to true, +// debugging information is printed to stdout while parsing. +// +// The default is false. +func Debug(b bool) Option { + return func(p *parser) Option { + old := p.debug + p.debug = b + return Debug(old) + } +} + +// Memoize creates an Option to set the memoize flag to b. When set to true, +// the parser will cache all results so each expression is evaluated only +// once. This guarantees linear parsing time even for pathological cases, +// at the expense of more memory and slower times for typical cases. +// +// The default is false. +func Memoize(b bool) Option { + return func(p *parser) Option { + old := p.memoize + p.memoize = b + return Memoize(old) + } +} + +// AllowInvalidUTF8 creates an Option to allow invalid UTF-8 bytes. +// Every invalid UTF-8 byte is treated as a utf8.RuneError (U+FFFD) +// by character class matchers and is matched by the any matcher. +// The returned matched value, c.text and c.offset are NOT affected. +// +// The default is false. +func AllowInvalidUTF8(b bool) Option { + return func(p *parser) Option { + old := p.allowInvalidUTF8 + p.allowInvalidUTF8 = b + return AllowInvalidUTF8(old) + } +} + +// Recover creates an Option to set the recover flag to b. When set to +// true, this causes the parser to recover from panics and convert it +// to an error. Setting it to false can be useful while debugging to +// access the full stack trace. +// +// The default is true. +func Recover(b bool) Option { + return func(p *parser) Option { + old := p.recover + p.recover = b + return Recover(old) + } +} + +// GlobalStore creates an Option to set a key to a certain value in +// the globalStore. +func GlobalStore(key string, value any) Option { + return func(p *parser) Option { + old := p.cur.globalStore[key] + p.cur.globalStore[key] = value + return GlobalStore(key, old) + } +} + +// InitState creates an Option to set a key to a certain value in +// the global "state" store. +func InitState(key string, value any) Option { + return func(p *parser) Option { + old := p.cur.state[key] + p.cur.state[key] = value + return InitState(key, old) + } +} + +// ParseFile parses the file identified by filename. +func ParseFile(filename string, opts ...Option) (i any, err error) { + f, err := os.Open(filename) + if err != nil { + return nil, err + } + defer func() { + if closeErr := f.Close(); closeErr != nil { + err = closeErr + } + }() + return ParseReader(filename, f, opts...) +} + +// ParseReader parses the data from r using filename as information in the +// error messages. +func ParseReader(filename string, r io.Reader, opts ...Option) (any, error) { + b, err := io.ReadAll(r) + if err != nil { + return nil, err + } + + return Parse(filename, b, opts...) +} + +// Parse parses the data from b using filename as information in the +// error messages. +func Parse(filename string, b []byte, opts ...Option) (any, error) { + return newParser(filename, b, opts...).parse(g) +} + +// position records a position in the text. +type position struct { + line, col, offset int +} + +func (p position) String() string { + return strconv.Itoa(p.line) + ":" + strconv.Itoa(p.col) + " [" + strconv.Itoa(p.offset) + "]" +} + +// savepoint stores all state required to go back to this point in the +// parser. +type savepoint struct { + position + rn rune + w int +} + +type current struct { + pos position // start position of the match + text []byte // raw text of the match + + // state is a store for arbitrary key,value pairs that the user wants to be + // tied to the backtracking of the parser. + // This is always rolled back if a parsing rule fails. + state storeDict + + // globalStore is a general store for the user to store arbitrary key-value + // pairs that they need to manage and that they do not want tied to the + // backtracking of the parser. This is only modified by the user and never + // rolled back by the parser. It is always up to the user to keep this in a + // consistent state. + globalStore storeDict +} + +type storeDict map[string]any + +// the AST types... + +type grammar struct { + pos position + rules []*rule +} + +type rule struct { + pos position + name string + displayName string + expr any +} + +type choiceExpr struct { + pos position + alternatives []any +} + +type actionExpr struct { + pos position + expr any + run func(*parser) (any, error) +} + +type recoveryExpr struct { + pos position + expr any + recoverExpr any + failureLabel []string +} + +type seqExpr struct { + pos position + exprs []any +} + +type throwExpr struct { + pos position + label string +} + +type labeledExpr struct { + pos position + label string + expr any +} + +type expr struct { + pos position + expr any +} + +type ( + andExpr expr + notExpr expr + zeroOrOneExpr expr + zeroOrMoreExpr expr + oneOrMoreExpr expr +) + +type ruleRefExpr struct { + pos position + name string +} + +type stateCodeExpr struct { + pos position + run func(*parser) error +} + +type andCodeExpr struct { + pos position + run func(*parser) (bool, error) +} + +type notCodeExpr struct { + pos position + run func(*parser) (bool, error) +} + +type litMatcher struct { + pos position + val string + ignoreCase bool + want string +} + +type charClassMatcher struct { + pos position + val string + basicLatinChars [128]bool + chars []rune + ranges []rune + classes []*unicode.RangeTable + ignoreCase bool + inverted bool +} + +type anyMatcher position + +// errList cumulates the errors found by the parser. +type errList []error + +func (e *errList) add(err error) { + *e = append(*e, err) +} + +func (e errList) err() error { + if len(e) == 0 { + return nil + } + e.dedupe() + return e +} + +func (e *errList) dedupe() { + var cleaned []error + set := make(map[string]bool) + for _, err := range *e { + if msg := err.Error(); !set[msg] { + set[msg] = true + cleaned = append(cleaned, err) + } + } + *e = cleaned +} + +func (e errList) Error() string { + switch len(e) { + case 0: + return "" + case 1: + return e[0].Error() + default: + var buf bytes.Buffer + + for i, err := range e { + if i > 0 { + buf.WriteRune('\n') + } + buf.WriteString(err.Error()) + } + return buf.String() + } +} + +// parserError wraps an error with a prefix indicating the rule in which +// the error occurred. The original error is stored in the Inner field. +type parserError struct { + Inner error + pos position + prefix string + expected []string +} + +// Error returns the error message. +func (p *parserError) Error() string { + return p.prefix + ": " + p.Inner.Error() +} + +// newParser creates a parser with the specified input source and options. +func newParser(filename string, b []byte, opts ...Option) *parser { + stats := Stats{ + ChoiceAltCnt: make(map[string]map[string]int), + } + + p := &parser{ + filename: filename, + errs: new(errList), + data: b, + pt: savepoint{position: position{line: 1}}, + recover: true, + cur: current{ + state: make(storeDict), + globalStore: make(storeDict), + }, + maxFailPos: position{col: 1, line: 1}, + maxFailExpected: make([]string, 0, 20), + Stats: &stats, + // start rule is rule [0] unless an alternate entrypoint is specified + entrypoint: g.rules[0].name, + } + p.setOptions(opts) + + if p.maxExprCnt == 0 { + p.maxExprCnt = math.MaxUint64 + } + + return p +} + +// setOptions applies the options to the parser. +func (p *parser) setOptions(opts []Option) { + for _, opt := range opts { + opt(p) + } +} + +type resultTuple struct { + v any + b bool + end savepoint +} + +const choiceNoMatch = -1 + +// Stats stores some statistics, gathered during parsing +type Stats struct { + // ExprCnt counts the number of expressions processed during parsing + // This value is compared to the maximum number of expressions allowed + // (set by the MaxExpressions option). + ExprCnt uint64 + + // ChoiceAltCnt is used to count for each ordered choice expression, + // which alternative is used how may times. + // These numbers allow to optimize the order of the ordered choice expression + // to increase the performance of the parser + // + // The outer key of ChoiceAltCnt is composed of the name of the rule as well + // as the line and the column of the ordered choice. + // The inner key of ChoiceAltCnt is the number (one-based) of the matching alternative. + // For each alternative the number of matches are counted. If an ordered choice does not + // match, a special counter is incremented. The name of this counter is set with + // the parser option Statistics. + // For an alternative to be included in ChoiceAltCnt, it has to match at least once. + ChoiceAltCnt map[string]map[string]int +} + +type parser struct { + filename string + pt savepoint + cur current + + data []byte + errs *errList + + depth int + recover bool + debug bool + + memoize bool + // memoization table for the packrat algorithm: + // map[offset in source] map[expression or rule] {value, match} + memo map[int]map[any]resultTuple + + // rules table, maps the rule identifier to the rule node + rules map[string]*rule + // variables stack, map of label to value + vstack []map[string]any + // rule stack, allows identification of the current rule in errors + rstack []*rule + + // parse fail + maxFailPos position + maxFailExpected []string + maxFailInvertExpected bool + + // max number of expressions to be parsed + maxExprCnt uint64 + // entrypoint for the parser + entrypoint string + + allowInvalidUTF8 bool + + *Stats + + choiceNoMatch string + // recovery expression stack, keeps track of the currently available recovery expression, these are traversed in reverse + recoveryStack []map[string]any +} + +// push a variable set on the vstack. +func (p *parser) pushV() { + if cap(p.vstack) == len(p.vstack) { + // create new empty slot in the stack + p.vstack = append(p.vstack, nil) + } else { + // slice to 1 more + p.vstack = p.vstack[:len(p.vstack)+1] + } + + // get the last args set + m := p.vstack[len(p.vstack)-1] + if m != nil && len(m) == 0 { + // empty map, all good + return + } + + m = make(map[string]any) + p.vstack[len(p.vstack)-1] = m +} + +// pop a variable set from the vstack. +func (p *parser) popV() { + // if the map is not empty, clear it + m := p.vstack[len(p.vstack)-1] + if len(m) > 0 { + // GC that map + p.vstack[len(p.vstack)-1] = nil + } + p.vstack = p.vstack[:len(p.vstack)-1] +} + +// push a recovery expression with its labels to the recoveryStack +func (p *parser) pushRecovery(labels []string, expr any) { + if cap(p.recoveryStack) == len(p.recoveryStack) { + // create new empty slot in the stack + p.recoveryStack = append(p.recoveryStack, nil) + } else { + // slice to 1 more + p.recoveryStack = p.recoveryStack[:len(p.recoveryStack)+1] + } + + m := make(map[string]any, len(labels)) + for _, fl := range labels { + m[fl] = expr + } + p.recoveryStack[len(p.recoveryStack)-1] = m +} + +// pop a recovery expression from the recoveryStack +func (p *parser) popRecovery() { + // GC that map + p.recoveryStack[len(p.recoveryStack)-1] = nil + + p.recoveryStack = p.recoveryStack[:len(p.recoveryStack)-1] +} + +func (p *parser) print(prefix, s string) string { + if !p.debug { + return s + } + + fmt.Printf("%s %d:%d:%d: %s [%#U]\n", + prefix, p.pt.line, p.pt.col, p.pt.offset, s, p.pt.rn) + return s +} + +func (p *parser) printIndent(mark string, s string) string { + return p.print(strings.Repeat(" ", p.depth)+mark, s) +} + +func (p *parser) in(s string) string { + res := p.printIndent(">", s) + p.depth++ + return res +} + +func (p *parser) out(s string) string { + p.depth-- + return p.printIndent("<", s) +} + +func (p *parser) addErr(err error) { + p.addErrAt(err, p.pt.position, []string{}) +} + +func (p *parser) addErrAt(err error, pos position, expected []string) { + var buf bytes.Buffer + if p.filename != "" { + buf.WriteString(p.filename) + } + if buf.Len() > 0 { + buf.WriteString(":") + } + buf.WriteString(fmt.Sprintf("%d:%d (%d)", pos.line, pos.col, pos.offset)) + if len(p.rstack) > 0 { + if buf.Len() > 0 { + buf.WriteString(": ") + } + rule := p.rstack[len(p.rstack)-1] + if rule.displayName != "" { + buf.WriteString("rule " + rule.displayName) + } else { + buf.WriteString("rule " + rule.name) + } + } + pe := &parserError{Inner: err, pos: pos, prefix: buf.String(), expected: expected} + p.errs.add(pe) +} + +func (p *parser) failAt(fail bool, pos position, want string) { + // process fail if parsing fails and not inverted or parsing succeeds and invert is set + if fail == p.maxFailInvertExpected { + if pos.offset < p.maxFailPos.offset { + return + } + + if pos.offset > p.maxFailPos.offset { + p.maxFailPos = pos + p.maxFailExpected = p.maxFailExpected[:0] + } + + if p.maxFailInvertExpected { + want = "!" + want + } + p.maxFailExpected = append(p.maxFailExpected, want) + } +} + +// read advances the parser to the next rune. +func (p *parser) read() { + p.pt.offset += p.pt.w + rn, n := utf8.DecodeRune(p.data[p.pt.offset:]) + p.pt.rn = rn + p.pt.w = n + p.pt.col++ + if rn == '\n' { + p.pt.line++ + p.pt.col = 0 + } + + if rn == utf8.RuneError && n == 1 { // see utf8.DecodeRune + if !p.allowInvalidUTF8 { + p.addErr(errInvalidEncoding) + } + } +} + +// restore parser position to the savepoint pt. +func (p *parser) restore(pt savepoint) { + if p.debug { + defer p.out(p.in("restore")) + } + if pt.offset == p.pt.offset { + return + } + p.pt = pt +} + +// Cloner is implemented by any value that has a Clone method, which returns a +// copy of the value. This is mainly used for types which are not passed by +// value (e.g map, slice, chan) or structs that contain such types. +// +// This is used in conjunction with the global state feature to create proper +// copies of the state to allow the parser to properly restore the state in +// the case of backtracking. +type Cloner interface { + Clone() any +} + +var statePool = &sync.Pool{ + New: func() any { return make(storeDict) }, +} + +func (sd storeDict) Discard() { + for k := range sd { + delete(sd, k) + } + statePool.Put(sd) +} + +// clone and return parser current state. +func (p *parser) cloneState() storeDict { + if p.debug { + defer p.out(p.in("cloneState")) + } + + state := statePool.Get().(storeDict) + for k, v := range p.cur.state { + if c, ok := v.(Cloner); ok { + state[k] = c.Clone() + } else { + state[k] = v + } + } + return state +} + +// restore parser current state to the state storeDict. +// every restoreState should applied only one time for every cloned state +func (p *parser) restoreState(state storeDict) { + if p.debug { + defer p.out(p.in("restoreState")) + } + p.cur.state.Discard() + p.cur.state = state +} + +// get the slice of bytes from the savepoint start to the current position. +func (p *parser) sliceFrom(start savepoint) []byte { + return p.data[start.position.offset:p.pt.position.offset] +} + +func (p *parser) getMemoized(node any) (resultTuple, bool) { + if len(p.memo) == 0 { + return resultTuple{}, false + } + m := p.memo[p.pt.offset] + if len(m) == 0 { + return resultTuple{}, false + } + res, ok := m[node] + return res, ok +} + +func (p *parser) setMemoized(pt savepoint, node any, tuple resultTuple) { + if p.memo == nil { + p.memo = make(map[int]map[any]resultTuple) + } + m := p.memo[pt.offset] + if m == nil { + m = make(map[any]resultTuple) + p.memo[pt.offset] = m + } + m[node] = tuple +} + +func (p *parser) buildRulesTable(g *grammar) { + p.rules = make(map[string]*rule, len(g.rules)) + for _, r := range g.rules { + p.rules[r.name] = r + } +} + +func (p *parser) parse(g *grammar) (val any, err error) { + if len(g.rules) == 0 { + p.addErr(errNoRule) + return nil, p.errs.err() + } + + // TODO : not super critical but this could be generated + p.buildRulesTable(g) + + if p.recover { + // panic can be used in action code to stop parsing immediately + // and return the panic as an error. + defer func() { + if e := recover(); e != nil { + if p.debug { + defer p.out(p.in("panic handler")) + } + val = nil + switch e := e.(type) { + case error: + p.addErr(e) + default: + p.addErr(fmt.Errorf("%v", e)) + } + err = p.errs.err() + } + }() + } + + startRule, ok := p.rules[p.entrypoint] + if !ok { + p.addErr(errInvalidEntrypoint) + return nil, p.errs.err() + } + + p.read() // advance to first rune + val, ok = p.parseRuleWrap(startRule) + if !ok { + if len(*p.errs) == 0 { + // If parsing fails, but no errors have been recorded, the expected values + // for the farthest parser position are returned as error. + maxFailExpectedMap := make(map[string]struct{}, len(p.maxFailExpected)) + for _, v := range p.maxFailExpected { + maxFailExpectedMap[v] = struct{}{} + } + expected := make([]string, 0, len(maxFailExpectedMap)) + eof := false + if _, ok := maxFailExpectedMap["!."]; ok { + delete(maxFailExpectedMap, "!.") + eof = true + } + for k := range maxFailExpectedMap { + expected = append(expected, k) + } + sort.Strings(expected) + if eof { + expected = append(expected, "EOF") + } + p.addErrAt(errors.New("no match found, expected: "+listJoin(expected, ", ", "or")), p.maxFailPos, expected) + } + + return nil, p.errs.err() + } + return val, p.errs.err() +} + +func listJoin(list []string, sep string, lastSep string) string { + switch len(list) { + case 0: + return "" + case 1: + return list[0] + default: + return strings.Join(list[:len(list)-1], sep) + " " + lastSep + " " + list[len(list)-1] + } +} + +func (p *parser) parseRuleMemoize(rule *rule) (any, bool) { + res, ok := p.getMemoized(rule) + if ok { + p.restore(res.end) + return res.v, res.b + } + + startMark := p.pt + val, ok := p.parseRule(rule) + p.setMemoized(startMark, rule, resultTuple{val, ok, p.pt}) + + return val, ok +} + +func (p *parser) parseRuleWrap(rule *rule) (any, bool) { + if p.debug { + defer p.out(p.in("parseRule " + rule.name)) + } + var ( + val any + ok bool + startMark = p.pt + ) + + if p.memoize { + val, ok = p.parseRuleMemoize(rule) + } else { + val, ok = p.parseRule(rule) + } + + if ok && p.debug { + p.printIndent("MATCH", string(p.sliceFrom(startMark))) + } + return val, ok +} + +func (p *parser) parseRule(rule *rule) (any, bool) { + p.rstack = append(p.rstack, rule) + p.pushV() + val, ok := p.parseExprWrap(rule.expr) + p.popV() + p.rstack = p.rstack[:len(p.rstack)-1] + return val, ok +} + +func (p *parser) parseExprWrap(expr any) (any, bool) { + var pt savepoint + + if p.memoize { + res, ok := p.getMemoized(expr) + if ok { + p.restore(res.end) + return res.v, res.b + } + pt = p.pt + } + + val, ok := p.parseExpr(expr) + + if p.memoize { + p.setMemoized(pt, expr, resultTuple{val, ok, p.pt}) + } + return val, ok +} + +func (p *parser) parseExpr(expr any) (any, bool) { + p.ExprCnt++ + if p.ExprCnt > p.maxExprCnt { + panic(errMaxExprCnt) + } + + var val any + var ok bool + switch expr := expr.(type) { + case *actionExpr: + val, ok = p.parseActionExpr(expr) + case *andCodeExpr: + val, ok = p.parseAndCodeExpr(expr) + case *andExpr: + val, ok = p.parseAndExpr(expr) + case *anyMatcher: + val, ok = p.parseAnyMatcher(expr) + case *charClassMatcher: + val, ok = p.parseCharClassMatcher(expr) + case *choiceExpr: + val, ok = p.parseChoiceExpr(expr) + case *labeledExpr: + val, ok = p.parseLabeledExpr(expr) + case *litMatcher: + val, ok = p.parseLitMatcher(expr) + case *notCodeExpr: + val, ok = p.parseNotCodeExpr(expr) + case *notExpr: + val, ok = p.parseNotExpr(expr) + case *oneOrMoreExpr: + val, ok = p.parseOneOrMoreExpr(expr) + case *recoveryExpr: + val, ok = p.parseRecoveryExpr(expr) + case *ruleRefExpr: + val, ok = p.parseRuleRefExpr(expr) + case *seqExpr: + val, ok = p.parseSeqExpr(expr) + case *stateCodeExpr: + val, ok = p.parseStateCodeExpr(expr) + case *throwExpr: + val, ok = p.parseThrowExpr(expr) + case *zeroOrMoreExpr: + val, ok = p.parseZeroOrMoreExpr(expr) + case *zeroOrOneExpr: + val, ok = p.parseZeroOrOneExpr(expr) + default: + panic(fmt.Sprintf("unknown expression type %T", expr)) + } + return val, ok +} + +func (p *parser) parseActionExpr(act *actionExpr) (any, bool) { + if p.debug { + defer p.out(p.in("parseActionExpr")) + } + + start := p.pt + val, ok := p.parseExprWrap(act.expr) + if ok { + p.cur.pos = start.position + p.cur.text = p.sliceFrom(start) + state := p.cloneState() + actVal, err := act.run(p) + if err != nil { + p.addErrAt(err, start.position, []string{}) + } + p.restoreState(state) + + val = actVal + } + if ok && p.debug { + p.printIndent("MATCH", string(p.sliceFrom(start))) + } + return val, ok +} + +func (p *parser) parseAndCodeExpr(and *andCodeExpr) (any, bool) { + if p.debug { + defer p.out(p.in("parseAndCodeExpr")) + } + + state := p.cloneState() + + ok, err := and.run(p) + if err != nil { + p.addErr(err) + } + p.restoreState(state) + + return nil, ok +} + +func (p *parser) parseAndExpr(and *andExpr) (any, bool) { + if p.debug { + defer p.out(p.in("parseAndExpr")) + } + + pt := p.pt + state := p.cloneState() + p.pushV() + _, ok := p.parseExprWrap(and.expr) + p.popV() + p.restoreState(state) + p.restore(pt) + + return nil, ok +} + +func (p *parser) parseAnyMatcher(any *anyMatcher) (any, bool) { + if p.debug { + defer p.out(p.in("parseAnyMatcher")) + } + + if p.pt.rn == utf8.RuneError && p.pt.w == 0 { + // EOF - see utf8.DecodeRune + p.failAt(false, p.pt.position, ".") + return nil, false + } + start := p.pt + p.read() + p.failAt(true, start.position, ".") + return p.sliceFrom(start), true +} + +func (p *parser) parseCharClassMatcher(chr *charClassMatcher) (any, bool) { + if p.debug { + defer p.out(p.in("parseCharClassMatcher")) + } + + cur := p.pt.rn + start := p.pt + + // can't match EOF + if cur == utf8.RuneError && p.pt.w == 0 { // see utf8.DecodeRune + p.failAt(false, start.position, chr.val) + return nil, false + } + + if chr.ignoreCase { + cur = unicode.ToLower(cur) + } + + // try to match in the list of available chars + for _, rn := range chr.chars { + if rn == cur { + if chr.inverted { + p.failAt(false, start.position, chr.val) + return nil, false + } + p.read() + p.failAt(true, start.position, chr.val) + return p.sliceFrom(start), true + } + } + + // try to match in the list of ranges + for i := 0; i < len(chr.ranges); i += 2 { + if cur >= chr.ranges[i] && cur <= chr.ranges[i+1] { + if chr.inverted { + p.failAt(false, start.position, chr.val) + return nil, false + } + p.read() + p.failAt(true, start.position, chr.val) + return p.sliceFrom(start), true + } + } + + // try to match in the list of Unicode classes + for _, cl := range chr.classes { + if unicode.Is(cl, cur) { + if chr.inverted { + p.failAt(false, start.position, chr.val) + return nil, false + } + p.read() + p.failAt(true, start.position, chr.val) + return p.sliceFrom(start), true + } + } + + if chr.inverted { + p.read() + p.failAt(true, start.position, chr.val) + return p.sliceFrom(start), true + } + p.failAt(false, start.position, chr.val) + return nil, false +} + +func (p *parser) incChoiceAltCnt(ch *choiceExpr, altI int) { + choiceIdent := fmt.Sprintf("%s %d:%d", p.rstack[len(p.rstack)-1].name, ch.pos.line, ch.pos.col) + m := p.ChoiceAltCnt[choiceIdent] + if m == nil { + m = make(map[string]int) + p.ChoiceAltCnt[choiceIdent] = m + } + // We increment altI by 1, so the keys do not start at 0 + alt := strconv.Itoa(altI + 1) + if altI == choiceNoMatch { + alt = p.choiceNoMatch + } + m[alt]++ +} + +func (p *parser) parseChoiceExpr(ch *choiceExpr) (any, bool) { + if p.debug { + defer p.out(p.in("parseChoiceExpr")) + } + + for altI, alt := range ch.alternatives { + // dummy assignment to prevent compile error if optimized + _ = altI + + state := p.cloneState() + + p.pushV() + val, ok := p.parseExprWrap(alt) + p.popV() + if ok { + p.incChoiceAltCnt(ch, altI) + return val, ok + } + p.restoreState(state) + } + p.incChoiceAltCnt(ch, choiceNoMatch) + return nil, false +} + +func (p *parser) parseLabeledExpr(lab *labeledExpr) (any, bool) { + if p.debug { + defer p.out(p.in("parseLabeledExpr")) + } + + p.pushV() + val, ok := p.parseExprWrap(lab.expr) + p.popV() + if ok && lab.label != "" { + m := p.vstack[len(p.vstack)-1] + m[lab.label] = val + } + return val, ok +} + +func (p *parser) parseLitMatcher(lit *litMatcher) (any, bool) { + if p.debug { + defer p.out(p.in("parseLitMatcher")) + } + + start := p.pt + for _, want := range lit.val { + cur := p.pt.rn + if lit.ignoreCase { + cur = unicode.ToLower(cur) + } + if cur != want { + p.failAt(false, start.position, lit.want) + p.restore(start) + return nil, false + } + p.read() + } + p.failAt(true, start.position, lit.want) + return p.sliceFrom(start), true +} + +func (p *parser) parseNotCodeExpr(not *notCodeExpr) (any, bool) { + if p.debug { + defer p.out(p.in("parseNotCodeExpr")) + } + + state := p.cloneState() + + ok, err := not.run(p) + if err != nil { + p.addErr(err) + } + p.restoreState(state) + + return nil, !ok +} + +func (p *parser) parseNotExpr(not *notExpr) (any, bool) { + if p.debug { + defer p.out(p.in("parseNotExpr")) + } + + pt := p.pt + state := p.cloneState() + p.pushV() + p.maxFailInvertExpected = !p.maxFailInvertExpected + _, ok := p.parseExprWrap(not.expr) + p.maxFailInvertExpected = !p.maxFailInvertExpected + p.popV() + p.restoreState(state) + p.restore(pt) + + return nil, !ok +} + +func (p *parser) parseOneOrMoreExpr(expr *oneOrMoreExpr) (any, bool) { + if p.debug { + defer p.out(p.in("parseOneOrMoreExpr")) + } + + var vals []any + + for { + p.pushV() + val, ok := p.parseExprWrap(expr.expr) + p.popV() + if !ok { + if len(vals) == 0 { + // did not match once, no match + return nil, false + } + return vals, true + } + vals = append(vals, val) + } +} + +func (p *parser) parseRecoveryExpr(recover *recoveryExpr) (any, bool) { + if p.debug { + defer p.out(p.in("parseRecoveryExpr (" + strings.Join(recover.failureLabel, ",") + ")")) + } + + p.pushRecovery(recover.failureLabel, recover.recoverExpr) + val, ok := p.parseExprWrap(recover.expr) + p.popRecovery() + + return val, ok +} + +func (p *parser) parseRuleRefExpr(ref *ruleRefExpr) (any, bool) { + if p.debug { + defer p.out(p.in("parseRuleRefExpr " + ref.name)) + } + + if ref.name == "" { + panic(fmt.Sprintf("%s: invalid rule: missing name", ref.pos)) + } + + rule := p.rules[ref.name] + if rule == nil { + p.addErr(fmt.Errorf("undefined rule: %s", ref.name)) + return nil, false + } + return p.parseRuleWrap(rule) +} + +func (p *parser) parseSeqExpr(seq *seqExpr) (any, bool) { + if p.debug { + defer p.out(p.in("parseSeqExpr")) + } + + vals := make([]any, 0, len(seq.exprs)) + + pt := p.pt + state := p.cloneState() + for _, expr := range seq.exprs { + val, ok := p.parseExprWrap(expr) + if !ok { + p.restoreState(state) + p.restore(pt) + return nil, false + } + vals = append(vals, val) + } + return vals, true +} + +func (p *parser) parseStateCodeExpr(state *stateCodeExpr) (any, bool) { + if p.debug { + defer p.out(p.in("parseStateCodeExpr")) + } + + err := state.run(p) + if err != nil { + p.addErr(err) + } + return nil, true +} + +func (p *parser) parseThrowExpr(expr *throwExpr) (any, bool) { + if p.debug { + defer p.out(p.in("parseThrowExpr")) + } + + for i := len(p.recoveryStack) - 1; i >= 0; i-- { + if recoverExpr, ok := p.recoveryStack[i][expr.label]; ok { + if val, ok := p.parseExprWrap(recoverExpr); ok { + return val, ok + } + } + } + + return nil, false +} + +func (p *parser) parseZeroOrMoreExpr(expr *zeroOrMoreExpr) (any, bool) { + if p.debug { + defer p.out(p.in("parseZeroOrMoreExpr")) + } + + var vals []any + + for { + p.pushV() + val, ok := p.parseExprWrap(expr.expr) + p.popV() + if !ok { + return vals, true + } + vals = append(vals, val) + } +} + +func (p *parser) parseZeroOrOneExpr(expr *zeroOrOneExpr) (any, bool) { + if p.debug { + defer p.out(p.in("parseZeroOrOneExpr")) + } + + p.pushV() + val, _ := p.parseExprWrap(expr.expr) + p.popV() + // whether it matched or not, consider it a match + return val, true +} diff --git a/v1/topdown/durationparser/types.go b/v1/topdown/durationparser/types.go new file mode 100644 index 0000000000..1d5b2b6b8c --- /dev/null +++ b/v1/topdown/durationparser/types.go @@ -0,0 +1,13 @@ +package durationparser + +// Result holds the parsed components of a duration string. +type Result struct { + Sign string // "" or "-" or "+" + Segments []Segment +} + +// Segment holds a single parsed segment (e.g. Digits="1.5", Unit="d"). +type Segment struct { + Digits string + Unit string +} diff --git a/v1/topdown/time.go b/v1/topdown/time.go index 16eae3e0bd..7171d5c0b2 100644 --- a/v1/topdown/time.go +++ b/v1/topdown/time.go @@ -7,15 +7,18 @@ package topdown import ( "encoding/json" "errors" + "fmt" "math" "math/big" "strconv" + "strings" "sync" "time" _ "time/tzdata" // this is needed to have LoadLocation when no filesystem tzdata is available "github.com/open-policy-agent/opa/v1/ast" "github.com/open-policy-agent/opa/v1/topdown/builtins" + "github.com/open-policy-agent/opa/v1/topdown/durationparser" ) var tzCache map[string]*time.Location @@ -27,6 +30,84 @@ var minDateAllowedForNsConversion = time.Unix(0, math.MinInt64) // 2262-04-11T23:47:16.854775807-00:00 var maxDateAllowedForNsConversion = time.Unix(0, math.MaxInt64) +var durationCoefficients = map[string]int{ + "d": 24, + "w": 7 * 24, + "y": 365 * 24, +} + +// parseExtendedDuration parses a duration string that may contain extended +// units (d, w, y) mixed with standard Go duration units (h, m, s, ms, us, ns). +// Extended unit segments are rewritten to equivalent hours (e.g. "1d2h30m" → "24h2h30m") +func parseExtendedDuration(s string) (int64, error) { + if s == "" { + return 0, fmt.Errorf("time: invalid duration %q", s) + } + + if !strings.ContainsAny(s, "dwy") { + v, err := time.ParseDuration(s) + if err != nil { + return 0, err + } + return int64(v), nil + } + + result, err := durationparser.Parse("", []byte(s)) + if err != nil { + return 0, fmt.Errorf("time: invalid duration %q", s) + } + + rewritten, err := rewriteDuration(result.(durationparser.Result)) + if err != nil { + return 0, fmt.Errorf("time: invalid duration %q", s) + } + + v, err := time.ParseDuration(rewritten) + if err != nil { + // Replace the rewritten duration in the error with the original. + msg := err.Error() + if i := strings.LastIndex(msg, " "); i != -1 { + msg = msg[:i] + } + return 0, fmt.Errorf("%s %q", msg, s) + } + + return int64(v), nil +} + +// rewriteDuration converts parsed duration segments, replacing extended +// units (d, w, y) with their equivalent in hours. +func rewriteDuration(dr durationparser.Result) (string, error) { + var b strings.Builder + if dr.Sign != "" { + b.WriteString(dr.Sign) + } + for _, seg := range dr.Segments { + s, err := rewriteSegment(seg) + if err != nil { + return "", err + } + b.WriteString(s) + } + return b.String(), nil +} + +// rewriteSegment rewrites a single segment like {Digits:"1", Unit:"d"} to "24h". +// Segments with standard units are returned unchanged. +func rewriteSegment(seg durationparser.Segment) (string, error) { + coeff, ok := durationCoefficients[seg.Unit] + if !ok { + return seg.Digits + seg.Unit, nil + } + + val, err := strconv.ParseFloat(seg.Digits, 64) + if err != nil { + return "", fmt.Errorf("time: invalid duration: bad value %q for unit %q", seg.Digits, seg.Unit) + } + hours := val * float64(coeff) + return strconv.FormatFloat(hours, 'f', -1, 64) + "h", nil +} + func toSafeUnixNano(t time.Time, iter func(*ast.Term) error) error { if t.Before(minDateAllowedForNsConversion) || t.After(maxDateAllowedForNsConversion) { return errors.New("time outside of valid range") @@ -77,16 +158,19 @@ func builtinTimeParseRFC3339Nanos(_ BuiltinContext, operands []*ast.Term, iter f return toSafeUnixNano(result, iter) } + func builtinParseDurationNanos(_ BuiltinContext, operands []*ast.Term, iter func(*ast.Term) error) error { duration, err := builtins.StringOperand(operands[0].Value, 1) if err != nil { return err } - value, err := time.ParseDuration(string(duration)) + + ns, err := parseExtendedDuration(string(duration)) if err != nil { return err } - return iter(ast.NumberTerm(int64ToJSONNumber(int64(value)))) + + return iter(ast.NumberTerm(int64ToJSONNumber(ns))) } // Represent exposed constants for formatting from the stdlib time pkg diff --git a/v1/topdown/time_test.go b/v1/topdown/time_test.go index 09f68f23ce..c39a726e89 100644 --- a/v1/topdown/time_test.go +++ b/v1/topdown/time_test.go @@ -43,3 +43,176 @@ func TestTimeSeeding(t *testing.T) { } } + +func TestParseDurationNanos_BadInput(t *testing.T) { + tests := []struct { + name string + input string + expErr string + }{ + { + name: "no known suffix", + input: `badinput`, + expErr: "time: invalid duration \"badinput\"", + }, + { + name: "bad digits with d suffix", + input: `badinputd`, + expErr: "time: invalid duration \"badinputd\"", + }, + { + name: "bad digits with w suffix", + input: `abcw`, + expErr: "time: invalid duration \"abcw\"", + }, + { + name: "bad digits with y suffix", + input: `xyz.y`, + expErr: "time: invalid duration \"xyz.y\"", + }, + { + name: "overflow days", + input: `99999999999d`, + expErr: `time: invalid duration "99999999999d"`, + }, + { + name: "overflow weeks", + input: `99999999999w`, + expErr: `time: invalid duration "99999999999w"`, + }, + { + name: "overflow years", + input: `99999999999y`, + expErr: `time: invalid duration "99999999999y"`, + }, + { + name: "invalid multi-unit", + input: `1d2x`, + expErr: `time: unknown unit "x" in duration "1d2x"`, + }, + } + + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + err := builtinParseDurationNanos(BuiltinContext{}, []*ast.Term{ + ast.StringTerm(tc.input), + }, func(a *ast.Term) error { + return nil + }) + if err.Error() != tc.expErr { + t.Fatalf("expected error %q but got %q", tc.expErr, err.Error()) + } + }) + } +} + +func TestParseDurationNanos_ExtendedUnits(t *testing.T) { + tests := []struct { + name string + input string + expNs int64 + }{ + { + name: "fractional days", + input: "1.5d", + expNs: int64(36 * time.Hour), + }, + { + name: "fractional weeks", + input: "0.5w", + expNs: int64(84 * time.Hour), + }, + { + name: "negative days", + input: "-1d", + expNs: int64(-24 * time.Hour), + }, + { + name: "zero days", + input: "0d", + expNs: 0, + }, + { + name: "zero weeks", + input: "0w", + expNs: 0, + }, + { + name: "zero years", + input: "0y", + expNs: 0, + }, + { + name: "days and hours", + input: "1d2h", + expNs: int64(26 * time.Hour), + }, + { + name: "hours and days", + input: "2h1d", + expNs: int64(26 * time.Hour), + }, + { + name: "days hours minutes", + input: "1d2h30m", + expNs: int64(26*time.Hour + 30*time.Minute), + }, + { + name: "weeks and days", + input: "2w3d", + expNs: int64((2*7*24 + 3*24) * time.Hour), + }, + { + name: "days and seconds", + input: "1d30s", + expNs: int64(24*time.Hour + 30*time.Second), + }, + { + name: "negative multi-unit", + input: "-1d2h", + expNs: int64(-26 * time.Hour), + }, + { + name: "days and milliseconds", + input: "1d100ms", + expNs: int64(24*time.Hour + 100*time.Millisecond), + }, + { + name: "days and nanoseconds", + input: "1d500ns", + expNs: int64(24*time.Hour + 500), + }, + { + name: "days and microseconds", + input: "1d200us", + expNs: int64(24*time.Hour + 200*time.Microsecond), + }, + { + name: "days and microseconds µs", + input: "1d200µs", + expNs: int64(24*time.Hour + 200*time.Microsecond), + }, + } + + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + var got int64 + err := builtinParseDurationNanos(BuiltinContext{}, []*ast.Term{ + ast.StringTerm(tc.input), + }, func(a *ast.Term) error { + v, ok := a.Value.(ast.Number).Int64() + if !ok { + t.Fatal("expected int64 result") + } + got = v + return nil + }) + if err != nil { + t.Fatalf("unexpected error: %v", err) + } + if got != tc.expNs { + t.Fatalf("expected %d but got %d", tc.expNs, got) + } + }) + } +}