Fix issue with invalid chars in an image source

Sicos1977 · Aug 28, 2019 · 6902692 · 6902692
1 parent 45b8445
commit 6902692
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 4 deletions.
diff --git a/ChromeHtmlToPdfLib/ChromeHtmlToPdfLib.csproj b/ChromeHtmlToPdfLib/ChromeHtmlToPdfLib.csproj
@@ -131,6 +131,7 @@
     <Compile Include="Helpers\ExceptionHelper.cs" />
     <Compile Include="Helpers\Extensions.cs" />
     <Compile Include="Helpers\DocumentHelper.cs" />
+    <Compile Include="Helpers\FileManager.cs" />
     <Compile Include="Helpers\Logger.cs" />
     <Compile Include="Helpers\PreWrapper.cs" />
     <Compile Include="Helpers\Sanitizer\EventArgs.cs" />

diff --git a/ChromeHtmlToPdfLib/Helpers/DocumentHelper.cs b/ChromeHtmlToPdfLib/Helpers/DocumentHelper.cs
@@ -195,9 +195,12 @@ public bool Validate(ConvertUri inputUri,
                     }
 
                     Image image = null;
-                    var extension = Path.GetExtension(htmlImage.Source.Contains("?")
+                    var source = htmlImage.Source.Contains("?")
                         ? htmlImage.Source.Split('?')[0]
-                        : htmlImage.Source);
+                        : htmlImage.Source;
+
+                    var extension = Path.GetExtension(FileManager.RemoveInvalidFileNameChars(source));
+
                     var fileName = GetTempFile(extension);
 
                     try

diff --git a/ChromeHtmlToPdfLib/Helpers/FileManager.cs b/ChromeHtmlToPdfLib/Helpers/FileManager.cs
@@ -0,0 +1,22 @@
+using System.Globalization;
+using System.IO;
+using System.Linq;
+
+namespace ChromeHtmlToPdfLib.Helpers
+{
+    internal static class FileManager
+    {
+        #region RemoveInvalidFileNameChars
+        /// <summary>
+        /// Verwijdert illegale karakters uit een bestandsnaam
+        /// </summary>
+        /// <param name="fileName"></param>
+        /// <returns></returns>
+        public static string RemoveInvalidFileNameChars(string fileName)
+        {
+            return Path.GetInvalidFileNameChars()
+                .Aggregate(fileName, (current, c) => current.Replace(c.ToString(CultureInfo.InvariantCulture), string.Empty));
+        }
+        #endregion
+    }
+}
diff --git a/ChromeHtmlToPdfLib/Properties/AssemblyInfo.cs b/ChromeHtmlToPdfLib/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.2.0")]
-[assembly: AssemblyFileVersion("1.4.2.0")]
+[assembly: AssemblyVersion("1.4.4.0")]
+[assembly: AssemblyFileVersion("1.4.4.0")]