#139 Fix systemd not running

src/fiskaltrust.Launcher/Commands/HostCommand.cs

@@ -107,6 +107,7 @@ public static async Task<int> HandleAsync(HostOptions hostOptions, HostServices
             System.Text.Encoding.RegisterProvider(new LauncherEncodingProvider());
 
             var builder = Host.CreateDefaultBuilder()
+                .UseSystemd()
                 .UseSerilog()
                 .ConfigureServices(services =>
                 {

src/fiskaltrust.Launcher/Commands/RunCommand.cs

@@ -1,5 +1,4 @@
 using System.CommandLine;
-using System.CommandLine.Invocation;
 using fiskaltrust.Launcher.ProcessHost;
 using fiskaltrust.Launcher.Services;
 using Serilog;
@@ -8,12 +7,6 @@
 using fiskaltrust.Launcher.Extensions;
 using fiskaltrust.Launcher.Helpers;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
-using fiskaltrust.Launcher.Common.Configuration;
-using fiskaltrust.storage.serialization.V0;
-using System.Security.Cryptography;
-using Microsoft.AspNetCore.DataProtection;
-using Microsoft.AspNetCore.Hosting.Server;
-using Microsoft.AspNetCore.Hosting.Server.Features;
 
 
 namespace fiskaltrust.Launcher.Commands
@@ -67,8 +60,8 @@ public static class RunHandler
         public static async Task<int> HandleAsync(CommonOptions commonOptions, CommonProperties commonProperties, RunOptions _, RunServices runServices)
         {
             var builder = WebApplication.CreateBuilder();
-
             builder.Host
+                .UseSystemd()
                 .UseSerilog()
                 .ConfigureServices((_, services) =>
                 {
@@ -88,7 +81,7 @@ public static async Task<int> HandleAsync(CommonOptions commonOptions, CommonPro
             builder.Services.AddCodeFirstGrpc();
 
             var app = builder.Build();
-
+            Log.Verbose($"RunHandler builder.Build");
             app.UseRouting();
 #pragma warning disable ASP0014
             app.UseEndpoints(endpoints => endpoints.MapGrpcService<ProcessHostService>());
@@ -111,7 +104,6 @@ public static async Task<int> HandleAsync(CommonOptions commonOptions, CommonPro
             {
                 Log.CloseAndFlush();
             }
-
             return 0;
         }
     }

src/fiskaltrust.Launcher/Download/PackageDownloader.cs

@@ -146,7 +146,6 @@ public async Task DownloadAsync(string name, string version, string platform, st
 
                             return request;
                         });
-
                         response.EnsureSuccessStatusCode();
 
                         await using var fileStream = new FileStream(sourcePath, FileMode.Create, FileAccess.Write, FileShare.None);
@@ -163,7 +162,6 @@ public async Task DownloadAsync(string name, string version, string platform, st
 
                             return request;
                         });
-
                         response.EnsureSuccessStatusCode();
                         await File.WriteAllTextAsync($"{sourcePath}.hash", await response.Content.ReadAsStringAsync());
                     }

src/fiskaltrust.Launcher/Extensions/DataProtectionExtensions.cs

@@ -200,16 +200,7 @@ public static IDataProtectionBuilder ProtectKeysCustom(this IDataProtectionBuild
                 }
                 else if (OperatingSystem.IsLinux())
                 {
-                    try
-                    {
-                        Marshal.PrelinkAll(typeof(KeyUtils));
-                        builder.Services.Configure<KeyManagementOptions>(options => options.XmlEncryptor = new KeyringXmlEncryptor());
-                        return builder;
-                    }
-                    catch (Exception e)
-                    {
-                        Log.Warning(e, "Fallback config encryption mechanism used.");
-                    }
+                    Log.Warning("Fallback config encryption mechanism is used on linux.");
                 }
                 else if (OperatingSystem.IsMacOS())
                 {

src/fiskaltrust.Launcher/Extensions/LifetimeExtensions.cs

@@ -1,5 +1,6 @@
 using System.Runtime.Versioning;
 using System.Text;
+using Microsoft.Extensions.Hosting.Systemd;
 using Microsoft.Extensions.Hosting.WindowsServices;
 using Microsoft.Extensions.Options;
 
@@ -28,6 +29,21 @@ public static IHostBuilder UseCustomHostLifetime(this IHostBuilder builder)
 #pragma warning restore CA1416
                 });
             }
+            else if (SystemdHelpers.IsSystemdService())
+            {
+                builder.UseSystemd();
+                builder.ConfigureServices(services => services.AddSingleton<ILifetime, Lifetime>());
+                return builder;
+                /*
+                return builder.ConfigureServices(services =>
+                {
+                    var lifetime = services.FirstOrDefault(s => s.ImplementationType == typeof(SystemdLifetime));
+@@ -51,7 +44,7 @@ public static IHostBuilder UseCustomHostLifetime(this IHostBuilder builder, stri
+                    services.AddSingleton<ILifetime, CustomSystemdServiceLifetime>();
+                    services.AddSingleton<IHostLifetime>(sp => sp.GetRequiredService<ILifetime>());
+#pragma warning restore CA1416
+                });*/
+            }
             else
             {
                 Console.OutputEncoding = Encoding.UTF8;
@@ -133,4 +149,38 @@ protected override void Dispose(bool disposing)
             base.Dispose(disposing);
         }
     }
+
+    [SupportedOSPlatform("linux")]
+    public class CustomSystemdServiceLifetime : SystemdLifetime, ILifetime
+    {
+        private readonly CancellationTokenSource _starting = new();
+        private readonly ManualResetEventSlim _started = new();
+
+        public IHostApplicationLifetime ApplicationLifetime { get; init; }
+
+        public CustomSystemdServiceLifetime(
+            IHostEnvironment environment,
+            IHostApplicationLifetime applicationLifetime,
+            ILoggerFactory loggerFactory)
+            : base(environment, applicationLifetime, new SystemdNotifier(), loggerFactory)
+        {
+            ApplicationLifetime = applicationLifetime;
+        }
+
+        public void ServiceStartupCompleted()
+        {
+            ApplicationLifetime.ApplicationStarted.Register(() => _started.Set());
+        }
+
+        public new async Task WaitForStartAsync(CancellationToken cancellationToken)
+        {
+            try
+            {
+                using var cts = CancellationTokenSource.CreateLinkedTokenSource(_starting.Token, cancellationToken);
+                await base.WaitForStartAsync(cts.Token);
+            }
+            catch (OperationCanceledException) when (_starting.IsCancellationRequested) { }
+        }
+
+    }
 }

src/fiskaltrust.Launcher/ServiceInstallation/LinuxSystemD.cs

@@ -1,4 +1,5 @@
 using fiskaltrust.Launcher.Helpers;
+using Microsoft.Extensions.Hosting.Systemd;
 using Serilog;
 
 namespace fiskaltrust.Launcher.ServiceInstallation
@@ -15,7 +16,7 @@ public LinuxSystemD(string? serviceName, LauncherExecutablePath launcherExecutab
 
         public override async Task<int> InstallService(string commandArgs, string? displayName, bool delayedStart = false)
         {
-            if (!await IsSystemd())
+            if (!SystemdHelpers.IsSystemdService())
             {
                 return -1;
             }
@@ -32,7 +33,7 @@ public override async Task<int> InstallService(string commandArgs, string? displ
 
         public override async Task<int> UninstallService()
         {
-            if (!await IsSystemd())
+            if (!SystemdHelpers.IsSystemdService())
             {
                 return -1;
             }
@@ -49,30 +50,22 @@ public override async Task<int> UninstallService()
             return (await ProcessHelper.RunProcess("systemctl", new[] { "reset-failed" })).exitCode;
         }
 
-        private static async Task<bool> IsSystemd()
-        {
-            var (exitCode, output) = await ProcessHelper.RunProcess("ps", new[] { "--no-headers", "-o", "comm", "1" });
-            if (exitCode != 0 && output.Contains("systemd"))
-            {
-                Log.Error("Service installation works only for systemd setup.");
-                return false;
-            }
-            return true;
-        }
 
         private string[] GetServiceFileContent(string serviceDescription, string commandArgs)
         {
             var processPath = _launcherExecutablePath.Path;
 
-            var command = $"{processPath} {commandArgs}";
+            var command = $"sudo {processPath} {commandArgs}";
             return new[]
             {
                 "[Unit]",
                 $"Description=\"{serviceDescription}\"",
                 "",
                 "[Service]",
-                "Type=simple",
-                $"ExecStart=\"{command}\"",
+                "Type=notify",
+                $"ExecStart={command}",
+                "TimeoutSec=0",
+                $"WorkingDirectory={Path.GetDirectoryName(_launcherExecutablePath.Path)}",
                 "",
                 "[Install]",
                 "WantedBy = multi-user.target"

src/fiskaltrust.Launcher/fiskaltrust.Launcher.csproj

@@ -22,6 +22,7 @@
     <PackageReference Include="fiskaltrust.storage.serialization" Version="1.3.47" />
     <PackageReference Include="fiskaltrust.Middleware.Interface.Client.Grpc" Version="1.3.50-rc2" />
     <PackageReference Include="fiskaltrust.Middleware.Interface.Client.Http" Version="1.3.50-rc2" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="8.0.0" />
     <PackageReference Include="Polly" Version="7.2.4" />
     <PackageReference Include="Polly.Extensions.Http" Version="3.0.0" />
     <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
@@ -31,7 +32,7 @@
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
     <PackageReference Include="System.CommandLine.Hosting" Version="0.4.0-alpha.22272.1" />
     <PackageReference Include="McMaster.NETCore.Plugins" Version="1.4.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
     <PackageReference Include="SemanticVersioning" Version="2.0.2" />
     <PackageReference Include="DiffPlex" Version="1.7.1" />