summaryrefslogtreecommitdiffstats
path: root/api4/user.go
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-03-27 09:21:48 -0400
committerGitHub <noreply@github.com>2017-03-27 09:21:48 -0400
commit58397f853a31773f24ad4e62dc1f34df0a975d53 (patch)
treec2055df17b6347199bf48054d606cf1b3b0e89c2 /api4/user.go
parenta0d5c01dfd97b45478353ccff777de677f088d0f (diff)
downloadchat-58397f853a31773f24ad4e62dc1f34df0a975d53.tar.gz
chat-58397f853a31773f24ad4e62dc1f34df0a975d53.tar.bz2
chat-58397f853a31773f24ad4e62dc1f34df0a975d53.zip
Implement some MFA endpoints for APIv4 (#5864)
Diffstat (limited to 'api4/user.go')
-rw-r--r--api4/user.go52
1 files changed, 51 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 {