diff options
author | Saturnino Abril <saturnino.abril@gmail.com> | 2017-09-19 20:58:20 +0800 |
---|---|---|
committer | Jonathan <jonfritz@gmail.com> | 2017-09-19 08:58:20 -0400 |
commit | 0643bf51595396a7dab88be07a9f2b50410dedea (patch) | |
tree | 4352bf73802bc66a4ab2c9e6e8a71652059ddca2 | |
parent | 3811b1ce1e9cc0aab19ee09200f755c9defbfdc7 (diff) | |
download | chat-0643bf51595396a7dab88be07a9f2b50410dedea.tar.gz chat-0643bf51595396a7dab88be07a9f2b50410dedea.tar.bz2 chat-0643bf51595396a7dab88be07a9f2b50410dedea.zip |
generate web error when opening an invalid public file link (#7475)
-rw-r--r-- | api/file.go | 4 | ||||
-rw-r--r-- | api4/file.go | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/api/file.go b/api/file.go index 094c7d996..28ad5db08 100644 --- a/api/file.go +++ b/api/file.go @@ -177,10 +177,12 @@ func getPublicFile(c *Context, w http.ResponseWriter, r *http.Request) { if hash != correctHash { c.Err = model.NewAppError("getPublicFile", "api.file.get_file.public_invalid.app_error", nil, "", http.StatusBadRequest) + http.Redirect(w, r, c.GetSiteURLHeader()+"/error?message="+utils.T(c.Err.Message), http.StatusTemporaryRedirect) return } } else { c.Err = model.NewAppError("getPublicFile", "api.file.get_file.public_invalid.app_error", nil, "", http.StatusBadRequest) + http.Redirect(w, r, c.GetSiteURLHeader()+"/error?message="+utils.T(c.Err.Message), http.StatusTemporaryRedirect) return } @@ -251,10 +253,12 @@ func getPublicFileOld(c *Context, w http.ResponseWriter, r *http.Request) { if hash != correctHash { c.Err = model.NewAppError("getPublicFile", "api.file.get_file.public_invalid.app_error", nil, "", http.StatusBadRequest) + http.Redirect(w, r, c.GetSiteURLHeader()+"/error?message="+utils.T(c.Err.Message), http.StatusTemporaryRedirect) return } } else { c.Err = model.NewAppError("getPublicFile", "api.file.get_file.public_invalid.app_error", nil, "", http.StatusBadRequest) + http.Redirect(w, r, c.GetSiteURLHeader()+"/error?message="+utils.T(c.Err.Message), http.StatusTemporaryRedirect) return } diff --git a/api4/file.go b/api4/file.go index a0562a0c2..107a41122 100644 --- a/api4/file.go +++ b/api4/file.go @@ -284,11 +284,13 @@ func getPublicFile(c *Context, w http.ResponseWriter, r *http.Request) { if len(hash) == 0 { c.Err = model.NewAppError("getPublicFile", "api.file.get_file.public_invalid.app_error", nil, "", http.StatusBadRequest) + http.Redirect(w, r, c.GetSiteURLHeader()+"/error?message="+utils.T(c.Err.Message), http.StatusTemporaryRedirect) return } if hash != app.GeneratePublicLinkHash(info.Id, *utils.Cfg.FileSettings.PublicLinkSalt) { c.Err = model.NewAppError("getPublicFile", "api.file.get_file.public_invalid.app_error", nil, "", http.StatusBadRequest) + http.Redirect(w, r, c.GetSiteURLHeader()+"/error?message="+utils.T(c.Err.Message), http.StatusTemporaryRedirect) return } |