maemachinebroke/hakurei
1
0
Fork 0
forked from security/hakurei
Code Pull Requests Activity

internal/app: copy parts of config to state

Browse Source 
This is less error-prone than passing the address to the entire hst.Config struct, and reduces the likelihood of accidentally clobbering hst.Config. This also improves ease of testing.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
Ophestra
2025-10-10 03:19:09 +09:00
parent 22ee5ae151
commit 109aaee659
8 changed files with 45 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/app/spdbus.go
View File

@@ -19,26 +19,26 @@ type spDBusOp struct {
}
func (s *spDBusOp) toSystem(state *outcomeStateSys) error {
if state.config.Enablements.Unwrap()&hst.EDBus == 0 {
if state.et&hst.EDBus == 0 {
return errNotEnabled
}
if state.config.SessionBus == nil {
state.config.SessionBus = dbus.NewConfig(state.config.ID, true, true)
if state.sessionBus == nil {
state.sessionBus = dbus.NewConfig(state.appId, true, true)
}
// downstream socket paths
sessionPath, systemPath := state.instance().Append("bus"), state.instance().Append("system_bus_socket")
if err := state.sys.ProxyDBus(
state.config.SessionBus, state.config.SystemBus,
state.sessionBus, state.systemBus,
sessionPath, systemPath,
); err != nil {
return err
}
state.sys.UpdatePerm(sessionPath, acl.Read, acl.Write)
if state.config.SystemBus != nil {
if state.systemBus != nil {
s.ProxySystem = true
state.sys.UpdatePerm(systemPath, acl.Read, acl.Write)
}