Skip to content

A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.

TypeScript fluxerfluxerapp

fix(rexctl): keep the sudo password prompt visible during a step (#3561)

Hampuseaff840a45be
diff --git a/fluxer_rexctl/cmd/app.go b/fluxer_rexctl/cmd/app.go
index bddd09c80..128493956 100644
--- a/fluxer_rexctl/cmd/app.go
+++ b/fluxer_rexctl/cmd/app.go
@@ -18,6 +18,7 @@ import (
"github.com/fluxerapp/fluxer/fluxer_rexctl/internal/adminapi"
"github.com/fluxerapp/fluxer/fluxer_rexctl/internal/deploy"
"github.com/fluxerapp/fluxer/fluxer_rexctl/internal/engine"
+ "github.com/fluxerapp/fluxer/fluxer_rexctl/internal/host"
"github.com/fluxerapp/fluxer/fluxer_rexctl/internal/instance"
"github.com/fluxerapp/fluxer/fluxer_rexctl/internal/ui"
)
@@ -52,6 +53,7 @@ func (a *App) init(c *cobra.Command) {
Stdout: c.OutOrStdout(),
Stderr: c.ErrOrStderr(),
})
+ host.SetTerminalHold(a.UI.Hold)
if a.Flags.Verbose {
engine.SetDetail(detailWriter{a.UI})
}
diff --git a/fluxer_rexctl/internal/host/exec.go b/fluxer_rexctl/internal/host/exec.go
index de255757d..1cf11887a 100644
--- a/fluxer_rexctl/internal/host/exec.go
+++ b/fluxer_rexctl/internal/host/exec.go
@@ -17,6 +17,34 @@ import (
var ErrNeedsRoot = errors.New("host: needs root or sudo")
+var (
+ holdMu sync.Mutex
+ holdTerm = func() func() { return func() {} }
+)
+
+func SetTerminalHold(hold func() func()) {
+ holdMu.Lock()
+ holdTerm = hold
+ holdMu.Unlock()
+}
+
+func authenticate(ctx context.Context, sudo string) error {
+ if exec.CommandContext(ctx, sudo, "-n", "true").Run() == nil {
+ return nil
+ }
+ holdMu.Lock()
+ hold := holdTerm
+ holdMu.Unlock()
+ release := hold()
+ defer release()
+ cmd := exec.CommandContext(ctx, sudo, "-v")
+ cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stderr, os.Stderr
+ if err := cmd.Run(); err != nil {
+ return fmt.Errorf("sudo: %w", err)
+ }
+ return nil
+}
+
func privileged(name string, args ...string) (string, []string, error) {
if isRoot() {
return name, args, nil
@@ -36,6 +64,11 @@ func output(ctx context.Context, quiet bool, name string, args ...string) ([]byt
if quiet && bin != name {
argv = append([]string{"-n"}, argv...)
}
+ if !quiet && bin != name {
+ if err := authenticate(ctx, bin); err != nil {
+ return nil, err
+ }
+ }
cmd := exec.CommandContext(ctx, bin, argv...)
var stderr bytes.Buffer
cmd.Stderr = &stderr
@@ -54,6 +87,11 @@ func stream(ctx context.Context, log func(string), name string, args ...string)
if err != nil {
return err
}
+ if bin != name {
+ if err := authenticate(ctx, bin); err != nil {
+ return err
+ }
+ }
cmd := exec.CommandContext(ctx, bin, argv...)
cmd.Stdin = os.Stdin
pr, pw := io.Pipe()
diff --git a/fluxer_rexctl/internal/ui/step.go b/fluxer_rexctl/internal/ui/step.go
index c8e2b5c0b..96022c56d 100644
--- a/fluxer_rexctl/internal/ui/step.go
+++ b/fluxer_rexctl/internal/ui/step.go
@@ -122,6 +122,7 @@ type spinner struct {
frame int
width int
drawn bool
+ held bool
stop chan struct{}
wg sync.WaitGroup
}
@@ -158,7 +159,9 @@ func (sp *spinner) run() {
case <-t.C:
sp.u.mu.Lock()
sp.frame++
- sp.draw()
+ if !sp.held {
+ sp.draw()
+ }
sp.u.mu.Unlock()
}
}
@@ -200,6 +203,22 @@ func (u *UI) stopSpinner(sp *spinner) {
u.mu.Unlock()
}
+func (u *UI) Hold() func() {
+ u.mu.Lock()
+ defer u.mu.Unlock()
+ sp := u.spin
+ if sp == nil {
+ return func() {}
+ }
+ sp.clear()
+ sp.held = true
+ return func() {
+ u.mu.Lock()
+ sp.held = false
+ u.mu.Unlock()
+ }
+}
+
func (u *UI) Step(ctx context.Context, title string, fn func(ctx context.Context, s *Step) error) error {
s := &Step{ui: u, title: title}
var sp *spinner