Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: over-restrictive validation of wildcard match patterns #3310

Merged
merged 4 commits into from
Mar 27, 2024
Merged

fix: over-restrictive validation of wildcard match patterns #3310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7e1512b
Relax an unnecessarily restrictive field validation for wildcard patt…
bencouture Mar 14, 2024
65cb6c0
Tweak the regex. Run 'make generate manifests'
bencouture Mar 14, 2024
7b4b023
Merge branch 'open-policy-agent:master' into master
bencouture Mar 15, 2024
510f3af
Merge branch 'master' into master
ritazh Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions config/crd/bases/config.gatekeeper.sh_configs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,11 @@ spec:
excludedNamespaces:
items:
description: 'A string that supports globbing at its front
or end. Ex: "kube-*" will match "kube-system" or "kube-public",
"*-system" will match "kube-system" or "gatekeeper-system". The
and end. Ex: "kube-*" will match "kube-system" or "kube-public",
"*-system" will match "kube-system" or "gatekeeper-system",
"*system*" will match "system-kube" or "kube-system". The
asterisk is required for wildcard matching.'
pattern: ^(\*|\*-)?[a-z0-9]([-:a-z0-9]*[a-z0-9])?(\*|-\*)?$
pattern: ^\*?[-:a-z0-9]*\*?$
type: string
type: array
processes:
Expand Down
20 changes: 11 additions & 9 deletions config/crd/bases/match.gatekeeper.sh_matchcrd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,12 @@ spec:
`kube-system` and `kube-public`, and `excludedNamespaces: [*-system]`
matches both `kube-system` and `gatekeeper-system`.'
items:
description: 'A string that supports globbing at its front or end.
description: 'A string that supports globbing at its front and end.
Ex: "kube-*" will match "kube-system" or "kube-public", "*-system"
will match "kube-system" or "gatekeeper-system". The asterisk
is required for wildcard matching.'
pattern: ^(\*|\*-)?[a-z0-9]([-:a-z0-9]*[a-z0-9])?(\*|-\*)?$
will match "kube-system" or "gatekeeper-system", "*system*" will
match "system-kube" or "kube-system". The asterisk is required
for wildcard matching.'
pattern: ^\*?[-:a-z0-9]*\*?$
type: string
type: array
kinds:
Expand Down Expand Up @@ -120,7 +121,7 @@ spec:
a prefix or suffix glob. For example, `name: pod-*` would match
both `pod-a` and `pod-b`, and `name: *-pod` would match both `a-pod`
and `b-pod`.'
pattern: ^(\*|\*-)?[a-z0-9]([-:a-z0-9]*[a-z0-9])?(\*|-\*)?$
pattern: ^\*?[-:a-z0-9]*\*?$
type: string
namespaceSelector:
description: NamespaceSelector is a label selector against an object's
Expand Down Expand Up @@ -174,11 +175,12 @@ spec:
[kube-*]` matches both `kube-system` and `kube-public`, and `namespaces:
[*-system]` matches both `kube-system` and `gatekeeper-system`.'
items:
description: 'A string that supports globbing at its front or end.
description: 'A string that supports globbing at its front and end.
Ex: "kube-*" will match "kube-system" or "kube-public", "*-system"
will match "kube-system" or "gatekeeper-system". The asterisk
is required for wildcard matching.'
pattern: ^(\*|\*-)?[a-z0-9]([-:a-z0-9]*[a-z0-9])?(\*|-\*)?$
will match "kube-system" or "gatekeeper-system", "*system*" will
match "system-kube" or "kube-system". The asterisk is required
for wildcard matching.'
pattern: ^\*?[-:a-z0-9]*\*?$
type: string
type: array
scope:
Expand Down
48 changes: 27 additions & 21 deletions config/crd/bases/mutations.gatekeeper.sh_assign.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,12 @@ spec:
matches both `kube-system` and `kube-public`, and `excludedNamespaces:
[*-system]` matches both `kube-system` and `gatekeeper-system`.'
items:
description: 'A string that supports globbing at its front or
description: 'A string that supports globbing at its front and
end. Ex: "kube-*" will match "kube-system" or "kube-public",
"*-system" will match "kube-system" or "gatekeeper-system". The
"*-system" will match "kube-system" or "gatekeeper-system",
"*system*" will match "system-kube" or "kube-system". The
asterisk is required for wildcard matching.'
pattern: ^(\*|\*-)?[a-z0-9]([-:a-z0-9]*[a-z0-9])?(\*|-\*)?$
pattern: ^\*?[-:a-z0-9]*\*?$
type: string
type: array
kinds:
Expand Down Expand Up @@ -158,7 +159,7 @@ spec:
a prefix or suffix glob. For example, `name: pod-*` would match
both `pod-a` and `pod-b`, and `name: *-pod` would match both
`a-pod` and `b-pod`.'
pattern: ^(\*|\*-)?[a-z0-9]([-:a-z0-9]*[a-z0-9])?(\*|-\*)?$
pattern: ^\*?[-:a-z0-9]*\*?$
type: string
namespaceSelector:
description: NamespaceSelector is a label selector against an
Expand Down Expand Up @@ -213,11 +214,12 @@ spec:
[kube-*]` matches both `kube-system` and `kube-public`, and
`namespaces: [*-system]` matches both `kube-system` and `gatekeeper-system`.'
items:
description: 'A string that supports globbing at its front or
description: 'A string that supports globbing at its front and
end. Ex: "kube-*" will match "kube-system" or "kube-public",
"*-system" will match "kube-system" or "gatekeeper-system". The
"*-system" will match "kube-system" or "gatekeeper-system",
"*system*" will match "system-kube" or "kube-system". The
asterisk is required for wildcard matching.'
pattern: ^(\*|\*-)?[a-z0-9]([-:a-z0-9]*[a-z0-9])?(\*|-\*)?$
pattern: ^\*?[-:a-z0-9]*\*?$
type: string
type: array
scope:
Expand Down Expand Up @@ -422,11 +424,12 @@ spec:
matches both `kube-system` and `kube-public`, and `excludedNamespaces:
[*-system]` matches both `kube-system` and `gatekeeper-system`.'
items:
description: 'A string that supports globbing at its front or
description: 'A string that supports globbing at its front and
end. Ex: "kube-*" will match "kube-system" or "kube-public",
"*-system" will match "kube-system" or "gatekeeper-system". The
"*-system" will match "kube-system" or "gatekeeper-system",
"*system*" will match "system-kube" or "kube-system". The
asterisk is required for wildcard matching.'
pattern: ^(\*|\*-)?[a-z0-9]([-:a-z0-9]*[a-z0-9])?(\*|-\*)?$
pattern: ^\*?[-:a-z0-9]*\*?$
type: string
type: array
kinds:
Expand Down Expand Up @@ -505,7 +508,7 @@ spec:
a prefix or suffix glob. For example, `name: pod-*` would match
both `pod-a` and `pod-b`, and `name: *-pod` would match both
`a-pod` and `b-pod`.'
pattern: ^(\*|\*-)?[a-z0-9]([-:a-z0-9]*[a-z0-9])?(\*|-\*)?$
pattern: ^\*?[-:a-z0-9]*\*?$
type: string
namespaceSelector:
description: NamespaceSelector is a label selector against an
Expand Down Expand Up @@ -560,11 +563,12 @@ spec:
[kube-*]` matches both `kube-system` and `kube-public`, and
`namespaces: [*-system]` matches both `kube-system` and `gatekeeper-system`.'
items:
description: 'A string that supports globbing at its front or
description: 'A string that supports globbing at its front and
end. Ex: "kube-*" will match "kube-system" or "kube-public",
"*-system" will match "kube-system" or "gatekeeper-system". The
"*-system" will match "kube-system" or "gatekeeper-system",
"*system*" will match "system-kube" or "kube-system". The
asterisk is required for wildcard matching.'
pattern: ^(\*|\*-)?[a-z0-9]([-:a-z0-9]*[a-z0-9])?(\*|-\*)?$
pattern: ^\*?[-:a-z0-9]*\*?$
type: string
type: array
scope:
Expand Down Expand Up @@ -769,11 +773,12 @@ spec:
matches both `kube-system` and `kube-public`, and `excludedNamespaces:
[*-system]` matches both `kube-system` and `gatekeeper-system`.'
items:
description: 'A string that supports globbing at its front or
description: 'A string that supports globbing at its front and
end. Ex: "kube-*" will match "kube-system" or "kube-public",
"*-system" will match "kube-system" or "gatekeeper-system". The
"*-system" will match "kube-system" or "gatekeeper-system",
"*system*" will match "system-kube" or "kube-system". The
asterisk is required for wildcard matching.'
pattern: ^(\*|\*-)?[a-z0-9]([-:a-z0-9]*[a-z0-9])?(\*|-\*)?$
pattern: ^\*?[-:a-z0-9]*\*?$
type: string
type: array
kinds:
Expand Down Expand Up @@ -852,7 +857,7 @@ spec:
a prefix or suffix glob. For example, `name: pod-*` would match
both `pod-a` and `pod-b`, and `name: *-pod` would match both
`a-pod` and `b-pod`.'
pattern: ^(\*|\*-)?[a-z0-9]([-:a-z0-9]*[a-z0-9])?(\*|-\*)?$
pattern: ^\*?[-:a-z0-9]*\*?$
type: string
namespaceSelector:
description: NamespaceSelector is a label selector against an
Expand Down Expand Up @@ -907,11 +912,12 @@ spec:
[kube-*]` matches both `kube-system` and `kube-public`, and
`namespaces: [*-system]` matches both `kube-system` and `gatekeeper-system`.'
items:
description: 'A string that supports globbing at its front or
description: 'A string that supports globbing at its front and
end. Ex: "kube-*" will match "kube-system" or "kube-public",
"*-system" will match "kube-system" or "gatekeeper-system". The
"*-system" will match "kube-system" or "gatekeeper-system",
"*system*" will match "system-kube" or "kube-system". The
asterisk is required for wildcard matching.'
pattern: ^(\*|\*-)?[a-z0-9]([-:a-z0-9]*[a-z0-9])?(\*|-\*)?$
pattern: ^\*?[-:a-z0-9]*\*?$
type: string
type: array
scope:
Expand Down
16 changes: 9 additions & 7 deletions config/crd/bases/mutations.gatekeeper.sh_assignimage.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,12 @@ spec:
matches both `kube-system` and `kube-public`, and `excludedNamespaces:
[*-system]` matches both `kube-system` and `gatekeeper-system`.'
items:
description: 'A string that supports globbing at its front or
description: 'A string that supports globbing at its front and
end. Ex: "kube-*" will match "kube-system" or "kube-public",
"*-system" will match "kube-system" or "gatekeeper-system". The
"*-system" will match "kube-system" or "gatekeeper-system",
"*system*" will match "system-kube" or "kube-system". The
asterisk is required for wildcard matching.'
pattern: ^(\*|\*-)?[a-z0-9]([-:a-z0-9]*[a-z0-9])?(\*|-\*)?$
pattern: ^\*?[-:a-z0-9]*\*?$
type: string
type: array
kinds:
Expand Down Expand Up @@ -158,7 +159,7 @@ spec:
a prefix or suffix glob. For example, `name: pod-*` would match
both `pod-a` and `pod-b`, and `name: *-pod` would match both
`a-pod` and `b-pod`.'
pattern: ^(\*|\*-)?[a-z0-9]([-:a-z0-9]*[a-z0-9])?(\*|-\*)?$
pattern: ^\*?[-:a-z0-9]*\*?$
type: string
namespaceSelector:
description: NamespaceSelector is a label selector against an
Expand Down Expand Up @@ -213,11 +214,12 @@ spec:
[kube-*]` matches both `kube-system` and `kube-public`, and
`namespaces: [*-system]` matches both `kube-system` and `gatekeeper-system`.'
items:
description: 'A string that supports globbing at its front or
description: 'A string that supports globbing at its front and
end. Ex: "kube-*" will match "kube-system" or "kube-public",
"*-system" will match "kube-system" or "gatekeeper-system". The
"*-system" will match "kube-system" or "gatekeeper-system",
"*system*" will match "system-kube" or "kube-system". The
asterisk is required for wildcard matching.'
pattern: ^(\*|\*-)?[a-z0-9]([-:a-z0-9]*[a-z0-9])?(\*|-\*)?$
pattern: ^\*?[-:a-z0-9]*\*?$
type: string
type: array
scope:
Expand Down
Loading
Loading