Skip to content

Commit

Permalink
add tests
Browse files Browse the repository at this point in the history
  • Loading branch information
sauterp authored and k8s-infra-cherrypick-robot committed Jan 19, 2024
1 parent 4ffa507 commit 74bba64
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 0 deletions.
2 changes: 2 additions & 0 deletions internal/ingress/annotations/parser/validators.go
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ func ValidateRegex(regex *regexp.Regexp, removeSpace bool) AnnotationValidator {
}
}

// CommonNameAnnotationValidator checks whether the annotation value starts with
// 'CN=' and is followed by a valid regex.
func CommonNameAnnotationValidator(s string) error {
if !strings.HasPrefix(s, "CN=") {
return fmt.Errorf("value %s is not a valid Common Name annotation: missing prefix 'CN='", s)
Expand Down
56 changes: 56 additions & 0 deletions internal/ingress/annotations/parser/validators_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -307,3 +307,59 @@ func TestCheckAnnotationRisk(t *testing.T) {
})
}
}

func TestCommonNameAnnotationValidator(t *testing.T) {
tests := []struct {
name string
annotation string
wantErr bool
}{
{
name: "correct example",
annotation: `CN=(my\.common\.name)`,
wantErr: false,
},
{
name: "no CN= prefix",
annotation: `(my\.common\.name)`,
wantErr: true,
},
{
name: "invalid prefix",
annotation: `CN(my\.common\.name)`,
wantErr: true,
},
{
name: "invalid regex",
annotation: `CN=(my\.common\.name]`,
wantErr: true,
},
{
name: "wildcard regex",
annotation: `CN=(my\..*\.name)`,
wantErr: false,
},
{
name: "somewhat complex regex",
annotation: "CN=(my\\.app\\.dev|.*\\.bbb\\.aaaa\\.tld)",
wantErr: false,
},
{
name: "another somewhat complex regex",
annotation: `CN=(my-app.*\.c\.defg\.net|other.app.com)`,
wantErr: false,
},
{
name: "nested parenthesis regex",
annotation: `CN=(api-one\.(asdf)?qwer\.webpage\.organization\.org)`,
wantErr: false,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if err := CommonNameAnnotationValidator(tt.annotation); (err != nil) != tt.wantErr {
t.Errorf("CommonNameAnnotationValidator() error = %v, wantErr %v", err, tt.wantErr)
}
})
}
}

0 comments on commit 74bba64

Please sign in to comment.