From 0f062367b5ce0f577d8f3fe2f6f1b6b6507d5b56 Mon Sep 17 00:00:00 2001
From: Lev <1187448+levb@users.noreply.github.com>
Date: Mon, 1 Apr 2019 09:24:37 -0700
Subject: [PATCH] Fixed error message displayed for FileWillBeUploaded
 rejections (#10535)

#### Summary
Fixed the error message displayed when an uploading file gets rejected by a plugin's FileWillBeUploaded hook.

#### Ticket Link
https://mattermost.atlassian.net/browse/MM-14803
---
 app/file.go  | 4 ++--
 i18n/en.json | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/file.go b/app/file.go
index bda26fd9b5..423017260f 100644
--- a/app/file.go
+++ b/app/file.go
@@ -648,8 +648,8 @@ func (t *uploadFileTask) runPlugins() *model.AppError {
 		replacementInfo, rejectionReason := hooks.FileWillBeUploaded(pluginContext,
 			t.fileinfo, t.newReader(), buf)
 		if rejectionReason != "" {
-			rejectionError = t.newAppError("api.file.upload_file.read_request.app_error",
-				rejectionReason, http.StatusBadRequest)
+			rejectionError = t.newAppError("api.file.upload_file.rejected_by_plugin.app_error",
+				rejectionReason, http.StatusForbidden, "Reason", rejectionReason)
 			return false
 		}
 		if replacementInfo != nil {
diff --git a/i18n/en.json b/i18n/en.json
index 04f468be45..8b4046c0f5 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1252,6 +1252,10 @@
     "id": "api.file.upload_file.too_large_detailed.app_error",
     "translation": "Unable to upload file {{.Filename}}. {{.Length}} bytes exceeds the maximum allowed {{.Limit}} bytes."
   },
+  {
+    "id": "api.file.upload_file.rejected_by_plugin.app_error",
+    "translation": "Unable to upload file {{.Filename}}. Rejected by plugin: {{.Reason}}"
+  },
   {
     "id": "api.file.write_file.s3.app_error",
     "translation": "Encountered an error writing to S3"