Restore TTY when aborting TOTP ticker with Ctrl+C

internal/action/otp.go

@@ -53,35 +53,35 @@ func tickingBar(ctx context.Context, expiresAt time.Time, bar *termio.ProgressBa
 	}
 }
 
-func waitForKeyPress(ctx context.Context, cancel context.CancelFunc) {
-	tty, err := tty.Open()
+func waitForKeyPress(ctx context.Context, cancel context.CancelFunc) (func(), func()) {
+	tty1, err := tty.Open()
 	if err != nil {
 		out.Errorf(ctx, "Unexpected error opening tty: %v", err)
 		cancel()
 	}
 
-	defer func() {
-		_ = tty.Close()
-	}()
+	return func() {
+			for {
+				select {
+				case <-ctx.Done():
+					return // returning not to leak the goroutine.
+				default:
+				}
 
-	for {
-		select {
-		case <-ctx.Done():
-			return // returning not to leak the goroutine.
-		default:
-		}
-
-		r, err := tty.ReadRune()
-		if err != nil {
-			out.Errorf(ctx, "Unexpected error opening tty: %v", err)
-		}
+				r, err := tty1.ReadRune()
+				if err != nil {
+					out.Errorf(ctx, "Unexpected error opening tty: %v", err)
+				}
 
-		if r == 'q' || r == 'x' || err != nil {
-			cancel()
+				if r == 'q' || r == 'x' || err != nil {
+					cancel()
 
-			return
+					return
+				}
+			}
+		}, func() {
+			_ = tty1.Close()
 		}
-	}
 }
 
 // nolint: cyclop
@@ -97,7 +97,9 @@ func (s *Action) otp(ctx context.Context, name, qrf string, clip, pw, recurse bo
 	skip := ctxutil.IsHidden(ctx) || pw || qrf != "" || !ctxutil.IsTerminal(ctx) || !ctxutil.IsInteractive(ctx) || clip
 	if !skip {
 		// let us monitor key presses for cancellation:.
-		go waitForKeyPress(ctx, cancel)
+		runFn, cleanupFn := waitForKeyPress(ctx, cancel)
+		go runFn()
+		defer cleanupFn()
 	}
 
 	// only used for the HOTP case as a fallback
@@ -188,6 +190,7 @@ func (s *Action) otp(ctx context.Context, name, qrf string, clip, pw, recurse bo
 			select {
 			case <-ctx.Done():
 				bar.Done()
+				cancel()
 
 				return nil
 			default:

pkg/gopass/secrets/kv_test.go

@@ -35,21 +35,15 @@ username: myuser@test.com
 Test / test.com
 `
 
-	t.Run("read back the secret", func(t *testing.T) {
-		t.Parallel()
-
+	t.Run("read back the secret", func(t *testing.T) { //nolint:paralleltest
 		assert.Equal(t, mlOut, string(s.Bytes()))
 	})
 
-	t.Run("no_duplicate_keys", func(t *testing.T) {
-		t.Parallel()
-
+	t.Run("no_duplicate_keys", func(t *testing.T) { //nolint:paralleltest
 		assert.Equal(t, []string{"password", "url", "username"}, s.Keys())
 	})
 
-	t.Run("read some keys", func(t *testing.T) {
-		t.Parallel()
-
+	t.Run("read some keys", func(t *testing.T) { //nolint:paralleltest
 		for k, v := range map[string]string{
 			"password": "bar",
 			"url":      "http://www.test.com/",
@@ -62,9 +56,7 @@ Test / test.com
 		assert.Equal(t, "somepasswd", s.Password())
 	})
 
-	t.Run("remove a key", func(t *testing.T) {
-		t.Parallel()
-
+	t.Run("remove a key", func(t *testing.T) { //nolint:paralleltest
 		assert.NoError(t, s.Set("foobar", "baz"))
 		v, ok := s.Get("foobar")
 		assert.True(t, ok)
@@ -76,9 +68,7 @@ Test / test.com
 		assert.Equal(t, "", v)
 	})
 
-	t.Run("read the body", func(t *testing.T) {
-		t.Parallel()
-
+	t.Run("read the body", func(t *testing.T) { //nolint:paralleltest
 		body := "Test / test.com\n"
 		assert.Equal(t, body, s.Body())
 		assert.Equal(t, body, s.Body())