diff options
| author | Ophestra <cat@gensokyo.uk> | 2025-10-08 04:57:22 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2025-10-08 04:57:22 +0900 |
| commit | 9b507715d42f74c3f18fe817c2464abfca1b0182 (patch) | |
| tree | c3d8ee5ef6809aaf3174bd6ecb00b8115261897e /system/dbus/proxy.go | |
| parent | 12ab7ea3b465a130933efd9e7fe044f3636dc6ed (diff) | |
hst/dbus: validate interface strings
This is relocated to hst to validate early.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'system/dbus/proxy.go')
| -rw-r--r-- | system/dbus/proxy.go | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/system/dbus/proxy.go b/system/dbus/proxy.go index 59a1d7d4..535f233d 100644 --- a/system/dbus/proxy.go +++ b/system/dbus/proxy.go @@ -2,7 +2,6 @@ package dbus import ( "context" - "fmt" "io" "sync" "syscall" @@ -16,15 +15,6 @@ import ( // Overriding ProxyName will only affect Proxy instance created after the change. var ProxyName = "xdg-dbus-proxy" -type BadInterfaceError struct { - Interface string - Segment string -} - -func (e *BadInterfaceError) Error() string { - return fmt.Sprintf("bad interface string %q in %s bus configuration", e.Interface, e.Segment) -} - // Proxy holds the state of a xdg-dbus-proxy process, and should never be copied. type Proxy struct { helper helper.Helper @@ -74,13 +64,13 @@ func Finalise(sessionBus, systemBus ProxyPair, session, system *hst.BusConfig) ( var args []string if session != nil { - if err = checkInterfaces(session, "session"); err != nil { + if err = session.CheckInterfaces("session"); err != nil { return } args = append(args, Args(session, sessionBus)...) } if system != nil { - if err = checkInterfaces(system, "system"); err != nil { + if err = system.CheckInterfaces("system"); err != nil { return } args = append(args, Args(system, systemBus)...) |