Skip to content

fix: add null-safety checks in ValidateController.ProcessResource() (Fixes #5627) #5628

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

Open
rtmalikian wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: add null-safety checks in ValidateController.ProcessResource() (Fixes #5627) #5628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 40 additions & 0 deletions src/Microsoft.Health.Fhir.Shared.Api.UnitTests/Controllers/ValidateControllerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,46 @@ await _mediator.Received(valid && getResource ? 1 : 0).Send<GetResourceResponse>
Arg.Any<CancellationToken>());
}

[Fact]
public async Task GivenParametersWithNullParameterCollection_WhenValidating_ThenShouldNotThrowNullReferenceException()
{
var parameters = new Parameters();
parameters.Parameter = null;

// Should not throw NullReferenceException; ProcessResource should handle gracefully
await _controller.Validate(parameters, null);
}

[Fact]
public async Task GivenParametersWithMissingResourceParameter_WhenValidating_ThenShouldNotThrowNullReferenceException()
{
var parameters = new Parameters();
parameters.Parameter.Add(
new Parameters.ParameterComponent()
{
Name = "otherParam",
Value = new FhirString("test"),
});

// Should not throw NullReferenceException; ProcessResource should handle gracefully
await _controller.Validate(parameters, null);
}

[Fact]
public async Task GivenParametersWithNullResourceParameter_WhenValidating_ThenShouldNotThrowNullReferenceException()
{
var parameters = new Parameters();
parameters.Parameter.Add(
new Parameters.ParameterComponent()
{
Name = "resource",
Resource = null,
});

// Should not throw NullReferenceException; ProcessResource should handle gracefully
await _controller.Validate(parameters, null);
}

private ICollection<OperationOutcomeIssue> CreateIssues(int count)
{
var issues = new List<OperationOutcomeIssue>();
Expand Down
10 changes: 7 additions & 3 deletions src/Microsoft.Health.Fhir.Shared.Api/Controllers/ValidateController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ public async Task<IActionResult> Validate([FromBody] Resource resource, [FromQue

private static void ProcessResource(ref Resource resource, ref string profile)
{
if (resource.TypeName == KnownResourceTypes.Parameters)
if (resource?.TypeName == KnownResourceTypes.Parameters)
{
var parameterResource = (Parameters)resource;
var profileFromParameters = parameterResource.Parameter.Find(param => param.Name.Equals("profile", StringComparison.OrdinalIgnoreCase));
var profileFromParameters = parameterResource.Parameter?.Find(param => param.Name.Equals("profile", StringComparison.OrdinalIgnoreCase));
if (profileFromParameters != null)
{
if (profile != null)
Expand All @@ -71,7 +71,11 @@ private static void ProcessResource(ref Resource resource, ref string profile)
}
}

resource = parameterResource.Parameter.Find(param => param.Name.Equals("resource", StringComparison.OrdinalIgnoreCase)).Resource;
var resourceParam = parameterResource.Parameter?.Find(param => param.Name.Equals("resource", StringComparison.OrdinalIgnoreCase));
if (resourceParam?.Resource != null)
{
resource = resourceParam.Resource;
}
}
}

Expand Down
Loading