KEP-3619: Fine-grained SupplementalGroups control #1438
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -32,6 +32,7 @@ import ( | |||||
|
|
||||||
| . "github.com/onsi/ginkgo/v2" | ||||||
| . "github.com/onsi/gomega" | ||||||
| . "github.com/onsi/gomega/gstruct" | ||||||
| "golang.org/x/sys/unix" | ||||||
| internalapi "k8s.io/cri-api/pkg/apis" | ||||||
| runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" | ||||||
|
|
@@ -306,57 +307,6 @@ var _ = framework.KubeDescribe("Security Context", func() { | |||||
| Expect(groups).To(ContainElement("5678")) | ||||||
| }) | ||||||
|
|
||||||
| It("runtime should support RunAsUser", func() { | ||||||
| By("create pod") | ||||||
| podID, podConfig = framework.CreatePodSandboxForContainer(rc) | ||||||
|
|
@@ -639,6 +589,151 @@ var _ = framework.KubeDescribe("Security Context", func() { | |||||
| }) | ||||||
| }) | ||||||
|
|
||||||
| Context("SupplementalGroupsPolicy", func() { | ||||||
| BeforeEach(func(ctx context.Context) { | ||||||
| By("skip if the runtime does not support SupplementalGroupsPolicy") | ||||||
| statusResponse, err := rc.Status(ctx, false) | ||||||
| Expect(err).NotTo(HaveOccurred()) | ||||||
| if !(statusResponse.Features != nil && statusResponse.Features.SupplementalGroupsPolicy) { | ||||||
| Skip("The runtime does not support SupplementalGroupsPolicy feature") | ||||||
| } | ||||||
| }) | ||||||
|
|
||||||
| When("SupplementalGroupsPolicy=Merge (Default)", func() { | ||||||
| It("if the container's primary UID belongs to some groups in the image, runtime should add SupplementalGroups to them", func() { | ||||||
| By("create pod") | ||||||
| podID, podConfig, podLogDir = createPodSandboxWithLogDirectory(rc) | ||||||
|
|
||||||
| By("create container for security context SupplementalGroups") | ||||||
| supplementalGroup := int64(1234) | ||||||
| containerName := "container-with-SupplementalGroupsPolicyMerge-" + framework.NewUUID() | ||||||
| logPath := containerName + ".log" | ||||||
| containerConfig := &runtimeapi.ContainerConfig{ | ||||||
| Metadata: framework.BuildContainerMetadata(containerName, framework.DefaultAttempt), | ||||||
| Image: &runtimeapi.ImageSpec{Image: testImagePreDefinedGroup}, | ||||||
| Command: []string{"sh", "-c", "id -G; while :; do sleep 1; done"}, | ||||||
| Linux: &runtimeapi.LinuxContainerConfig{ | ||||||
| SecurityContext: &runtimeapi.LinuxContainerSecurityContext{ | ||||||
| RunAsUser: &runtimeapi.Int64Value{Value: imagePredefinedGroupUID}, | ||||||
| SupplementalGroups: []int64{supplementalGroup}, | ||||||
| // SupplementalGroupsPolicy_Merge is default(0) | ||||||
| // SupplementalGroupsPolicy: runtimeapi.SupplementalGroupsPolicy_Merge, | ||||||
| }, | ||||||
| }, | ||||||
| LogPath: logPath, | ||||||
| } | ||||||
| containerID := framework.CreateContainer(rc, ic, containerConfig, podID, podConfig) | ||||||
|
|
||||||
| By("start container") | ||||||
| startContainer(rc, containerID) | ||||||
|
|
||||||
| Eventually(func(g Gomega) { | ||||||
| containerStatus := getContainerStatus(rc, containerID) | ||||||
| g.Expect(containerStatus.State).To(Equal(runtimeapi.ContainerState_CONTAINER_RUNNING)) | ||||||
| // In testImagePreDefinedGroup, | ||||||
| // - its default user is default-user(uid=1000) | ||||||
| // - default-user belongs to group-defined-in-image(gid=50000) in /etc/group | ||||||
| // And, SupplementalGroupsPolicy is Merge(default) | ||||||
| // | ||||||
| // Thus, firstly attached process identity of the first container processes should be | ||||||
| // - uid: 1000 (RunAsUser) | ||||||
| // - gid: 1000 (default group for uid=1000) | ||||||
| // - supplementary groups | ||||||
| // - 1000: self | ||||||
| // - 1234: SupplementalGroups | ||||||
| // - 50000: groups defined in the container image (/etc/group) | ||||||
| g.Expect(containerStatus.User).To(PointTo(MatchFields(IgnoreExtras, Fields{ | ||||||
| "Linux": PointTo(MatchFields(IgnoreExtras, Fields{ | ||||||
| "Uid": Equal(imagePredefinedGroupUID), | ||||||
| "Gid": Equal(imagePredefinedGroupUID), | ||||||
| // we can not assume the order of gids | ||||||
| "SupplementalGroups": And(ContainElements(imagePredefinedGroupUID, supplementalGroup, imagePredefinedGroupGID), HaveLen(3)), | ||||||
| })), | ||||||
| }))) | ||||||
| g.Expect(parseLogLine(podConfig, logPath)).NotTo(BeEmpty()) | ||||||
| }, time.Minute, time.Second*4).Should(Succeed()) | ||||||
|
|
||||||
| // $ id -G | ||||||
| // 1000 1234 50000 | ||||||
| expectedOutput := fmt.Sprintf("%d %d %d\n", imagePredefinedGroupUID, supplementalGroup, imagePredefinedGroupGID) | ||||||
|
|
||||||
| By("verify groups for the first process of the container") | ||||||
| verifyLogContents(podConfig, logPath, expectedOutput, stdoutType) | ||||||
|
|
||||||
| By("verify groups for 'exec'-ed process of container") | ||||||
| command := []string{"id", "-G"} | ||||||
| o := execSyncContainer(rc, containerID, command) | ||||||
| Expect(o).To(BeEquivalentTo(expectedOutput)) | ||||||
| }) | ||||||
| }) | ||||||
| When("SupplementalGroupsPolicy=Strict", func() { | ||||||
| It("even if the container's primary UID belongs to some groups in the image, runtime should not add SupplementalGroups to them", func() { | ||||||
| By("create pod") | ||||||
| podID, podConfig, podLogDir = createPodSandboxWithLogDirectory(rc) | ||||||
|
|
||||||
| By("create container for security context SupplementalGroups") | ||||||
| supplementalGroup := int64(1234) | ||||||
| containerName := "container-with-SupplementalGroupsPolicyMerge-" + framework.NewUUID() | ||||||
| logPath := containerName + ".log" | ||||||
| containerConfig := &runtimeapi.ContainerConfig{ | ||||||
| Metadata: framework.BuildContainerMetadata(containerName, framework.DefaultAttempt), | ||||||
| Image: &runtimeapi.ImageSpec{Image: testImagePreDefinedGroup}, | ||||||
| Command: []string{"sh", "-c", "id -G; while :; do sleep 1; done"}, | ||||||
|
There was a problem hiding this comment. Would this work in place of the loop?
Suggested change
There was a problem hiding this comment. I realise this is a code that existed prior... hence I apologise for asking about it. However, perhaps we can make things bit better. 😄 There was a problem hiding this comment. never mind. fixed in c9e3de6 |
||||||
| Linux: &runtimeapi.LinuxContainerConfig{ | ||||||
| SecurityContext: &runtimeapi.LinuxContainerSecurityContext{ | ||||||
| RunAsUser: &runtimeapi.Int64Value{Value: imagePredefinedGroupUID}, | ||||||
| SupplementalGroups: []int64{supplementalGroup}, | ||||||
| SupplementalGroupsPolicy: runtimeapi.SupplementalGroupsPolicy_Strict, | ||||||
| }, | ||||||
| }, | ||||||
| LogPath: logPath, | ||||||
| } | ||||||
| containerID := framework.CreateContainer(rc, ic, containerConfig, podID, podConfig) | ||||||
|
|
||||||
| By("start container") | ||||||
| startContainer(rc, containerID) | ||||||
|
|
||||||
| Eventually(func(g Gomega) { | ||||||
| containerStatus := getContainerStatus(rc, containerID) | ||||||
| g.Expect(containerStatus.State).To(Equal(runtimeapi.ContainerState_CONTAINER_RUNNING)) | ||||||
| // In testImagePreDefinedGroup, | ||||||
| // - its default user is default-user(uid=1000) | ||||||
| // - default-user belongs to group-defined-in-image(gid=50000) in /etc/group | ||||||
| // And, SupplementalGroupsPolicy is Strict | ||||||
| // | ||||||
| // Thus, firstly attached process identity of the first container processes should be | ||||||
| // (5000(defined in /etc/group) is not appended to supplementary groups) | ||||||
| // - uid: 1000 (RunAsUser) | ||||||
| // - gid: 1000 (default group for uid=1000) | ||||||
| // - supplementary groups | ||||||
| // - 1000: self | ||||||
| // - 1234: SupplementalGroups | ||||||
| g.Expect(containerStatus.User).To(PointTo(MatchFields(IgnoreExtras, Fields{ | ||||||
| "Linux": PointTo(MatchFields(IgnoreExtras, Fields{ | ||||||
| "Uid": Equal(imagePredefinedGroupUID), | ||||||
| "Gid": Equal(imagePredefinedGroupUID), | ||||||
| // we can not assume the order of gids | ||||||
|
There was a problem hiding this comment. Would sorting the list make it a little more deterministic? There was a problem hiding this comment. Sure, fixed in 695b675. Sorting removes gstruct usage, too👍. |
||||||
| "SupplementalGroups": And(ContainElements(imagePredefinedGroupUID, supplementalGroup), HaveLen(2)), | ||||||
| })), | ||||||
| }))) | ||||||
| g.Expect(parseLogLine(podConfig, logPath)).NotTo(BeEmpty()) | ||||||
| }, time.Minute, time.Second*4).Should(Succeed()) | ||||||
|
|
||||||
| // $ id -G | ||||||
| // 1000 1234 | ||||||
| expectedOutput := fmt.Sprintf("%d %d\n", imagePredefinedGroupUID, supplementalGroup) | ||||||
|
|
||||||
| By("verify groups for the first process of the container") | ||||||
| verifyLogContents(podConfig, logPath, expectedOutput, stdoutType) | ||||||
|
|
||||||
| By("verify groups for 'exec'-ed process of container") | ||||||
| command := []string{"id", "-G"} | ||||||
|
There was a problem hiding this comment. Would the There was a problem hiding this comment. As far as I know |
||||||
| o := execSyncContainer(rc, containerID, command) | ||||||
| Expect(o).To(BeEquivalentTo(expectedOutput)) | ||||||
| }) | ||||||
| }) | ||||||
| }) | ||||||
|
|
||||||
| // TODO(random-liu): We should set apparmor to unconfined in seccomp test to prevent | ||||||
| // them from interfering with each other. | ||||||
| Context("SeccompProfilePath", func() { | ||||||
|
|
||||||
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you want to keep this comment here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not really. fixed in c45cf82