Skip to content

Fix/missing base control ccis 218 - #230

Open
kevjablonski wants to merge 3 commits into
mainfrom
fix/missing-base-control-ccis-218
Open

Fix/missing base control ccis 218#230
kevjablonski wants to merge 3 commits into
mainfrom
fix/missing-base-control-ccis-218

Conversation

@kevjablonski

Copy link
Copy Markdown
Collaborator

Summary

Fixes missing CCI mappings in SCTM and SCA exports and ensures SCA technical assessment findings are associated with the correct controls.

DISA CCI references are often mapped to statement-level indexes such as SI-3 a or SI-3 c 1, while export rows use the base control identifier SI-3. The export logic now normalizes these references to their base control or enhancement before performing lookups.

Changes

Fixed

  • Normalize statement-level CCI reference indexes to their base control or enhancement identifier.
  • Map references such as SI-3 a and SI-3 c 1 to SI-3.
  • Preserve enhancement mappings such as SI-2 (6) as SI-2(6).
  • Include base-control CCIs in both SCTM and SCA exports.
  • Prevent duplicate CCI entries when multiple references map to the same control.
  • Apply the same normalization when rolling STIG findings into SCA technical assessment details.
  • Process all references associated with each CCI instead of only the first reference.
  • Ensure technical assessment comments and statuses match the applicable control rows.

Testing

  • Generated SCTM and SCA exports and verified base controls now include their expected CCIs.
  • Verified control enhancements continue to receive their expected CCIs.
  • Generated an SCA export and confirmed applicable STIG findings appear under Technical Assessment Comments.
  • Verified controls without applicable STIG findings continue to display the existing fallback message.
  • Verified technical assessment fields remain blank for controls with an implementation status of Not Applicable.

Related

Closes #218
Closes #217

Normalizes CCI reference indexes to their base control or enhancement identifier
so statement-level references are included in SCTM and SCA exports. Prevents
duplicate CCI entries while preserving enhancement mappings.

Signed-off-by: Kevin Jablonski <kevjablonski@gmail.com>
Normalizes CCI references to their base control or enhancement when rolling up
STIG findings. Processes all references per CCI so technical assessment details
match the SCTM web view.

Signed-off-by: Kevin Jablonski <kevjablonski@gmail.com>
@kevjablonski kevjablonski linked an issue Aug 5, 2026 that may be closed by this pull request
@Amndeep7
Amndeep7 temporarily deployed to tir-fix-missing-base-co-gnx8y4 August 5, 2026 21:17 Inactive
Extract shared CCI lookup and normalization logic into a reusable utility for SCTM and SCA exports, reducing duplicated code while preserving existing mappings.

Signed-off-by: Kevin Jablonski <kevjablonski@gmail.com>
@Amndeep7
Amndeep7 temporarily deployed to tir-fix-missing-base-co-gnx8y4 August 6, 2026 15:07 Inactive
@sonarqubecloud

sonarqubecloud Bot commented Aug 6, 2026

Copy link
Copy Markdown

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Some CCIs missing from SCTM export Security Control Assessment Export has incorrect Technical Assessment details

2 participants