Messaging: Correct most warnings + suppress a few in auto-generated files

src/Helsenorge.Messaging.AdminLib/Helsenorge.Messaging.AdminLib.csproj

@@ -4,6 +4,7 @@
         <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
         <ImplicitUsings>disable</ImplicitUsings>
         <Nullable>disable</Nullable>
+        <NoWarn>CS1591</NoWarn>
     </PropertyGroup>
 
     <ItemGroup>

src/Helsenorge.Messaging/Helsenorge.Messaging.csproj

@@ -10,6 +10,7 @@
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
     <SignAssembly>false</SignAssembly>
     <PackageId>Helsenorge.Messaging</PackageId>
+    <NoWarn>CS1591</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

src/Helsenorge.Messaging/Security/SignThenEncryptMessageProtection.cs

@@ -13,32 +13,32 @@
 using System.Security.Cryptography.Pkcs;
 using Helsenorge.Messaging.Abstractions;
 using System.Security.Cryptography;
-using Microsoft.Extensions.Logging;
-using Helsenorge.Messaging.Amqp.Receivers;
-
+using Microsoft.Extensions.Logging;
+using Helsenorge.Messaging.Amqp.Receivers;
+
 namespace Helsenorge.Messaging.Security
 {
     /// <summary>
     /// Provides message protection that first signs the message, then encrypts it
     /// </summary>
     public class SignThenEncryptMessageProtection : MessageProtection
-    {
-        private readonly ILogger _logger;
+    {
+        private readonly ILogger _logger;
         private readonly X509IncludeOption? _includeOption;
-        private readonly MessagingEncryptionType _messagingEncryptionType;
-        private readonly MessagingEncryptionType _rejectMessagingEncryptionTypes;
-
+        private readonly MessagingEncryptionType _messagingEncryptionType;
+        private readonly MessagingEncryptionType _rejectMessagingEncryptionTypes;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="SignThenEncryptMessageProtection"/> class with the required certificates for signing and encrypting data.
         /// </summary>
         /// <param name="signingCertificate">Certificcate that will be used to sign data</param>
-        /// <param name="encryptionCertificate">Certificate that will be used to encrypt data</param>
+        /// <param name="encryptionCertificate">Certificate that will be used to encrypt data</param>
         /// <param name="logger"></param>
         /// <param name="legacyEncryptionCertificate">A legacy certificate that can be used when swapping certificates.</param>
         /// <param name="includeOption">Controls how much of the signer certificate's certificate chain should be
         /// embedded in the signed message. If not specified, the default <see cref="X509IncludeOption.ExcludeRoot"/>
         /// is used.</param>
-        /// <param name="messagingEncryptionType">Controls which encryption type the Protect methods use.</param>
+        /// <param name="messagingEncryptionType">Controls which encryption type the Protect methods use.</param>
         /// <param name="rejectMessagingEncryptionType">Controls which encryption type the Unprotect methods rejects.</param>
         public SignThenEncryptMessageProtection(
             X509Certificate2 signingCertificate,
@@ -49,11 +49,11 @@ public SignThenEncryptMessageProtection(
             MessagingEncryptionType messagingEncryptionType = MessagingEncryptionType.AES256,
             MessagingEncryptionType rejectMessagingEncryptionType = MessagingEncryptionType.None)
             : base(signingCertificate, encryptionCertificate, legacyEncryptionCertificate)
-        {
-            _logger = logger;
+        {
+            _logger = logger;
             _includeOption = includeOption;
-            _messagingEncryptionType = messagingEncryptionType;
-            _rejectMessagingEncryptionTypes = rejectMessagingEncryptionType;
+            _messagingEncryptionType = messagingEncryptionType;
+            _rejectMessagingEncryptionTypes = rejectMessagingEncryptionType;
         }
 
         /// <summary>
@@ -73,16 +73,19 @@ public override Stream Protect(Stream data, X509Certificate2 encryptionCertifica
         }
 
         /// <inheritdoc/>
-        public override Stream Protect(Stream data, X509Certificate2 encryptionCertificate, X509Certificate2 signingCertificate)
-        {
+        public override Stream Protect(Stream data, X509Certificate2 encryptionCertificate, X509Certificate2 signingCertificate)
+        {
             if (data == null) throw new ArgumentNullException(nameof(data));
             if (encryptionCertificate == null) throw new ArgumentNullException(nameof(encryptionCertificate));
             if (signingCertificate == null) throw new ArgumentNullException(nameof(signingCertificate));
 
             byte[] dataAsBytes = new byte[data.Length];
+#if NET9_0_OR_GREATER
+            data.ReadExactly(dataAsBytes, 0, (int)data.Length);
+#else
             data.Read(dataAsBytes, 0, (int)data.Length);
-
-            return new MemoryStream(Protect(dataAsBytes, encryptionCertificate, signingCertificate));
+#endif
+            return new MemoryStream(Protect(dataAsBytes, encryptionCertificate, signingCertificate));
         }
 
         private byte[] Protect(byte[] data, X509Certificate2 encryptionCertificate, X509Certificate2 signingCertificate)
@@ -117,7 +120,11 @@ public override Stream Unprotect(Stream data, X509Certificate2 signingCertificat
             if (data == null) throw new ArgumentNullException(nameof(data));
 
             byte[] dataAsBytes = new byte[data.Length];
+#if NET9_0_OR_GREATER
+            data.ReadExactly(dataAsBytes, 0, (int)data.Length);
+#else
             data.Read(dataAsBytes, 0, (int)data.Length);
+#endif
 
             return new MemoryStream(Unprotect(dataAsBytes, signingCertificate));
         }
@@ -133,13 +140,13 @@ private byte[] Unprotect(byte[] data, X509Certificate2 signingCertificate)
             envelopedCms.Decode(data);
             try
             {
-                var encryptionOid = envelopedCms?.ContentEncryptionAlgorithm?.Oid;
+                var encryptionOid = envelopedCms?.ContentEncryptionAlgorithm?.Oid;
                 _logger.LogInformation($"Decrypting EnvelopedCms with ContentEncryptionAlgorithm: {encryptionOid?.FriendlyName ?? "null"} : {encryptionOid?.Value ?? "null"}");
 
-                if ((_rejectMessagingEncryptionTypes.HasFlag(MessagingEncryptionType.DES) && encryptionOid.Value == "1.3.14.3.2.7")
-                    || (_rejectMessagingEncryptionTypes.HasFlag(MessagingEncryptionType.TripleDES) && encryptionOid.Value == "1.2.840.113549.3.7"))
-                {
-                    throw new UnsupportedMessageException($"EnvelopedCms was encrypted with disabled ContentEncryptionAlgorithm: {encryptionOid?.FriendlyName ?? "null"} : {encryptionOid?.Value ?? "null"}");
+                if ((_rejectMessagingEncryptionTypes.HasFlag(MessagingEncryptionType.DES) && encryptionOid.Value == "1.3.14.3.2.7")
+                    || (_rejectMessagingEncryptionTypes.HasFlag(MessagingEncryptionType.TripleDES) && encryptionOid.Value == "1.2.840.113549.3.7"))
+                {
+                    throw new UnsupportedMessageException($"EnvelopedCms was encrypted with disabled ContentEncryptionAlgorithm: {encryptionOid?.FriendlyName ?? "null"} : {encryptionOid?.Value ?? "null"}");
                 }
 
                 envelopedCms.Decrypt(envelopedCms.RecipientInfos[0], encryptionCertificates);
@@ -187,15 +194,15 @@ private byte[] Unprotect(byte[] data, X509Certificate2 signingCertificate)
 
         private EnvelopedCms GetEnvelope(byte[] rawContent)
         {
-            if (_messagingEncryptionType.HasFlag(MessagingEncryptionType.AES256))
-            {
-                return new EnvelopedCms(new ContentInfo(rawContent), new AlgorithmIdentifier(new Oid("2.16.840.1.101.3.4.1.42")));
-            }
-            else if (_messagingEncryptionType.HasFlag(MessagingEncryptionType.TripleDES))
-            {
-                return new EnvelopedCms(new ContentInfo(rawContent), new AlgorithmIdentifier(new Oid("1.2.840.113549.3.7")));
-            }
-
+            if (_messagingEncryptionType.HasFlag(MessagingEncryptionType.AES256))
+            {
+                return new EnvelopedCms(new ContentInfo(rawContent), new AlgorithmIdentifier(new Oid("2.16.840.1.101.3.4.1.42")));
+            }
+            else if (_messagingEncryptionType.HasFlag(MessagingEncryptionType.TripleDES))
+            {
+                return new EnvelopedCms(new ContentInfo(rawContent), new AlgorithmIdentifier(new Oid("1.2.840.113549.3.7")));
+            }
+
             throw new ArgumentException($"MessagingEncryptionType has been set to an unsupported type.: {_messagingEncryptionType}", nameof(_messagingEncryptionType));
         }
     }

src/Helsenorge.Registries/Abstractions/CertificateDetails.cs

@@ -58,7 +58,11 @@ internal void OnDeserialized(StreamingContext context)
         {
             Certificate = string.IsNullOrWhiteSpace(_certificateBase64String)
                 ? null
+#if NET9_0_OR_GREATER
+                : X509CertificateLoader.LoadCertificate(Convert.FromBase64String(_certificateBase64String));
+#else
                 : new X509Certificate2(Convert.FromBase64String(_certificateBase64String));
+#endif
         }
     }
 }

src/Helsenorge.Registries/Abstractions/CollaborationProtocolProfile.cs

@@ -51,7 +51,11 @@ public static CollaborationProtocolProfile CreateFromPartyInfoElement(XElement p
             foreach (var certificateElement in partyInfo.Elements(NameSpace + "Certificate"))
             {
                 var base64 = certificateElement.Descendants(xmlSig + "X509Certificate").First().Value;
+#if NET9_0_OR_GREATER
+                var certificate = X509CertificateLoader.LoadCertificate(Convert.FromBase64String(base64));
+#else
                 var certificate = new X509Certificate2(Convert.FromBase64String(base64));
+#endif
 
                 if (certificate.HasKeyUsage(X509KeyUsageFlags.KeyEncipherment))
                 {
@@ -99,10 +103,18 @@ internal void OnDeserialized(StreamingContext context)
         {
             EncryptionCertificate = string.IsNullOrWhiteSpace(_encryptionCertificateBase64String)
                 ? null
+#if NET9_0_OR_GREATER
+                : X509CertificateLoader.LoadCertificate(Convert.FromBase64String(_encryptionCertificateBase64String));
+#else
                 : new X509Certificate2(Convert.FromBase64String(_encryptionCertificateBase64String));
+#endif
             SignatureCertificate = string.IsNullOrWhiteSpace(_signatureCertificateBase64String)
                 ? null
+#if NET9_0_OR_GREATER
+                : X509CertificateLoader.LoadCertificate(Convert.FromBase64String(_signatureCertificateBase64String));
+#else
                 : new X509Certificate2(Convert.FromBase64String(_signatureCertificateBase64String));
+#endif
         }
 
         /// <summary>

src/Helsenorge.Registries/AddressRegistry.cs

@@ -477,7 +477,11 @@ private static CertificateDetails MapCertificateDetails(int herId, AddressServic
             return new CertificateDetails
             {
                 HerId = herId,
+#if NET9_0_OR_GREATER
+                Certificate = X509CertificateLoader.LoadCertificate(certificateDetails.Certificate),
+#else
                 Certificate = new X509Certificate2(certificateDetails.Certificate),
+#endif
                 LdapUrl = certificateDetails.LdapUrl
             };
         }

src/Helsenorge.Registries/Connected Services/AddressService/AddressService.cs

@@ -7,6 +7,8 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
+#pragma warning disable CS0108
+
 namespace Helsenorge.Registries.AddressService
 {
     using System.Runtime.Serialization;

src/Helsenorge.Registries/Connected Services/CPAService/CPAService.cs

@@ -7,6 +7,8 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
+#pragma warning disable CS0108
+
 namespace Helsenorge.Registries.CPAService
 {
     using System.Runtime.Serialization;

src/Helsenorge.Registries/Connected Services/ServiceBusManagerServiceV2/ServiceBusManagerServiceV2.cs

@@ -7,6 +7,8 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
+#pragma warning disable CS0108
+
 namespace Helsenorge.Registries
 {
     using System.Runtime.Serialization;

src/Helsenorge.Registries/DummyCollaborationProtocolProfileFactory.cs

@@ -44,7 +44,6 @@ public static class DummyCollaborationProtocolProfileFactory
     /// <param name="logger">An instance of <see cref="ILogger"/>.</param>
     /// <param name="herId">The HER-id to create a "dummy" <see cref="CollaborationProtocolProfile"/></param>
     /// <param name="messageFunction"></param>
-    /// <param name="collaborationProtocolRegistry"></param>
     /// <returns></returns>
     public static async Task<CollaborationProtocolProfile> CreateAsync(
         IAddressRegistry addressRegistry,

src/Helsenorge.Registries/Helsenorge.Registries.csproj

@@ -12,6 +12,7 @@
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
     <SignAssembly>false</SignAssembly>
     <PackageId>Helsenorge.Registries</PackageId>
+    <NoWarn>CS1591</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

src/Helsenorge.Registries/RegistriesException.cs

@@ -54,26 +54,5 @@ public RegistriesException(string message) : base(message)
         public RegistriesException(string message, Exception inner) : base(message, inner)
         {
         }
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="info"></param>
-        /// <param name="context"></param>
-        protected RegistriesException(
-            SerializationInfo info,
-            StreamingContext context) : base(info, context)
-        {
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="info"></param>
-        /// <param name="context"></param>
-        // ReSharper disable once RedundantOverridenMember
-        public override void GetObjectData(SerializationInfo info, StreamingContext context)
-        {
-            base.GetObjectData(info, context);
-        }
     }
 }

test/Helsenorge.Messaging.Tests.Mocks/Helsenorge.Messaging.Tests.Mocks.csproj

@@ -4,6 +4,7 @@
         <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
         <ImplicitUsings>disable</ImplicitUsings>
         <Nullable>disable</Nullable>
+        <NoWarn>CS1591</NoWarn>
     </PropertyGroup>
 
     <ItemGroup>

test/Helsenorge.Messaging.Tests/Security/SignThenEncryptMessageProtectionTests.cs

@@ -72,7 +72,11 @@ public void Protect_And_Unprotect_UsingLegacy_OK()
         public void Protect_And_Unprotect_WrongSigningCertificate()
         {
             const string wrongCertificateBase64 = "MIIE3jCCA8agAwIBAgILCE2BUrKlJGrOxOgwDQYJKoZIhvcNAQELBQAwSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDMgQ0EgMzAeFw0xNjAxMTgwOTA3NTZaFw0xOTAxMTgyMjU5MDBaMHIxCzAJBgNVBAYTAk5PMRswGQYDVQQKDBJOT1JTSyBIRUxTRU5FVFQgU0YxFTATBgNVBAsMDFRFU1RTRU5URVJFVDEbMBkGA1UEAwwSTk9SU0sgSEVMU0VORVRUIFNGMRIwEAYDVQQFEwk5OTQ1OTg3NTkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZ34VMBCzmHwmvMWwq0YhtNaEz19PxcEq3ImbCLWZx0zIf2hp8ZSDQy23KpgTumrTebeXEW5b1ig4THXizKzDtwirV5ssO441U7hvTXr+Bm1GYpRc1Q0vzZbKg41Nje5cq+kAovq3H8nnJ3csdjFS5QWKKz1hyUL9V6mZiR1eMVLWbOL2gBR6rjB0OgpoXtF9wmb2Z9So+srAyqnpRy9xBumBFdqvx3+8iZp8G9FH0TPgzeEPreLX5tdKZL0J/Z7+zWXqCx+Fu1PoKMkdw+aYJCVtUJPRXY1t4BpLKO0h6yXf7Rpky+sUQcJmKyagOBPZr9mqqjycYQg6JPSkcTo+XAgMBAAGjggGaMIIBljAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFMzD+Ae3nG16TvWnKx0F+bNHHJHRMB0GA1UdDgQWBBRpioossQ08OgpOuAl6/58qpAkvajAOBgNVHQ8BAf8EBAMCBkAwFQYDVR0gBA4wDDAKBghghEIBGgEDAjCBpQYDVR0fBIGdMIGaMC+gLaArhilodHRwOi8vY3JsLmJ1eXBhc3Mubm8vY3JsL0JQQ2xhc3MzQ0EzLmNybDBnoGWgY4ZhbGRhcDovL2xkYXAuYnV5cGFzcy5uby9kYz1CdXlwYXNzLGRjPU5PLENOPUJ1eXBhc3MlMjBDbGFzcyUyMDMlMjBDQSUyMDM/Y2VydGlmaWNhdGVSZXZvY2F0aW9uTGlzdDB6BggrBgEFBQcBAQRuMGwwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLmJ1eXBhc3Mubm8vb2NzcC9CUENsYXNzM0NBMzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC5idXlwYXNzLm5vL2NydC9CUENsYXNzM0NBMy5jZXIwDQYJKoZIhvcNAQELBQADggEBALPuCmA93Mi9NZFUFOaQz3PasTFLeLmtSXtt4Qp0TVtJuhqrlDeWYXDCsffMQoCAZXE3569/hdEgHPBVALo8xKS9vdwZR5SgIF+IivsEdC4ZYsq8C5VX4qq2WxW7yHNy3GYU8RBdOaztTfUliv7uaAeooP6EOPa6m+R+dgGfGnb5rM8NRyGgcAKDvC1YUFwdWaIgqO0gBB6WnSkhkyk0iX4tksUkbemQFcyMi2XDog6IFpkYt85MvfBklwjjufCiIcpkzHmuZCcYSLdwqi40Cz4QM5FE8zQYJJLco35A7NVW3MusyFImTleOlL10NH3XnqeLM8loa1Ph7YPl0SpiSjY=";
+#if NET9_0_OR_GREATER
+            var wrongCertificate = X509CertificateLoader.LoadCertificate(Convert.FromBase64String(wrongCertificateBase64));
+#else
             var wrongCertificate = new X509Certificate2(Convert.FromBase64String(wrongCertificateBase64));
+#endif
             MemoryStream contentStream = new MemoryStream(Encoding.UTF8.GetBytes(_content.ToString()));
 
             var partyAProtection = new SignThenEncryptMessageProtection(TestCertificates.GetCertificate(TestCertificates.CounterpartySignatureThumbprint), TestCertificates.GetCertificate(TestCertificates.CounterpartyEncryptionThumbprint), _logger);

test/Helsenorge.Registries.Tests/AddressRegistryTests.cs

@@ -267,7 +267,11 @@ public void Serialize_AddressService_CertificateDetails()
 
             var serialized = XmlCacheFormatter.Serialize(serviceDetails);
             var deserialized = XmlCacheFormatter.DeserializeAsync<AddressService.CertificateDetails>(serialized).Result;
+#if NET9_0_OR_GREATER
+            var deserializedCert = X509CertificateLoader.LoadCertificate(deserialized.Certificate);
+#else
             var deserializedCert = new X509Certificate2(deserialized.Certificate);
+#endif
             Assert.AreEqual(serviceDetails.LdapUrl, deserialized.LdapUrl);
             Assert.AreEqual(cert.Thumbprint, deserializedCert.Thumbprint);
         }