Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[1.21] server: filter sysctls passed through CRI if host namespace #5686

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

Merged
openshift-merge-robot merged 2 commits into from
Mar 1, 2022
Merged

[1.21] server: filter sysctls passed through CRI if host namespace #5686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd19459
server: skip sysctls that would affect the host
haircommander Jan 27, 2022
1cb18d8
test: add test for skipped sysctls
haircommander Jan 27, 2022
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
4 changes: 4 additions & 0 deletions pkg/config/sysctl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ import (
"github.com/pkg/errors"
)

func NewSysctl(key, value string) *Sysctl {
return &Sysctl{key, value}
}

// Sysctl is a generic abstraction over key value based sysctls
type Sysctl struct {
key, value string
Expand Down
7 changes: 6 additions & 1 deletion server/sandbox_run_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1001,7 +1001,7 @@ func (s *Server) configureGeneratorForSysctls(ctx context.Context, g *generate.G

for _, sysctl := range defaultSysctls {
if err := sysctl.Validate(hostNetwork, hostIPC); err != nil {
log.Warnf(ctx, "skipping invalid sysctl %s: %v", sysctl, err)
log.Warnf(ctx, "Skipping invalid sysctl specified by config %s: %v", sysctl, err)
continue
}
g.AddLinuxSysctl(sysctl.Key(), sysctl.Value())
Expand All @@ -1011,6 +1011,11 @@ func (s *Server) configureGeneratorForSysctls(ctx context.Context, g *generate.G
// extract linux sysctls from annotations and pass down to oci runtime
// Will override any duplicate default systcl from crio.conf
for key, value := range sysctls {
sysctl := libconfig.NewSysctl(key, value)
if err := sysctl.Validate(hostNetwork, hostIPC); err != nil {
log.Warnf(ctx, "Skipping invalid sysctl specified over CRI %s: %v", sysctl, err)
continue
}
g.AddLinuxSysctl(key, value)
sysctlsToReturn[key] = value
}
Expand Down
33 changes: 33 additions & 0 deletions test/pod.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,39 @@ function teardown() {
[[ "$output" == *"net.ipv4.ip_forward = 1"* ]]
}

@test "skip pod sysctls to runtime if host" {
if test -n "$CONTAINER_UID_MAPPINGS"; then
skip "userNS enabled"
fi
CONTAINER_DEFAULT_SYSCTLS="net.ipv4.ip_forward=0" start_crio

jq ' .linux.security_context.namespace_options = {
network: 2,
ipc: 2
} |
.linux.sysctls = {
"kernel.shm_rmid_forced": "1",
"net.ipv4.ip_local_port_range": "2048 65000",
"kernel.msgmax": "16384"
}' "$TESTDATA"/sandbox_config.json > "$TESTDIR"/sandbox.json

pod_id=$(crictl runp "$TESTDIR"/sandbox.json)
ctr_id=$(crictl create "$pod_id" "$TESTDATA"/container_redis.json "$TESTDIR"/sandbox.json)
crictl start "$ctr_id"

output=$(crictl exec --sync "$ctr_id" sysctl kernel.shm_rmid_forced)
[[ "$output" != *"kernel.shm_rmid_forced = 1"* ]]

output=$(crictl exec --sync "$ctr_id" sysctl kernel.msgmax)
[[ "$output" != *"kernel.msgmax = 16384"* ]]

output=$(crictl exec --sync "$ctr_id" sysctl net.ipv4.ip_local_port_range)
[[ "$output" != *"net.ipv4.ip_local_port_range = 2048 65000"* ]]

output=$(crictl exec --sync "$ctr_id" sysctl net.ipv4.ip_forward)
[[ "$output" != *"net.ipv4.ip_forward = 0"* ]]
}

@test "pod stop idempotent" {
start_crio
pod_id=$(crictl runp "$TESTDATA"/sandbox_config.json)
Expand Down