From 72258266aa4556557262bb517918ba2194bd7edb Mon Sep 17 00:00:00 2001 From: George Goldberg Date: Thu, 6 Sep 2018 22:41:19 +0100 Subject: MM-11649: Fix caching issue in channel API endpoints. (#9345) This fixes an issue where the cached Channel objects would contain data from a failed update when the update to the database failed. --- api4/channel.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'api4') diff --git a/api4/channel.go b/api4/channel.go index 1599b6e70..d497c9793 100644 --- a/api4/channel.go +++ b/api4/channel.go @@ -97,10 +97,11 @@ func updateChannel(c *Context, w http.ResponseWriter, r *http.Request) { } var oldChannel *model.Channel - var err *model.AppError - if oldChannel, err = c.App.GetChannel(channel.Id); err != nil { + if originalOldChannel, err := c.App.GetChannel(channel.Id); err != nil { c.Err = err return + } else { + oldChannel = originalOldChannel.DeepCopy() } switch oldChannel.Type { @@ -229,10 +230,12 @@ func patchChannel(c *Context, w http.ResponseWriter, r *http.Request) { return } - oldChannel, err := c.App.GetChannel(c.Params.ChannelId) - if err != nil { + var oldChannel *model.Channel + if originalOldChannel, err := c.App.GetChannel(c.Params.ChannelId); err != nil { c.Err = err return + } else { + oldChannel = originalOldChannel.DeepCopy() } switch oldChannel.Type { -- cgit v1.2.3-1-g7c22 From bb605a6b91073714f6b9a59b86c25c1b46bd2ba9 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Mon, 10 Sep 2018 06:19:29 -0700 Subject: Changing comparison method. (#9383) --- api4/file.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'api4') diff --git a/api4/file.go b/api4/file.go index cfb72cdcb..3bb4ea9d6 100644 --- a/api4/file.go +++ b/api4/file.go @@ -4,6 +4,7 @@ package api4 import ( + "crypto/subtle" "io" "io/ioutil" "net/http" @@ -342,7 +343,7 @@ func getPublicFile(c *Context, w http.ResponseWriter, r *http.Request) { return } - if hash != app.GeneratePublicLinkHash(info.Id, *c.App.Config().FileSettings.PublicLinkSalt) { + if subtle.ConstantTimeCompare([]byte(hash), []byte(app.GeneratePublicLinkHash(info.Id, *c.App.Config().FileSettings.PublicLinkSalt))) != 1 { c.Err = model.NewAppError("getPublicFile", "api.file.get_file.public_invalid.app_error", nil, "", http.StatusBadRequest) utils.RenderWebAppError(c.App.Config(), w, r, c.Err, c.App.AsymmetricSigningKey()) return -- cgit v1.2.3-1-g7c22