Merge pull request #74 from datalust/dev

2.1 Maintenance Release
datalust · Feb 22, 2024 · f1b851f · f1b851f
2 parents 5e046f3 + a7198ca
commit f1b851f
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 91 deletions.
diff --git a/src/Seq.Forwarder/Cli/Commands/BindSslCommand.cs b/src/Seq.Forwarder/Cli/Commands/BindSslCommand.cs
diff --git a/src/Seq.Forwarder/Cli/Commands/RunCommand.cs b/src/Seq.Forwarder/Cli/Commands/RunCommand.cs
@@ -20,6 +20,8 @@
 using Serilog.Formatting.Compact;
 using System;
 using System.IO;
+using System.Net;
+using System.Security.Cryptography.X509Certificates;
 using Autofac.Extensions.DependencyInjection;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
@@ -97,8 +99,42 @@ protected override int Run(TextWriter cout)
                     })
                     .ConfigureWebHostDefaults(web =>
                     {
-                        web.UseUrls(listenUri);
                         web.UseStartup<Startup>();
+                        web.UseKestrel(options =>
+                        {
+                            options.AddServerHeader = false;
+                            options.AllowSynchronousIO = true;
+                        })
+                        .ConfigureKestrel(options =>
+                        {
+                            var apiListenUri = new Uri(listenUri);
+
+                            var ipAddress = apiListenUri.HostNameType switch
+                            {
+                                UriHostNameType.Basic => IPAddress.Any,
+                                UriHostNameType.Dns => IPAddress.Any,
+                                UriHostNameType.IPv4 => IPAddress.Parse(apiListenUri.Host),
+                                UriHostNameType.IPv6 => IPAddress.Parse(apiListenUri.Host),
+                                _ => throw new NotSupportedException($"Listen URI type `{apiListenUri.HostNameType}` is not supported.")
+                            };
+
+                            if (apiListenUri.Scheme.Equals("https", StringComparison.OrdinalIgnoreCase))
+                            {
+                                options.Listen(ipAddress, apiListenUri.Port, listenOptions =>
+                                {
+#if WINDOWS
+                                    listenOptions.UseHttps(StoreName.My, apiListenUri.Host,
+                                        location: StoreLocation.LocalMachine, allowInvalid: true);
+#else
+                                    listenOptions.UseHttps();
+#endif
+                                });
+                            }
+                            else
+                            {
+                                options.Listen(ipAddress, apiListenUri.Port);
+                            }
+                        });
                     })
                     .Build();
 
@@ -164,9 +200,9 @@ static string GetRollingLogFilePathFormat(string internalLogPath)
         static int RunService(ServerService service)
         {
 #if WINDOWS
-            System.ServiceProcess.ServiceBase.Run(new System.ServiceProcess.ServiceBase[] {
-                new Seq.Forwarder.ServiceProcess.SeqForwarderWindowsService(service)
-            });
+            System.ServiceProcess.ServiceBase.Run([
+                new ServiceProcess.SeqForwarderWindowsService(service)
+            ]);
             return 0;
 #else
             throw new NotSupportedException("Windows services are not supported on this platform.");            
@@ -204,7 +240,7 @@ static void WriteBanner()
             Console.WriteLine();
             Write(" Seq Forwarder", ConsoleColor.White);
             Write(" ──", ConsoleColor.DarkGray);
-            Write(" © 2020 Datalust Pty Ltd", ConsoleColor.Gray);
+            Write(" © 2024 Datalust Pty Ltd", ConsoleColor.Gray);
             Console.WriteLine();
             Write("─", ConsoleColor.DarkGray, 47);
             Console.WriteLine();