Handle and log unhandled errors

Currently, we don't process the results of this execution,
because it's not really imprortant

Let's at least log the err if the execution went wrong

That will also make Vulnerability report happy

2 files changed, 11 insertions, 7 deletions

diff --git a/internal/command/twofactorrecover/twofactorrecover.go b/internal/command/twofactorrecover/twofactorrecover.go
index 91eca3a..6982689 100644
--- a/internal/command/twofactorrecover/twofactorrecover.go
+++ b/internal/command/twofactorrecover/twofactorrecover.go
@@ -26,7 +26,7 @@ func (c *Command) Execute(ctx context.Context) error {
 	ctxlog := log.ContextLogger(ctx)
 	ctxlog.Debug("twofactorrecover: execute: Waiting for user input")
 
-	if c.canContinue() {
+	if c.getUserAnswer(ctx) == "yes" {
 		ctxlog.Debug("twofactorrecover: execute: User chose to continue")
 		c.displayRecoveryCodes(ctx)
 	} else {
@@ -37,16 +37,18 @@ func (c *Command) Execute(ctx context.Context) error {
 	return nil
 }
 
-func (c *Command) canContinue() bool {
+func (c *Command) getUserAnswer(ctx context.Context) string {
 	question :=
 		"Are you sure you want to generate new two-factor recovery codes?\n" +
 			"Any existing recovery codes you saved will be invalidated. (yes/no)"
 	fmt.Fprintln(c.ReadWriter.Out, question)
 
 	var answer string
-	fmt.Fscanln(io.LimitReader(c.ReadWriter.In, readerLimit), &answer)
+	if _, err := fmt.Fscanln(io.LimitReader(c.ReadWriter.In, readerLimit), &answer); err != nil {
+		log.ContextLogger(ctx).WithError(err).Debug("twofactorrecover: getUserAnswer: Failed to get user input")
+	}
 
-	return answer == "yes"
+	return answer
 }
 
 func (c *Command) displayRecoveryCodes(ctx context.Context) {
diff --git a/internal/command/twofactorverify/twofactorverify.go b/internal/command/twofactorverify/twofactorverify.go
index fe17339..0099e84 100644
--- a/internal/command/twofactorverify/twofactorverify.go
+++ b/internal/command/twofactorverify/twofactorverify.go
@@ -22,7 +22,7 @@ type Command struct {
 func (c *Command) Execute(ctx context.Context) error {
 	ctxlog := log.ContextLogger(ctx)
 	ctxlog.Info("twofactorverify: execute: waiting for user input")
-	otp := c.getOTP()
+	otp := c.getOTP(ctx)
 
 	ctxlog.Info("twofactorverify: execute: verifying entered OTP")
 	err := c.verifyOTP(ctx, otp)
@@ -35,14 +35,16 @@ func (c *Command) Execute(ctx context.Context) error {
 	return nil
 }
 
-func (c *Command) getOTP() string {
+func (c *Command) getOTP(ctx context.Context) string {
 	prompt := "OTP: "
 	fmt.Fprint(c.ReadWriter.Out, prompt)
 
 	var answer string
 	otpLength := int64(64)
 	reader := io.LimitReader(c.ReadWriter.In, otpLength)
-	fmt.Fscanln(reader, &answer)
+	if _, err := fmt.Fscanln(reader, &answer); err != nil {
+		log.ContextLogger(ctx).WithError(err).Debug("twofactorverify: getOTP: Failed to get user input")
+	}
 
 	return answer
 }