helper: separate helper args fd builder from dbus

This method of passing arguments is used in bubblewrap as well as other tools, this commit separates the argument builder/writer to the helper package and generalise it as an interface.

Signed-off-by: Ophestra Umiker <cat@ophivana.moe>

2 files changed, 13 insertions, 13 deletions

diff --git a/dbus/setup.go b/dbus/dbus.go
index 2fb7c797..d0e82e17 100644
--- a/dbus/setup.go
+++ b/dbus/dbus.go
@@ -4,8 +4,9 @@ import (
 	"errors"
 	"os"
 	"os/exec"
-	"strings"
 	"sync"
+
+	"git.ophivana.moe/cat/fortify/helper"
 )
 
 // Proxy holds references to a xdg-dbus-proxy process, and should never be copied.
@@ -24,7 +25,7 @@ type Proxy struct {
 	read  *chan error
 	ready *chan bool
 
-	seal *string
+	seal helper.Args
 	lock sync.RWMutex
 }
 
@@ -41,7 +42,7 @@ func (p *Proxy) String() string {
 	}
 
 	if p.seal != nil {
-		return *p.seal
+		return p.seal.String()
 	}
 
 	return "(unsealed dbus proxy)"
@@ -60,21 +61,20 @@ func (p *Proxy) Seal(session, system *Config) error {
 		return errors.New("no configuration to seal")
 	}
 
-	seal := strings.Builder{}
+	seal := helper.NewArgs()
 
+	var args []string
 	if session != nil {
-		if err := session.buildSeal(&seal, p.session); err != nil {
-			return err
-		}
+		args = append(args, session.Args(p.session)...)
 	}
 	if system != nil {
-		if err := system.buildSeal(&seal, p.system); err != nil {
-			return err
-		}
+		args = append(args, system.Args(p.system)...)
+	}
+	if err := seal.Seal(args); err != nil {
+		return err
 	}
 
-	v := seal.String()
-	p.seal = &v
+	p.seal = seal
 	return nil
 }
 
diff --git a/dbus/run.go b/dbus/run.go
index 315b31de..cc776063 100644
--- a/dbus/run.go
+++ b/dbus/run.go
@@ -43,7 +43,7 @@ func (p *Proxy) Start(ready *chan bool) error {
 
 	statsP, argsP := p.statP[0], p.argsP[1]
 
-	if _, err := argsP.Write([]byte(*p.seal)); err != nil {
+	if _, err := p.seal.WriteTo(argsP); err != nil {
 		if err1 := p.cmd.Process.Kill(); err1 != nil {
 			panic(err1)
 		}