Use sensitive output. (#106)

Author: lexbritvin

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/go-chi/cors v1.2.1
 	github.com/go-chi/render v1.0.3
 	github.com/gorilla/websocket v1.5.3
-	github.com/launchrctl/launchr v0.18.0
+	github.com/launchrctl/launchr v0.18.3-0.20250320175144-edbfae1fb9fb
 	github.com/oapi-codegen/nethttp-middleware v1.0.2
 	github.com/oapi-codegen/oapi-codegen/v2 v2.4.1
 	github.com/oapi-codegen/runtime v1.1.1

go.sum

@@ -265,6 +265,10 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/launchrctl/launchr v0.18.0 h1:Kp5iguwl5rx1qo2M3A2eMlhTeefgL5UDKFzP/7B45UE=
 github.com/launchrctl/launchr v0.18.0/go.mod h1:hhJSGcxn1FhD267u0JfNu6u65naTQAVxElnqUTY9nag=
+github.com/launchrctl/launchr v0.18.3-0.20250316225153-b280479eabd0 h1:cOlcoOCphR/qR0Fw2/W8xjbFHF0kuYbRnIZ6M8CXosI=
+github.com/launchrctl/launchr v0.18.3-0.20250316225153-b280479eabd0/go.mod h1:hhJSGcxn1FhD267u0JfNu6u65naTQAVxElnqUTY9nag=
+github.com/launchrctl/launchr v0.18.3-0.20250320175144-edbfae1fb9fb h1:RpFawKeAYg7VW72zxUUSSwedGkZXyT0XxwjMxXkqoLY=
+github.com/launchrctl/launchr v0.18.3-0.20250320175144-edbfae1fb9fb/go.mod h1:hhJSGcxn1FhD267u0JfNu6u65naTQAVxElnqUTY9nag=
 github.com/lithammer/fuzzysearch v1.1.8 h1:/HIuJnjHuXS8bKaiTMeeDlW2/AyIWk2brx1V8LFgLN4=
 github.com/lithammer/fuzzysearch v1.1.8/go.mod h1:IdqeyBClc3FFqSzYq/MXESsS4S0FsZ5ajtkr5xPLts4=
 github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=

server/api.go

@@ -30,6 +30,7 @@ type launchrServer struct {
 	wsMutex     sync.Mutex
 	customize   FrontendCustomize
 	logsDirPath string
+	app         launchr.App
 }
 
 // FrontendCustomize stores variables to customize web appearance.
@@ -354,7 +355,7 @@ func (l *launchrServer) RunAction(w http.ResponseWriter, r *http.Request, id str
 
 	// Prepare action for run.
 	// Can we fetch directly json?
-	streams, err := createFileStreams(l.logsDirPath, runID)
+	streams, err := createFileStreams(l.logsDirPath, runID, l.app)
 	if err != nil {
 		sendError(w, http.StatusInternalServerError, "Error preparing streams")
 	}

server/server.go

@@ -94,6 +94,7 @@ func Run(ctx context.Context, app launchr.App, opts *RunOptions) error {
 		apiPrefix:   opts.APIPrefix,
 		customize:   opts.FrontendCustomize,
 		logsDirPath: opts.LogsDirPath,
+		app:         app,
 	}
 	app.GetService(&store.actionMngr)
 	app.GetService(&store.cfg)

server/streams.go

@@ -6,7 +6,6 @@ import (
 	"io"
 	"os"
 	"path/filepath"
-	"strings"
 
 	"github.com/launchrctl/launchr"
 )
@@ -16,35 +15,14 @@ type fileStreams interface {
 }
 
 // webCli implements Streams interface.
-// @todo Maybe refactor original streams.
 type webCli struct {
-	in    *launchr.In
-	out   *launchr.Out
-	err   io.Writer
+	launchr.Streams
 	files []*os.File
 }
 
-// In returns the reader used for stdin
-func (cli *webCli) In() *launchr.In {
-	return cli.in
-}
-
-// Out returns the writer used for stdout
-func (cli *webCli) Out() *launchr.Out {
-	return cli.out
-}
-
-// Err returns the writer used for stderr
-func (cli *webCli) Err() io.Writer {
-	return cli.err
-}
-
 // Close implements io.Closer.
 func (cli *webCli) Close() (err error) {
-	for i := 0; i < len(cli.files); i++ {
-		_ = cli.files[i].Close()
-	}
-	return nil
+	return cli.Streams.Close()
 }
 
 // GetStreamData implements fileStreams.
@@ -93,7 +71,14 @@ func (w *wrappedWriter) Write(p []byte) (int, error) {
 	return w.w.Write(p)
 }
 
-func createFileStreams(streamsDir, runId string) (*webCli, error) {
+func (w *wrappedWriter) Close() error {
+	if c, ok := w.w.(io.Closer); ok {
+		return c.Close()
+	}
+	return nil
+}
+
+func createFileStreams(streamsDir, runId string, app launchr.App) (*webCli, error) {
 	outfile, err := os.Create(filepath.Join(streamsDir, runId+"-out.txt"))
 	if err != nil {
 		return nil, fmt.Errorf("error creating output file: %w", err)
@@ -116,9 +101,7 @@ func createFileStreams(streamsDir, runId string) (*webCli, error) {
 
 	// Build and return webCli
 	return &webCli{
-		files: []*os.File{outfile, errfile},
-		in:    launchr.NewIn(io.NopCloser(strings.NewReader(""))),
-		out:   launchr.NewOut(out),
-		err:   errWriter,
+		Streams: launchr.NewBasicStreams(nil, app.SensitiveWriter(out), app.SensitiveWriter(errWriter)),
+		files:   []*os.File{outfile, errfile},
 	}, nil
 }

web_runner.go

@@ -21,12 +21,12 @@ import (
 )
 
 const (
-	backgroundEnvVar   = "LAUNCHR_BACKGROUND"
+	backgroundEnvVar   = launchr.EnvVar("web_background")
 	serverInfoFilename = "server-info.json"
 )
 
 func isBackGroundEnv() bool {
-	return len(os.Getenv(backgroundEnvVar)) == 1
+	return len(backgroundEnvVar.Get()) == 1
 }
 
 func (p *Plugin) runWeb(ctx context.Context, webOpts webFlags) error {
@@ -72,7 +72,7 @@ func (p *Plugin) runWeb(ctx context.Context, webOpts webFlags) error {
 
 func (p *Plugin) runBackgroundWeb(ctx context.Context, flags webFlags, pidFile string) error {
 	if isBackGroundEnv() {
-		err := redirectOutputs(flags.PluginDir)
+		err := redirectOutputs(p.app, flags.PluginDir)
 		if err != nil {
 			return err
 		}
@@ -158,7 +158,7 @@ func runBackgroundCmd(pidFile string) (int, error) {
 
 	// Prepare the command to restart itself in the background
 	command := exec.Command(os.Args[0], os.Args[1:]...) //nolint G204
-	command.Env = append(os.Environ(), backgroundEnvVar+"=1")
+	command.Env = append(os.Environ(), backgroundEnvVar.EnvString("1"))
 
 	// Set platform-specific process ID
 	setSysProcAttr(command)
@@ -176,7 +176,7 @@ func runBackgroundCmd(pidFile string) (int, error) {
 	return command.Process.Pid, nil
 }
 
-func redirectOutputs(dir string) error {
+func redirectOutputs(app launchr.App, dir string) error {
 	err := launchr.EnsurePath(dir)
 	if err != nil {
 		return fmt.Errorf("can't create plugin temporary directory")
@@ -188,7 +188,7 @@ func redirectOutputs(dir string) error {
 	}
 
 	// Redirect log messages to a file.
-	launchr.Log().SetOutput(outLog)
+	launchr.Log().SetOutput(app.SensitiveWriter(outLog))
 	// Discard console output because it's intended for user interaction.
 	launchr.Term().SetOutput(io.Discard)