Skip to content

Fix: enforce restrictMetadata for non-system attributes even when allowSystemMetadata is true #153

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
dinhys merged 2 commits into from
Mar 3, 2026
Merged

Fix: enforce restrictMetadata for non-system attributes even when allowSystemMetadata is true #153

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e6aa96
Initial plan
Copilot Mar 3, 2026
cefd740
Fix restrictMetadata to only exempt system-generated attributes when …
Copilot Mar 3, 2026
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
3 changes: 2 additions & 1 deletion ...hpc-app-service-impl/src/main/java/gov/nih/nci/hpc/service/impl/HpcMetadataValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,8 @@ private void validateMetadata(List<HpcMetadataEntry> existingMetadataEntries,
// If the restrict_metadata flag is set in the database, then ensure
// that the add/update metadata entry defined in the validation rules
// i.e. it is a mandatory or optional metadata for the applicable DOC
if (restrictMetadata && !allowSystemMetadata) {
if (restrictMetadata && !(allowSystemMetadata
&& systemGeneratedMetadataAttributes.contains(metadataEntry.getAttribute()))) {
Copy link

Copilot AI Mar 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The exemption for DOC validation when allowSystemMetadata is true is currently keyed off the global systemGeneratedMetadataAttributes set. That set includes data-object-only system attributes (see constructor) in addition to the smaller collectionSystemGeneratedMetadataAttributeNames list. For collection metadata updates, this means object-only system attributes would also be treated as exempt from DOC validation. Consider using the collection/data-object specific system-attribute lists (or passing the relevant set into validateMetadata) so only resource-appropriate system attributes are exempted.

Suggested change
&& systemGeneratedMetadataAttributes.contains(metadataEntry.getAttribute()))) {
&& collectionSystemGeneratedMetadataAttributeNames.contains(metadataEntry.getAttribute()))) {

Copilot uses AI. Check for mistakes.
// Do this check only for new files or collections so that fixing
// of existing ones is not necessitated
if (CollectionUtils.isNullOrEmpty(existingMetadataEntries)) {
Expand Down