Skip to content

Commit

Permalink
Assessment Plan, Result, and POA&M Models (#681)
Browse files Browse the repository at this point in the history
* Renamed group-as names to make them more consistent.
* Moved levergaed-authorizations to system-implementation. Made system-implementation and control-implementation required.
* Added metadata and fixed other front matter in content
* Updated examples with AU-5 mock-up data
* Filled in missing titles and descriptions. Added role/user.
* Updates to examples. Tweak to SSP Metaschema
* Adding metaschema support for UUIDs. Implemented uuids addressing issue #676.
* Fixed broken schema and schematron paths.
* Fixed content to use new uuid-based flags.
* Profile resolution test set update to M3 models
* Updating profile resolver; renaming uuid support XSLT (#42)
* Removed SSL certificate check for wget to deal with broken SSL cert on apache archive site.
* Updated OSCAL version in metaschema files.
* Migrated definition of a system interconnection and service into components. The "service" and "interconnection" component types are now used to define these. (#498)
* Flattened party -> org/person to be just party. Party now has a type which identifies if the party is a person or organization.
* Added SHA-3 algorithms to the hash algorithm list. (#632)
* Fixed Docker container to run scripts that require in-place editing.
* Fixed SSP elements that reference a component UUID, but lacked the correct type.
* Added a location title.
* Updating metaschema support to fix bug (usnistgov/metaschema#56).
* Added "homepage" link relation.

* Fixed message error in round-trip validation which indicated the wrong type of conversion as compared to what was actually happening.
Fixed remaining round-trip issues.

* Updated Assessment Metaschemas

* Updated FedRAMP Profiles

* WIP - UUID transition prep

* WIP assessment

* Finished UUID Transition

* Significant assessment metaschema updates

* Assessment metaschema changes

* Assessment metaschema changes

* party assembly tweaks

* Assessment Metaschema Updates

* Updated FedRAMP Profiles

* additional assessment model tweaks

* SAR and POA&M Model Adjustments

* Metaschema gymnastics

* Fixed invalid content.

* SSP Example - Remove Schema Line

* Baselines with relative path to catalog

* Baseline path tweaks

Co-authored-by: David Waltermire <[email protected]>
Co-authored-by: Wendell Piez <[email protected]>
Co-authored-by: Wendell Piez <[email protected]>
  • Loading branch information
4 people authored Jun 1, 2020
1 parent 7602560 commit 0c79f10
Show file tree
Hide file tree
Showing 70 changed files with 44,334 additions and 72,468 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ commands:
command: |
# update maven version
cd /opt
sudo wget "https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz"
sudo wget --no-check-certificate "https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz"
sudo tar -xvzf "apache-maven-${MAVEN_VERSION}-bin.tar.gz"
sudo mv "apache-maven-${MAVEN_VERSION}" maven
export M2_HOME=/opt/maven
Expand Down
14 changes: 7 additions & 7 deletions build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ ARG saxonversion
ARG schematrondir
ARG oscaltoolsdir

RUN apt-get update && apt-get install -y apt-utils libxml2-utils jq maven hugo nodejs npm build-essential python3-pip git && apt-get clean
RUN apt-get update && apt-get install -y apt-utils libxml2-utils jq maven hugo nodejs npm build-essential python-pip git && apt-get clean
RUN npm install -g prettyjson markdown-link-check json-diff
RUN pip3 install lxml
RUN pip install lxml

RUN useradd --create-home --home-dir /home/user user
USER user
#RUN useradd --create-home --home-dir /home/user user
#USER user

RUN mkdir "${schematrondir}" && git clone --depth 1 --no-checkout https://github.com/Schematron/schematron.git "${schematrondir}" && cd "${schematrondir}" && git checkout master -- trunk/schematron/code
RUN mkdir "${oscaltoolsdir}" && git clone --depth 1 https://github.com/usnistgov/oscal-tools.git "${oscaltoolsdir}" && cd "${oscaltoolsdir}/json-cli" && mvn install
RUN mkdir -p "${schematrondir}" && git clone --depth 1 --no-checkout https://github.com/Schematron/schematron.git "${schematrondir}" && cd "${schematrondir}" && git checkout master -- trunk/schematron/code
RUN mkdir -p "${oscaltoolsdir}" && git clone --depth 1 https://github.com/usnistgov/oscal-tools.git "${oscaltoolsdir}" && cd "${oscaltoolsdir}/json-cli" && mvn install
RUN mvn org.apache.maven.plugins:maven-dependency-plugin:2.10:get -DartifactId=Saxon-HE -DgroupId=net.sf.saxon -Dversion=${saxonversion}

RUN chown -R user:user /home/user
#RUN chown -R user:user /home/user

VOLUME ["/oscal"]
WORKDIR /oscal
Expand Down
2 changes: 1 addition & 1 deletion build/ci-cd/validate-content-conversion-round-trips.sh
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ for i in ${!paths[@]}; do
exitcode=1
continue;
else
echo -e "${P_OK}Converted ${source_format^^} '${P_END}${target_file}${P_OK}' to ${target_format^^} as '${P_END}${roundtrip_file}${P_OK}'.${P_END}"
echo -e "${P_OK}Converted ${target_format^^} '${P_END}${target_file}${P_OK}' to ${source_format^^} as '${P_END}${roundtrip_file}${P_OK}'.${P_END}"
fi

# compare the XML files to see if there is data loss
Expand Down
Loading

0 comments on commit 0c79f10

Please sign in to comment.