Skip to content

fix(input): improve askStdin handling for normal and hidden input #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yaninyzwitty wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(input): improve askStdin handling for normal and hidden input #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions internal/tools/hypertest/exec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
package main

import (
"bufio"
"errors"
"fmt"
"io"
Expand All @@ -25,7 +26,6 @@ import (
"strings"
"sync"
"sync/atomic"
"syscall"
"time"

"al.essio.dev/pkg/shellescape"
Expand Down Expand Up @@ -309,28 +309,33 @@ func (r *runner) runOverSSH(remote string, tests []test) (string, error) {
return stdout.String(), nil
}

// interactive prompt handler for asking questions on the command line
func askStdin(name, instruction string, questions []string, echos []bool) (answers []string, err error) {
if len(questions) == 0 && name != "" {
fmt.Printf("%s: %s\n", name, instruction)
}

answers = make([]string, len(questions))
reader := bufio.NewReader(os.Stdin) // to allow capturing multiple words

for i, q := range questions {
fmt.Printf("%s ", q)
if echos[i] {
_, err := fmt.Scan("%s", &answers[i])
// Normal input (echo on) → allow spaces
input, err := reader.ReadString('\n')
if err != nil {
return nil, err
}
answers[i] = strings.TrimSpace(input)
continue
}

answer, err := term.ReadPassword(syscall.Stdin)
// Hidden input - use os.Stdin.Fd for portability
answer, err := term.ReadPassword(int(os.Stdin.Fd()))
fmt.Println()
if err != nil {
return nil, err
}
answers[i] = string(answer)
answers[i] = strings.TrimSpace(string(answer)) // clean trailing spaces and lines
}

return answers, nil
Expand Down