diff --git a/server/.golangci.yml b/server/.golangci.yml index 9ea368b782..423827d5f6 100644 --- a/server/.golangci.yml +++ b/server/.golangci.yml @@ -101,7 +101,7 @@ issues: channels/api4/status_test.go|\ channels/api4/system_local.go|\ channels/api4/system_test.go|\ - channels/api4/team.go|\ + channels/api4/team_local.go|\ channels/api4/team_test.go|\ channels/api4/upload_test.go|\ channels/api4/usage.go|\ diff --git a/server/channels/api4/team.go b/server/channels/api4/team.go index 7e7d57dcd7..b6d991d708 100644 --- a/server/channels/api4/team.go +++ b/server/channels/api4/team.go @@ -498,7 +498,9 @@ func getTeamsForUser(c *Context, w http.ResponseWriter, r *http.Request) { return } - w.Write(js) + if _, err := w.Write(js); err != nil { + c.Logger.Warn("Error while writing response", mlog.Err(err)) + } } func getTeamsUnreadForUser(c *Context, w http.ResponseWriter, r *http.Request) { @@ -527,7 +529,9 @@ func getTeamsUnreadForUser(c *Context, w http.ResponseWriter, r *http.Request) { c.Err = model.NewAppError("getTeamsUnreadForUser", "api.marshal_error", nil, "", http.StatusInternalServerError).Wrap(err) return } - w.Write(js) + if _, err := w.Write(js); err != nil { + c.Logger.Warn("Error while writing response", mlog.Err(err)) + } } func getTeamMember(c *Context, w http.ResponseWriter, r *http.Request) { @@ -602,7 +606,9 @@ func getTeamMembers(c *Context, w http.ResponseWriter, r *http.Request) { return } - w.Write(js) + if _, err := w.Write(js); err != nil { + c.Logger.Warn("Error while writing response", mlog.Err(err)) + } } func getTeamMembersForUser(c *Context, w http.ResponseWriter, r *http.Request) { @@ -639,7 +645,9 @@ func getTeamMembersForUser(c *Context, w http.ResponseWriter, r *http.Request) { return } - w.Write(js) + if _, err := w.Write(js); err != nil { + c.Logger.Warn("Error while writing response", mlog.Err(err)) + } } func getTeamMembersByIds(c *Context, w http.ResponseWriter, r *http.Request) { @@ -680,7 +688,9 @@ func getTeamMembersByIds(c *Context, w http.ResponseWriter, r *http.Request) { return } - w.Write(js) + if _, err := w.Write(js); err != nil { + c.Logger.Warn("Error while writing response", mlog.Err(err)) + } } func addTeamMember(c *Context, w http.ResponseWriter, r *http.Request) { @@ -938,7 +948,9 @@ func addTeamMembers(c *Context, w http.ResponseWriter, r *http.Request) { auditRec.Success() w.WriteHeader(http.StatusCreated) - w.Write(js) + if _, err := w.Write(js); err != nil { + c.Logger.Warn("Error while writing response", mlog.Err(err)) + } } func removeTeamMember(c *Context, w http.ResponseWriter, r *http.Request) { @@ -1171,7 +1183,9 @@ func getAllTeams(c *Context, w http.ResponseWriter, r *http.Request) { return } - w.Write(js) + if _, err := w.Write(js); err != nil { + c.Logger.Warn("Error while writing response", mlog.Err(err)) + } } func searchTeams(c *Context, w http.ResponseWriter, r *http.Request) { @@ -1235,7 +1249,9 @@ func searchTeams(c *Context, w http.ResponseWriter, r *http.Request) { payload = js } - w.Write(payload) + if _, err := w.Write(payload); err != nil { + c.Logger.Warn("Error while writing response", mlog.Err(err)) + } } func teamExists(c *Context, w http.ResponseWriter, r *http.Request) { @@ -1269,7 +1285,9 @@ func teamExists(c *Context, w http.ResponseWriter, r *http.Request) { } resp := map[string]bool{"exists": exists} - w.Write([]byte(model.MapBoolToJSON(resp))) + if _, err := w.Write([]byte(model.MapBoolToJSON(resp))); err != nil { + c.Logger.Warn("Error while writing response", mlog.Err(err)) + } } func importTeam(c *Context, w http.ResponseWriter, r *http.Request) { @@ -1358,7 +1376,9 @@ func importTeam(c *Context, w http.ResponseWriter, r *http.Request) { return } auditRec.Success() - w.Write([]byte(model.MapToJSON(data))) + if _, err := w.Write([]byte(model.MapToJSON(data))); err != nil { + c.Logger.Warn("Error while writing response", mlog.Err(err)) + } } func inviteUsersToTeam(c *Context, w http.ResponseWriter, r *http.Request) { @@ -1460,7 +1480,9 @@ func inviteUsersToTeam(c *Context, w http.ResponseWriter, r *http.Request) { return } - w.Write(js) + if _, err := w.Write(js); err != nil { + c.Logger.Warn("Error while writing response", mlog.Err(err)) + } } else { appErr := c.App.InviteNewUsersToTeam(c.AppContext, emailList, c.Params.TeamId, c.AppContext.Session().UserId) if appErr != nil { @@ -1551,7 +1573,9 @@ func inviteGuestsToChannels(c *Context, w http.ResponseWriter, r *http.Request) return } - w.Write(js) + if _, err := w.Write(js); err != nil { + c.Logger.Warn("Error while writing response", mlog.Err(err)) + } } else { appErr := c.App.InviteGuestsToChannels(c.AppContext, c.Params.TeamId, &guestsInvite, c.AppContext.Session().UserId) if appErr != nil { @@ -1650,11 +1674,17 @@ func getTeamIcon(c *Context, w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "image/png") w.Header().Set("Cache-Control", fmt.Sprintf("max-age=%v, private", model.DayInSeconds)) // 24 hrs w.Header().Set(model.HeaderEtagServer, etag) - w.Write(img) + if _, err := w.Write(img); err != nil { + c.Logger.Warn("Error while writing response", mlog.Err(err)) + } } func setTeamIcon(c *Context, w http.ResponseWriter, r *http.Request) { - defer io.Copy(io.Discard, r.Body) + defer func() { + if _, err := io.Copy(io.Discard, r.Body); err != nil { + c.Logger.Warn("Error while reading request body", mlog.Err(err)) + } + }() c.RequireTeamId() if c.Err != nil { @@ -1846,5 +1876,7 @@ func teamMembersMinusGroupMembers(c *Context, w http.ResponseWriter, r *http.Req return } - w.Write(b) + if _, err := w.Write(b); err != nil { + c.Logger.Warn("Error while writing response", mlog.Err(err)) + } }