policy: improve args and env variables validation #308
+323
−37
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 tasks
Redent0r
commented
Feb 11, 2025
Redent0r
commented
Feb 11, 2025
Redent0r
commented
Feb 11, 2025
Redent0r
commented
Feb 11, 2025
Redent0r
commented
Feb 11, 2025
danmihai1
reviewed
Feb 11, 2025
ms-mahuber
reviewed
Feb 11, 2025
ms-mahuber
reviewed
Feb 11, 2025
ms-mahuber
reviewed
Feb 11, 2025
ms-mahuber
reviewed
Feb 11, 2025
ms-mahuber
reviewed
Feb 11, 2025
Redent0r
commented
Feb 11, 2025
Redent0r
commented
Feb 18, 2025
Redent0r
force-pushed
the
saulparedes/improve_arg_validation
branch
2 times, most recently
from
1ab8fa6 to
05b6c7b
Compare
Redent0r
commented
Feb 19, 2025
| @@ -219,6 +219,8 @@ | |||
| "dns_label": "[a-zA-Z0-9_\\.\\-]+", | |||
There was a problem hiding this comment.
We may want to refine this regex. Per https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#dns-label-names , a dns label name does not allows upper case, nor ., and we could limit it to 63 characters
Redent0r
commented
Feb 19, 2025
| @@ -55,12 +55,125 @@ default AllowRequestsFailingPolicy := false | |||
| S_NAME_KEY = "io.kubernetes.cri.sandbox-name" | |||
| S_NAMESPACE_KEY = "io.kubernetes.cri.sandbox-namespace" | |||
| BUNDLE_ID = "[a-z0-9]{64}" | |||
| # from https://github.com/kubernetes/kubernetes/blob/8294abc599696e0d1b5aa734afa7ae1e4f5059a0/staging/src/k8s.io/apimachinery/pkg/util/validation/validation.go#L177 | |||
| SUBDOMAIN_NAME = "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" | |||
| ALWAYS_ALLOWED = ["$(resource-field)", "$(todo-annotation)"] | |||
There was a problem hiding this comment.
todo: double check we are not allowing the execution of args that include these vars that are always allowed. Before, these placeholders where replaced in the policy and there wasn't a special rule to allow these for args, like there was for node-name.
Redent0r
commented
Feb 19, 2025
| allow_env_map_entry(key, i_val, p_env_map) { | ||
| p_val := p_env_map[key] | ||
| p_val == "$(node-name)" | ||
| regex.match(policy_data.common.dns_subdomain , i_val) |
There was a problem hiding this comment.
node-name most match a dns subdomain format
Redent0r
commented
Feb 19, 2025
| allow_env_map_entry(key, i_val, p_env_map) { | ||
| p_val := p_env_map[key] | ||
| p_val == "$(host-name)" | ||
| regex.match(policy_data.common.dns_label , i_val) |
There was a problem hiding this comment.
host-name most match a dns label format
Redent0r
commented
Feb 19, 2025
| allow_env_map_entry(key, i_val, p_env_map) { | ||
| p_val := p_env_map[key] | ||
| p_val == "$(pod-uid)" | ||
| regex.match(policy_data.common.pod_uid , i_val) |
There was a problem hiding this comment.
pod-uid most match a UUID format
Redent0r
force-pushed
the
saulparedes/improve_arg_validation
branch
3 times, most recently
from
f486a3f to
45ce34f
Compare
PolicyCreateContainerRequest will be a wrapper to CreateContainerRequest and will allow the agent to transform the input such that is easier to validate in the policy. Signed-off-by: Saul Paredes <[email protected]>
- Add environment variable map to the engine on the agent - Add environment variable map to the policy on genpolicy - Validate this environemnt variable map on the rules - Restrain some environment variable values that we expect to look like a subdomain and use a regex to validate them Signed-off-by: Saul Paredes <[email protected]>
Redent0r
force-pushed
the
saulparedes/improve_arg_validation
branch
from
45ce34f to
22d11d2
Compare
Add a new rule that validates args by substituting env variables received from the input. This new rule ensures that the args received from the input are the same as the args received from the policy. Signed-off-by: Saul Paredes <[email protected]>
Redent0r
force-pushed
the
saulparedes/improve_arg_validation
branch
from
22d11d2 to
d3303fd
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge Checklist
upstream/missinglabel (orupstream/not-needed) has been set on the PR.Summary
policy: improve args and env variables validation. See commits for details
Test Methodology
Passing all fork samples