Keep the mnemonic variables from the mnemonic command (closes #80)
check / check (push) Waiting to run
check / check (push) Waiting to run
The mnemonic command ran with the tool's whole environment, so a mnemonic set in KEYFUNC_MNEMONIC reached it, although the command is there to supply one of its own. It now gets the environment ssh and sftp already get, with KEYFUNC_MNEMONIC and KEYFUNC_MNEMONIC_COMMAND removed. The function that builds that environment moves from the ssh command group into internal/mnemonic, beside the two variable names, so all three programs use the one copy. The README says so. A mnemonic command that runs keyfunc itself no longer finds the main mnemonic in either variable. Model: opus-5-5 Co-authored-by: clawbot <sneak+clawbot@sneak.cloud>
This commit was merged in pull request #83.
This commit is contained in:
@@ -63,6 +63,7 @@ func Read(ctx context.Context, command string) (string, error) {
|
||||
func run(ctx context.Context, command string) (string, error) {
|
||||
//nolint:gosec // running the user's own command is the point
|
||||
shell := exec.CommandContext(ctx, "sh", "-c", command)
|
||||
shell.Env = ChildEnv()
|
||||
|
||||
var complaint bytes.Buffer
|
||||
|
||||
@@ -83,6 +84,25 @@ func run(ctx context.Context, command string) (string, error) {
|
||||
return string(out), nil
|
||||
}
|
||||
|
||||
// ChildEnv is the tool's environment with the mnemonic variables taken
|
||||
// out, for the programs the tool starts: the mnemonic command, ssh and
|
||||
// sftp. The mnemonic, from either variable, never leaves the tool.
|
||||
func ChildEnv() []string {
|
||||
environ := os.Environ()
|
||||
kept := make([]string, 0, len(environ))
|
||||
|
||||
for _, entry := range environ {
|
||||
name, _, _ := strings.Cut(entry, "=")
|
||||
if name == Variable || name == CommandVariable {
|
||||
continue
|
||||
}
|
||||
|
||||
kept = append(kept, entry)
|
||||
}
|
||||
|
||||
return kept
|
||||
}
|
||||
|
||||
// ask prompts on the terminal with echo turned off.
|
||||
func ask() (string, error) {
|
||||
fd := int(os.Stdin.Fd())
|
||||
|
||||
Reference in New Issue
Block a user