Update file upload validation (#3854)

dnnsoftware · Jun 25, 2020 · 402fd83 · 402fd83
1 parent 0b1c037
commit 402fd83
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/DNN Platform/DotNetNuke.Web/InternalServices/FileUploadController.cs b/DNN Platform/DotNetNuke.Web/InternalServices/FileUploadController.cs
@@ -495,7 +495,12 @@ private static FileUploadDto UploadFile(
                     extensionList = filter.Split(',').Select(i => i.Trim()).ToList();
                 }
 
-                var validateParams = new List<object> { extensionList, portalId, userInfo.UserID };
+                var validateParams = new List<object> { extensionList, userInfo.UserID };
+                if (!userInfo.IsSuperUser)
+                {
+                    validateParams.Add(portalId);
+                }
+
                 if (!ValidationUtils.ValidationCodeMatched(validateParams, validationCode))
                 {
                     throw new InvalidOperationException("Bad Request");

diff --git a/DNN Platform/DotNetNuke.Web/UI/WebControls/DnnFileUploadOptions.cs b/DNN Platform/DotNetNuke.Web/UI/WebControls/DnnFileUploadOptions.cs
@@ -188,8 +188,11 @@ public string ValidationCode
                 var parameters = new List<object>() { this.Extensions };
                 if (portalSettings != null)
                 {
-                    parameters.Add(portalSettings.PortalId);
                     parameters.Add(portalSettings.UserInfo.UserID);
+                    if (!portalSettings.UserInfo.IsSuperUser)
+                    {
+                        parameters.Add(portalSettings.PortalId);
+                    }
                 }
 
                 return ValidationUtils.ComputeValidationCode(parameters);