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.

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

Add imported-from link rel to relevant SSP assemblies #1403

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion README_validations.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ For OSCAL XML, this schema syntax is [XML Schema Definition (XSD)](https://www.w

Each tool will have its own way to provide for validation. Bindings or configurations to link documents to schemas can be maintained either inside or outside the documents themselves; many tools offer several ways to do this.

Some tools support self-contained validation functionality without full-fledged application frameworks or development environments, with tools like [`xmllint`](http://xmlsoft.org/xmllint.html) offering command-line interfaces. Similarly, you can use the [`ajv-cli`](https://github.com/ajv-validator/ajv-cli) for JSON.
Some tools support self-contained validation functionality without full-fledged application frameworks or development environments, with tools like [`xmllint`](https://linux.die.net/man/1/xmllint/) offering command-line interfaces. Similarly, you can use the [`ajv-cli`](https://github.com/ajv-validator/ajv-cli) for JSON.

## What does success look like?

Expand Down
4 changes: 2 additions & 2 deletions build/ci-cd/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ Not every script above is run with every pull request as part of the CI/CD syste

The bash scripts used in the CI/CD workflow can be run locally in the correct environment. In addition to a bash shell, to run these scripts the following must be installed:

- [xmlint](http://xmlsoft.org/xmllint.html)
- Java 8.0 or greater
- [xmlint](https://linux.die.net/man/1/xmllint/)
- Java 11 or greater
- [Apache Maven](https://maven.apache.org/) 3.6.1 or greater
- [Node.js and Node Package Manager (NPM)](https://nodejs.org/en/) 10.15.3 or greater
- 'Another Json Validator' Command Line Interface ([ajv-cli](https://github.com/jessedc/ajv-cli)) v3.0.0 or greater
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ This code provides test coverage to validate the OSCAL artifacts as new document
### Pre-Requisites

1. [Python 2.7.10 or greater](https://www.python.org/)
2. [xmllint](http://xmlsoft.org/xmllint.html)
3. Java 8.0 or greater
2. [xmllint](https://linux.die.net/man/1/xmllint/)
3. Java 11 or greater
4. [Saxon 10 HE](http://saxon.sourceforge.net/)

### Instructions
Expand Down
2 changes: 1 addition & 1 deletion docs/content/contribute/dev-lunch/meeting-2020-05-07.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ sidenav:

## Notes

- There is interest in having the model discussion. A Doodle pool will be sent to the [email protected] mailing list to find a good day.
- There is interest in having the model discussion. A Doodle pool will be sent to the oscal-dev@list.nist.gov mailing list to find a good day.
2 changes: 1 addition & 1 deletion docs/content/contribute/dev-lunch/meeting-2020-05-21.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ sidenav:

## Notes

- The Doodle pool results show that Fridays @ 10am EDT are the best time to have the model review meeting. The OSCAL team will send out a meeting invite for this time to the [email protected] mailing list.
- The Doodle pool results show that Fridays @ 10am EDT are the best time to have the model review meeting. The OSCAL team will send out a meeting invite for this time to the [oscal-dev@list.nist.gov](mailto:[email protected]) mailing list.
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
<!-- ========================================================================================================== -->
&allowed-values-component_component_link-rel;
<enum value="uses-network">This component uses the network provided by the identified network component.</enum>
<enum value="imported-from">The hyperlink identifies a URI pointing to the <code>component</code> in a <code>component-definition</code> that originally defined the <code>component</code>.</enum>
</allowed-values>

<allowed-values target="responsible-role/@role-id" allow-other="yes">
Expand Down
4 changes: 4 additions & 0 deletions src/metaschema/oscal_ssp_metaschema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1020,6 +1020,10 @@
<field ref="remarks" in-xml="WITH_WRAPPER"/>
</model>
<constraint>
<allowed-values target="link/@rel" allow-other="yes">
<!-- TODO: More work needs to be done around link enforcement constraints and requires Metaschema work on recurse-depth-first() recursive index searching. -->
<enum value="imported-from">The hyperlink identifies a URI pointing to the <code>component</code> in a <code>component-definition</code> that originally described the <code>component</code> this component was based on.</enum>
</allowed-values>
<allowed-values target=".//responsible-role/@role-id" allow-other="yes">
&allowed-values-responsible-roles-operations;
&allowed-values-responsible-roles-component-production;
Expand Down
4 changes: 2 additions & 2 deletions xml/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ XML Schema based on the [XML Schema Definition Language (XSD) 1.1](https://www.w

## Validating OSCAL XML Content

The OSCAL project uses [xmllint](http://xmlsoft.org/xmllint.html) to perform automated validation of all XML-based OSCAL [content](../content) provided in this repository. *xmllint* is an open source tool that can be [downloaded](http://xmlsoft.org/downloads.html), installed, and run on OSX, Linux, and Windows environments.
The OSCAL project uses [xmllint](https://linux.die.net/man/1/xmllint/) to perform automated validation of all XML-based OSCAL [content](../content) provided in this repository. *xmllint* is an open source tool that can be downloaded, installed, and run on OSX, Linux, and Windows environments with your preferred package manager.

The following example uses **xmllint** to perform validation of an OSCAL catalog XML file.

```
xmllint --noout --schema "oscal_catalog_schema.xsd" "catalog.xml"
```

The [online documentation](http://xmlsoft.org/xmllint.html) for *xmllint* provides more information on the commandline arguments.
The [online documentation](https://linux.die.net/man/1/xmllint/) for *xmllint* provides more information on the commandline arguments.

# OSCAL JSON to XML Converters

Expand Down