Refactoring

PowerCommands · PowerCommands · commit e4db9615be77 · 2022-03-27T22:18:34.000+02:00
diff --git a/src/PainKiller.PowerCommands/PainKiller.PowerCommands.Bootstrap/Configuration/PowerCommandsConfiguration.cs b/src/PainKiller.PowerCommands/PainKiller.PowerCommands.Bootstrap/Configuration/PowerCommandsConfiguration.cs
diff --git a/src/PainKiller.PowerCommands/PainKiller.PowerCommands.Bootstrap/PainKiller.PowerCommands.Bootstrap.csproj b/src/PainKiller.PowerCommands/PainKiller.PowerCommands.Bootstrap/PainKiller.PowerCommands.Bootstrap.csproj
@@ -10,6 +10,7 @@
     <ProjectReference Include="..\PainKiller.AzureKeyVault\PainKiller.AzureKeyVault.csproj" />
     <ProjectReference Include="..\PainKiller.PowerCommands.Configuration\PainKiller.PowerCommands.Configuration.csproj" />
     <ProjectReference Include="..\PainKiller.PowerCommands.Core\PainKiller.PowerCommands.Core.csproj" />
+    <ProjectReference Include="..\PainKiller.PowerCommands.MyExampleCommands\PainKiller.PowerCommands.MyExampleCommands.csproj" />
     <ProjectReference Include="..\PainKiller.PowerCommands.Security\PainKiller.PowerCommands.Security.csproj" />
     <ProjectReference Include="..\PainKiller.PowerCommands.Shared\PainKiller.PowerCommands.Shared.csproj" />
     <ProjectReference Include="..\PainKiller.SerilogExtensions\PainKiller.SerilogExtensions.csproj" />
@@ -21,4 +22,8 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Configuration\" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/PainKiller.PowerCommands/PainKiller.PowerCommands.Bootstrap/Startup.cs b/src/PainKiller.PowerCommands/PainKiller.PowerCommands.Bootstrap/Startup.cs
@@ -1,9 +1,7 @@
 ﻿using Microsoft.Extensions.Logging;
-using PainKiller.PowerCommands.Bootstrap.Configuration;
-using PainKiller.PowerCommands.Configuration;
 using PainKiller.PowerCommands.Configuration.Extensions;
 using PainKiller.PowerCommands.Core.Managers;
-using PainKiller.PowerCommands.Shared.DomainObjects.Configuration;
+using PainKiller.PowerCommands.MyExampleCommands.Configuration;
 using PainKiller.SerilogExtensions.Managers;
 
 namespace PainKiller.PowerCommands.Bootstrap
@@ -12,24 +10,24 @@ public static class Startup
     {
         private static PluginManager<PowerCommandsConfiguration>? _pluginManager;
 
-        public static BaseCommandsConfiguration Initialize()
+        public static void Initialize()
         {
-            var configuration = ConfigurationManager.GetConfiguration<PowerCommandsConfiguration>().Configuration;
+            var configuration = PowerCommandsConfiguration.Instance ?? new PowerCommandsConfiguration();
             var logger = GetLoggerManager.GetFileLogger(configuration.Log.FileName.GetSafePathRegardlessHowApplicationStarted("logs"));
+
             logger.LogInformation("Program started, configuration read");
             
             _pluginManager = new PluginManager<PowerCommandsConfiguration>(configuration);
             try
             {
                 var validatePlugins = _pluginManager.ValidateConfigurationWithPlugins();
-
+                if(!validatePlugins) Console.WriteLine("Some of the components did not pass security check...");
             }
             catch (Exception ex)
             {
                 logger.LogCritical(ex,"Critical error, program could not start");
                 throw;
             }
-            return configuration;
         }
     }
 }
diff --git a/src/PainKiller.PowerCommands/PainKiller.PowerCommands.Core/Managers/PluginManager.cs b/src/PainKiller.PowerCommands/PainKiller.PowerCommands.Core/Managers/PluginManager.cs
@@ -1,5 +1,4 @@
-﻿using System.Security;
-using PainKiller.PowerCommands.Core.Extensions;
+﻿using PainKiller.PowerCommands.Core.Extensions;
 using PainKiller.PowerCommands.Security.DomainObjects;
 using PainKiller.PowerCommands.Security.Extensions;
 using PainKiller.PowerCommands.Shared.DomainObjects.Configuration;
@@ -28,16 +27,16 @@ public PluginManager(TConfiguration configuration)
 
     public bool ValidateConfigurationWithPlugins()
     {
-        var retVal = false;
+        var retVal = true;
         var components = typeof(TConfiguration).GetPropertiesOfT<BaseComponentConfiguration>();
         
         foreach (var propertyInfo in components)
         {
             if (propertyInfo.GetValue(_configuration) is not BaseComponentConfiguration instance) continue;
             var fileCheckSum = new FileChecksum(instance.Component);
             var validateCheckSum = fileCheckSum.CompareFileChecksum(instance.Checksum);
+            if(!validateCheckSum) retVal = false;
             if(_configuration.ShowDiagnosticInformation) Console.WriteLine($"{instance?.Name ?? "null"} Checksum {fileCheckSum.Mde5Hash} {validateCheckSum}");
-            retVal = true;
         }
         return retVal;
     }
diff --git a/src/PainKiller.PowerCommands/PainKiller.PowerCommands.MyExampleCommands/Configuration/PowerCommandsConfiguration.cs b/src/PainKiller.PowerCommands/PainKiller.PowerCommands.MyExampleCommands/Configuration/PowerCommandsConfiguration.cs
@@ -0,0 +1,22 @@
+﻿using PainKiller.AzureKeyVault.DomainObjects;
+using PainKiller.PowerCommands.Configuration;
+using PainKiller.PowerCommands.Shared.DomainObjects.Configuration;
+
+namespace PainKiller.PowerCommands.MyExampleCommands.Configuration;
+
+public class PowerCommandsConfiguration : BaseCommandsConfiguration
+{
+    private static PowerCommandsConfiguration? _instance;
+    public static PowerCommandsConfiguration? Instance
+    {
+        get
+        {
+            if(_instance != null) return _instance;
+            _instance = ConfigurationManager.GetConfiguration<PowerCommandsConfiguration>().Configuration;
+            return _instance;
+
+        }
+    }
+    public KeyVaultConfig KeyVault { get; set; } = new();
+
+}
diff --git a/src/PainKiller.PowerCommands/PainKiller.PowerCommands.MyExampleCommands/PainKiller.PowerCommands.MyExampleCommands.csproj b/src/PainKiller.PowerCommands/PainKiller.PowerCommands.MyExampleCommands/PainKiller.PowerCommands.MyExampleCommands.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Folder Include="Commands\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\PainKiller.AzureKeyVault\PainKiller.AzureKeyVault.csproj" />
+    <ProjectReference Include="..\PainKiller.PowerCommands.Configuration\PainKiller.PowerCommands.Configuration.csproj" />
+    <ProjectReference Include="..\PainKiller.PowerCommands.Shared\PainKiller.PowerCommands.Shared.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/PainKiller.PowerCommands/PainKiller.PowerCommands.Shared/PainKiller.PowerCommands.Shared.csproj b/src/PainKiller.PowerCommands/PainKiller.PowerCommands.Shared/PainKiller.PowerCommands.Shared.csproj
@@ -1,9 +1,17 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\PainKiller.SerilogExtensions\PainKiller.SerilogExtensions.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/PainKiller.PowerCommands/PainKiller.PowerCommands.sln b/src/PainKiller.PowerCommands/PainKiller.PowerCommands.sln
@@ -29,6 +29,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Custom Components", "Custom
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PainKiller.AzureKeyVault", "PainKiller.AzureKeyVault\PainKiller.AzureKeyVault.csproj", "{13CC0652-52C9-4675-8E45-0BAEC32D9431}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PainKiller.PowerCommands.MyExampleCommands", "PainKiller.PowerCommands.MyExampleCommands\PainKiller.PowerCommands.MyExampleCommands.csproj", "{C53C0EBD-1FEF-43F3-8AF9-285A4AB2A524}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -71,6 +73,10 @@ Global
 		{13CC0652-52C9-4675-8E45-0BAEC32D9431}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{13CC0652-52C9-4675-8E45-0BAEC32D9431}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{13CC0652-52C9-4675-8E45-0BAEC32D9431}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C53C0EBD-1FEF-43F3-8AF9-285A4AB2A524}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C53C0EBD-1FEF-43F3-8AF9-285A4AB2A524}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C53C0EBD-1FEF-43F3-8AF9-285A4AB2A524}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C53C0EBD-1FEF-43F3-8AF9-285A4AB2A524}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,7 @@`
`1`	`1`	`using Microsoft.Extensions.Logging;`
`2`		`-using PainKiller.PowerCommands.Bootstrap.Configuration;`
`3`		`-using PainKiller.PowerCommands.Configuration;`
`4`	`2`	`using PainKiller.PowerCommands.Configuration.Extensions;`
`5`	`3`	`using PainKiller.PowerCommands.Core.Managers;`
`6`		`-using PainKiller.PowerCommands.Shared.DomainObjects.Configuration;`
	`4`	`+using PainKiller.PowerCommands.MyExampleCommands.Configuration;`
`7`	`5`	`using PainKiller.SerilogExtensions.Managers;`
`8`	`6`
`9`	`7`	`namespace PainKiller.PowerCommands.Bootstrap`
`@@ -12,24 +10,24 @@ public static class Startup`
`12`	`10`	`{`
`13`	`11`	`private static PluginManager<PowerCommandsConfiguration>? _pluginManager;`
`14`	`12`
`15`		`- public static BaseCommandsConfiguration Initialize()`
	`13`	`+ public static void Initialize()`
`16`	`14`	`{`
`17`		`- var configuration = ConfigurationManager.GetConfiguration<PowerCommandsConfiguration>().Configuration;`
	`15`	`+ var configuration = PowerCommandsConfiguration.Instance ?? new PowerCommandsConfiguration();`
`18`	`16`	`var logger = GetLoggerManager.GetFileLogger(configuration.Log.FileName.GetSafePathRegardlessHowApplicationStarted("logs"));`
	`17`	`+`
`19`	`18`	`logger.LogInformation("Program started, configuration read");`
`20`	`19`
`21`	`20`	`_pluginManager = new PluginManager<PowerCommandsConfiguration>(configuration);`
`22`	`21`	`try`
`23`	`22`	`{`
`24`	`23`	`var validatePlugins = _pluginManager.ValidateConfigurationWithPlugins();`
`25`		`-`
	`24`	`+ if(!validatePlugins) Console.WriteLine("Some of the components did not pass security check...");`
`26`	`25`	`}`
`27`	`26`	`catch (Exception ex)`
`28`	`27`	`{`
`29`	`28`	`logger.LogCritical(ex,"Critical error, program could not start");`
`30`	`29`	`throw;`
`31`	`30`	`}`
`32`		`- return configuration;`
`33`	`31`	`}`
`34`	`32`	`}`
`35`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`		`-using System.Security;`
`2`		`-using PainKiller.PowerCommands.Core.Extensions;`
	`1`	`+using PainKiller.PowerCommands.Core.Extensions;`
`3`	`2`	`using PainKiller.PowerCommands.Security.DomainObjects;`
`4`	`3`	`using PainKiller.PowerCommands.Security.Extensions;`
`5`	`4`	`using PainKiller.PowerCommands.Shared.DomainObjects.Configuration;`
`@@ -28,16 +27,16 @@ public PluginManager(TConfiguration configuration)`
`28`	`27`
`29`	`28`	`public bool ValidateConfigurationWithPlugins()`
`30`	`29`	`{`
`31`		`- var retVal = false;`
	`30`	`+ var retVal = true;`
`32`	`31`	`var components = typeof(TConfiguration).GetPropertiesOfT<BaseComponentConfiguration>();`
`33`	`32`
`34`	`33`	`foreach (var propertyInfo in components)`
`35`	`34`	`{`
`36`	`35`	`if (propertyInfo.GetValue(_configuration) is not BaseComponentConfiguration instance) continue;`
`37`	`36`	`var fileCheckSum = new FileChecksum(instance.Component);`
`38`	`37`	`var validateCheckSum = fileCheckSum.CompareFileChecksum(instance.Checksum);`
	`38`	`+ if(!validateCheckSum) retVal = false;`
`39`	`39`	`if(_configuration.ShowDiagnosticInformation) Console.WriteLine($"{instance?.Name ?? "null"} Checksum {fileCheckSum.Mde5Hash} {validateCheckSum}");`
`40`		`- retVal = true;`
`41`	`40`	`}`
`42`	`41`	`return retVal;`
`43`	`42`	`}`