Merge pull request ComplianceAsCode#219 from redhatrises/telnet-server

shawndwells · shawndwells · commit 62722efb767a · 2014-09-21T00:20:22.000-04:00
[bugfix] Add checks for telnet packages and service for RHEL7
diff --git a/RHEL/6/input/checks/package_telnet-server_removed.xml b/RHEL/6/input/checks/package_telnet-server_removed.xml
diff --git a/RHEL/6/input/checks/package_telnet-server_removed.xml b/RHEL/6/input/checks/package_telnet-server_removed.xml
@@ -0,0 +1 @@
+../../../../shared/oval/package_telnet-server_removed.xml
diff --git a/RHEL/6/input/checks/package_telnet_removed.xml b/RHEL/6/input/checks/package_telnet_removed.xml
diff --git a/RHEL/6/input/checks/package_telnet_removed.xml b/RHEL/6/input/checks/package_telnet_removed.xml
@@ -0,0 +1 @@
+../../../../shared/oval/package_telnet_removed.xml
diff --git a/RHEL/6/input/checks/service_telnetd_disabled.xml b/RHEL/6/input/checks/service_telnetd_disabled.xml
diff --git a/RHEL/6/input/checks/service_telnetd_disabled.xml b/RHEL/6/input/checks/service_telnetd_disabled.xml
@@ -0,0 +1 @@
+../../../../shared/oval/service_telnetd_disabled.xml
diff --git a/RHEL/7/input/checks/package_telnet-server_removed.xml b/RHEL/7/input/checks/package_telnet-server_removed.xml
@@ -0,0 +1 @@
+../../../../shared/oval/package_telnet-server_removed.xml
diff --git a/RHEL/7/input/checks/package_telnet_removed.xml b/RHEL/7/input/checks/package_telnet_removed.xml
@@ -0,0 +1 @@
+../../../../shared/oval/package_telnet_removed.xml
diff --git a/RHEL/7/input/checks/service_telnetd_disabled.xml b/RHEL/7/input/checks/service_telnetd_disabled.xml
@@ -0,0 +1 @@
+../../../../shared/oval/service_telnetd_disabled.xml
diff --git a/RHEL/7/input/profiles/rht-ccp.xml b/RHEL/7/input/profiles/rht-ccp.xml
@@ -111,8 +111,6 @@ see: https://github.com/OpenSCAP/scap-security-guide/issues/67 for details.
 ANTIQUATED SERVICES
 <select idref="disable_xinetd" selected="true"/>
 <select idref="uninstall_xinetd" selected="true"/>
-<select idref="uninstall_telnet_server" selected="true"/>
-<select idref="disable_telnet_service" selected="true"/>
 <select idref="uninstall_rsh-server" selected="true"/>
 <select idref="disable_rsh" selected="true"/>
 <select idref="disable_rexec" selected="true"/>
@@ -128,9 +126,12 @@ ANTIQUATED SERVICES
 <select idref="service_ntpdate_disabled" selected="true"/>
 <select idref="service_oddjobd_disabled" selected="true"/>
 <select idref="service_qpidd_disabled" selected="true"/>
-<select idref="service_rdisc_disabled" selected="true"/>
+<select idref="service_rdisc_disabled" selected="true"/-->
+<select idref="disable_telnet_service" selected="true"/>
+<select idref="package_telnet_removed" selected="true"/>
+<select idref="uninstall_telnet_server" selected="true"/>
 
-SSH / REMOTE ACCESS CHECKS -->
+<!-- SSH / REMOTE ACCESS CHECKS -->
 <select idref="sshd_allow_only_protocol2" selected="true"/>
 <select idref="sshd_set_idle_timeout" selected="true"/>
 <select idref="sshd_set_keepalive" selected="true"/>
diff --git a/shared/oval/package_telnet-server_removed.xml b/shared/oval/package_telnet-server_removed.xml
@@ -0,0 +1,27 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_telnet-server_removed"
+  version="1">
+    <metadata>
+      <title>Package telnet-server Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The RPM package telnet-server should be removed.</description>
+      <reference source="galford" ref_id="20140915" ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package telnet-server is removed"
+      test_ref="test_package_telnet-server_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_telnet-server_removed" version="1"
+  comment="package telnet-server is removed">
+    <linux:object object_ref="obj_package_telnet-server_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_telnet-server_removed" version="1">
+    <linux:name>telnet-server</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/shared/oval/package_telnet_removed.xml b/shared/oval/package_telnet_removed.xml
@@ -0,0 +1,27 @@
+<def-group>
+ <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
+  <definition class="compliance" id="package_telnet_removed"
+  version="1">
+    <metadata>
+      <title>Package telnet Removed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The RPM package telnet should be removed.</description>
+      <reference source="galford" ref_id="20140915" ref_url="test_attestation"/>
+    </metadata>
+    <criteria>
+      <criterion comment="package telnet is removed"
+      test_ref="test_package_telnet_removed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="none_exist"
+  id="test_package_telnet_removed" version="1"
+  comment="package telnet is removed">
+    <linux:object object_ref="obj_package_telnet_removed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_telnet_removed" version="1">
+    <linux:name>telnet</linux:name>
+  </linux:rpminfo_object>
+</def-group>
diff --git a/shared/oval/service_telnetd_disabled.xml b/shared/oval/service_telnetd_disabled.xml
@@ -0,0 +1,29 @@
+<def-group>
+  <definition class="compliance"
+  id="service_telnetd_disabled" version="1">
+    <metadata>
+      <title>Disable telnet Service</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>Disable telnet Service</description>
+      <reference source="galford" ref_id="20140915" ref_url="test_attestation" />
+    </metadata>
+    <criteria comment="package telnet-server removed or service telnetd is not configured to start" operator="OR">
+      <extend_definition comment="rpm package telnet-server removed" definition_ref="package_telnet-server_removed" />
+      <criterion comment="Disable telnet Service" test_ref="test_disable_telnet_service" />
+    </criteria>
+  </definition>
+  <ind:textfilecontent54_test check="all"
+  check_existence="none_exist" comment="Disable Telnet Service"
+  id="test_disable_telnet_service" version="1">
+    <ind:object object_ref="obj_disable_telnet_service" />
+  </ind:textfilecontent54_test>
+  <ind:textfilecontent54_object comment="Disable Telnet Service"
+  id="obj_disable_telnet_service" version="1">
+    <ind:filepath>/etc/xinetd.d/telnet</ind:filepath>
+    <ind:pattern operation="pattern match">^\s*disable\s+=\s+no\s*$</ind:pattern>
+    <ind:instance datatype="int">1</ind:instance>
+  </ind:textfilecontent54_object>
+</def-group>

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../../../../shared/oval/package_telnet-server_removed.xml`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../../../../shared/oval/service_telnetd_disabled.xml`