-
Notifications
You must be signed in to change notification settings - Fork 58
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix first_run and add friendlier component import by refactoring sour…
…ce catalog handling (#1683) * Move user creation earlier in first_run * Update sample components to OSCAL 1.0.0 * Friendlier component importart, refactor source catalog handling Import components and their statements even when catalog not found or statement control ids are not found in referenced catalog. * Fix source of sample components * bump version * Fix name of ILIAS component * Use faster bulk_create importing components * Small fixes and synchronizations * Comment out soon-to-be deprecated account settings Co-authored-by: Greg Elin <greg.elin@govready.com>
- Loading branch information
1 parent
c6f67a9
commit 5c79f2a
Showing
8 changed files
with
248 additions
and
325 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| v0.9.9-dev | ||
| v0.9.8.1-dev |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,74 +1,82 @@ | ||
| { | ||
| "component-definition": { | ||
| "uuid": "e7b37ba4-ce0d-46bb-8900-231003dba10c", | ||
| "uuid": "343d3b0a-30a7-4196-b2b9-4bb3df85e04d", | ||
| "metadata": { | ||
| "title": "Cybrary Component-to-Control Narratives", | ||
| "published": "2021-02-15T10:10:57+00:00", | ||
| "last-modified": "2021-01-05T03:40:57+00:00", | ||
| "version": "string", | ||
| "oscal-version": "1.0.0-rc1" | ||
| "title": "Cybrary", | ||
| "last-modified": "2021-03-23T23:45:28+00:00", | ||
| "version": "2021-03-23T23:45:28+00:00", | ||
| "oscal-version": "1.0.0", | ||
| "parties": [ | ||
| { | ||
| "uuid": "49e75032-c17a-4b57-9afd-cf7f23fc1dee", | ||
| "type": "organization", | ||
| "name": "Main" | ||
| } | ||
| ] | ||
| }, | ||
| "components": { | ||
| "a42932ab-7aa9-4c34-a643-2840b6630a19": { | ||
| "components": [ | ||
| { | ||
| "uuid": "a42932ab-7aa9-4c34-a643-2840b6630a19", | ||
| "type": "software", | ||
| "title": "Cybrary", | ||
| "type": "system_element", | ||
| "description": "Training course", | ||
| "responsible-roles": [ | ||
| { | ||
| "role-id": "supplier", | ||
| "party-uuids": [ | ||
| "49e75032-c17a-4b57-9afd-cf7f23fc1dee" | ||
| ] | ||
| } | ||
| ], | ||
| "control-implementations": [ | ||
| { | ||
| "uuid": "8a8f9643-2c68-4f87-a47d-70d8af924e73", | ||
| "uuid": "f986c0f5-47b3-4c06-aa74-e7d0d3683f8f", | ||
| "source": "NIST_SP-800-53_rev4", | ||
| "description": "Partial implementation of NIST_SP-800-53_rev4", | ||
| "description": "This is a partial implementation of the at-2 catalog, focusing on the control enhancement at-2.", | ||
| "implemented-requirements": [ | ||
| { | ||
| "uuid": "8a9856df-69b4-4b5c-9709-169b34ef06b9", | ||
| "control-id": "at-2", | ||
| "description": "", | ||
| "remarks": "", | ||
| "statements": { | ||
| "at-2_smt": { | ||
| "uuid": "3d9091a6-1315-4fb9-94c7-f138e0d93191", | ||
| "description": "Cybrary provides a complete catalog of security awareness and role-based security training. Cybrary also tracks the training completed by each user. Cybrary content can be tailored for annual security awareness.", | ||
| "remarks": "" | ||
| } | ||
| } | ||
| "uuid": "3d9091a6-1315-4fb9-94c7-f138e0d93191", | ||
| "description": "Cybrary provides a complete catalog of security awareness and role-based security training. Cybrary also tracks the training completed by each user. Cybrary content can be tailored for annual security awareness.", | ||
| "control-id": "at-2" | ||
| }, | ||
| { | ||
| "uuid": "a25c123b-b78d-4833-b7f9-7826676699be", | ||
| "control-id": "at-3", | ||
| "description": "", | ||
| "remarks": "", | ||
| "statements": { | ||
| "at-3_smt": { | ||
| "uuid": "08a5bcb1-80ff-4c44-8f5f-28d24c796e63", | ||
| "description": "Role base training implementation narrative.", | ||
| "remarks": "" | ||
| } | ||
| } | ||
| "uuid": "3d9091a6-1315-4fb9-94c7-f138e0d93191", | ||
| "description": "Cybrary provides a complete catalog of security awareness, role-based security training, and vendor training. Cybrary also tracks the training completed by each user. Cybrary content can be tailored for annual security awareness. \r\nCybrary version 4.5 is being used by system Admins.", | ||
| "control-id": "at-2" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "uuid": "ed191423-96b6-4a8f-98b9-de07b953d36d", | ||
| "source": "NIST_SP-800-53_rev5", | ||
| "description": "Partial implementation of NIST_SP-800-53_rev5", | ||
| "uuid": "5a8952e7-1846-49e1-9a4d-bd58f23610e4", | ||
| "source": "NIST_SP-800-53_rev4", | ||
| "description": "This is a partial implementation of the at-2.2 catalog, focusing on the control enhancement at-2.2.", | ||
| "implemented-requirements": [ | ||
| { | ||
| "uuid": "28383ff1-8870-484e-b31b-3d00bfd6fbae", | ||
| "control-id": "at-2.2", | ||
| "description": "", | ||
| "remarks": "", | ||
| "statements": { | ||
| "at-2.2_smt": { | ||
| "uuid": "ddba3705-efbd-446f-8ac1-2c68f1b28e55", | ||
| "description": "THis is how Cybrary helps with Insider Threat.", | ||
| "remarks": "" | ||
| } | ||
| } | ||
| "uuid": "ddba3705-efbd-446f-8ac1-2c68f1b28e55", | ||
| "description": "THis is how Cybrary helps with Insider Threat.", | ||
| "control-id": "at-2.2" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "uuid": "04507036-0a47-4612-b39a-576e60df614c", | ||
| "source": "NIST_SP-800-53_rev4", | ||
| "description": "This is a partial implementation of the at-3 catalog, focusing on the control enhancement at-3.", | ||
| "implemented-requirements": [ | ||
| { | ||
| "uuid": "08a5bcb1-80ff-4c44-8f5f-28d24c796e63", | ||
| "description": "Role base training implementation narrative.", | ||
| "control-id": "at-3" | ||
| }, | ||
| { | ||
| "uuid": "08a5bcb1-80ff-4c44-8f5f-28d24c796e63", | ||
| "description": "Role base training implementation narrative. sdfsdfdf", | ||
| "control-id": "at-3" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } |
Oops, something went wrong.