Ophestra Umiker
9647eb6a6b
Upcoming bwrap helper implementation requires two sets of pipes to be managed, fd will also no longer be constant. Signed-off-by: Ophestra Umiker <cat@ophivana.moe>
61 lines
1.2 KiB
Go
61 lines
1.2 KiB
Go
package dbus
|
|
|
|
import (
|
|
"errors"
|
|
"io"
|
|
"strconv"
|
|
|
|
"git.ophivana.moe/cat/fortify/helper"
|
|
)
|
|
|
|
// Start launches the D-Bus proxy and sets up the Wait method.
|
|
// ready should be buffered and should only be received from once.
|
|
func (p *Proxy) Start(ready chan error, output io.Writer) error {
|
|
p.lock.Lock()
|
|
defer p.lock.Unlock()
|
|
|
|
if p.seal == nil {
|
|
return errors.New("proxy not sealed")
|
|
}
|
|
|
|
h := helper.New(p.seal, p.path,
|
|
func(argsFD, statFD int) []string {
|
|
if statFD == -1 {
|
|
return []string{"--args=" + strconv.Itoa(argsFD)}
|
|
} else {
|
|
return []string{"--args=" + strconv.Itoa(argsFD), "--fd=" + strconv.Itoa(statFD)}
|
|
}
|
|
},
|
|
)
|
|
// xdg-dbus-proxy does not need to inherit the environment
|
|
h.Env = []string{}
|
|
|
|
if output != nil {
|
|
h.Stdout = output
|
|
h.Stderr = output
|
|
}
|
|
if err := h.StartNotify(ready); err != nil {
|
|
return err
|
|
}
|
|
|
|
p.helper = h
|
|
return nil
|
|
}
|
|
|
|
// Wait waits for xdg-dbus-proxy to exit or fault.
|
|
func (p *Proxy) Wait() error {
|
|
p.lock.RLock()
|
|
defer p.lock.RUnlock()
|
|
|
|
if p.helper == nil {
|
|
return errors.New("proxy not started")
|
|
}
|
|
|
|
return p.helper.Wait()
|
|
}
|
|
|
|
// Close closes the status file descriptor passed to xdg-dbus-proxy, causing it to stop.
|
|
func (p *Proxy) Close() error {
|
|
return p.helper.Close()
|
|
}
|