merge changes from v7 and main into v8 branch. (#404)

* chore(deps): update nuget non-major dependencies (#310) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Add [Authorize] attribute on AuthorizationController.GetCurrentParty (#339) This means that the code won't crash with missing cookie when the cookie exipires * chore(deps): update nuget non-major dependencies (#330) * chore(deps): update nuget non-major dependencies * Fix broken test --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Vemund Gaukstad <[email protected]> * chore(deps): update dependency moq to v4.20.70 (#371) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update actions/setup-java action to v4 (#372) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update nuget non-major dependencies (#385) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update github/codeql-action action to v3 (#388) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update actions/setup-dotnet action to v4 (#386) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update actions/upload-artifact action to v4 (#387) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Support using connectionString for ApplicationInsights (#379) (#391) This wil become a requirement from may 2025, so adding this early ensures that does not become an requirement for updating apps. microsoft/ApplicationInsights-dotnet#2560 * chore(deps): update nuget non-major dependencies (#390) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * v7: Fix issue with non-ascii characters in code list parameters not being correctly encoded in parameter header. (#402) Likely fix Altinn/codelists-lib-dotnet#23 * Include changes from main in v8 branch mostly verion updates --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Vemund Gaukstad <[email protected]>
Altinn · Jan 26, 2024 · 07a7897 · 07a7897
1 parent ee15289
commit 07a7897
Show file tree

Hide file tree

Showing 13 changed files with 64 additions and 38 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -41,7 +41,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         queries: security-extended,security-and-quality
@@ -54,7 +54,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -67,6 +67,6 @@ jobs:
     #   ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
       with:
         category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/dotnet-test.yml b/.github/workflows/dotnet-test.yml
@@ -17,7 +17,7 @@ jobs:
       DOTNET_HOSTBUILDER__RELOADCONFIGONCHANGE: false
     steps:
       - name: Setup .NET
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
             8.0.x

diff --git a/.github/workflows/test-and-analyze-fork.yml b/.github/workflows/test-and-analyze-fork.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Setup .NET
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
             8.0.x
@@ -30,7 +30,7 @@ jobs:
           reportgenerator -reports:TestResults/**/coverage.cobertura.xml -targetdir:TestResults/Output/CoverageReport -reporttypes:Cobertura
 
       - name: Archive code coverage results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: code-coverage-report
           path: TestResults/Output/CoverageReport/

diff --git a/.github/workflows/test-and-analyze.yml b/.github/workflows/test-and-analyze.yml
@@ -16,12 +16,12 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Setup .NET
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
             8.0.x
       - name: Set up JDK 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: 17

diff --git a/src/Altinn.App.Api/Altinn.App.Api.csproj b/src/Altinn.App.Api/Altinn.App.Api.csproj
@@ -22,11 +22,11 @@
   <ItemGroup>
     <PackageReference Include="Altinn.Common.PEP" Version="1.3.0" />
     <PackageReference Include="Altinn.Platform.Storage.Interface" Version="3.24.0" />
-    <PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="3.0.0" />
+    <PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="3.1.1" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(Configuration)'=='Debug'">
-     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507">
+     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

diff --git a/src/Altinn.App.Api/Controllers/OptionsController.cs b/src/Altinn.App.Api/Controllers/OptionsController.cs
@@ -49,7 +49,7 @@ public async Task<IActionResult> Get(
                 return NotFound();
             }
 
-            HttpContext.Response.Headers.Add("Altinn-DownstreamParameters", appOptions.Parameters.ToNameValueString(','));
+            HttpContext.Response.Headers.Append("Altinn-DownstreamParameters", appOptions.Parameters.ToUrlEncodedNameValueString(','));
 
             return Ok(appOptions.Options);
         }
@@ -90,7 +90,7 @@ public async Task<IActionResult> Get(
                 return NotFound();
             }
 
-            HttpContext.Response.Headers.Add("Altinn-DownstreamParameters", appOptions.Parameters.ToNameValueString(','));
+            HttpContext.Response.Headers.Append("Altinn-DownstreamParameters", appOptions.Parameters.ToUrlEncodedNameValueString(','));
 
             return Ok(appOptions.Options);
         }

diff --git a/src/Altinn.App.Core/Altinn.App.Core.csproj b/src/Altinn.App.Core/Altinn.App.Core.csproj
@@ -14,11 +14,12 @@
     <PackageReference Include="Altinn.Common.PEP" Version="1.3.0" />
     <PackageReference Include="Altinn.Platform.Models" Version="1.2.0" />
     <PackageReference Include="Altinn.Platform.Storage.Interface" Version="3.24.0" />
-    <PackageReference Include="HtmlAgilityPack" Version="1.11.54" />
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.57" />
     <PackageReference Include="JsonPatch.Net" Version="2.1.0" />
     <PackageReference Include="JWTCookieAuthentication" Version="3.0.1" />
-    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
-    <PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="3.0.0" />
+    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
+    <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
+    <PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="3.1.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Scrutor" Version="4.2.2" />
     <PackageReference Include="prometheus-net" Version="8.0.0" />

diff --git a/src/Altinn.App.Core/Extensions/DictionaryExtensions.cs b/src/Altinn.App.Core/Extensions/DictionaryExtensions.cs
@@ -1,4 +1,5 @@
-using System.Text;
+using System.Net;
+using System.Text;
 
 namespace Altinn.App.Core.Extensions
 {
@@ -8,9 +9,9 @@ namespace Altinn.App.Core.Extensions
     public static class DictionaryExtensions
     {
         /// <summary>
-        /// Converts a dictionary to a name value string on the form key1=value1,key2=value2
+        /// Converts a dictionary to a name value string on the form key1=value1,key2=value2 url encoding both key and value.
         /// </summary>
-        public static string ToNameValueString(this Dictionary<string, string> parameters, char separator)
+        public static string ToUrlEncodedNameValueString(this Dictionary<string, string>? parameters, char separator)
         {
             if (parameters == null)
             {
@@ -24,8 +25,12 @@ public static string ToNameValueString(this Dictionary<string, string> parameter
                 {
                     builder.Append(separator);
                 }
-                builder.Append(param.Key + "=" + param.Value);
+
+                builder.Append(WebUtility.UrlEncode(param.Key));
+                builder.Append('=');
+                builder.Append(WebUtility.UrlEncode(param.Value));
             }
+
             return builder.ToString();
         }
     }

diff --git a/test/Altinn.App.Api.Tests/Altinn.App.Api.Tests.csproj b/test/Altinn.App.Api.Tests/Altinn.App.Api.Tests.csproj
@@ -16,10 +16,10 @@
 		<PackageReference Include="FluentAssertions" Version="6.12.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0" />
 		<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.0" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-		<PackageReference Include="Moq" Version="4.20.69" />
-		<PackageReference Include="xunit" Version="2.5.2" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+		<PackageReference Include="Moq" Version="4.20.70" />
+		<PackageReference Include="xunit" Version="2.6.5" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>

diff --git a/test/Altinn.App.Api.Tests/Controllers/OptionsControllerTests.cs b/test/Altinn.App.Api.Tests/Controllers/OptionsControllerTests.cs
@@ -5,6 +5,7 @@
 using Altinn.App.Core.Features;
 using Altinn.App.Core.Models;
 using FluentAssertions;
+using Moq;
 
 namespace Altinn.App.Api.Tests.Controllers
 {
@@ -70,8 +71,7 @@ public Task<AppOptions> GetAppOptionsAsync(string language, Dictionary<string, s
                 Parameters = new Dictionary<string, string>()
                 {
                     { "lang", language }
-                },
-
+                }
             };
 
             return Task.FromResult(appOptions);

diff --git a/test/Altinn.App.Common.Tests/Altinn.App.Common.Tests.csproj b/test/Altinn.App.Common.Tests/Altinn.App.Common.Tests.csproj
@@ -25,9 +25,9 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-    <PackageReference Include="xunit" Version="2.5.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="xunit" Version="2.6.5" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/test/Altinn.App.Core.Tests/Altinn.App.Core.Tests.csproj b/test/Altinn.App.Core.Tests/Altinn.App.Core.Tests.csproj
@@ -42,11 +42,11 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    <PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="3.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-    <PackageReference Include="Moq" Version="4.20.69" />
-    <PackageReference Include="xunit" Version="2.5.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
+    <PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="3.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="Moq" Version="4.20.70" />
+    <PackageReference Include="xunit" Version="2.6.5" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -57,7 +57,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(Configuration)'=='Debug'">
-     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507">
+     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

diff --git a/test/Altinn.App.Core.Tests/Extensions/DictionaryExtensionsTests.cs b/test/Altinn.App.Core.Tests/Extensions/DictionaryExtensionsTests.cs
@@ -21,7 +21,7 @@ public void ToNameValueString_OptionParameters_ShouldConvertToHttpHeaderFormat()
 
             IHeaderDictionary headers = new HeaderDictionary
             {
-                { "Altinn-DownstreamParameters", options.Parameters.ToNameValueString(',') }
+                { "Altinn-DownstreamParameters", options.Parameters.ToUrlEncodedNameValueString(',') }
             };
 
             Assert.Equal("lang=nb,level=1", headers["Altinn-DownstreamParameters"]);
@@ -37,7 +37,7 @@ public void ToNameValueString_OptionParametersWithEmptyValue_ShouldConvertToHttp
 
             IHeaderDictionary headers = new HeaderDictionary
             {
-                { "Altinn-DownstreamParameters", options.Parameters.ToNameValueString(',') }
+                { "Altinn-DownstreamParameters", options.Parameters.ToUrlEncodedNameValueString(',') }
             };
 
             Assert.Equal(string.Empty, headers["Altinn-DownstreamParameters"]);
@@ -48,15 +48,35 @@ public void ToNameValueString_OptionParametersWithNullValue_ShouldConvertToHttpH
         {
             var options = new AppOptions
             {
-                Parameters = null
+                Parameters = null!
             };
 
             IHeaderDictionary headers = new HeaderDictionary
             {
-                { "Altinn-DownstreamParameters", options.Parameters.ToNameValueString(',') }
+                { "Altinn-DownstreamParameters", options.Parameters.ToUrlEncodedNameValueString(',') }
             };
 
             Assert.Equal(string.Empty, headers["Altinn-DownstreamParameters"]);
         }
+
+        [Fact]
+        public void ToNameValueString_OptionParametersWithSpecialCharaters_IsValidAsHeaders()
+        {
+            var options = new AppOptions
+            {
+                Parameters = new Dictionary<string, string>
+                {
+                    { "lang", "nb" },
+                    { "level", "1" },
+                    { "name", "ÆØÅ" },
+                    { "variant", "Småvilt1" }
+                },
+            };
+
+            IHeaderDictionary headers = new HeaderDictionary();
+            headers.Add("Altinn-DownstreamParameters", options.Parameters.ToUrlEncodedNameValueString(','));
+
+            Assert.Equal("lang=nb,level=1,name=%C3%86%C3%98%C3%85,variant=Sm%C3%A5vilt1", headers["Altinn-DownstreamParameters"]);
+        }
     }
 }