CEL Support (#495)

* CEL Support! Signed-off-by: Alex Snaps <[email protected]> --------- Signed-off-by: Alex Snaps <[email protected]> Signed-off-by: Guilherme Cassolato <[email protected]> Signed-off-by: KevFan <[email protected]> Co-authored-by: Guilherme Cassolato <[email protected]> Co-authored-by: KevFan <[email protected]>
Kuadrant · Oct 30, 2024 · 82d7619 · 82d7619
1 parent 8e530e5
commit 82d7619
Show file tree

Hide file tree

Showing 44 changed files with 1,108 additions and 326 deletions.
diff --git a/Makefile b/Makefile
@@ -54,7 +54,7 @@ controller-gen: ## Installs controller-gen in $PROJECT_DIR/bin
 
 KUSTOMIZE = $(PROJECT_DIR)/bin/kustomize
 kustomize: ## Installs kustomize in $PROJECT_DIR/bin
-	$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v4@v4.5.5)
+	$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v5@v5.5.0)
 
 ENVTEST = $(PROJECT_DIR)/bin/setup-envtest
 envtest: ## Installs setup-envtest in $PROJECT_DIR/bin
@@ -118,11 +118,11 @@ vet: ## Runs go vet against code
 	go vet ./...
 
 generate: vendor controller-gen ## Generates types deepcopy code
-	controller-gen object:headerFile="hack/boilerplate.go.txt" paths="./..."
+	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
 	$(MAKE) fmt vet
 
 manifests: controller-gen kustomize ## Generates the manifests in $PROJECT_DIR/install
-	controller-gen crd:crdVersions=v1 rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=install/crd output:rbac:artifacts:config=install/rbac && $(KUSTOMIZE) build install > $(AUTHORINO_MANIFESTS)
+	$(CONTROLLER_GEN) crd:crdVersions=v1 rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=install/crd output:rbac:artifacts:config=install/rbac && $(KUSTOMIZE) build install > $(AUTHORINO_MANIFESTS)
 	$(MAKE) patch-webhook
 
 run:git_sha=$(shell git rev-parse HEAD)

diff --git a/api/v1beta3/auth_config_types.go b/api/v1beta3/auth_config_types.go
@@ -164,13 +164,19 @@ type PatternExpression struct {
 	Value string `json:"value,omitempty"`
 }
 
+type CelExpression string
+
+type CelPredicate struct {
+	Predicate string `json:"predicate,omitempty"`
+}
+
 // +kubebuilder:validation:Enum:=eq;neq;incl;excl;matches
 type PatternExpressionOperator string
 
 type PatternExpressionOrRef struct {
 	PatternExpression `json:",omitempty"`
 	PatternRef        `json:",omitempty"`
-
+	CelPredicate      `json:",omitempty"`
 	// A list of pattern expressions to be evaluated as a logical AND.
 	All []UnstructuredPatternExpressionOrRef `json:"all,omitempty"`
 	// A list of pattern expressions to be evaluated as a logical OR.
@@ -199,6 +205,8 @@ type ValueOrSelector struct {
 	// Any pattern supported by https://pkg.go.dev/github.com/tidwall/gjson can be used.
 	// The following Authorino custom modifiers are supported: @extract:{sep:" ",pos:0}, @replace{old:"",new:""}, @case:upper|lower, @base64:encode|decode and @strip.
 	Selector string `json:"selector,omitempty"`
+
+	Expression CelExpression `json:"expression,omitempty"`
 }
 
 type CommonEvaluatorSpec struct {
@@ -401,7 +409,9 @@ type PlainIdentitySpec struct {
 	// Simple path selector to fetch content from the authorization JSON (e.g. 'request.method') or a string template with variables that resolve to patterns (e.g. "Hello, {auth.identity.name}!").
 	// Any pattern supported by https://pkg.go.dev/github.com/tidwall/gjson can be used.
 	// The following Authorino custom modifiers are supported: @extract:{sep:" ",pos:0}, @replace{old:"",new:""}, @case:upper|lower, @base64:encode|decode and @strip.
-	Selector string `json:"selector"`
+	Selector string `json:"selector,omitempty"`
+
+	Expression CelExpression `json:"expression,omitempty"`
 }
 
 type AnonymousAccessSpec struct{}
@@ -437,7 +447,9 @@ type HttpEndpointSpec struct {
 	// The value can include variable placeholders in the format "{selector}", where "selector" is any pattern supported
 	// by https://pkg.go.dev/github.com/tidwall/gjson and selects value from the authorization JSON.
 	// E.g. https://ext-auth-server.io/metadata?p={request.path}
-	Url string `json:"url"`
+	Url string `json:"url,omitempty"`
+
+	UrlExpression CelExpression `json:"urlExpression,omitempty"`
 
 	// HTTP verb used in the request to the service. Accepted values: GET (default), POST.
 	// When the request method is POST, the authorization JSON is passed in the body of the request.

diff --git a/api/v1beta3/zz_generated.deepcopy.go b/api/v1beta3/zz_generated.deepcopy.go