Fix prompts with Windows line endings (sigstore#2674)

Signed-off-by: Zachary Newman <zjn@chainguard.dev>
dmitris · Mar 24, 2023 · e6d1d85 · e6d1d85
1 parent f7a3591
commit e6d1d85
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/internal/ui/prompt.go b/internal/ui/prompt.go
@@ -50,7 +50,7 @@ func (w *Env) prompt() error {
 		return err
 	}
 
-	value := strings.Trim(r, "\n")
+	value := strings.Trim(r, "\r\n")
 	switch strings.ToLower(value) {
 	case "y":
 		return nil

diff --git a/internal/ui/prompt_test.go b/internal/ui/prompt_test.go
@@ -37,6 +37,10 @@ func TestConfirm(t *testing.T) {
 		{"default", "\n", &ui.ErrPromptDeclined{}, "user declined"},
 		{"empty", "", &ui.ErrPromptDeclined{}, "user declined"},
 		{"invalid", "yy", &ui.ErrInvalidInput{Got: "yy", Allowed: "y, n"}, "invalid input"},
+		{"no-windows", "n\r\n", &ui.ErrPromptDeclined{}, "user declined"},
+		{"yes-windows", "y\r\n", nil, ""},
+		{"default-windows", "\r\n", &ui.ErrPromptDeclined{}, "user declined"},
+		{"invalid", "yy\r\n", &ui.ErrInvalidInput{Got: "yy", Allowed: "y, n"}, "invalid input"},
 	}
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {