Merge with main

Altinn · Nov 7, 2024 · db277db · db277db
2 parents 29e57ca + be02ec0
commit db277db
Show file tree

Hide file tree

Showing 56 changed files with 2,606 additions and 1,460 deletions.
diff --git a/.github/scripts/package.json b/.github/scripts/package.json
@@ -7,7 +7,7 @@
     "private": true,
     "devDependencies": {
       "@octokit/action": "^7.0.0",
-      "@types/node": "^20.11.30",
+      "@types/node": "^22.0.0",
       "chalk": "^5.3.0",
       "globby": "^14.0.1",
       "tsx": "^4.7.1",

diff --git a/.github/scripts/pnpm-lock.yaml b/.github/scripts/pnpm-lock.yaml
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build
+FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build
 WORKDIR Authorization/
 
 COPY src/Authorization ./Authorization

diff --git a/infrastructure/shared/.terraform.lock.hcl b/infrastructure/shared/.terraform.lock.hcl
diff --git a/infrastructure/shared/main.tf b/infrastructure/shared/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "4.3.0"
+      version = "4.8.0"
     }
     random = {
       source  = "hashicorp/random"

diff --git a/src/Altinn.Authorization.ABAC/Altinn.Authorization.ABAC.csproj b/src/Altinn.Authorization.ABAC/Altinn.Authorization.ABAC.csproj
@@ -20,8 +20,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all"/>
-    <PackageReference Include="DotNet.ReproducibleBuilds" Version="1.2.25" PrivateAssets="all"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
+    <PackageReference Include="DotNet.ReproducibleBuilds" Version="1.2.25" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(Configuration)'=='Debug'">
@@ -35,7 +35,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Text.Json" Version="8.0.4" />
+    <PackageReference Include="System.Text.Json" Version="8.0.5" />
   </ItemGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">

diff --git a/src/Altinn.Common.PEP/Altinn.Common.PEP/Altinn.Common.PEP.csproj b/src/Altinn.Common.PEP/Altinn.Common.PEP/Altinn.Common.PEP.csproj
@@ -27,7 +27,7 @@
   <ItemGroup>
     <PackageReference Include="Altinn.Authorization.ABAC" Version="0.0.8" />
     <!-- More about this dependency in issue #5706 -->
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.33" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.35" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(Configuration)'=='Debug'">

diff --git a/src/Authorization/Altinn.Platform.Authorization.csproj b/src/Authorization/Altinn.Platform.Authorization.csproj
@@ -7,35 +7,35 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Altinn.ApiClients.Maskinporten" Version="9.2.0" />
+    <PackageReference Include="Altinn.ApiClients.Maskinporten" Version="9.2.1" />
     <PackageReference Include="Altinn.Authorization.ProblemDetails" Version="3.0.1" />
     <PackageReference Include="Altinn.Authorization.ProblemDetails.Abstractions" Version="3.0.1" />
-    <PackageReference Include="Altinn.Common.AccessToken" Version="4.5.1" />
-    <PackageReference Include="Altinn.Common.AccessTokenClient" Version="3.0.7" />
+    <PackageReference Include="Altinn.Common.AccessToken" Version="4.5.3" />
+    <PackageReference Include="Altinn.Common.AccessTokenClient" Version="3.0.9" />
     <PackageReference Include="Altinn.Common.PEP" Version="4.0.0" />
     <PackageReference Include="Altinn.Platform.Models" Version="1.6.1" />
-    <PackageReference Include="Altinn.Swashbuckle" Version="2.1.0" />
-    <PackageReference Include="Altinn.Urn" Version="2.5.0" />
-    <PackageReference Include="Altinn.Urn.Swashbuckle" Version="2.5.0" />
+    <PackageReference Include="Altinn.Swashbuckle" Version="2.1.1" />
+    <PackageReference Include="Altinn.Urn" Version="2.5.1" />
+    <PackageReference Include="Altinn.Urn.Swashbuckle" Version="2.5.1" />
     <PackageReference Include="AutoMapper" Version="13.0.1" />
-    <PackageReference Include="Azure.Identity" Version="1.12.1" />
-    <PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.6.0" />
-    <PackageReference Include="Azure.Storage.Queues" Version="12.20.0" />
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.22.1" />
+    <PackageReference Include="Azure.Identity" Version="1.13.1" />
+    <PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.7.0" />
+    <PackageReference Include="Azure.Storage.Queues" Version="12.20.1" />
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.22.2" />
     <PackageReference Include="IdentityModel" Version="7.0.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
     <PackageReference Include="Altinn.Authorization.ABAC" Version="0.0.8" />
-    <PackageReference Include="Altinn.Platform.Storage.Interface" Version="4.0.0" />
+    <PackageReference Include="Altinn.Platform.Storage.Interface" Version="4.0.3" />
     <PackageReference Include="JWTCookieAuthentication" Version="4.0.1" />
     <PackageReference Include="Microsoft.Azure.DocumentDB.Core" Version="2.22.0" />
     <PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.6.2" />
     <PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="3.1.24" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
-    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.1.0" />
-    <PackageReference Include="Microsoft.FeatureManagement" Version="3.5.0" />
-    <PackageReference Include="Npgsql" Version="8.0.4" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.8.1" />
-    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.8.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
+    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.2.0" />
+    <PackageReference Include="Microsoft.FeatureManagement" Version="4.0.0" />
+    <PackageReference Include="Npgsql" Version="8.0.5" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.9.0" />
     <PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.2" />
     <PackageReference Include="System.Text.Json" Version="8.0.5" />
     <PackageReference Include="Yuniql.AspNetCore" Version="1.2.25" />

diff --git a/src/Authorization/Constants/XacmlRequestAttribute.cs b/src/Authorization/Constants/XacmlRequestAttribute.cs
@@ -46,10 +46,15 @@ public static class XacmlRequestAttribute
         public const string OrganizationNumberAttribute = "urn:altinn:organization:identifier-no";
 
         /// <summary>
-        /// Legacu xacml string that represents organization number. Can be removed when all peps are updated
+        /// Legacy xacml string that represents organization number. Can be removed when all peps are updated
         /// </summary>
         public const string LegacyOrganizationNumberAttribute = "urn:altinn:organizationnumber";
 
+        /// <summary>
+        /// xacml string that represents organization universally unique identifier
+        /// </summary>
+        public const string OrganizationUuidAttribute = "urn:altinn:organization:uuid";
+
         /// <summary>
         /// xacml string that represents user
         /// </summary>
@@ -70,11 +75,21 @@ public static class XacmlRequestAttribute
         /// </summary>
         public const string ResourceRegistryAttribute = "urn:altinn:resource";
 
+        /// <summary>
+        /// xacml string that represents a resource instance
+        /// </summary>
+        public const string ResourceRegistryInstanceAttribute = "urn:altinn:resource:instance-id";
+
         /// <summary>
         /// xacml string that represents person identifier
         /// </summary>
         public const string PersonIdAttribute = "urn:altinn:person:identifier-no";
 
+        /// <summary>
+        /// xacml string that represents person universally unique identifier
+        /// </summary>
+        public const string PersonUuidAttribute = "urn:altinn:person:uuid";
+
         /// <summary>
         /// xacml attribute urn prefix that represents system user id
         /// </summary>