Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remove explicit org check in instancesController #564

Merged
merged 10 commits into from
Nov 29, 2024
Merged

fix: remove explicit org check in instancesController #564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
26c2912
fix: remove explicit org check in instancesController
mikaelrss Nov 25, 2024
ca5f5b9
Authenticate an organization with policy file if org is differing fro…
mikaelrss Nov 26, 2024
5357b56
Add access-subject category to policy file in test-read-app-no-permis…
mikaelrss Nov 26, 2024
ac99383
update resource to correctly reflect app name in policy.xml file for …
mikaelrss Nov 26, 2024
dfa2dc5
Fix wrong attributeId for access-subject in test-read-app-no-permission
mikaelrss Nov 26, 2024
f96bae1
rename rules in both test-read-app and test-read-app-no-permission
mikaelrss Nov 26, 2024
6a0f479
Remove unnecessary logging with try-catch in InstancesController
mikaelrss Nov 27, 2024
9aad89f
Add Altinn.Common.PEP v4.1.2 and make a decision request without inst…
mikaelrss Nov 28, 2024
dabcee7
Add nullcheck for AppId
mikaelrss Nov 28, 2024
398ba13
Make organisations that are permitted to fetch instances via policy f…
mikaelrss Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Storage/Altinn.Platform.Storage.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<PackageReference Include="Azure.Identity" Version="1.13.1" />
<PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.7.0" />
<PackageReference Include="Azure.Storage.Blobs" Version="12.23.0" />
<PackageReference Include="Altinn.Common.PEP" Version="4.1.1" />
<PackageReference Include="Altinn.Common.PEP" Version="4.1.2" />
<PackageReference Include="Azure.Storage.Queues" Version="12.21.0" />

<PackageReference Include="JWTCookieAuthentication" Version="3.0.1" />
Expand Down
21 changes: 17 additions & 4 deletions src/Storage/Controllers/InstancesController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,12 +118,25 @@ public async Task<ActionResult<QueryResponse<Instance>>> GetInstances(InstanceQu
{
queryParameters.Org = queryParameters.AppId.Split('/')[0];
}

if (!orgClaim.Equals(queryParameters.Org, StringComparison.InvariantCultureIgnoreCase))
{
return Forbid();
}

if (string.IsNullOrEmpty(queryParameters.AppId))
{
return BadRequest("AppId must be defined.");
}

var appId = ValidateAppId(queryParameters.AppId).Split("/")[1];

XacmlJsonRequestRoot request = DecisionHelper.CreateDecisionRequest(queryParameters.Org, appId, HttpContext.User, "read");
XacmlJsonResponse response = await _authorizationService.GetDecisionForRequest(request);

if (!DecisionHelper.ValidatePdpDecision(response?.Response, HttpContext.User))
{
return Forbid();
}
}

appOwnerRequestingInstances = true;
}
else if (userId != null)
Expand Down
Loading
Loading