From 2647a71be1f287e50011a65653b9e9c806627899 Mon Sep 17 00:00:00 2001
From: Ophestra <cat@gensokyo.uk>
Date: Fri, 14 Mar 2025 22:42:40 +0900
Subject: [PATCH] seccomp: move out of helper
Signed-off-by: Ophestra <cat@gensokyo.uk>
---
cmd/fpkg/main.go | 2 +-
helper/bwrap/config_test.go | 2 +-
helper/bwrap/seccomp.go | 2 +-
internal/app/shim/main.go | 2 +-
internal/sandbox/container.go | 2 +-
internal/sandbox/init.go | 2 +-
main.go | 2 +-
{helper/seccomp => seccomp}/api.go | 0
{helper/seccomp => seccomp}/export.go | 0
{helper/seccomp => seccomp}/export_test.go | 2 +-
{helper/seccomp => seccomp}/seccomp-build.c | 0
{helper/seccomp => seccomp}/seccomp-build.h | 0
{helper/seccomp => seccomp}/seccomp.go | 0
{helper/seccomp => seccomp}/seccomp_test.go | 2 +-
14 files changed, 9 insertions(+), 9 deletions(-)
rename {helper/seccomp => seccomp}/api.go (100%)
rename {helper/seccomp => seccomp}/export.go (100%)
rename {helper/seccomp => seccomp}/export_test.go (98%)
rename {helper/seccomp => seccomp}/seccomp-build.c (100%)
rename {helper/seccomp => seccomp}/seccomp-build.h (100%)
rename {helper/seccomp => seccomp}/seccomp.go (100%)
rename {helper/seccomp => seccomp}/seccomp_test.go (96%)
diff --git a/cmd/fpkg/main.go b/cmd/fpkg/main.go
index 70f4293..480833b 100644
--- a/cmd/fpkg/main.go
+++ b/cmd/fpkg/main.go
@@ -13,13 +13,13 @@ import (
"git.gensokyo.uk/security/fortify/command"
"git.gensokyo.uk/security/fortify/fst"
"git.gensokyo.uk/security/fortify/helper/bwrap"
- "git.gensokyo.uk/security/fortify/helper/seccomp"
"git.gensokyo.uk/security/fortify/internal"
"git.gensokyo.uk/security/fortify/internal/app/init0"
"git.gensokyo.uk/security/fortify/internal/app/shim"
"git.gensokyo.uk/security/fortify/internal/fmsg"
"git.gensokyo.uk/security/fortify/internal/sandbox"
"git.gensokyo.uk/security/fortify/internal/sys"
+ "git.gensokyo.uk/security/fortify/seccomp"
)
const shellPath = "/run/current-system/sw/bin/bash"
diff --git a/helper/bwrap/config_test.go b/helper/bwrap/config_test.go
index e0f1451..678f49d 100644
--- a/helper/bwrap/config_test.go
+++ b/helper/bwrap/config_test.go
@@ -8,7 +8,7 @@ import (
"git.gensokyo.uk/security/fortify/helper/bwrap"
"git.gensokyo.uk/security/fortify/helper/proc"
- "git.gensokyo.uk/security/fortify/helper/seccomp"
+ "git.gensokyo.uk/security/fortify/seccomp"
)
func TestConfig_Args(t *testing.T) {
diff --git a/helper/bwrap/seccomp.go b/helper/bwrap/seccomp.go
index f74015f..8e55171 100644
--- a/helper/bwrap/seccomp.go
+++ b/helper/bwrap/seccomp.go
@@ -5,7 +5,7 @@ import (
"strconv"
"git.gensokyo.uk/security/fortify/helper/proc"
- "git.gensokyo.uk/security/fortify/helper/seccomp"
+ "git.gensokyo.uk/security/fortify/seccomp"
)
type SyscallPolicy struct {
diff --git a/internal/app/shim/main.go b/internal/app/shim/main.go
index 4ec3916..9855535 100644
--- a/internal/app/shim/main.go
+++ b/internal/app/shim/main.go
@@ -14,10 +14,10 @@ import (
"git.gensokyo.uk/security/fortify/fst"
"git.gensokyo.uk/security/fortify/helper"
"git.gensokyo.uk/security/fortify/helper/proc"
- "git.gensokyo.uk/security/fortify/helper/seccomp"
"git.gensokyo.uk/security/fortify/internal"
"git.gensokyo.uk/security/fortify/internal/app/init0"
"git.gensokyo.uk/security/fortify/internal/fmsg"
+ "git.gensokyo.uk/security/fortify/seccomp"
)
// everything beyond this point runs as unconstrained target user
diff --git a/internal/sandbox/container.go b/internal/sandbox/container.go
index 7638935..97dd0ee 100644
--- a/internal/sandbox/container.go
+++ b/internal/sandbox/container.go
@@ -12,9 +12,9 @@ import (
"syscall"
"git.gensokyo.uk/security/fortify/helper/proc"
- "git.gensokyo.uk/security/fortify/helper/seccomp"
"git.gensokyo.uk/security/fortify/internal"
"git.gensokyo.uk/security/fortify/internal/fmsg"
+ "git.gensokyo.uk/security/fortify/seccomp"
)
type HardeningFlags uintptr
diff --git a/internal/sandbox/init.go b/internal/sandbox/init.go
index 6bc5270..83b5f46 100644
--- a/internal/sandbox/init.go
+++ b/internal/sandbox/init.go
@@ -14,9 +14,9 @@ import (
"time"
"git.gensokyo.uk/security/fortify/helper/proc"
- "git.gensokyo.uk/security/fortify/helper/seccomp"
"git.gensokyo.uk/security/fortify/internal"
"git.gensokyo.uk/security/fortify/internal/fmsg"
+ "git.gensokyo.uk/security/fortify/seccomp"
)
const (
diff --git a/main.go b/main.go
index ecf5bc7..ac5532e 100644
--- a/main.go
+++ b/main.go
@@ -18,7 +18,6 @@ import (
"git.gensokyo.uk/security/fortify/command"
"git.gensokyo.uk/security/fortify/dbus"
"git.gensokyo.uk/security/fortify/fst"
- "git.gensokyo.uk/security/fortify/helper/seccomp"
"git.gensokyo.uk/security/fortify/internal"
"git.gensokyo.uk/security/fortify/internal/app"
"git.gensokyo.uk/security/fortify/internal/app/init0"
@@ -27,6 +26,7 @@ import (
"git.gensokyo.uk/security/fortify/internal/sandbox"
"git.gensokyo.uk/security/fortify/internal/state"
"git.gensokyo.uk/security/fortify/internal/sys"
+ "git.gensokyo.uk/security/fortify/seccomp"
"git.gensokyo.uk/security/fortify/system"
)
diff --git a/helper/seccomp/api.go b/seccomp/api.go
similarity index 100%
rename from helper/seccomp/api.go
rename to seccomp/api.go
diff --git a/helper/seccomp/export.go b/seccomp/export.go
similarity index 100%
rename from helper/seccomp/export.go
rename to seccomp/export.go
diff --git a/helper/seccomp/export_test.go b/seccomp/export_test.go
similarity index 98%
rename from helper/seccomp/export_test.go
rename to seccomp/export_test.go
index ff6f250..991517f 100644
--- a/helper/seccomp/export_test.go
+++ b/seccomp/export_test.go
@@ -9,7 +9,7 @@ import (
"syscall"
"testing"
- "git.gensokyo.uk/security/fortify/helper/seccomp"
+ "git.gensokyo.uk/security/fortify/seccomp"
)
func TestExport(t *testing.T) {
diff --git a/helper/seccomp/seccomp-build.c b/seccomp/seccomp-build.c
similarity index 100%
rename from helper/seccomp/seccomp-build.c
rename to seccomp/seccomp-build.c
diff --git a/helper/seccomp/seccomp-build.h b/seccomp/seccomp-build.h
similarity index 100%
rename from helper/seccomp/seccomp-build.h
rename to seccomp/seccomp-build.h
diff --git a/helper/seccomp/seccomp.go b/seccomp/seccomp.go
similarity index 100%
rename from helper/seccomp/seccomp.go
rename to seccomp/seccomp.go
diff --git a/helper/seccomp/seccomp_test.go b/seccomp/seccomp_test.go
similarity index 96%
rename from helper/seccomp/seccomp_test.go
rename to seccomp/seccomp_test.go
index c04179c..f2949ef 100644
--- a/helper/seccomp/seccomp_test.go
+++ b/seccomp/seccomp_test.go
@@ -6,7 +6,7 @@ import (
"syscall"
"testing"
- "git.gensokyo.uk/security/fortify/helper/seccomp"
+ "git.gensokyo.uk/security/fortify/seccomp"
)
func TestLibraryError(t *testing.T) {