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.

Sign up for GitHub

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

Modifications to disabledservice_(test|object|state|item) #128

Merged
merged 1 commit into from
Jul 19, 2021
+3 −35
Merged

Modifications to disabledservice_(test|object|state|item) #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 3 additions & 30 deletions oval-schemas/macos-definitions-schema.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@
<!-- =============================================================================== -->
<xsd:element name="disabledservice_test" substitutionGroup="oval-def:test">
<xsd:annotation>
<xsd:documentation>The disabledservice_test is used to check the status of daemons/agents disabled via the launchd service, via the command 'launchctl print-disabled &lt;domain&gt;'. It extends the standard TestType as defined in the oval-definitions-schema and one should refer to the TestType description for more information. The required object element references a disabledservice_object and the optional state element specifies the data to check.</xsd:documentation>
<xsd:documentation>The disabledservice_test is used to check the status of daemons/agents disabled via the launchd service, via the command 'launchctl print-disabled system'. It extends the standard TestType as defined in the oval-definitions-schema and one should refer to the TestType description for more information. The required object element references a disabledservice_object and the optional state element specifies the data to check.</xsd:documentation>
<xsd:appinfo>
<oval:element_mapping>
<oval:test>disabledservice_test</oval:test>
Expand Down Expand Up @@ -414,8 +414,7 @@
</xsd:element>
<xsd:element name="disabledservice_object" substitutionGroup="oval-def:object">
<xsd:annotation>
<xsd:documentation>The disabledservice_object element is used by a disabledservice_test to define the service domain to be evaluated. Each object extends the standard ObjectType as defined in the oval-definitions-schema and one should refer to the ObjectType description for more information. The common set element allows complex objects to be created using filters and set logic. Again, please refer to the description of the set element in the oval-definitions-schema.</xsd:documentation>
<xsd:documentation>A disabledservice_object consists of a domain entity that contains the name of the domain that will be queried for disabled services.</xsd:documentation>
<xsd:documentation>The disabledservice_object element is used by a disabledservice_test to define the service domain to be evaluated. It is a singleton object. Each object extends the standard ObjectType as defined in the oval-definitions-schema and one should refer to the ObjectType description for more information. The common set element allows complex objects to be created using filters and set logic. Again, please refer to the description of the set element in the oval-definitions-schema.</xsd:documentation>
<xsd:appinfo>
<sch:pattern id="macos-def_disabledsvc_object_verify_filter_state">
<sch:rule context="macos-def:macos_object//oval-def:filter">
Expand All @@ -432,28 +431,7 @@
</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="oval-def:ObjectType">
<xsd:sequence>
<xsd:choice>
<xsd:element ref="oval-def:set"/>
<xsd:sequence>
<xsd:element name="domain" type="oval-def:EntityObjectStringType">
<xsd:annotation>
<xsd:documentation>Specifies the domain to be queried. The only valid operation for this field is "equals".</xsd:documentation>
<xsd:appinfo>
<sch:pattern id="macos-def_disabledsvcobjdomain">
<sch:rule context="macos-def:disabledservice_object/macos-def:domain">
<sch:assert test="@operation='equals'"><sch:value-of select="../@id"/> - operation attribute for the domain entity of a disabledservice_object must be 'equals'</sch:assert>
</sch:rule>
</sch:pattern>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<xsd:element ref="oval-def:filter" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:choice>
</xsd:sequence>
</xsd:extension>
<xsd:extension base="oval-def:ObjectType"></xsd:extension>
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
Expand All @@ -465,11 +443,6 @@
<xsd:complexContent>
<xsd:extension base="oval-def:StateType">
<xsd:sequence>
<xsd:element name="domain" type="oval-def:EntityStateStringType" minOccurs="0" maxOccurs="1">
<xsd:annotation>
<xsd:documentation>Specifies the name of the domain used to create the object.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="label" type="oval-def:EntityStateStringType" minOccurs="0" maxOccurs="1">
<xsd:annotation>
<xsd:documentation>Specifies the name of the service disabled in the domain.</xsd:documentation>
Expand Down
5 changes: 0 additions & 5 deletions oval-schemas/macos-system-characteristics-schema.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,11 +356,6 @@
<xsd:complexContent>
<xsd:extension base="oval-sc:ItemType">
<xsd:sequence>
<xsd:element name="domain" type="oval-sc:EntityItemStringType" minOccurs="0" maxOccurs="1">
<xsd:annotation>
<xsd:documentation>Specifies the name of the domain used to create the object.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="label" type="oval-sc:EntityItemStringType" minOccurs="1" maxOccurs="1">
<xsd:annotation>
<xsd:documentation>Specifies the name of the agent/daemon.</xsd:documentation>
Expand Down