diff options
Diffstat (limited to 'api4')
-rw-r--r-- | api4/user.go | 52 | ||||
-rw-r--r-- | api4/user_test.go | 80 |
2 files changed, 131 insertions, 1 deletions
diff --git a/api4/user.go b/api4/user.go index 3d10473a2..66f1b7a88 100644 --- a/api4/user.go +++ b/api4/user.go @@ -30,7 +30,6 @@ func InitUser() { BaseRoutes.User.Handle("/image", ApiSessionRequired(setProfileImage)).Methods("POST") BaseRoutes.User.Handle("", ApiSessionRequired(updateUser)).Methods("PUT") BaseRoutes.User.Handle("/patch", ApiSessionRequired(patchUser)).Methods("PUT") - BaseRoutes.User.Handle("/mfa", ApiSessionRequired(updateUserMfa)).Methods("PUT") BaseRoutes.User.Handle("", ApiSessionRequired(deleteUser)).Methods("DELETE") BaseRoutes.User.Handle("/roles", ApiSessionRequired(updateUserRoles)).Methods("PUT") BaseRoutes.User.Handle("/password", ApiSessionRequired(updatePassword)).Methods("PUT") @@ -39,6 +38,10 @@ func InitUser() { BaseRoutes.Users.Handle("/email/verify", ApiHandler(verifyUserEmail)).Methods("POST") BaseRoutes.Users.Handle("/email/verify/send", ApiHandler(sendVerificationEmail)).Methods("POST") + BaseRoutes.Users.Handle("/mfa", ApiHandler(checkUserMfa)).Methods("POST") + BaseRoutes.User.Handle("/mfa", ApiSessionRequired(updateUserMfa)).Methods("PUT") + BaseRoutes.User.Handle("/mfa/generate", ApiSessionRequired(generateMfaSecret)).Methods("POST") + BaseRoutes.Users.Handle("/login", ApiHandler(login)).Methods("POST") BaseRoutes.Users.Handle("/logout", ApiHandler(logout)).Methods("POST") @@ -554,6 +557,30 @@ func updateUserRoles(c *Context, w http.ResponseWriter, r *http.Request) { ReturnStatusOK(w) } +func checkUserMfa(c *Context, w http.ResponseWriter, r *http.Request) { + props := model.MapFromJson(r.Body) + + loginId := props["login_id"] + if len(loginId) == 0 { + c.SetInvalidParam("login_id") + return + } + + resp := map[string]interface{}{} + resp["mfa_required"] = false + + if !utils.IsLicensed || !*utils.License.Features.MFA || !*utils.Cfg.ServiceSettings.EnableMultifactorAuthentication { + w.Write([]byte(model.StringInterfaceToJson(resp))) + return + } + + if user, err := app.GetUserForLogin(loginId, false); err == nil { + resp["mfa_required"] = user.MfaActive + } + + w.Write([]byte(model.StringInterfaceToJson(resp))) +} + func updateUserMfa(c *Context, w http.ResponseWriter, r *http.Request) { c.RequireUserId() if c.Err != nil { @@ -593,6 +620,29 @@ func updateUserMfa(c *Context, w http.ResponseWriter, r *http.Request) { ReturnStatusOK(w) } +func generateMfaSecret(c *Context, w http.ResponseWriter, r *http.Request) { + c.RequireUserId() + if c.Err != nil { + return + } + + if !app.SessionHasPermissionToUser(c.Session, c.Params.UserId) { + c.SetPermissionError(model.PERMISSION_EDIT_OTHER_USERS) + return + } + + secret, err := app.GenerateMfaSecret(c.Params.UserId) + if err != nil { + c.Err = err + return + } + + w.Header().Set("Cache-Control", "no-cache") + w.Header().Set("Pragma", "no-cache") + w.Header().Set("Expires", "0") + w.Write([]byte(secret.ToJson())) +} + func updatePassword(c *Context, w http.ResponseWriter, r *http.Request) { c.RequireUserId() if c.Err != nil { diff --git a/api4/user_test.go b/api4/user_test.go index 3bdc73045..39a7dce10 100644 --- a/api4/user_test.go +++ b/api4/user_test.go @@ -1009,6 +1009,86 @@ func TestGetUsersNotInChannel(t *testing.T) { CheckNotImplementedStatus(t, resp) }*/ +func TestCheckUserMfa(t *testing.T) { + th := Setup().InitBasic().InitSystemAdmin() + defer TearDown() + Client := th.Client + + required, resp := Client.CheckUserMfa(th.BasicUser.Email) + CheckNoError(t, resp) + + if required { + t.Fatal("should be false - mfa not active") + } + + _, resp = Client.CheckUserMfa("") + CheckBadRequestStatus(t, resp) + + Client.Logout() + + required, resp = Client.CheckUserMfa(th.BasicUser.Email) + CheckNoError(t, resp) + + if required { + t.Fatal("should be false - mfa not active") + } + + isLicensed := utils.IsLicensed + license := utils.License + enableMfa := *utils.Cfg.ServiceSettings.EnableMultifactorAuthentication + defer func() { + utils.IsLicensed = isLicensed + utils.License = license + *utils.Cfg.ServiceSettings.EnableMultifactorAuthentication = enableMfa + }() + utils.IsLicensed = true + utils.License = &model.License{Features: &model.Features{}} + utils.License.Features.SetDefaults() + *utils.License.Features.MFA = true + *utils.Cfg.ServiceSettings.EnableMultifactorAuthentication = true + + th.LoginBasic() + + required, resp = Client.CheckUserMfa(th.BasicUser.Email) + CheckNoError(t, resp) + + if required { + t.Fatal("should be false - mfa not active") + } + + Client.Logout() + + required, resp = Client.CheckUserMfa(th.BasicUser.Email) + CheckNoError(t, resp) + + if required { + t.Fatal("should be false - mfa not active") + } +} + +func TestGenerateMfaSecret(t *testing.T) { + th := Setup().InitBasic().InitSystemAdmin() + defer TearDown() + Client := th.Client + + _, resp := Client.GenerateMfaSecret(th.BasicUser.Id) + CheckNotImplementedStatus(t, resp) + + _, resp = Client.GenerateMfaSecret("junk") + CheckBadRequestStatus(t, resp) + + _, resp = Client.GenerateMfaSecret(model.NewId()) + CheckForbiddenStatus(t, resp) + + Client.Logout() + + _, resp = Client.GenerateMfaSecret(th.BasicUser.Id) + CheckUnauthorizedStatus(t, resp) + + _, resp = th.SystemAdminClient.GenerateMfaSecret(th.BasicUser.Id) + CheckNotImplementedStatus(t, resp) +} + func TestUpdateUserPassword(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() defer TearDown() |