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

Jump to bottom

Add convert CCI list workflow #6336

Open
wants to merge 49 commits into
base: master
Choose a base branch
from
Open

Add convert CCI list workflow #6336

wants to merge 49 commits into from
+296,336 −94,399

Commits on Nov 15, 2024

  1. Fix typo 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    68dce97 View commit details
    Browse the repository at this point in the history

  2. Fix crashing on CCIs who had no references to any NIST controls 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    f2f3684 View commit details
    Browse the repository at this point in the history

  3. Generate CCI definitions alongside CCI to NIST file 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    eb7524d View commit details
    Browse the repository at this point in the history

  4. Rename xml2json to cciListXml2json 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    935bcbb View commit details
    Browse the repository at this point in the history

  5. Update CciNistMappingData with converted content from U_CCI_List.xml 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    1254cb1 View commit details
    Browse the repository at this point in the history

  6. Update frontend component, CciNistMapping used in converters, delete … 

    …cci_util.ts, and add NIST_DESCRIPTIONS array produced from cciListXml2json

Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    25cc18f View commit details
    Browse the repository at this point in the history

  7. Add comment about GitHub-hosted wiki for cciListXml2json 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    c62bdf5 View commit details
    Browse the repository at this point in the history

  8. Create GitHub workflow for pulling down U_CCI_List.xml and converting… 

    … it every month

Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    be6e290 View commit details
    Browse the repository at this point in the history

  9. Fix cron syntax 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    8c51912 View commit details
    Browse the repository at this point in the history

  10. Also add Prettier job to format CciNistMappingData.ts 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    bfb58ef View commit details
    Browse the repository at this point in the history

  11. Update author and email in commit changes step 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    4e0d5cc View commit details
    Browse the repository at this point in the history

  12. Update XCCDF mapper OpenSCAP ubuntu1804 expected JSON 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    7d23cd4 View commit details
    Browse the repository at this point in the history

  13. Remove temporary file after updating CciNistMappingData.ts 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    f6cb6fb View commit details
    Browse the repository at this point in the history

  14. Address review comments 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    c122a9e View commit details
    Browse the repository at this point in the history

  15. Check that workflow runs 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    437df99 View commit details
    Browse the repository at this point in the history

  16. Remove step 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    f2a17a9 View commit details
    Browse the repository at this point in the history

  17. Update xml-file parameter in publish-date step 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    35d3f94 View commit details
    Browse the repository at this point in the history

  18. Add namespaces parameter to publish-date step and add debug commands 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    2271642 View commit details
    Browse the repository at this point in the history

  19. Update xpath 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    388c2df View commit details
    Browse the repository at this point in the history

  20. Try to fix xpath again 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    b7a19ce View commit details
    Browse the repository at this point in the history

  21. Try to fix path of input XML 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    b44b570 View commit details
    Browse the repository at this point in the history

  22. Try to resolve 'a mapping was not expected' error 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    5958225 View commit details
    Browse the repository at this point in the history

  23. Remove env var 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    58343ce View commit details
    Browse the repository at this point in the history

  24. Set env var with path to input XML in separate step 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    edb626b View commit details
    Browse the repository at this point in the history

  25. Update paths to input and output XML files 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    73fd687 View commit details
    Browse the repository at this point in the history

  26. Move env attribute 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    647ca4b View commit details
    Browse the repository at this point in the history

  27. Try to print result of previous step 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    e061ef8 View commit details
    Browse the repository at this point in the history

  28. Try to grab output of publish-date step from object 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    c71ce2b View commit details
    Browse the repository at this point in the history

  29. Update to proper branch 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    ede2b75 View commit details
    Browse the repository at this point in the history

  30. Explicitly specify parent-most component in U_CCI_List.xml to grab ve… 

    …rsion from

Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    961a1df View commit details
    Browse the repository at this point in the history

  31. Move getCCIsForNISTTags function into libs/hdf-converters/src/mapping… 

    …s/CciNistMapping.ts

Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    6c762ce View commit details
    Browse the repository at this point in the history

  32. Update GitHub Action and cciListXml2json script to create NIST->CCI J… 

    …SON file and check in that file

Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    b7d4ef0 View commit details
    Browse the repository at this point in the history

  33. Update files from cciListXml2json script and new formatting 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    7557310 View commit details
    Browse the repository at this point in the history

  34. Remove step 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    a9a6953 View commit details
    Browse the repository at this point in the history

  35. Fix env var 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    4a22950 View commit details
    Browse the repository at this point in the history

  36. Remove trailing slash 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    04e44d7 View commit details
    Browse the repository at this point in the history

  37. Restructure CCI to NIST and NIST to CCI logic across mappers and dele… 

    …te obsolete files

Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    6a680a3 View commit details
    Browse the repository at this point in the history

  38. Export variables representing magic strings to be used in NIST2CCI fu… 

    …nction

Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    3f4b9d0 View commit details
    Browse the repository at this point in the history

  39. Update path for output directory and rename steps 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    6db2095 View commit details
    Browse the repository at this point in the history

  40. WIP address latest PR review comments 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    152627f View commit details
    Browse the repository at this point in the history

  41. Revert NIST->CCI trie to Record<string, string[]> 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    3257185 View commit details
    Browse the repository at this point in the history

  42. Fix typo 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    071d949 View commit details
    Browse the repository at this point in the history

  43. Update XCCDF mapper and expected XML->HDF test outputs to not include… 

    … static analysis tags if there are already existing found NIST tags and/or mapped CCI->NIST tags

Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    9a41dd1 View commit details
    Browse the repository at this point in the history

  44. Fix typo in commented generating-expected-output code 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    bf0d8a9 View commit details
    Browse the repository at this point in the history

  45. Regenerate test expected output files 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    2085553 View commit details
    Browse the repository at this point in the history

  46. Uncomment GitHub Action code 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    928bb6d View commit details
    Browse the repository at this point in the history

  47. Fix lint issue 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    3451cdc View commit details
    Browse the repository at this point in the history

  48. Update XCCDF mapper as per NIST to CCI, CCI to NIST, and proper defau… 

    …lt NIST and CCI tags discussion

Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    635b270 View commit details
    Browse the repository at this point in the history

  49. Reduce code complexity in CCI List XML to JSON converter 

    Signed-off-by: Joyce Quach <[email protected]>
    @jtquach1
    jtquach1 committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    4e5c4c4 View commit details
    Browse the repository at this point in the history