Merge pull request #354 from justin-wilxite/totp-fix

Handle invalid recovery code in totp2fa #351

Author: aarondl

otp/twofactor/sms2fa/sms_test.go

@@ -525,6 +525,33 @@ func TestValidatorPostOk(t *testing.T) {
 		}
 	})
 
+	t.Run("InvalidRecovery", func(t *testing.T) {
+		h := testSetup()
+		r, w, _ := h.newHTTP("POST")
+		v := &SMSValidator{SMS: h.sms, Page: PageSMSValidate}
+
+		user := &mocks.User{Email: "test@test.com", SMSPhoneNumber: "number"}
+		h.storer.Users[user.Email] = user
+		h.setSession(authboss.SessionKey, user.Email)
+
+		h.setSession(SessionSMSSecret, "code-user-never-got")
+		h.bodyReader.Return = mocks.Values{Recovery: "INVALID"}
+
+		h.loadClientState(w, &r)
+
+		if err := v.Post(w, r); err != nil {
+			t.Fatal(err)
+		}
+
+		// Flush client state
+		w.WriteHeader(http.StatusOK)
+
+		validation := h.responder.Data[authboss.DataValidation].(map[string][]string)
+		if got := validation[FormValueCode][0]; got != "2fa code was invalid" {
+			t.Error("data wrong:", got)
+		}
+	})
+
 	t.Run("FailRemoveCode", func(t *testing.T) {
 		h := testSetup()
 		r, w, _ := h.newHTTP("POST")

otp/twofactor/totp2fa/totp.go

@@ -477,6 +477,8 @@ func (t *TOTP) validate(r *http.Request) (User, string, error) {
 			if err := t.Authboss.Config.Storage.Server.Save(r.Context(), user); err != nil {
 				return nil, "", err
 			}
+		} else {
+			return user, validationErrInvalidCode, nil
 		}
 
 		return user, validationSuccess, nil

otp/twofactor/totp2fa/totp_test.go

@@ -597,6 +597,34 @@ func TestPostValidate(t *testing.T) {
 			t.Error("path wrong:", opts.RedirectPath)
 		}
 	})
+
+	t.Run("InvalidRecovery", func(t *testing.T) {
+		h := testSetup()
+
+		r, w, _ := h.newHTTP("POST")
+		user := setupMore(h)
+		secret := makeSecretKey(h, user.Email)
+		user.TOTPSecretKey = secret
+
+		// User inputs invalid recovery code
+		h.bodyReader.Return = mocks.Values{Recovery: "INVALID"}
+
+		h.setSession(SessionTOTPPendingPID, user.Email)
+		h.setSession(SessionTOTPSecret, "secret")
+		h.setSession(authboss.SessionHalfAuthKey, "true")
+		h.loadClientState(w, &r)
+
+		if err := h.totp.PostValidate(w, r); err != nil {
+			t.Error(err)
+		}
+
+		// Flush client state
+		w.WriteHeader(http.StatusOK)
+
+		if got := h.responder.Data[authboss.DataValidation].(map[string][]string); got[FormValueCode][0] != "2fa code was invalid" {
+			t.Error("data wrong:", got)
+		}
+	})
 }
 
 func makeSecretKey(h *testHarness, email string) string {