IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

team code review

Browse Source
This commit is contained in:
=Corey Hulen
2015-07-06 11:20:40 -08:00
parent 10b625ba17
commit e3ab0a4e3d
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/context.go
View File

@@ -84,6 +84,7 @@ func (h handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
if forwardProto == "http" {
l4g.Info("redirecting http request to https for %v", r.URL.Path)
http.Redirect(w, r, "https://"+r.Host, http.StatusTemporaryRedirect)
return
} else {
protocol = "https"
}

11
api/user.go
View File

@@ -289,7 +289,7 @@ func login(c *Context, w http.ResponseWriter, r *http.Request) {
if !model.ComparePassword(user.Password, props["password"]) {
c.LogAuditWithUserId(user.Id, "fail")
c.Err = model.NewAppError("login", "Login failed because of invalid password", extraInfo)
c.Err.StatusCode = http.StatusBadRequest
c.Err.StatusCode = http.StatusForbidden
return
}
@@ -417,7 +417,7 @@ func getSessions(c *Context, w http.ResponseWriter, r *http.Request) {
params := mux.Vars(r)
id := params["id"]
if !c.HasPermissionsToUser(id, "getAudits") {
if !c.HasPermissionsToUser(id, "getSessions") {
return
}
@@ -740,7 +740,7 @@ func updateUser(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
if !c.HasPermissionsToUser(user.Id, "updateUsers") {
if !c.HasPermissionsToUser(user.Id, "updateUser") {
return
}
@@ -813,12 +813,13 @@ func updatePassword(c *Context, w http.ResponseWriter, r *http.Request) {
if !model.ComparePassword(user.Password, currentPassword) {
c.Err = model.NewAppError("updatePassword", "Update password failed because of invalid password", "")
c.Err.StatusCode = http.StatusBadRequest
c.Err.StatusCode = http.StatusForbidden
return
}
if uresult := <-Srv.Store.User().UpdatePassword(c.Session.UserId, model.HashPassword(newPassword)); uresult.Err != nil {
c.Err = uresult.Err
c.Err = model.NewAppError("updatePassword", "Update password failed", uresult.Err.Error())
c.Err.StatusCode = http.StatusForbidden
return
} else {
c.LogAudit("completed")

2
model/user.go
View File

@@ -198,7 +198,7 @@ func (u *User) Sanitize(options map[string]bool) {
if len(options) != 0 && !options["phonenumber"] {
// TODO - fill in when PhoneNumber is added to user model
}
if len(options) != 0 && !options["passwordupadte"] {
if len(options) != 0 && !options["passwordupdate"] {
u.LastPasswordUpdate = 0
}
}

4
store/sql_user_store.go
View File

@@ -95,7 +95,7 @@ func (us SqlUserStore) Save(user *model.User) StoreChannel {
return storeChannel
}
func (us SqlUserStore) Update(user *model.User, allowRoleActiveUpdate bool) StoreChannel {
func (us SqlUserStore) Update(user *model.User, allowActiveUpdate bool) StoreChannel {
storeChannel := make(StoreChannel)
@@ -125,7 +125,7 @@ func (us SqlUserStore) Update(user *model.User, allowRoleActiveUpdate bool) Stor
user.LastPingAt = oldUser.LastPingAt
user.EmailVerified = oldUser.EmailVerified
if !allowRoleActiveUpdate {
if !allowActiveUpdate {
user.Roles = oldUser.Roles
user.DeleteAt = oldUser.DeleteAt
}