From 6b9d63e97b6158a8b8e794b44151571f902a4555 Mon Sep 17 00:00:00 2001 From: David Rothenberg Date: Thu, 9 Apr 2015 17:56:49 -0400 Subject: [PATCH] Additional Core changes. Generated new timestamps for targeted release. Included check_existence attribute for State entities. Fixes #191. --- schemas/oval-common-schema.xsd | 2 +- schemas/oval-definitions-schema.xsd | 6 +++++- schemas/oval-directives-schema.xsd | 2 +- schemas/oval-results-schema.xsd | 2 +- schemas/oval-system-characteristics-schema.xsd | 2 +- schemas/oval-variables-schema.xsd | 2 +- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/schemas/oval-common-schema.xsd b/schemas/oval-common-schema.xsd index ba59501..e1977ed 100644 --- a/schemas/oval-common-schema.xsd +++ b/schemas/oval-common-schema.xsd @@ -6,7 +6,7 @@ Core Common 5.11.1 - 3/30/2015 09:00:00 AM + 4/13/2015 09:00:00 AM Copyright (c) 2002-2015, The MITRE Corporation. All rights reserved. The contents of this file are subject to the terms of the OVAL License located at http://oval.mitre.org/oval/about/termsofuse.html. See the OVAL License for the specific language governing permissions and limitations for use of this schema. When distributing copies of the OVAL Schema, this license header must be included. diff --git a/schemas/oval-definitions-schema.xsd b/schemas/oval-definitions-schema.xsd index ded5984..9e77d27 100644 --- a/schemas/oval-definitions-schema.xsd +++ b/schemas/oval-definitions-schema.xsd @@ -8,7 +8,7 @@ Core Definition 5.11.1 - 3/30/2015 09:00:00 AM + 4/13/2015 09:00:00 AM Copyright (c) 2002-2015, The MITRE Corporation. All rights reserved. The contents of this file are subject to the terms of the OVAL License located at http://oval.mitre.org/oval/about/termsofuse.html. See the OVAL License for the specific language governing permissions and limitations for use of this schema. When distributing copies of the OVAL Schema, this license header must be included. @@ -1462,24 +1462,28 @@ The EntityStateSimpleBaseType complex type is an abstract type that extends the EntitySimpleBaseType and is used by some entities within an OVAL State. + The optional check_existence attribute specifies how to interpret the status of corresponding item entities when performing an item-state comparison. The default value for this attribute is 'at_least_one_exists' indicating that by default an item comparison may evaluate to true only if at least one corresponding item entity has a status of 'exists'. For example, if a value of 'none_exist' is given, then the comparison can evaluate to true only if there are one or more corresponding item entities, each with a status of 'does not exist'. The optional entity_check attribute specifies how to handle multiple item entities with the same name in the OVAL Systems Characteristics file. For example, suppose we are dealing with a Group Test and an entity in the state is related to the user. It is very likely that when the information about the group is collected off of the system (and represented in the OVAL System Characteristics file) that there will be multiple users associated with the group (i.e. multiple 'user' item entities associated with the same 'user' state entity). If the OVAL State defines the value of the user entity to equal 'Fred', then the entity_check attribute determines if all values for 'user' item entities must be equal to 'Fred', or at least one value must be equal to 'Fred', etc. Note that with the exception of the 'none_satisfy' check value, the entity_check attribute can only affect the result of the test if the corresponding OVAL Item allows more than one occurrence of the entity (e.g. 'maxOccurs' is some value greater than one). The entity_check and var_check attributes are considered together when evaluating a single state entity. When a variable identifies more than one value and multiple item entities with the same name exist, for a single state entity, a many-to-many comparison must be conducted. In this situation, there are many values for the state entity that must be compared to many item entities. Each item entity is compared to the state entity. For each item entity, an interim result is calculated by using the var_check attribute to combine the result of comparing each variable value with a single system value. Then these interim results are combined for each system value using the entity_check attribute. + The EntityStateComplexBaseType complex type is an abstract type that extends the EntityComplexBaseType and is used by some entities within an OVAL State. + The optional check_existence attribute specifies how to interpret the status of corresponding item entities when performing an item-state comparison. The default value for this attribute is 'at_least_one_exists' indicating that by default an item comparison may evaluate to true only if at least one corresponding item entity has a status of 'exists'. For example, if a value of 'none_exist' is given, then the comparison can evaluate to true only if there are one or more corresponding item entities, each with a status of 'does not exist'. The optional entity_check attribute specifies how to handle multiple item entities with the same name in the OVAL Systems Characteristics file. For example, suppose we are dealing with a Group Test and an entity in the state is related to the user. It is very likely that when the information about the group is collected off of the system (and represented in the OVAL System Characteristics file) that there will be multiple users associated with the group (i.e. multiple 'user' item entities associated with the same 'user' state entity). If the OVAL State defines the value of the user entity to equal 'Fred', then the entity_check attribute determines if all values for 'user' item entities must be equal to 'Fred', or at least one value must be equal to 'Fred', etc. Note that with the exception of the 'none_satisfy' check value, the entity_check attribute can only affect the result of the test if the corresponding OVAL Item allows more than one occurrence of the entity (e.g. 'maxOccurs' is some value greater than one). The entity_check and var_check attributes are considered together when evaluating a single state entity. When a variable identifies more than one value and multiple item entities with the same name exist, for a single state entity, a many-to-many comparison must be conducted. In this situation, there are many values for the state entity that must be compared to many item entities. Each item entity is compared to the state entity. For each item entity, an interim result is calculated by using the var_check attribute to combine the result of comparing each variable value with a single system value. Then these interim results are combined for each system value using the entity_check attribute. + diff --git a/schemas/oval-directives-schema.xsd b/schemas/oval-directives-schema.xsd index 9bec0ad..d2d0818 100644 --- a/schemas/oval-directives-schema.xsd +++ b/schemas/oval-directives-schema.xsd @@ -9,7 +9,7 @@ Core Directives 5.11.1 - 3/30/2015 09:00:00 AM + 4/13/2015 09:00:00 AM Copyright (c) 2002-2015, The MITRE Corporation. All rights reserved. The contents of this file are subject to the terms of the OVAL License located at http://oval.mitre.org/oval/about/termsofuse.html. See the OVAL License for the specific language governing permissions and limitations for use of this schema. When distributing copies of the OVAL Schema, this license header must be included. diff --git a/schemas/oval-results-schema.xsd b/schemas/oval-results-schema.xsd index c7d7d95..6c49d7b 100644 --- a/schemas/oval-results-schema.xsd +++ b/schemas/oval-results-schema.xsd @@ -10,7 +10,7 @@ Core Results 5.11.1 - 3/30/2015 09:00:00 AM + 4/13/2015 09:00:00 AM Copyright (c) 2002-2015, The MITRE Corporation. All rights reserved. The contents of this file are subject to the terms of the OVAL License located at http://oval.mitre.org/oval/about/termsofuse.html. See the OVAL License for the specific language governing permissions and limitations for use of this schema. When distributing copies of the OVAL Schema, this license header must be included. diff --git a/schemas/oval-system-characteristics-schema.xsd b/schemas/oval-system-characteristics-schema.xsd index 3a61890..dcfbdc1 100644 --- a/schemas/oval-system-characteristics-schema.xsd +++ b/schemas/oval-system-characteristics-schema.xsd @@ -8,7 +8,7 @@ Core System Characteristics 5.11.1 - 3/30/2015 09:00:00 AM + 4/13/2015 09:00:00 AM Copyright (c) 2002-2015, The MITRE Corporation. All rights reserved. The contents of this file are subject to the terms of the OVAL License located at http://oval.mitre.org/oval/about/termsofuse.html. See the OVAL License for the specific language governing permissions and limitations for use of this schema. When distributing copies of the OVAL Schema, this license header must be included. diff --git a/schemas/oval-variables-schema.xsd b/schemas/oval-variables-schema.xsd index a93d513..c2ebeac 100644 --- a/schemas/oval-variables-schema.xsd +++ b/schemas/oval-variables-schema.xsd @@ -9,7 +9,7 @@ Core Variable 5.11.1 - 3/30/2015 09:00:00 AM + 4/13/2015 09:00:00 AM Copyright (c) 2002-2015, The MITRE Corporation. All rights reserved. The contents of this file are subject to the terms of the OVAL License located at http://oval.mitre.org/oval/about/termsofuse.html. See the OVAL License for the specific language governing permissions and limitations for use of this schema. When distributing copies of the OVAL Schema, this license header must be included.