Extend SCC tests with their corresponding service account variants#27491
Merged
openshift-merge-robot merged 1 commit intoOct 28, 2022
Merged
Conversation
openshift-merge-robot
added
the
needs-rebase
ingvagabund
force-pushed
the
mirror-scc-with-service-account
branch
from
9f9f09b to
e103e1f
Compare
openshift-merge-robot
removed
the
needs-rebase
stlaz
suggested changes
Oct 25, 2022
Comment on lines
+90
to
+142
| g.It("TestPodUpdateSCCEnforcement with service account", func() { | ||
| t := g.GinkgoT() | ||
|
|
||
| clusterAdminKubeClientset := oc.AdminKubeClient() | ||
|
|
||
| projectName := oc.Namespace() | ||
|
|
||
| sa := createServiceAccount(ctx, oc, projectName) | ||
| createPodAdminRoleOrDie(ctx, oc, sa) | ||
| restrictedClient, _ := createClientFromServiceAccount(oc, sa) | ||
|
|
||
| // so cluster-admin can create privileged pods, but harold cannot. This means that harold should not be able | ||
| // to update the privileged pods either, even if he lies about its privileged nature | ||
| privilegedPod := getPrivilegedPod("unsafe") | ||
|
|
||
| if _, err := restrictedClient.CoreV1().Pods(projectName).Create(ctx, privilegedPod, metav1.CreateOptions{}); !isForbiddenBySCC(err) { | ||
| t.Fatalf("missing forbidden: %v", err) | ||
| } | ||
|
|
||
| actualPod, err := clusterAdminKubeClientset.CoreV1().Pods(projectName).Create(ctx, privilegedPod, metav1.CreateOptions{}) | ||
| if err != nil { | ||
| t.Fatalf("unexpected error: %v", err) | ||
| } | ||
|
|
||
| actualPod.Spec.Containers[0].Image = "something-nefarious" | ||
| if _, err := restrictedClient.CoreV1().Pods(projectName).Update(ctx, actualPod, metav1.UpdateOptions{}); !isForbiddenBySCC(err) { | ||
| t.Fatalf("missing forbidden: %v", err) | ||
| } | ||
|
|
||
| // try to connect to /exec subresource as harold | ||
| restrictedClientCorev1Rest := restrictedClient.CoreV1().RESTClient() | ||
| if err != nil { | ||
| t.Fatalf("unexpected error: %v", err) | ||
| } | ||
| result := &metav1.Status{} | ||
| err = restrictedClientCorev1Rest.Post(). | ||
| Resource("pods"). | ||
| Namespace(projectName). | ||
| Name(actualPod.Name). | ||
| SubResource("exec"). | ||
| Param("container", "first"). | ||
| Do(ctx). | ||
| Into(result) | ||
| if !isForbiddenBySCCExecRestrictions(err) { | ||
| t.Fatalf("missing forbidden by SCCExecRestrictions: %v", err) | ||
| } | ||
|
|
||
| // try to lie about the privileged nature | ||
| actualPod.Spec.HostPID = false | ||
| if _, err := restrictedClient.CoreV1().Pods(projectName).Update(context.Background(), actualPod, metav1.UpdateOptions{}); err == nil { | ||
| t.Fatalf("missing error: %v", err) | ||
| } | ||
| }) |
Contributor
There was a problem hiding this comment.
This looks like a copy-pasta of the above. Could you just derive the variables (I believe it's just the restConfig for the user?) from the code and turn this into a function that's run from the two tests?
ingvagabund
force-pushed
the
mirror-scc-with-service-account
branch
from
e103e1f to
94e1dc1
Compare
Member
Author
|
/retest-required |
ingvagabund
force-pushed
the
mirror-scc-with-service-account
branch
from
94e1dc1 to
77ca6e1
Compare
Member
Author
|
/retest-required |
stlaz
suggested changes
Oct 26, 2022
| } | ||
|
|
||
| func createPodsecuritypolicyselfsubjectreviewsRoleBindingOrDie(ctx context.Context, oc *exutil.CLI, sa *corev1.ServiceAccount) { | ||
| framework.Logf("Creating pspssr role") |
Member
Author
There was a problem hiding this comment.
createPodSecurityPolicySelfSubjectReviewsRoleBindingOrDie :D
Contributor
There was a problem hiding this comment.
my point is - please expand the shortcut in the log, otherwise people will hate you whenever they will be trying to understand what's going on in here :)
ingvagabund
force-pushed
the
mirror-scc-with-service-account
branch
2 times, most recently
from
d04fe0d to
f9aa361
Compare
Contributor
|
/lgtm |
ingvagabund
force-pushed
the
mirror-scc-with-service-account
branch
from
f9aa361 to
8304466
Compare
Contributor
|
/aprove |
Contributor
|
/approve |
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: ingvagabund, mfojtik, soltysh, stlaz The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
Bot
added
the
approved
Contributor
|
@ingvagabund: The following tests failed, say
Full PR test history. Your PR dashboard. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
Member
Author
|
/retest-required |
Merged
bparees
added a commit
to bparees/origin
that referenced
this pull request
Nov 1, 2022
…irror-scc-with-service-account"" This reverts commit 6a8ff38.
bparees
added a commit
to bparees/origin
that referenced
this pull request
Nov 1, 2022
…irror-scc-with-service-account"" This reverts commit 6a8ff38.
bparees
added a commit
to bparees/origin
that referenced
this pull request
Nov 1, 2022
…irror-scc-with-service-account"" This reverts commit 6a8ff38.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Duplicate existing
TestPodUpdateSCCEnforcementandTestAllowedSCCViaRBACe2e tests with their corresponding service account equivalents to drop api group dependency onapigroup:user.openshift.ioandapigroup:authorization.openshift.io.