mirror of
https://github.com/opencontainers/runc.git
synced 2026-07-10 21:53:57 +08:00
build(deps): bump github.com/opencontainers/selinux
Bumps [github.com/opencontainers/selinux](https://github.com/opencontainers/selinux) from 1.14.1 to 1.15.1. - [Release notes](https://github.com/opencontainers/selinux/releases) - [Commits](https://github.com/opencontainers/selinux/compare/v1.14.1...v1.15.1) --- updated-dependencies: - dependency-name: github.com/opencontainers/selinux dependency-version: 1.15.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
This commit is contained in:
+8
-3
@@ -10,7 +10,6 @@ import (
|
||||
|
||||
// Valid Label Options
|
||||
var validOptions = map[string]bool{
|
||||
"disable": true,
|
||||
"type": true,
|
||||
"filetype": true,
|
||||
"user": true,
|
||||
@@ -35,9 +34,13 @@ func InitLabels(options []string) (plabel string, mlabel string, retErr error) {
|
||||
if !selinux.GetEnabled() {
|
||||
return "", "", nil
|
||||
}
|
||||
if len(options) > 0 && options[0] == "disable" {
|
||||
return "", selinux.PrivContainerMountLabel(), nil
|
||||
}
|
||||
processLabel, mountLabel := selinux.ContainerLabels() //nolint:staticcheck // ContainerLabels will be moved to an internal package.
|
||||
if processLabel == "" {
|
||||
// processLabel is required; if empty, do nothing.
|
||||
if processLabel == "" || len(options) == 0 {
|
||||
// 1. processLabel is required; if empty, do nothing.
|
||||
// 2. If there are no options to process, we're done.
|
||||
return processLabel, mountLabel, nil
|
||||
}
|
||||
defer func() {
|
||||
@@ -55,6 +58,8 @@ func InitLabels(options []string) (plabel string, mlabel string, retErr error) {
|
||||
return "", "", err
|
||||
}
|
||||
for _, opt := range options {
|
||||
// For backward compatibility, process "disable"
|
||||
// even if it's not the only option.
|
||||
if opt == "disable" {
|
||||
selinux.ReleaseLabel(mountLabel)
|
||||
return "", selinux.PrivContainerMountLabel(), nil
|
||||
|
||||
+20
@@ -48,6 +48,21 @@ var (
|
||||
privContainerMountLabel string
|
||||
)
|
||||
|
||||
// ProcessKind selects which process domain [SetProcessKind] applies to a label.
|
||||
type ProcessKind int
|
||||
|
||||
const (
|
||||
ProcessKindRegular ProcessKind = 1
|
||||
ProcessKindInit ProcessKind = 2
|
||||
ProcessKindKVM ProcessKind = 3
|
||||
)
|
||||
|
||||
// SetProcessKind returns label with its type component replaced by the one
|
||||
// corresponding to kind. Other label components are kept intact.
|
||||
func SetProcessKind(label string, kind ProcessKind) (string, error) {
|
||||
return setProcessKind(label, kind)
|
||||
}
|
||||
|
||||
// Context is a representation of the SELinux label broken into 4 parts
|
||||
type Context map[string]string
|
||||
|
||||
@@ -231,6 +246,7 @@ func ReserveLabel(label string) {
|
||||
}
|
||||
|
||||
// ReserveLabelV2 reserves the MLS/MCS level component of the specified label.
|
||||
// Labels without MLS/MCS category component (":c") are ignored.
|
||||
// Returns an error if the label can't be reserved.
|
||||
//
|
||||
// Callers that are intentionally reusing an existing level/MCS (e.g. multiple
|
||||
@@ -292,6 +308,8 @@ func KVMContainerLabels() (string, string) {
|
||||
|
||||
// KVMContainerLabel returns the default process label to be used
|
||||
// for KVM containers by the calling process.
|
||||
//
|
||||
// If you only need to change a type of existing label, use [SetProcessKind] instead.
|
||||
func KVMContainerLabel() (string, error) {
|
||||
return kvmContainerLabel()
|
||||
}
|
||||
@@ -306,6 +324,8 @@ func InitContainerLabels() (string, string) {
|
||||
|
||||
// InitContainerLabel returns the default process label to be used
|
||||
// for containers running an init system like systemd by the calling process.
|
||||
//
|
||||
// If you only need to change a type of existing label, use [SetProcessKind] instead.
|
||||
func InitContainerLabel() (string, error) {
|
||||
return initContainerLabel()
|
||||
}
|
||||
|
||||
+46
-1
@@ -890,8 +890,10 @@ func defaultEnforceMode() int {
|
||||
return Disabled
|
||||
}
|
||||
|
||||
// mcsAdd reserves a level. If the argument is empty or does not contain
|
||||
// MCS/MLS category component (no ":c"), it is ignored.
|
||||
func mcsAdd(mcs string) error {
|
||||
if mcs == "" {
|
||||
if !strings.Contains(mcs, ":c") {
|
||||
return nil
|
||||
}
|
||||
state.Lock()
|
||||
@@ -1513,3 +1515,46 @@ func getDefaultContextWithLevel(user, level, scon string) (string, error) {
|
||||
|
||||
return getDefaultContextFromReaders(&c)
|
||||
}
|
||||
|
||||
func (k ProcessKind) keys() (primary, fallback string, ok bool) {
|
||||
switch k {
|
||||
case ProcessKindRegular:
|
||||
return "process", "", true
|
||||
case ProcessKindInit:
|
||||
return "init_process", "process", true
|
||||
case ProcessKindKVM:
|
||||
return "kvm_process", "process", true
|
||||
}
|
||||
return "", "", false
|
||||
}
|
||||
|
||||
func setProcessKind(cLabel string, k ProcessKind) (string, error) {
|
||||
if cLabel == "" {
|
||||
return "", nil
|
||||
}
|
||||
primary, fallback, ok := k.keys()
|
||||
if !ok {
|
||||
return "", fmt.Errorf("selinux.SetProcessKind: invalid ProcessKind %d", k)
|
||||
}
|
||||
|
||||
src := label(primary)
|
||||
if src == "" && fallback != "" {
|
||||
src = label(fallback)
|
||||
}
|
||||
if src == "" {
|
||||
return cLabel, nil
|
||||
}
|
||||
|
||||
// Replace cLabel type with one from src.
|
||||
srcCtx, err := newContext(src)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("selinux.SetProcessKind: invalid %s label %s: %w", primary, src, err)
|
||||
}
|
||||
dstCtx, err := newContext(cLabel)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("selinux.SetProcessKind: invalid label %s: %w", cLabel, err)
|
||||
}
|
||||
|
||||
dstCtx["type"] = srcCtx["type"]
|
||||
return dstCtx.get(), nil
|
||||
}
|
||||
|
||||
+4
@@ -157,3 +157,7 @@ func getDefaultContextWithLevel(string, string, string) (string, error) {
|
||||
func label(_ string) string {
|
||||
return ""
|
||||
}
|
||||
|
||||
func setProcessKind(string, ProcessKind) (string, error) {
|
||||
return "", nil
|
||||
}
|
||||
|
||||
Vendored
+1
-1
@@ -82,7 +82,7 @@ github.com/opencontainers/cgroups/systemd
|
||||
## explicit
|
||||
github.com/opencontainers/runtime-spec/specs-go
|
||||
github.com/opencontainers/runtime-spec/specs-go/features
|
||||
# github.com/opencontainers/selinux v1.14.1
|
||||
# github.com/opencontainers/selinux v1.15.1
|
||||
## explicit; go 1.22
|
||||
github.com/opencontainers/selinux/go-selinux
|
||||
github.com/opencontainers/selinux/go-selinux/label
|
||||
|
||||
Reference in New Issue
Block a user