Rewrite of MimeTypeMap to support extensions with multiple mimetypes (#…

…296) * Rewrite of MimeTypeMap to support matching file extensions to mimetype aliases. Example: zip files can be application/zip, application/zip-compressed or application/x-zip-compressed * Test to cover case where fileextension not found in map * remove misleading comment * Fix codeQL warning
Altinn · Aug 28, 2023 · 0e2e509 · 0e2e509
1 parent 9d441d6
commit 0e2e509
Show file tree

Hide file tree

Showing 6 changed files with 856 additions and 711 deletions.
diff --git a/src/Altinn.App.Api/Controllers/ResourceController.cs b/src/Altinn.App.Api/Controllers/ResourceController.cs
@@ -50,7 +50,7 @@ public IActionResult Index(string org, string app, string id)
 
             if (fileContent != null)
             {
-                return new FileContentResult(fileContent, MimeTypeMap.GetMimeType(Path.GetExtension(id).ToLower()));
+                return new FileContentResult(fileContent, MimeTypeMap.GetMimeType(Path.GetExtension(id).ToLower()).ToString());
             }
 
             if (id == _appSettings.RuleConfigurationJSONFileName || id == _appSettings.RuleHandlerFileName)
@@ -75,7 +75,7 @@ public IActionResult GetRuntimeResource(string id)
 
             if (fileContent != null)
             {
-                return new FileContentResult(fileContent, MimeTypeMap.GetMimeType(Path.GetExtension(id).ToLower()));
+                return new FileContentResult(fileContent, MimeTypeMap.GetMimeType(Path.GetExtension(id).ToLower()).ToString());
             }
 
             return StatusCode(404);
@@ -99,14 +99,14 @@ public IActionResult GetTextResources(string org, string app)
             byte[] fileContent = _appResourceService.GetText(org, app, id);
             if (fileContent != null)
             {
-                return new FileContentResult(fileContent, MimeTypeMap.GetMimeType(Path.GetExtension(id).ToLower()));
+                return new FileContentResult(fileContent, MimeTypeMap.GetMimeType(Path.GetExtension(id).ToLower()).ToString());
             }
 
             id = $"resource.{defaultLang}.json";
             fileContent = _appResourceService.GetText(org, app, id);
             if (fileContent != null)
             {
-                return new FileContentResult(fileContent, MimeTypeMap.GetMimeType(Path.GetExtension(id).ToLower()));
+                return new FileContentResult(fileContent, MimeTypeMap.GetMimeType(Path.GetExtension(id).ToLower()).ToString());
             }
 
             return StatusCode(404);
@@ -226,7 +226,7 @@ public ActionResult GetRulehandler(string org, string app, string id)
             byte[] fileContent = _appResourceService.GetRuleHandlerForSet(id);
             if (fileContent != null)
             {
-                return new FileContentResult(fileContent, MimeTypeMap.GetMimeType(".ts"));
+                return new FileContentResult(fileContent, MimeTypeMap.GetMimeType(".ts").ToString());
             }
 
             return NoContent();
@@ -249,7 +249,7 @@ public ActionResult GetRuleConfiguration(string org, string app, string id)
                 return NoContent();
             }
 
-            return new FileContentResult(fileContent, MimeTypeMap.GetMimeType(".json"));
+            return new FileContentResult(fileContent, MimeTypeMap.GetMimeType(".json").ToString());
         }
 
         /// <summary>

diff --git a/src/Altinn.App.Api/Helpers/RequestHandling/DataRestrictionValidation.cs b/src/Altinn.App.Api/Helpers/RequestHandling/DataRestrictionValidation.cs
@@ -82,7 +82,7 @@ public static (bool Success, List<ValidationIssue> Errors) CompliesWithDataRestr
             }
 
             string filetype = splitFilename[splitFilename.Length - 1];
-            string mimeType = MimeTypeMap.GetMimeType(filetype);
+            var mimeType = MimeTypeMap.GetMimeType(filetype);
 
             if (!request.Headers.TryGetValue("Content-Type", out StringValues contentType))
             {
@@ -97,7 +97,7 @@ public static (bool Success, List<ValidationIssue> Errors) CompliesWithDataRestr
             }
 
             // Verify that file mime type matches content type in request
-            if (!contentType.Equals("application/octet-stream") && !mimeType.Equals(contentType, StringComparison.InvariantCultureIgnoreCase))
+            if (!contentType.Equals("application/octet-stream") && !mimeType.Equals(contentType))
             {
                 errors.Add(new ValidationIssue
                 {
@@ -110,7 +110,7 @@ public static (bool Success, List<ValidationIssue> Errors) CompliesWithDataRestr
             }
 
             // Verify that file mime type is an allowed content-type
-            if (!dataType.AllowedContentTypes.Contains(mimeType, StringComparer.InvariantCultureIgnoreCase) && !dataType.AllowedContentTypes.Contains("application/octet-stream"))
+            if (!dataType.AllowedContentTypes.Contains(contentType.ToString(), StringComparer.InvariantCultureIgnoreCase) && !dataType.AllowedContentTypes.Contains("application/octet-stream"))
             {
                 errors.Add(new ValidationIssue
                 {