feat(doc): Documentation update

WE2-587

Signed-off-by: Mati Agukas <[email protected]>

Author: mrts

.github/workflows/dotnet-build-linux.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Setup dotnet
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.x # SDK Version to use.
+          dotnet-version: 6.0.x # SDK Version to use.
 
       - name: Cache Nuget packages      
         uses: actions/cache@v2

.github/workflows/dotnet-build-windows.yml

@@ -12,12 +12,12 @@ jobs:
       - name: Setup dotnet
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.x # SDK Version to use.
+          dotnet-version: 6.0.x # SDK Version to use.
 
       - name: Setup MSBuild
         uses: microsoft/[email protected]
         with:
-          vs-version: 16.10 # Visual Studio Version to use.
+          vs-version: 17.1 # Visual Studio Version to use.
 
       - name: Setup VSTest
         uses: darenm/Setup-VSTest@v1
@@ -37,4 +37,4 @@ jobs:
         run: msbuild src/WebEid.Security.sln /t:Build /p:Configuration=Release
 
       - name: Test
-        run: vstest.console.exe src/WebEid.Security.Tests/bin/Release/net5.0/WebEID.Security.Tests.dll
+        run: vstest.console.exe src/WebEid.Security.Tests/bin/Release/net6.0/WebEID.Security.Tests.dll

.github/workflows/sonarcloud-analysis.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Setup dotnet
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.x # SDK Version to use.
+          dotnet-version: 6.0.x # SDK Version to use.
 
       - name: Set up JDK 11
         uses: actions/setup-java@v1

README.md

@@ -15,7 +15,7 @@ public static IAuthTokenValidator GetAuthTokenValidator() =>
         public static IAuthTokenValidator GetAuthTokenValidator(string url) =>
             GetAuthTokenValidator(url, GetCaCertificates());
 
-        public static IAuthTokenValidator GetAuthTokenValidator(string url, params X509Certificate[] certificates) =>
+        public static IAuthTokenValidator GetAuthTokenValidator(string url, params X509Certificate2[] certificates) =>
             GetAuthTokenValidatorBuilder(url, certificates)
                 // Assure that all builder methods are covered with tests.
                 .WithOcspRequestTimeout(TimeSpan.FromSeconds(1))
@@ -41,12 +41,12 @@ public static IAuthTokenValidator GetAuthTokenValidatorWithDisallowedEsteidPolic
                 .WithDisallowedCertificatePolicies(EstIdemiaPolicy)
                 .Build();
 
-        private static AuthTokenValidatorBuilder GetAuthTokenValidatorBuilder(string uri, X509Certificate[] certificates) =>
+        private static AuthTokenValidatorBuilder GetAuthTokenValidatorBuilder(string uri, X509Certificate2[] certificates) =>
             new AuthTokenValidatorBuilder()
                 .WithSiteOrigin(new Uri(uri))
                 .WithTrustedCertificateAuthorities(certificates);
 
-        private static X509Certificate[] GetCaCertificates() =>
+        private static X509Certificate2[] GetCaCertificates() =>
             Certificates.CertificateLoader.LoadCertificatesFromResources("TEST_of_ESTEID2018.cer");
     }
 }

src/WebEid.Security.Tests/TestUtils/AuthTokenValidators.cs

@@ -48,7 +48,7 @@ public void AuthTokenValidationConfigurationWithZeroOcspRequestTimeoutThrowsArgu
             {
                 SiteOrigin = new Uri("https://valid", UriKind.RelativeOrAbsolute),
             };
-            configuration.TrustedCaCertificates.Add(new X509Certificate2());
+            configuration.TrustedCaCertificates.Add(new X509Certificate2(Array.Empty<byte>()));
             configuration.OcspRequestTimeout = TimeSpan.Zero;
             Assert.Throws<ArgumentOutOfRangeException>(() => configuration.Validate())
                 .WithMessage("OCSP request timeout must be greater than zero (Parameter 'ocspRequestTimeout')");
@@ -61,7 +61,7 @@ public void AuthTokenValidationConfigurationWithCorrectDataDoesNotThrowException
             {
                 SiteOrigin = new Uri("https://valid", UriKind.RelativeOrAbsolute),
             };
-            configuration.TrustedCaCertificates.Add(new X509Certificate2());
+            configuration.TrustedCaCertificates.Add(new X509Certificate2(Array.Empty<byte>()));
             Assert.DoesNotThrow(() => configuration.Validate());
         }
 

src/WebEid.Security.Tests/Validator/AuthTokenValidationConfigurationTests.cs

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
 

src/WebEid.Security.Tests/WebEid.Security.Tests.csproj

@@ -36,9 +36,9 @@ public AuthTokenValidatorBuilder WithSiteOrigin(Uri origin)
         /// </summary>
         /// <param name="certificates">trusted intermediate Certificate Authority certificates</param>
         /// <returns>the builder instance for method chaining</returns>
-        public AuthTokenValidatorBuilder WithTrustedCertificateAuthorities(params X509Certificate[] certificates)
+        public AuthTokenValidatorBuilder WithTrustedCertificateAuthorities(params X509Certificate2[] certificates)
         {
-            this.configuration.TrustedCaCertificates.AddRange(certificates.Select(c => new X509Certificate2(c)));
+            this.configuration.TrustedCaCertificates.AddRange(certificates);
             this.logger?.LogDebug("Trusted intermediate certificate authorities set to {0}",
                 this.configuration.TrustedCaCertificates.Select(c => c.GetSubjectCn()));
             return this;

src/WebEid.Security/Validator/AuthTokenValidatorBuilder.cs

@@ -59,7 +59,7 @@ private void AddNonce(OcspReqGenerator builder)
         {
             this.Nonce = new byte[8];
 
-            using (var rndGenerator = RNGCryptoServiceProvider.Create())
+            using (var rndGenerator = RandomNumberGenerator.Create())
             {
                 rndGenerator.GetBytes(this.Nonce);
             }

src/WebEid.Security/Validator/Ocsp/OcspRequestBuilder.cs

@@ -4,10 +4,12 @@
     <Description>Web eID authentication token validation library</Description>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageReleaseNotes>Release</PackageReleaseNotes>
-
     <TargetFramework>netstandard2.1</TargetFramework>
     <RootNamespace>WebEid.Security</RootNamespace>
     <AssemblyName>WebEid.Security</AssemblyName>
+    <PublisherName>RIA</PublisherName>
+    <Authors>RIA</Authors>
+    <Copyright>RIA</Copyright>
   </PropertyGroup>
 
   <ItemGroup>