Skip to content

Harden Attr/Relationship attributes against invalid input #1268

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

Merged
merged 4 commits into from
May 11, 2023
Merged

Harden Attr/Relationship attributes against invalid input #1268

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9e03e0f
Various (non-breaking) name changes for internal consistency
bkoelman Apr 15, 2023
11894ad
Harden Attr/Relationship attributes against invalid input
bkoelman Apr 15, 2023
b51d681
Add missing null checks
bkoelman Apr 15, 2023
338c63e
Merge branch 'master' into harden-attributes
maurei May 11, 2023
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add missing null checks
  • Loading branch information
@bkoelman
bkoelman committed Apr 20, 2023
commit b51d68125a14c153048b3e9c32efcf6a5ef4adef
3 changes: 2 additions & 1 deletion src/JsonApiDotNetCore/Queries/FieldSelectors.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,10 @@ public void IncludeAttributes(IEnumerable<AttrAttribute> attributes)
}
}

public void IncludeRelationship(RelationshipAttribute relationship, QueryLayer? queryLayer)
public void IncludeRelationship(RelationshipAttribute relationship, QueryLayer queryLayer)
{
ArgumentGuard.NotNull(relationship);
ArgumentGuard.NotNull(queryLayer);

this[relationship] = queryLayer;
}
Expand Down
2 changes: 2 additions & 0 deletions src/JsonApiDotNetCore/Repositories/EntityFrameworkCoreRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,8 @@ public virtual Task<TResource> GetForCreateAsync(Type resourceClrType, TId id, C
id
});

ArgumentGuard.NotNull(resourceClrType);

var resource = (TResource)_resourceFactory.CreateInstance(resourceClrType);
resource.Id = id;

Expand Down