sys: rename from linux
All checks were successful
Test / Create distribution (push) Successful in 26s
Test / Run NixOS test (push) Successful in 3m28s

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
2025-02-18 18:47:48 +09:00
parent 2c9c7fee5b
commit e0f321b2c4
12 changed files with 30 additions and 30 deletions

View File

@@ -6,7 +6,7 @@ import (
"git.gensokyo.uk/security/fortify/fst"
"git.gensokyo.uk/security/fortify/internal/app/shim"
"git.gensokyo.uk/security/fortify/internal/linux"
"git.gensokyo.uk/security/fortify/internal/sys"
)
type App interface {
@@ -32,7 +32,7 @@ type app struct {
// application unique identifier
id *fst.ID
// operating system interface
os linux.System
os sys.State
// shim process manager
shim *shim.Shim
// child process related information
@@ -64,7 +64,7 @@ func (a *app) String() string {
return "(unsealed fortified app)"
}
func New(os linux.System) (App, error) {
func New(os sys.State) (App, error) {
a := new(app)
a.id = new(fst.ID)
a.os = os

View File

@@ -6,7 +6,7 @@ import (
"os/user"
"strconv"
"git.gensokyo.uk/security/fortify/internal/linux"
"git.gensokyo.uk/security/fortify/internal/sys"
)
// fs methods are not implemented using a real FS
@@ -122,8 +122,8 @@ func (s *stubNixOS) Open(name string) (fs.File, error) {
}
}
func (s *stubNixOS) Paths() linux.Paths {
return linux.Paths{
func (s *stubNixOS) Paths() sys.Paths {
return sys.Paths{
SharePath: "/tmp/fortify.1971",
RuntimePath: "/run/user/1971",
RunDirPath: "/run/user/1971/fortify",

View File

@@ -10,13 +10,13 @@ import (
"git.gensokyo.uk/security/fortify/fst"
"git.gensokyo.uk/security/fortify/helper/bwrap"
"git.gensokyo.uk/security/fortify/internal/app"
"git.gensokyo.uk/security/fortify/internal/linux"
"git.gensokyo.uk/security/fortify/internal/sys"
"git.gensokyo.uk/security/fortify/system"
)
type sealTestCase struct {
name string
os linux.System
os sys.State
config *fst.Config
id fst.ID
wantSys *system.I

View File

@@ -3,11 +3,11 @@ package app
import (
"git.gensokyo.uk/security/fortify/fst"
"git.gensokyo.uk/security/fortify/helper/bwrap"
"git.gensokyo.uk/security/fortify/internal/linux"
"git.gensokyo.uk/security/fortify/internal/sys"
"git.gensokyo.uk/security/fortify/system"
)
func NewWithID(id fst.ID, os linux.System) App {
func NewWithID(id fst.ID, os sys.State) App {
a := new(app)
a.id = &id
a.os = os

View File

@@ -17,8 +17,8 @@ import (
"git.gensokyo.uk/security/fortify/helper/bwrap"
"git.gensokyo.uk/security/fortify/internal"
"git.gensokyo.uk/security/fortify/internal/fmsg"
"git.gensokyo.uk/security/fortify/internal/linux"
"git.gensokyo.uk/security/fortify/internal/state"
"git.gensokyo.uk/security/fortify/internal/sys"
"git.gensokyo.uk/security/fortify/system"
)
@@ -64,7 +64,7 @@ type appSeal struct {
// seal system-level component
sys *appSealSys
linux.Paths
sys.Paths
// protected by upstream mutex
}

View File

@@ -11,7 +11,7 @@ import (
"git.gensokyo.uk/security/fortify/dbus"
"git.gensokyo.uk/security/fortify/fst"
"git.gensokyo.uk/security/fortify/internal/fmsg"
"git.gensokyo.uk/security/fortify/internal/linux"
"git.gensokyo.uk/security/fortify/internal/sys"
"git.gensokyo.uk/security/fortify/system"
"git.gensokyo.uk/security/fortify/wl"
)
@@ -43,7 +43,7 @@ var (
ErrPulseMode = errors.New("unexpected pulse socket mode")
)
func (seal *appSeal) setupShares(bus [2]*dbus.Config, os linux.System) error {
func (seal *appSeal) setupShares(bus [2]*dbus.Config, os sys.State) error {
if seal.shared {
panic("seal shared twice")
}
@@ -300,7 +300,7 @@ func (seal *appSeal) setupShares(bus [2]*dbus.Config, os linux.System) error {
}
// discoverPulseCookie attempts various standard methods to discover the current user's PulseAudio authentication cookie
func discoverPulseCookie(os linux.System) (string, error) {
func discoverPulseCookie(os sys.State) (string, error) {
if p, ok := os.LookupEnv(pulseCookie); ok {
return p, nil
}