CactuseSecurity · SolidProgramming · Sep 10, 2024 · Sep 10, 2024 · Sep 11, 2024 · Sep 12, 2024
diff --git a/roles/lib/files/FWO.GlobalConstants/GlobalConstants.cs b/roles/lib/files/FWO.GlobalConstants/GlobalConstants.cs
@@ -39,6 +39,8 @@ public struct GlobalConst
 		public const string kUndefinedText = "(undefined text)";
 
 		public const string kStyleHighlighted = "color:red;";
+
+		public const string FworchUnixBrowserBinPath = "/usr/local/fworch/";
 	}
 
 	public struct PageName

diff --git a/roles/lib/files/FWO.Report/FWO.Report.csproj b/roles/lib/files/FWO.Report/FWO.Report.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Haukcode.WkHtmlToPdfDotNet" Version="1.5.90" />
+	<PackageReference Include="PuppeteerSharp" Version="20.0.2" />	  
   </ItemGroup>
 
   <ItemGroup>

diff --git a/roles/lib/files/FWO.Report/PaperFormat.cs b/roles/lib/files/FWO.Report/PaperFormat.cs
@@ -0,0 +1,18 @@
+namespace FWO.Report
+{
+    public enum PaperFormat
+    {
+        A0,
+        A1,
+        A2,
+        A3,
+        A4,
+        A5,
+        A6,
+        Letter,
+        Legal,
+        Tabloid,
+        Ledger,
+        Custom
+    }
+}
diff --git a/roles/lib/files/FWO.Report/ReportBase.cs b/roles/lib/files/FWO.Report/ReportBase.cs
@@ -4,14 +4,16 @@
 using FWO.Report.Filter;
 using FWO.Config.Api;
 using System.Text;
-using WkHtmlToPdfDotNet;
+using PuppeteerSharp.Media;
+using PuppeteerSharp;
+using System.Reflection;
 
 namespace FWO.Report
 {
     public enum RsbTab
     {
-        all = 10, 
-        report = 20, 
+        all = 10,
+        report = 20,
         rule = 30,
 
         usedObj = 40,
@@ -21,8 +23,8 @@ public enum RsbTab
     public enum ObjCategory
     {
         all = 0,
-        nobj = 1, 
-        nsrv = 2, 
+        nobj = 1,
+        nsrv = 2,
         user = 3
     }
 
@@ -42,7 +44,7 @@ public enum OutputLocation
 
     public abstract class ReportBase
     {
-        protected StringBuilder HtmlTemplate = new ($@"
+        protected StringBuilder HtmlTemplate = new($@"
 <!DOCTYPE html>
 <html>
 <head>
@@ -86,11 +88,11 @@ public abstract class ReportBase
         protected UserConfig userConfig;
         public ReportType ReportType;
         public ReportData ReportData = new();
+        public int CustomWidth = 0;
+        public int CustomHeight = 0;
 
         protected string htmlExport = "";
 
-        // Pdf converter
-        protected static readonly SynchronizedConverter converter = new (new PdfTools());
         public bool GotObjectsInReport { get; protected set; } = false;
 
 
@@ -160,14 +162,14 @@ protected string GenerateHtmlFrameBase(string title, string filter, DateTime dat
                 HtmlTemplate = HtmlTemplate.Replace("##Filter##", userConfig.GetText("filter") + ": " + filter);
                 HtmlTemplate = HtmlTemplate.Replace("##GeneratedOn##", userConfig.GetText("generated_on"));
                 HtmlTemplate = HtmlTemplate.Replace("##Date##", date.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssK"));
-                if(ReportType.IsChangeReport())
+                if (ReportType.IsChangeReport())
                 {
                     string timeRange = $"{userConfig.GetText("change_time")}: " +
                         $"{userConfig.GetText("from")}: {ToUtcString(Query.QueryVariables["start"]?.ToString())}, " +
                         $"{userConfig.GetText("until")}: {ToUtcString(Query.QueryVariables["stop"]?.ToString())}";
                     HtmlTemplate = HtmlTemplate.Replace("##Date-of-Config##: ##GeneratedFor##", timeRange);
                 }
-                else if(ReportType.IsRuleReport() || ReportType == ReportType.Statistics)
+                else if (ReportType.IsRuleReport() || ReportType == ReportType.Statistics)
                 {
                     HtmlTemplate = HtmlTemplate.Replace("##Date-of-Config##", userConfig.GetText("date_of_config"));
                     HtmlTemplate = HtmlTemplate.Replace("##GeneratedFor##", ToUtcString(Query.ReportTimeString));
@@ -186,7 +188,7 @@ protected string GenerateHtmlFrameBase(string title, string filter, DateTime dat
                     HtmlTemplate = HtmlTemplate.Replace("<p>##OwnerFilters##</p>", "");
                 }
 
-                if(deviceFilter != null)
+                if (deviceFilter != null)
                 {
                     HtmlTemplate = HtmlTemplate.Replace("##OtherFilters##", userConfig.GetText("devices") + ": " + deviceFilter);
                 }
@@ -206,58 +208,74 @@ public static string ToUtcString(string? timestring)
             {
                 return timestring != null ? DateTime.Parse(timestring).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssK") : "";
             }
-            catch(Exception)
+            catch (Exception)
             {
                 return timestring ?? "";
             }
         }
 
-        public virtual byte[] ToPdf(PaperKind paperKind, int width = -1, int height = -1)
+        private async Task<string?> CreatePDFViaPuppeteer(string html, PaperFormat format)
         {
-            // HTML
-            if (string.IsNullOrEmpty(htmlExport))
+            using IBrowser? browser = await Puppeteer.LaunchAsync(new LaunchOptions
             {
-                htmlExport = ExportToHtml();
-            }
+                Headless = true
+            });
 
-            GlobalSettings globalSettings = new ()
+            try
             {
-                ColorMode = ColorMode.Color,
-                Orientation = Orientation.Landscape,
-            };
+                using IPage page = await browser.NewPageAsync();
+                await page.SetContentAsync(html);
 
-            if (paperKind == PaperKind.Custom)
+                PuppeteerSharp.Media.PaperFormat? pupformat =  GetPuppeteerPaperFormat(format)  ?? throw new Exception();
+
+                PdfOptions pdfOptions = new() { DisplayHeaderFooter = true, Landscape = true, PrintBackground = true, Format = pupformat, MarginOptions = new MarginOptions { Top = "1cm", Bottom = "1cm", Left = "1cm", Right = "1cm" } };
+                byte[] pdfData = await page.PdfDataAsync(pdfOptions);
+
+                return Convert.ToBase64String(pdfData);
+            }
+            catch (Exception)
             {
-                if (width > 0 && height > 0)
-                {
-                    globalSettings.PaperSize = new PechkinPaperSize(width + "mm", height + "mm");
-                }
-                else
-                {
-                    throw new Exception("Custom paper size: width or height <= 0");
-                }
+                throw new Exception("This paper kind is currently not supported. Please choose another one or \"Custom\" for a custom size.");
             }
-            else
+            finally
             {
-                globalSettings.PaperSize = paperKind;
+                await browser.CloseAsync();
             }
+        }
 
-            HtmlToPdfDocument doc = new ()
-            {
-                GlobalSettings = globalSettings,
-                Objects =
-                {
-                    new ObjectSettings()
-                    {
-                        PagesCount = true,
-                        HtmlContent = htmlExport,
-                        WebSettings = { DefaultEncoding = "utf-8" },
-                        HeaderSettings = { FontSize = 9, Right = "Page [page] of [toPage]", Line = true, Spacing = 2.812 }
-                    }
-                }
-            };
+        private PuppeteerSharp.Media.PaperFormat? GetPuppeteerPaperFormat(PaperFormat format)
+        {
+            if (format == PaperFormat.Custom)
+                return new PuppeteerSharp.Media.PaperFormat(CustomWidth, CustomHeight);
+
+            PropertyInfo[] propertyInfos = typeof(PuppeteerSharp.Media.PaperFormat).GetProperties(BindingFlags.Public | BindingFlags.Static | BindingFlags.Instance | BindingFlags.NonPublic);
+
+            PropertyInfo? prop = propertyInfos.SingleOrDefault(_ => _.Name == format.ToString());
+
+            if (prop == null)
+                return default;
+
+            PuppeteerSharp.Media.PaperFormat? propFormat = (PuppeteerSharp.Media.PaperFormat)prop.GetValue(null);
+
+            if (propFormat is null)
+                return default;
+
+            return propFormat;
+        }
+
+        public virtual async Task<string?> ToPdf(string html, PaperFormat format)
+        {
+            return await CreatePDFViaPuppeteer(html, format);
+        }
 
-            return converter.Convert(doc);
+        public virtual async Task<string?> ToPdf(string html)
+        {
+            return await CreatePDFViaPuppeteer(html, PaperFormat.A4);
+        }
+
+        public virtual async Task<string?> ToPdf(PaperFormat format)
+        {
+            return await CreatePDFViaPuppeteer(htmlExport, format);
         }
 
         public static string GetIconClass(ObjCategory? objCategory, string? objType)

diff --git a/roles/middleware/files/FWO.Middleware.Server/ImportChangeNotifier.cs b/roles/middleware/files/FWO.Middleware.Server/ImportChangeNotifier.cs
@@ -11,7 +11,7 @@
 using Newtonsoft.Json;
 using System.Text.Json.Serialization; 
 using System.Text.RegularExpressions;
-using WkHtmlToPdfDotNet;
+using PuppeteerSharp.Media;
 
 namespace FWO.Middleware.Server
 {
@@ -175,11 +175,14 @@ private async Task SendEmail()
 			EmailConnection emailConnection = new(globalConfig.EmailServerAddress, globalConfig.EmailPort,
 				globalConfig.EmailTls, globalConfig.EmailUser, decryptedSecret, globalConfig.EmailSenderAddress);
 			MailKitMailer mailer = new(emailConnection);
-			await mailer.SendAsync(PrepareEmail(), emailConnection, new CancellationToken(),
+
+			MailData? mail = await PrepareEmail();
+
+            await mailer.SendAsync(mail, emailConnection, new CancellationToken(),
 				globalConfig.ImpChangeNotifyType == (int)ImpChangeNotificationType.HtmlInBody);
 		}
 
-		private MailData PrepareEmail()
+		private async Task<MailData> PrepareEmail()
 		{
 			string subject = globalConfig.ImpChangeNotifySubject;
 			string body = CreateBody();
@@ -192,7 +195,12 @@ private MailData PrepareEmail()
 						body += changeReport?.ExportToHtml();
 						break;
 					case (int)ImpChangeNotificationType.PdfAsAttachment:
-						attachment = CreateAttachment(Convert.ToBase64String(changeReport?.ToPdf(PaperKind.A4) ?? throw new Exception("No Pdf generated.")), GlobalConst.kPdf);
+						string? pdfData = await changeReport.ToPdf(Report.PaperFormat.A4);
+
+						if (string.IsNullOrWhiteSpace(pdfData))
+							throw new Exception("No Pdf generated.");
+
+                        attachment = CreateAttachment(pdfData, GlobalConst.kPdf);
 						break;
 					case (int)ImpChangeNotificationType.HtmlAsAttachment:
 						attachment = CreateAttachment(changeReport?.ExportToHtml(), GlobalConst.kHtml);

diff --git a/roles/middleware/files/FWO.Middleware.Server/ReportScheduler.cs b/roles/middleware/files/FWO.Middleware.Server/ReportScheduler.cs
@@ -8,8 +8,8 @@
 using FWO.Report;
 using FWO.Report.Filter;
 using System.Timers;
-using WkHtmlToPdfDotNet;
 using FWO.Config.File;
+using PuppeteerSharp.Media;
 
 namespace FWO.Middleware.Server
 {
@@ -255,7 +255,7 @@ private static async Task AdaptDeviceFilter(ReportParams reportParams, ApiConnec
             }
         }
 
-        private static void WriteReportFile(ReportBase report, List<FileFormat> fileFormats, ReportFile reportFile)
+        private static async Task WriteReportFile(ReportBase report, List<FileFormat> fileFormats, ReportFile reportFile)
         {
             reportFile.Json = report.ExportToJson();
             foreach (FileFormat format in fileFormats)
@@ -271,7 +271,7 @@ private static void WriteReportFile(ReportBase report, List<FileFormat> fileForm
                         break;
 
                     case GlobalConst.kPdf:
-                        reportFile.Pdf = Convert.ToBase64String(report.ToPdf(PaperKind.A4));
+                        reportFile.Pdf = await report.ToPdf(Report.PaperFormat.A4);
                         break;
 
                     case GlobalConst.kJson:

diff --git a/roles/test/files/FWO.Test/FWO.Test.csproj b/roles/test/files/FWO.Test/FWO.Test.csproj
@@ -8,11 +8,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Haukcode.WkHtmlToPdfDotNet" Version="1.5.90" />
     <PackageReference Include="NUnit" Version="4.1.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.0.0" />
+    <PackageReference Include="PuppeteerSharp" Version="20.0.2" />
   </ItemGroup>
 
   <ItemGroup>