Merge branch 'release/3.803.0'

VirtoCommerce · Feb 26, 2024 · 78cf5e3 · 78cf5e3
2 parents 2842a00 + 05cae62
commit 78cf5e3
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,7 @@
 <Project>
   <!-- These properties will be shared for all projects -->
   <PropertyGroup>
-    <VersionPrefix>3.802.0</VersionPrefix>
+    <VersionPrefix>3.803.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>

diff --git a/src/VirtoCommerce.AssetsModule.Core/Provider/BasicBlobProvider.cs b/src/VirtoCommerce.AssetsModule.Core/Provider/BasicBlobProvider.cs
@@ -1,5 +1,4 @@
 using System;
-using System.IO;
 using Microsoft.Extensions.Options;
 using VirtoCommerce.AssetsModule.Core.Services;
 using VirtoCommerce.Platform.Core;
@@ -19,8 +18,7 @@ protected BasicBlobProvider(IOptions<PlatformOptions> platformOptions, ISettings
 
         public virtual bool IsExtensionBlacklisted(string path)
         {
-            var extension = Path.GetExtension(path);
-            var allowed = _fileExtensionService.IsExtensionAllowedAsync(extension).GetAwaiter().GetResult();
+            var allowed = _fileExtensionService.IsExtensionAllowedAsync(path).GetAwaiter().GetResult();
             return !allowed;
         }
     }

diff --git a/src/VirtoCommerce.AssetsModule.Core/Services/FileExtensionService.cs b/src/VirtoCommerce.AssetsModule.Core/Services/FileExtensionService.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Options;
@@ -23,9 +24,11 @@ public FileExtensionService(IOptions<PlatformOptions> platformOptions, ISettings
         _settingsManager = settingsManager;
     }
 
-    public virtual async Task<bool> IsExtensionAllowedAsync(string extension)
+    public virtual async Task<bool> IsExtensionAllowedAsync(string path)
     {
+        var extension = Path.GetExtension(path);
         var whiteList = await GetWhiteListAsync();
+
         if (whiteList.Count != 0)
         {
             return whiteList.Contains(extension, _ignoreCase);

diff --git a/src/VirtoCommerce.AssetsModule.Core/Services/IFileExtensionService.cs b/src/VirtoCommerce.AssetsModule.Core/Services/IFileExtensionService.cs
@@ -7,5 +7,5 @@ public interface IFileExtensionService
 {
     Task<IList<string>> GetWhiteListAsync();
     Task<IList<string>> GetBlackListAsync();
-    Task<bool> IsExtensionAllowedAsync(string extension);
+    Task<bool> IsExtensionAllowedAsync(string path);
 }
diff --git a/src/VirtoCommerce.AssetsModule.Web/module.manifest b/src/VirtoCommerce.AssetsModule.Web/module.manifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <id>VirtoCommerce.Assets</id>
-  <version>3.802.0</version>
+  <version>3.803.0</version>
   <version-tag />
   <platformVersion>3.800.0</platformVersion>
   <dependencies />

diff --git a/tests/VirtoCommerce.AssetsModule.Tests/VirtoCommerce.AssetsModule.Tests.csproj b/tests/VirtoCommerce.AssetsModule.Tests/VirtoCommerce.AssetsModule.Tests.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="AutoFixture" Version="4.18.1" />
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>