Skip to content

Commit

Permalink
Resolving merge conflict.
Browse files Browse the repository at this point in the history
  • Loading branch information
@mateusdz
mateusdz committed Jan 24, 2023
2 parents 844112b + 47c26b2 commit df8e6df
Show file tree
Hide file tree
Showing 12 changed files with 298 additions and 96 deletions.
Empty file removed stix/bundle-object/bundle.fowl
View file
Empty file.
75 changes: 75 additions & 0 deletions stix/bundle-object/bundle.owl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE rdf:RDF [
<!ENTITY owl "http://www.w3.org/2002/07/owl#">
<!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<!ENTITY rdfs "http://www.w3.org/2000/01/rdf-schema#">
<!ENTITY stix "http://docs.oasis-open.org/cti/ns/stix#">
<!ENTITY xsd "http://www.w3.org/2001/XMLSchema#">
]>
<rdf:RDF xml:base="http://docs.oasis-open.org/cti/ns/stix/bundle"
xmlns:owl="http://www.w3.org/2002/07/owl#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
xmlns:stix="http://docs.oasis-open.org/cti/ns/stix#"
xmlns:xsd="http://www.w3.org/2001/XMLSchema#">

<owl:Ontology rdf:about="http://docs.oasis-open.org/cti/ns/stix/bundle">
<owl:imports rdf:resource="http://docs.oasis-open.org/cti/ns/stix/common-properties"/>
<owl:versionInfo>2.1.0</owl:versionInfo>
</owl:Ontology>

<owl:Class rdf:about="&stix;Bundle">
<rdfs:subClassOf rdf:resource="&owl;Thing"/>
<rdfs:subClassOf>
<owl:Restriction>
<owl:onProperty rdf:resource="&stix;id"/>
<owl:someValuesFrom rdf:resource="&stix;identifier"/>
</owl:Restriction>
</rdfs:subClassOf>
<rdfs:subClassOf>
<owl:Restriction>
<owl:onProperty rdf:resource="&stix;id_string"/>
<owl:someValuesFrom rdf:resource="&xsd;string"/>
</owl:Restriction>
</rdfs:subClassOf>
<rdfs:subClassOf>
<owl:Restriction>
<owl:onProperty rdf:resource="&stix;objects"/>
<owl:someValuesFrom rdf:resource="&stix;StixObject"/>
</owl:Restriction>
</rdfs:subClassOf>
<rdfs:subClassOf>
<owl:Restriction>
<owl:onProperty rdf:resource="&stix;type"/>
<owl:someValuesFrom rdf:resource="&xsd;string"/>
</owl:Restriction>
</rdfs:subClassOf>
<rdfs:label xml:lang="en">STIX Bundle Object</rdfs:label>
<rdfs:comment xml:lang="en-us">A Bundle is a collection of arbitrary STIX Objects grouped together in a single container. A Bundle does not have any semantic meaning and the objects contained within the Bundle are not considered related by virtue of being in the same Bundle. \n\n A STIX Bundle Object is not a STIX Object but makes use of the type and id Common Properties. A Bundle is transient, and implementations SHOULD NOT assume that other implementations will treat it as a persistent object or keep any custom properties found on the bundle itself. \n\n The JSON MTI serialization uses the JSON Object type [RFC8259] when representing bundle.</rdfs:comment>
</owl:Class>

<owl:DatatypeProperty rdf:about="&stix;id">
<rdfs:label xml:lang="en">id</rdfs:label>
<rdfs:comment xml:lang="en">An identifier for this Bundle. The id property for the Bundle is designed to help tools that may need it for processing, however, tools are not required to store or track it. Tools that consume STIX should not rely on the ability to refer to bundles by ID.</rdfs:comment>
<rdfs:range rdf:resource="&stix;identifier"/>
</owl:DatatypeProperty>

<owl:DatatypeProperty rdf:about="&stix;id_string">
<rdfs:label xml:lang="en">id_string</rdfs:label>
<rdfs:comment xml:lang="en">An identifier for this Bundle. The id property for the Bundle is designed to help tools that may need it for processing, however, tools are not required to store or track it. Tools that consume STIX should not rely on the ability to refer to bundles by ID.</rdfs:comment>
<rdfs:range rdf:resource="&xsd;string"/>
</owl:DatatypeProperty>

<owl:DatatypeProperty rdf:about="&stix;objects">
<rdfs:label xml:lang="en">objects</rdfs:label>
<rdfs:comment xml:lang="en">Specifies a set of one or more STIX Objects. Objects in this list MUST be a STIX Object.</rdfs:comment>
<rdfs:range rdf:resource="&stix;StixObject"/>
</owl:DatatypeProperty>

<owl:DatatypeProperty rdf:about="&stix;type">
<rdfs:label xml:lang="en">type</rdfs:label>
<rdfs:comment xml:lang="en">The type property identifies the type of object. The value of this property MUST be bundle.</rdfs:comment>
<rdfs:range rdf:resource="&xsd;string"/>
</owl:DatatypeProperty>

</rdf:RDF>
98 changes: 50 additions & 48 deletions stix/catalog-v001.xml
View file

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions stix/core-objects/common-properties.owl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema#">

<owl:Ontology rdf:about="http://docs.oasis-open.org/cti/ns/stix/common-properties">
<owl:imports rdf:resource="http://docs.oasis-open.org/cti/ns/data-marking"/>
<owl:imports rdf:resource="http://docs.oasis-open.org/cti/ns/data-types"/>
<owl:versionInfo>2.1.0</owl:versionInfo>
</owl:Ontology>
Expand Down Expand Up @@ -90,7 +91,7 @@
<rdfs:subClassOf>
<owl:Restriction>
<owl:onProperty rdf:resource="&stix;id"/>
<owl:someValuesFrom rdf:resource="&stix;Identifier"/>
<owl:someValuesFrom rdf:resource="&stix;identifier"/>
</owl:Restriction>
</rdfs:subClassOf>
<rdfs:subClassOf>
Expand Down Expand Up @@ -214,7 +215,7 @@
<owl:DatatypeProperty rdf:about="&stix;id">
<rdfs:label xml:lang="en-us">id</rdfs:label>
<rdfs:comment xml:lang="en-us">The id property uniquely identifies this object. For objects that support versioning, all objects with the same id are considered different versions of the same object and the version of the object is identified by its modified property.</rdfs:comment>
<rdfs:range rdf:resource="&xsd;string"/>
<rdfs:range rdf:resource="&stix;identifier"/>
</owl:DatatypeProperty>

<owl:DatatypeProperty rdf:about="&stix;labels">
Expand Down
4 changes: 2 additions & 2 deletions stix/core-objects/data-types.owl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema#">

<owl:Ontology rdf:about="http://docs.oasis-open.org/cti/ns/stix/data-types">
<owl:imports rdf:resource="http://docs.oasis-open.org/cti/ns/data-marking"/>
<owl:imports rdf:resource="http://docs.oasis-open.org/cti/ns/vocabularies"/>
<owl:versionInfo>2.1.0</owl:versionInfo>
</owl:Ontology>
Expand Down Expand Up @@ -147,7 +146,7 @@
<owl:DatatypeProperty rdf:about="&stix;hash_algorithm">
<rdfs:label xml:lang="en-us">hash_algorithm</rdfs:label>
<rdfs:comment xml:lang="en-us">Represents the cryptographic hash algorithm used.\n\nThe name of the cryptographic hash algorithm used SHOULD come from one of the values defined in the hash-algorithm-ov open vocabulary.</rdfs:comment>
<rdfs:range rdf:resource="&xsd;HashAlgorithmOv"/>
<rdfs:range rdf:resource="&stix;HashAlgorithmOv"/>
</owl:DatatypeProperty>

<owl:DatatypeProperty rdf:about="&stix;hash_value">
Expand All @@ -163,6 +162,7 @@
</owl:ObjectProperty>

<owl:DatatypeProperty rdf:about="&stix;identifier">
<rdfs:subClassOf rdf:resource="&stix;StixDatatype"/>
<rdfs:label xml:lang="en-us">identifier</rdfs:label>
<rdfs:comment xml:lang="en-us">An identifier uniquely identifies a STIX Object and MAY do so in a deterministic way. A deterministic identifier means that the identifier generated by more than one producer for the exact same STIX Object using the same namespace, &quot;ID Contributing Properties&quot;, and UUID method will have the exact same identifier value. \n\n All identifiers, excluding those used in the deprecated Cyber Observable Container, MUST follow the form object-type--UUID, where object-type is the exact value (all type names are lowercase strings, by definition) from the type property of the object being identified or referenced and where the UUID MUST be an RFC 4122-compliant UUID [RFC4122].</rdfs:comment>
<rdfs:range rdf:resource="&xsd;string"/>
Expand Down
2 changes: 1 addition & 1 deletion stix/core-objects/sco/file/file.owl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@
<rdfs:subClassOf>
<owl:Restriction>
<owl:onProperty rdf:resource="&stix;pe_type"/>
<owl:someValuesFrom rdf:resource="&stix;WinPebinaryTypeOpenVocab"/>
<owl:someValuesFrom rdf:resource="&stix;WindowsPebinaryTypeOv"/>
</owl:Restriction>
</rdfs:subClassOf>
<rdfs:subClassOf>
Expand Down
2 changes: 1 addition & 1 deletion stix/core-objects/sdo/grouping/grouping.owl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<owl:DatatypeProperty rdf:about="&stix;context">
<rdfs:label xml:lang="en-us">context</rdfs:label>
<rdfs:comment xml:lang="en-us">A short descriptor of the particular context shared by the content referenced by the Grouping. The value for this property SHOULD come from the grouping-context-ov open vocabulary.</rdfs:comment>
<rdfs:range rdf:resource="&xsd;GroupingContextOv"/>
<rdfs:range rdf:resource="&stix;GroupingContextOv"/>
</owl:DatatypeProperty>

<owl:DatatypeProperty rdf:about="&stix;description">
Expand Down
4 changes: 2 additions & 2 deletions stix/core-objects/sdo/intrusion-set/intrusion-set.owl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
<owl:DatatypeProperty rdf:about="&stix;primary_motivation">
<rdfs:label xml:lang="en-us">primary_motivation</rdfs:label>
<rdfs:comment xml:lang="en-us">The time that this Intrusion Set was first seen. A summary property of data from sightings and other data that may or may not be available in STIX. If new sightings are received that are earlier than the first seen timestamp, the object may be updated to account for the new data.</rdfs:comment>
<rdfs:range rdf:resource="&stix;AttackMotivationVocab"/>
<rdfs:range rdf:resource="&stix;AttackMotivationOv"/>
</owl:DatatypeProperty>

<owl:DatatypeProperty rdf:about="&stix;resource_level">
Expand All @@ -131,7 +131,7 @@
<owl:DatatypeProperty rdf:about="&stix;secondary_motivations">
<rdfs:label xml:lang="en-us">secondary_motivations</rdfs:label>
<rdfs:comment xml:lang="en-us">The time that this Intrusion Set was first seen. A summary property of data from sightings and other data that may or may not be available in STIX. If new sightings are received that are earlier than the first seen timestamp, the object may be updated to account for the new data.</rdfs:comment>
<rdfs:range rdf:resource="&stix;AttackMotivationVocab"/>
<rdfs:range rdf:resource="&stix;AttackMotivationOv"/>
</owl:DatatypeProperty>

</rdf:RDF>
107 changes: 79 additions & 28 deletions stix/meta-objects/data-marking/data-marking.owl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,42 +6,105 @@
<!ENTITY stix "http://docs.oasis-open.org/cti/ns/stix#">
<!ENTITY xsd "http://www.w3.org/2001/XMLSchema#">
]>
<rdf:RDF xml:base="http://docs.oasis-open.org/cti/ns/data-marking"
xmlns="http://docs.oasis-open.org/cti/ns/data-marking#"
<rdf:RDF xml:base="http://docs.oasis-open.org/cti/ns/stix/data-marking"
xmlns="http://docs.oasis-open.org/cti/ns/stix/data-marking#"
xmlns:owl="http://www.w3.org/2002/07/owl#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
xmlns:stix="http://docs.oasis-open.org/cti/ns/stix#"
xmlns:xsd="http://www.w3.org/2001/XMLSchema#">

<owl:Ontology rdf:about="http://docs.oasis-open.org/cti/ns/data-marking">
<owl:Ontology rdf:about="http://docs.oasis-open.org/cti/ns/stix/data-marking">
<owl:imports rdf:resource="http://docs.oasis-open.org/cti/ns/stix/common-properties"/>
<owl:versionInfo>2.1.0</owl:versionInfo>
</owl:Ontology>

<owl:Class rdf:about="&stix;GranularMarking">
<rdfs:subClassOf rdf:resource="&stix;StixMetaObject"/>
<rdfs:label xml:lang="en-us">Granular Marking</rdfs:label>
<rdfs:comment xml:lang="en-us">Specifies how the marking-definition object referenced by the marking_ref property or a language specified by the lang property applies to a set of content identified by the list of selectors in the selectors property.</rdfs:comment>
<rdfs:subClassOf rdf:resource="&stix;StixDatatype"/>
<rdfs:subClassOf>
<owl:Restriction>
<owl:onProperty rdf:resource="&stix;lang"/>
<owl:someValuesFrom rdf:resource="&xsd;string"/>
</owl:Restriction>
</rdfs:subClassOf>
<rdfs:subClassOf>
<owl:Restriction>
<owl:onProperty rdf:resource="&stix;marking_ref"/>
<owl:someValuesFrom rdf:resource="&stix;MarkingDefinition"/>
</owl:Restriction>
</rdfs:subClassOf>
<rdfs:subClassOf>
<owl:Restriction>
<owl:onProperty rdf:resource="&stix;marking_ref_string"/>
<owl:someValuesFrom rdf:resource="&xsd;string"/>
</owl:Restriction>
</rdfs:subClassOf>
<rdfs:subClassOf>
<owl:Restriction>
<owl:onProperty rdf:resource="&stix;selectors"/>
<owl:someValuesFrom rdf:resource="&xsd;string"/>
</owl:Restriction>
</rdfs:subClassOf>
<rdfs:label xml:lang="en-us">Granular Marking Type</rdfs:label>
<rdfs:comment xml:lang="en-us">The granular-marking type defines how the marking-definition object referenced by the marking_ref property or a language specified by the lang property applies to a set of content identified by the list of selectors in the selectors property.</rdfs:comment>
</owl:Class>

<owl:Class rdf:about="&stix;MarkingDefinition">
<rdfs:subClassOf rdf:resource="&stix;StixMetaObject"/>
<rdfs:subClassOf>
<owl:Restriction>
<owl:onProperty rdf:resource="&stix;definition"/>
<owl:someValuesFrom rdf:resource="&stix;StatementMarking"/>
<owl:someValuesFrom rdf:resource="&stix;TLPMarking"/>
</owl:Restriction>
</rdfs:subClassOf>
<rdfs:subClassOf>
<owl:Restriction>
<owl:onProperty rdf:resource="&stix;definition_type"/>
<owl:someValuesFrom rdf:resource="&xsd;string"/>
</owl:Restriction>
</rdfs:subClassOf>
<rdfs:subClassOf>
<owl:Restriction>
<owl:onProperty rdf:resource="&stix;name"/>
<owl:someValuesFrom rdf:resource="&xsd;string"/>
</owl:Restriction>
</rdfs:subClassOf>
<rdfs:label xml:lang="en-us">Marking Definition</rdfs:label>
<rdfs:comment xml:lang="en-us">Represents a specific marking. Data markings typically represent handling or sharing requirements for data and are applied in the object_marking_refs and granular_markings properties on Objects.</rdfs:comment>
</owl:Class>

<owl:Class rdf:about="&stix;StatementMarking">
<rdfs:subClassOf rdf:resource="&stix;MarkingDefinition"/>
<rdfs:label xml:lang="en-us">Statement Marking</rdfs:label>
<rdfs:comment xml:lang="en-us">The Statement marking type defines the representation of a textual marking statement (e.g., copyright, terms of use, etc.) in a definition.@[en-US}</rdfs:comment>
<rdfs:subClassOf>
<owl:Restriction>
<owl:onProperty rdf:resource="&stix;statement"/>
<owl:someValuesFrom rdf:resource="&xsd;string"/>
</owl:Restriction>
</rdfs:subClassOf>
<rdfs:label xml:lang="en-us">Statement Marking Object Type</rdfs:label>
<rdfs:comment xml:lang="en-us">The Statement marking type defines the representation of a textual marking statement (e.g., copyright, terms of use, etc.) in a definition. The value of the definition_type property MUST be statement when using this marking type. Statement markings are generally not machine-readable, and this specification does not define any behavior or actions based on their values. \n\n Content may be marked with multiple statements of use. In other words, the same content can be marked both with a statement saying &quot;Copyright 2019&quot; and a statement saying, &quot;Terms of use are ...&quot; and both statements apply.</rdfs:comment>
</owl:Class>

<owl:Class rdf:about="&stix;TLPMarking">
<rdfs:subClassOf rdf:resource="&stix;MarkingDefinition"/>
<rdfs:label xml:lang="en-us">TLP Marking</rdfs:label>
<rdfs:comment xml:lang="en-us">Represent a Traffic Light Protocol (TLP) marking in a definition property. The value of the definition_type property MUST be tlp when using this marking type.</rdfs:comment>
<rdfs:subClassOf>
<owl:Restriction>
<owl:onProperty rdf:resource="&stix;tlp"/>
<owl:someValuesFrom rdf:resource="&xsd;string"/>
</owl:Restriction>
</rdfs:subClassOf>
<rdfs:label xml:lang="en-us">TLP Marking Object Type</rdfs:label>
<rdfs:comment xml:lang="en-us">The TLP marking type defines how you would represent a Traffic Light Protocol (TLP) marking in a definition property. The value of the definition_type property MUST be tlp when using this marking type.</rdfs:comment>
</owl:Class>

<owl:ObjectProperty rdf:about="&stix;definition">
<rdfs:label xml:lang="en-us">definition</rdfs:label>
<rdfs:comment xml:lang="en-us">Specifies a reference to the marking-definition object that describes the marking.\n\nIf the lang property is not present, this property MUST be present. If the lang property is present, this property MUST NOT be present.@[en-US}</rdfs:comment>
<rdfs:range rdf:resource="&stix;StatementMarking"/>
<rdfs:range rdf:resource="&stix;TLPMarking"/>
</owl:ObjectProperty>

<owl:DatatypeProperty rdf:about="&stix;definition_type">
<rdfs:label>definition_type</rdfs:label>
<rdfs:comment>Specifies the type of Marking Definition.</rdfs:comment>
Expand All @@ -62,33 +125,21 @@
</rdfs:range>
</owl:DatatypeProperty>

<owl:ObjectProperty rdf:about="&stix;granular_markings">
<rdfs:label xml:lang="en-us">granular_markings</rdfs:label>
<rdfs:comment xml:lang="en-us">Specifies a list of granular markings applied to this object.\n\nIn some cases, though uncommon, marking definitions themselves may be marked with sharing or handling guidance. In this case, this property MUST NOT contain any references to the same Marking Definition object (i.e., it cannot contain any circular references).</rdfs:comment>
<rdfs:range rdf:resource="&stix;GranularMarking"/>
</owl:ObjectProperty>

<owl:ObjectProperty rdf:about="&stix;marking_ref">
<rdfs:label xml:lang="en-us">marking_ref</rdfs:label>
<rdfs:comment xml:lang="en-us">Specifies a reference to the marking-definition object that describes the marking.\n\nIf the lang property is not present, this property MUST be present. If the lang property is present, this property MUST NOT be present.@[en-US}</rdfs:comment>
<rdfs:range rdf:resource="&stix;MarkingDefinition"/>
</owl:ObjectProperty>

<owl:DatatypeProperty rdf:about="&stix;marking_ref_id">
<rdfs:label xml:lang="en-us">marking_ref_id</rdfs:label>
<owl:DatatypeProperty rdf:about="&stix;marking_ref_string">
<rdfs:label xml:lang="en-us">marking_ref_string</rdfs:label>
<rdfs:comment xml:lang="en-us">Specifies an identifier to the marking-definition object that describes the marking.\n\nIf the lang property is not present, this property MUST be present. If the lang property is present, this property MUST NOT be present.</rdfs:comment>
<rdfs:range rdf:resource="&xsd;string"/>
</owl:DatatypeProperty>

<owl:ObjectProperty rdf:about="&stix;object_marking_refs">
<rdfs:label xml:lang="en-us">object_marking_refs</rdfs:label>
<rdfs:comment xml:lang="en-us">Specifies a list of references to marking-definition objects that apply to this object.\n\nIn some cases, though uncommon, marking definitions themselves may be marked with sharing or handling guidance. In this case, this property MUST NOT contain any references to the same Marking Definition object (i.e., it cannot contain any circular references).</rdfs:comment>
<rdfs:range rdf:resource="&stix;MarkingDefinition"/>
</owl:ObjectProperty>

<owl:DatatypeProperty rdf:about="&stix;object_marking_refs_id">
<rdfs:label xml:lang="en-us">object marking_refs_id</rdfs:label>
<rdfs:comment xml:lang="en-us">Specifies a list of identifiers to marking-definition objects that apply to this object.\n\nIn some cases, though uncommon, marking definitions themselves may be marked with sharing or handling guidance. In this case, this property MUST NOT contain any references to the same Marking Definition object (i.e., it cannot contain any circular references).</rdfs:comment>
<owl:DatatypeProperty rdf:about="&stix;name">
<rdfs:label xml:lang="en-us">name</rdfs:label>
<rdfs:comment xml:lang="en-us">A name used to identify the Marking Definition.</rdfs:comment>
<rdfs:range rdf:resource="&xsd;string"/>
</owl:DatatypeProperty>

Expand All @@ -106,7 +157,7 @@

<owl:DatatypeProperty rdf:about="&stix;tlp">
<rdfs:label xml:lang="en-us">tlp</rdfs:label>
<rdfs:comment xml:lang="en-us">Specifies the TLP level [TLP] of the content marked by this marking definition.</rdfs:comment>
<rdfs:comment xml:lang="en-us">The TLP level [TLP] of the content marked by this marking definition.</rdfs:comment>
<rdfs:range>
<rdfs:Datatype>
<owl:oneOf>
Expand Down
Loading

0 comments on commit df8e6df

Please sign in to comment.