From e94acc424c5746eb6cf903ed97b4e71223fda50f Mon Sep 17 00:00:00 2001 From: Ophestra Date: Tue, 21 Oct 2025 20:54:03 +0900 Subject: container/comp: rename from bits This package will also hold syscall lookup tables for seccomp. Signed-off-by: Ophestra --- container/seccomp/hash_amd64_test.go | 2 +- container/seccomp/hash_arm64_test.go | 2 +- container/seccomp/hash_test.go | 4 ++-- container/seccomp/libseccomp_test.go | 2 +- container/seccomp/presets.go | 26 +++++++++++++------------- 5 files changed, 18 insertions(+), 18 deletions(-) (limited to 'container/seccomp') diff --git a/container/seccomp/hash_amd64_test.go b/container/seccomp/hash_amd64_test.go index 5a5e5439..eb3e6092 100644 --- a/container/seccomp/hash_amd64_test.go +++ b/container/seccomp/hash_amd64_test.go @@ -1,7 +1,7 @@ package seccomp_test import ( - . "hakurei.app/container/bits" + . "hakurei.app/container/comp" . "hakurei.app/container/seccomp" ) diff --git a/container/seccomp/hash_arm64_test.go b/container/seccomp/hash_arm64_test.go index 2395bcee..44c692d5 100644 --- a/container/seccomp/hash_arm64_test.go +++ b/container/seccomp/hash_arm64_test.go @@ -1,7 +1,7 @@ package seccomp_test import ( - . "hakurei.app/container/bits" + . "hakurei.app/container/comp" . "hakurei.app/container/seccomp" ) diff --git a/container/seccomp/hash_test.go b/container/seccomp/hash_test.go index 5c995582..90bfe638 100644 --- a/container/seccomp/hash_test.go +++ b/container/seccomp/hash_test.go @@ -4,14 +4,14 @@ import ( "crypto/sha512" "encoding/hex" - "hakurei.app/container/bits" + "hakurei.app/container/comp" "hakurei.app/container/seccomp" ) type ( bpfPreset = struct { seccomp.ExportFlag - bits.FilterPreset + comp.FilterPreset } bpfLookup map[bpfPreset][sha512.Size]byte ) diff --git a/container/seccomp/libseccomp_test.go b/container/seccomp/libseccomp_test.go index 5d58ac7a..cb5a29cb 100644 --- a/container/seccomp/libseccomp_test.go +++ b/container/seccomp/libseccomp_test.go @@ -6,7 +6,7 @@ import ( "syscall" "testing" - . "hakurei.app/container/bits" + . "hakurei.app/container/comp" . "hakurei.app/container/seccomp" ) diff --git a/container/seccomp/presets.go b/container/seccomp/presets.go index f12d9f76..1f6f7290 100644 --- a/container/seccomp/presets.go +++ b/container/seccomp/presets.go @@ -5,32 +5,32 @@ package seccomp import ( . "syscall" - "hakurei.app/container/bits" + "hakurei.app/container/comp" ) -func Preset(presets bits.FilterPreset, flags ExportFlag) (rules []NativeRule) { +func Preset(presets comp.FilterPreset, flags ExportFlag) (rules []NativeRule) { allowedPersonality := PersonaLinux - if presets&bits.PresetLinux32 != 0 { + if presets&comp.PresetLinux32 != 0 { allowedPersonality = PersonaLinux32 } presetDevelFinal := presetDevel(ScmpDatum(allowedPersonality)) l := len(presetCommon) - if presets&bits.PresetDenyNS != 0 { + if presets&comp.PresetDenyNS != 0 { l += len(presetNamespace) } - if presets&bits.PresetDenyTTY != 0 { + if presets&comp.PresetDenyTTY != 0 { l += len(presetTTY) } - if presets&bits.PresetDenyDevel != 0 { + if presets&comp.PresetDenyDevel != 0 { l += len(presetDevelFinal) } if flags&AllowMultiarch == 0 { l += len(presetEmu) } - if presets&bits.PresetExt != 0 { + if presets&comp.PresetExt != 0 { l += len(presetCommonExt) - if presets&bits.PresetDenyNS != 0 { + if presets&comp.PresetDenyNS != 0 { l += len(presetNamespaceExt) } if flags&AllowMultiarch == 0 { @@ -40,21 +40,21 @@ func Preset(presets bits.FilterPreset, flags ExportFlag) (rules []NativeRule) { rules = make([]NativeRule, 0, l) rules = append(rules, presetCommon...) - if presets&bits.PresetDenyNS != 0 { + if presets&comp.PresetDenyNS != 0 { rules = append(rules, presetNamespace...) } - if presets&bits.PresetDenyTTY != 0 { + if presets&comp.PresetDenyTTY != 0 { rules = append(rules, presetTTY...) } - if presets&bits.PresetDenyDevel != 0 { + if presets&comp.PresetDenyDevel != 0 { rules = append(rules, presetDevelFinal...) } if flags&AllowMultiarch == 0 { rules = append(rules, presetEmu...) } - if presets&bits.PresetExt != 0 { + if presets&comp.PresetExt != 0 { rules = append(rules, presetCommonExt...) - if presets&bits.PresetDenyNS != 0 { + if presets&comp.PresetDenyNS != 0 { rules = append(rules, presetNamespaceExt...) } if flags&AllowMultiarch == 0 { -- cgit v1.3.1