Allow less strict validation of the Resolver Name during Webhook.

tektoncd · May 27, 2024 · 14b416b · 14b416b
1 parent 13af266
commit 14b416b
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 16 deletions.
diff --git a/pkg/apis/pipeline/v1/container_validation.go b/pkg/apis/pipeline/v1/container_validation.go
@@ -18,11 +18,11 @@ package v1
 
 import (
 	"context"
+	"errors"
 	"fmt"
+	"regexp"
 	"strings"
 
-	"net/url"
-
 	"github.com/tektoncd/pipeline/pkg/apis/config"
 	"k8s.io/apimachinery/pkg/util/validation"
 	"knative.dev/pkg/apis"
@@ -91,6 +91,9 @@ func (ref *Ref) Validate(ctx context.Context) (errs *apis.FieldError) {
 
 // RefNameLikeUrl checks if the name is url parsable and returns an error if it isn't.
 func RefNameLikeUrl(name string) error {
-	_, err := url.ParseRequestURI(name)
-	return err
+	schemeRegex := regexp.MustCompile(`[\w-]+:\/\/*`)
+	if !schemeRegex.MatchString(name) {
+		return errors.New("invalid URI for request")
+	}
+	return nil
 }
diff --git a/pkg/apis/pipeline/v1/container_validation_test.go b/pkg/apis/pipeline/v1/container_validation_test.go
@@ -47,6 +47,10 @@ func TestRef_Valid(t *testing.T) {
 	}, {
 		name: "simple ref",
 		ref:  &v1.Ref{Name: "refname"},
+	}, {
+		name: "ref name - consice syntax",
+		ref:  &v1.Ref{Name: "foo://baz:ver", ResolverRef: v1.ResolverRef{Resolver: "git"}},
+		wc:   enableConciseResolverSyntax,
 	}, {
 		name: "beta feature: valid resolver",
 		ref:  &v1.Ref{ResolverRef: v1.ResolverRef{Resolver: "git"}},
@@ -110,7 +114,7 @@ func TestRef_Invalid(t *testing.T) {
 				Resolver: "git",
 			},
 		},
-		wantErr: apis.ErrInvalidValue(`parse "foo": invalid URI for request`, "name"),
+		wantErr: apis.ErrInvalidValue(`invalid URI for request`, "name"),
 		wc:      enableConciseResolverSyntax,
 	}, {
 		name: "ref with url-like name without resolver",

diff --git a/pkg/apis/pipeline/v1/pipeline_types_test.go b/pkg/apis/pipeline/v1/pipeline_types_test.go
@@ -619,7 +619,7 @@ func TestPipelineTask_ValidateRegularTask_Failure(t *testing.T) {
 			TaskRef: &TaskRef{Name: "foo", ResolverRef: ResolverRef{Resolver: "git"}},
 		},
 		expectedError: apis.FieldError{
-			Message: `invalid value: parse "foo": invalid URI for request`,
+			Message: `invalid value: invalid URI for request`,
 			Paths:   []string{"taskRef.name"},
 		},
 		configMap: map[string]string{"enable-concise-resolver-syntax": "true"},

diff --git a/pkg/apis/pipeline/v1/pipelineref_validation_test.go b/pkg/apis/pipeline/v1/pipelineref_validation_test.go
@@ -79,7 +79,7 @@ func TestPipelineRef_Invalid(t *testing.T) {
 				Resolver: "git",
 			},
 		},
-		wantErr:     apis.ErrInvalidValue(`parse "foo": invalid URI for request`, "name"),
+		wantErr:     apis.ErrInvalidValue(`invalid URI for request`, "name"),
 		withContext: enableConciseResolverSyntax,
 	}, {
 		name: "pipelineRef with url-like name without resolver",

diff --git a/pkg/apis/pipeline/v1/taskref_validation_test.go b/pkg/apis/pipeline/v1/taskref_validation_test.go
@@ -127,7 +127,7 @@ func TestTaskRef_Invalid(t *testing.T) {
 				Resolver: "git",
 			},
 		},
-		wantErr: apis.ErrInvalidValue(`parse "foo": invalid URI for request`, "name"),
+		wantErr: apis.ErrInvalidValue(`invalid URI for request`, "name"),
 		wc:      enableConciseResolverSyntax,
 	}, {
 		name: "taskRef with url-like name without resolver",

diff --git a/pkg/apis/pipeline/v1beta1/container_validation.go b/pkg/apis/pipeline/v1beta1/container_validation.go
@@ -18,11 +18,11 @@ package v1beta1
 
 import (
 	"context"
+	"errors"
 	"fmt"
+	"regexp"
 	"strings"
 
-	"net/url"
-
 	"github.com/tektoncd/pipeline/pkg/apis/config"
 	"k8s.io/apimachinery/pkg/util/validation"
 	"knative.dev/pkg/apis"
@@ -91,6 +91,9 @@ func (ref *Ref) Validate(ctx context.Context) (errs *apis.FieldError) {
 
 // RefNameLikeUrl checks if the name is url parsable and returns an error if it isn't.
 func RefNameLikeUrl(name string) error {
-	_, err := url.ParseRequestURI(name)
-	return err
+	schemeRegex := regexp.MustCompile(`[\w-]+:\/\/*`)
+	if !schemeRegex.MatchString(name) {
+		return errors.New("invalid URI for request")
+	}
+	return nil
 }
diff --git a/pkg/apis/pipeline/v1beta1/container_validation_test.go b/pkg/apis/pipeline/v1beta1/container_validation_test.go
@@ -47,6 +47,10 @@ func TestRef_Valid(t *testing.T) {
 	}, {
 		name: "simple ref",
 		ref:  &v1beta1.Ref{Name: "refname"},
+	}, {
+		name: "ref name - consice syntax",
+		ref:  &v1beta1.Ref{Name: "foo://baz:ver", ResolverRef: v1beta1.ResolverRef{Resolver: "git"}},
+		wc:   enableConciseResolverSyntax,
 	}, {
 		name: "beta feature: valid resolver",
 		ref:  &v1beta1.Ref{ResolverRef: v1beta1.ResolverRef{Resolver: "git"}},
@@ -110,7 +114,7 @@ func TestRef_Invalid(t *testing.T) {
 				Resolver: "git",
 			},
 		},
-		wantErr: apis.ErrInvalidValue(`parse "foo": invalid URI for request`, "name"),
+		wantErr: apis.ErrInvalidValue(`invalid URI for request`, "name"),
 		wc:      enableConciseResolverSyntax,
 	}, {
 		name: "ref with url-like name without resolver",

diff --git a/pkg/apis/pipeline/v1beta1/pipeline_types_test.go b/pkg/apis/pipeline/v1beta1/pipeline_types_test.go
@@ -615,7 +615,7 @@ func TestPipelineTask_ValidateRegularTask_Failure(t *testing.T) {
 			TaskRef: &TaskRef{Name: "foo", ResolverRef: ResolverRef{Resolver: "git"}},
 		},
 		expectedError: apis.FieldError{
-			Message: `invalid value: parse "foo": invalid URI for request`,
+			Message: `invalid value: invalid URI for request`,
 			Paths:   []string{"taskRef.name"},
 		},
 		configMap: map[string]string{"enable-concise-resolver-syntax": "true"},

diff --git a/pkg/apis/pipeline/v1beta1/pipelineref_validation_test.go b/pkg/apis/pipeline/v1beta1/pipelineref_validation_test.go
@@ -79,7 +79,7 @@ func TestPipelineRef_Invalid(t *testing.T) {
 				Resolver: "git",
 			},
 		},
-		wantErr:     apis.ErrInvalidValue(`parse "foo": invalid URI for request`, "name"),
+		wantErr:     apis.ErrInvalidValue(`invalid URI for request`, "name"),
 		withContext: enableConciseResolverSyntax,
 	}, {
 		name: "pipelineRef with url-like name without resolver",

diff --git a/pkg/apis/pipeline/v1beta1/taskref_validation_test.go b/pkg/apis/pipeline/v1beta1/taskref_validation_test.go
@@ -92,7 +92,7 @@ func TestTaskRef_Invalid(t *testing.T) {
 				Resolver: "git",
 			},
 		},
-		wantErr: apis.ErrInvalidValue(`parse "foo": invalid URI for request`, "name"),
+		wantErr: apis.ErrInvalidValue(`invalid URI for request`, "name"),
 		wc:      enableConciseResolverSyntax,
 	}, {
 		name: "taskRef with url-like name without resolver",