fix: AOT json serializer; SslProxy certificate loader

Author: CypherPotato

extensions/Sisk.SslProxy/CertificateUtil.cs

@@ -92,7 +92,13 @@ public static X509Certificate2 CreateDevelopmentCertificate ( params string [] d
                 sanBuilder.Build () );
 
             var certificate = request.CreateSelfSigned ( new DateTimeOffset ( DateTime.UtcNow.AddDays ( -1 ) ), new DateTimeOffset ( DateTime.UtcNow.AddDays ( 3650 ) ) );
+
+#if NET9_0_OR_GREATER
+            // TODO: need to test this.
+            return X509CertificateLoader.LoadPkcs12 ( certificate.Export ( X509ContentType.Pfx, "sisk" ), "sisk", X509KeyStorageFlags.DefaultKeySet );
+#else
             return new X509Certificate2 ( certificate.Export ( X509ContentType.Pfx, "sisk" ), "sisk", X509KeyStorageFlags.DefaultKeySet );
+#endif
         }
     }
 }

extensions/Sisk.SslProxy/Sisk.SslProxy.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0</TargetFrameworks>
+		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>

src/Internal/ServiceProvider/JsonConfigParser.cs

@@ -7,24 +7,21 @@
 // File name:   JsonConfigParser.cs
 // Repository:  https://github.com/sisk-http/core
 
+using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 using Sisk.Core.Http;
 using Sisk.Core.Http.Hosting;
 
 namespace Sisk.Core.Internal.ServiceProvider {
     internal sealed class JsonConfigParser : IConfigurationReader {
+
         public void ReadConfiguration ( ConfigurationContext prov ) {
             string filename = prov.ConfigurationFile;
-
             string fileContents = File.ReadAllText ( filename );
 
-            if (System.Text.Json.JsonSerializer.Deserialize ( fileContents, typeof ( ConfigStructureFile ),
-                new SourceGenerationContext ( new System.Text.Json.JsonSerializerOptions () {
-                    AllowTrailingCommas = true,
-                    PropertyNameCaseInsensitive = true,
-                    ReadCommentHandling = System.Text.Json.JsonCommentHandling.Skip
-                } ) ) is not ConfigStructureFile config) {
+            if (JsonSerializer.Deserialize<ConfigStructureFile> ( fileContents, JsonConfigJsonSerializer.Default.ConfigStructureFile )
+                is not { } config) {
 
                 throw new InvalidOperationException ( SR.Provider_ConfigParser_ConfigFileInvalid );
             }
@@ -57,7 +54,7 @@ public void ReadConfiguration ( ConfigurationContext prov ) {
 
             if (config.Parameters != null) {
                 foreach (var prop in config.Parameters) {
-                    prov.Host.Parameters.Add ( prop.Key, prop.Value?.AsValue ().GetValue<object> ().ToString () );
+                    prov.Host.Parameters.Add ( prop.Key, prop.Value );
                 }
                 prov.Host.Parameters.MakeReadonly ();
             }
@@ -90,25 +87,32 @@ public void ReadConfiguration ( ConfigurationContext prov ) {
         }
     }
 
+    [JsonSourceGenerationOptions ( AllowTrailingCommas = true,
+        ReadCommentHandling = System.Text.Json.JsonCommentHandling.Skip,
+        DictionaryKeyPolicy = JsonKnownNamingPolicy.Unspecified )]
     [JsonSerializable ( typeof ( JsonObject ) )]
+    [JsonSerializable ( typeof ( ConfigStructureFile ) )]
     [JsonSerializable ( typeof ( ConfigStructureFile__ServerConfiguration ) )]
     [JsonSerializable ( typeof ( ConfigStructureFile__ListeningHost ) )]
-    internal partial class ConfigStructureFile : JsonSerializerContext {
+    [JsonSerializable ( typeof ( ConfigStructureFile__ListeningHost__CrossOriginResourceSharingPolicy ) )]
+    internal sealed partial class JsonConfigJsonSerializer : JsonSerializerContext {
+    }
+
+    internal sealed class ConfigStructureFile {
         public ConfigStructureFile__ServerConfiguration? Server { get; set; } = null!;
         public ConfigStructureFile__ListeningHost? ListeningHost { get; set; } = null!;
-        public JsonObject? Parameters { get; set; }
+        public Dictionary<string, string>? Parameters { get; set; }
     }
 
-    internal class ConfigStructureFile__ServerConfiguration {
+    internal sealed class ConfigStructureFile__ServerConfiguration {
         public string? AccessLogsStream { get; set; } = "console";
         public string? ErrorsLogsStream { get; set; }
         public int MaximumContentLength { get; set; }
         public bool IncludeRequestIdHeader { get; set; }
         public bool ThrowExceptions { get; set; } = true;
     }
 
-    [JsonSerializable ( typeof ( string [] ) )]
-    internal sealed partial class ConfigStructureFile__ListeningHost__CrossOriginResourceSharingPolicy : JsonSerializerContext {
+    internal sealed class ConfigStructureFile__ListeningHost__CrossOriginResourceSharingPolicy {
         public bool? AllowCredentials { get; set; }
         public string []? ExposeHeaders { get; set; }
         public string? AllowOrigin { get; set; }
@@ -118,16 +122,10 @@ internal sealed partial class ConfigStructureFile__ListeningHost__CrossOriginRes
         public int? MaxAge { get; set; }
     }
 
-    [JsonSerializable ( typeof ( ConfigStructureFile__ListeningHost__CrossOriginResourceSharingPolicy ) )]
-    internal sealed partial class ConfigStructureFile__ListeningHost : JsonSerializerContext {
+    internal sealed class ConfigStructureFile__ListeningHost {
         public string? Label { get; set; }
         public string []? Ports { get; set; }
 
         public ConfigStructureFile__ListeningHost__CrossOriginResourceSharingPolicy? CrossOriginResourceSharingPolicy { get; set; }
     }
-
-    [JsonSourceGenerationOptions ( WriteIndented = true )]
-    [JsonSerializable ( typeof ( ConfigStructureFile ) )]
-    internal sealed partial class SourceGenerationContext : JsonSerializerContext {
-    }
 }

src/Sisk.Core.csproj

@@ -77,9 +77,6 @@
 		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 		<AnalysisLevel>latest</AnalysisLevel>
 		<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-
-		<!-- SYSLIB0020: IgnoreNullValues is obsolete -->
-		<NoWarn>$(NoWarn);SYSLIB0020</NoWarn>
 	</PropertyGroup>
 
 	<!-- package included files -->