arian/anubis-mirror
1
0
Fork 0
mirror of https://github.com/TecharoHQ/anubis.git synced 2026-04-21 15:46:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: replace checker.NewMapIterator with newMapIterator for HTTPHeaders and URLValues

Browse Source 
Signed-off-by: Jason Cameron <jason.cameron@stanwith.me>
This commit is contained in:
Jason Cameron
2026-02-18 12:47:15 -05:00
committed by Jason Cameron
parent 8e9b641280
commit 33ea6c714f
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/policy/expressions/http_headers.go
+1 -2
View File
@@ -5,7 +5,6 @@ import (
"reflect" "reflect"
"strings" "strings"
"github.com/TecharoHQ/anubis/lib/policy/checker"
"github.com/google/cel-go/common/types" "github.com/google/cel-go/common/types"
"github.com/google/cel-go/common/types/ref" "github.com/google/cel-go/common/types/ref"
"github.com/google/cel-go/common/types/traits" "github.com/google/cel-go/common/types/traits"
@@ -68,7 +67,7 @@ func (h HTTPHeaders) Get(key ref.Val) ref.Val {
} }
func (h HTTPHeaders) Iterator() traits.Iterator { func (h HTTPHeaders) Iterator() traits.Iterator {
return checker.NewMapIterator(h.Header) return newMapIterator(h.Header)
} }
func (h HTTPHeaders) IsZeroValue() bool { func (h HTTPHeaders) IsZeroValue() bool {
lib/policy/checker/celutils.go → lib/policy/expressions/map_iterator.go
+3 -4
View File
@@ -1,4 +1,4 @@
package checker package expressions
import ( import (
"errors" "errors"
@@ -11,7 +11,7 @@ import (
"github.com/google/cel-go/common/types/traits" "github.com/google/cel-go/common/types/traits"
) )
var ErrNotImplemented = errors.New("cel: functionality not implemented") var ErrNotImplemented = errors.New("expressions: not implemented")
type stringSliceIterator struct { type stringSliceIterator struct {
keys []string keys []string
@@ -32,7 +32,6 @@ func (s *stringSliceIterator) ConvertToType(typeValue ref.Type) ref.Val {
func (s *stringSliceIterator) Equal(other ref.Val) ref.Val { func (s *stringSliceIterator) Equal(other ref.Val) ref.Val {
return types.NewErr("can't compare %q to %q", types.IteratorType, other.Type()) return types.NewErr("can't compare %q to %q", types.IteratorType, other.Type())
} }
func (s *stringSliceIterator) Type() ref.Type { func (s *stringSliceIterator) Type() ref.Type {
@@ -53,7 +52,7 @@ func (s *stringSliceIterator) Next() ref.Val {
return types.String(val) return types.String(val)
} }
func NewMapIterator(m map[string][]string) traits.Iterator { func newMapIterator(m map[string][]string) traits.Iterator {
return &stringSliceIterator{ return &stringSliceIterator{
keys: slices.Collect(maps.Keys(m)), keys: slices.Collect(maps.Keys(m)),
idx: 0, idx: 0,
lib/policy/expressions/url_values.go
+1 -5
View File
@@ -1,19 +1,15 @@
package expressions package expressions
import ( import (
"errors"
"net/url" "net/url"
"reflect" "reflect"
"strings" "strings"
"github.com/TecharoHQ/anubis/lib/policy/checker"
"github.com/google/cel-go/common/types" "github.com/google/cel-go/common/types"
"github.com/google/cel-go/common/types/ref" "github.com/google/cel-go/common/types/ref"
"github.com/google/cel-go/common/types/traits" "github.com/google/cel-go/common/types/traits"
) )
var ErrNotImplemented = errors.New("expressions: not implemented")
// URLValues is a type wrapper to expose url.Values into CEL programs. // URLValues is a type wrapper to expose url.Values into CEL programs.
type URLValues struct { type URLValues struct {
url.Values url.Values
@@ -71,7 +67,7 @@ func (u URLValues) Get(key ref.Val) ref.Val {
} }
func (u URLValues) Iterator() traits.Iterator { func (u URLValues) Iterator() traits.Iterator {
return checker.NewMapIterator(u.Values) return newMapIterator(u.Values)
} }
func (u URLValues) IsZeroValue() bool { func (u URLValues) IsZeroValue() bool {