From jlieskov at redhat.com Thu Aug 20 11:36:42 2015 Content-Type: multipart/mixed; boundary="===============4782849754531608507==" MIME-Version: 1.0 From: Jan Lieskovsky To: scap-security-guide at lists.fedorahosted.org Subject: Re: [PATCH] Consolidate ntp and openssh package checks for Fedora, RHEL 6, and RHEL 7 into the shared directory, since they all share the same package name. Date: Mon, 31 Mar 2014 11:10:30 -0400 Message-ID: <1997721025.8616653.1396278630994.JavaMail.zimbra@redhat.com> In-Reply-To: 1396036742-23563-1-git-send-email-maura@eclipse.ncsc.mil --===============4782849754531608507== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable ----- Original Message ----- > From: "Maura Dailey" > = > This small patch takes care of the existing package checks in Fedora and > shared. More patches will be forthcoming for shared package checks in RHE= L 6 > and RHEL 7. > = > - Maura Dailey Tested on all three products and works fine [*]. ACK for me, please push. Thank you && Regards, Jan. -- Jan iankko Lieskovsky / Red Hat Security Technologies Team [*] For RHEL/7 there doesn't seem to be service_ntpd_enabled.xml OVAL check yet (=3D> attempt to scan returns 'notchecked' as result). But the (pro= per work) on RHEL-7 can be verified by evaluating just package_ntp_installed.xml = rule via oscap oval eval --id .. command (verified it returns correct results depending on the fact if ntp package is installed on the system or not). > = > Signed-off-by: Maura Dailey > --- > Fedora/input/checks/package_ntp_installed.xml | 26 +-------------= ---- > .../checks/package_openssh-server_removed.xml | 26 +-------------= ---- > RHEL/6/input/checks/package_ntp_installed.xml | 27 > +------------------ > RHEL/7/input/checks/package_ntp_installed.xml | 1 + > shared/oval/package_ntp_installed.xml | 28 > ++++++++++++++++++++ > shared/oval/package_openssh-server_removed.xml | 1 + > 6 files changed, 33 insertions(+), 76 deletions(-) > mode change 100644 =3D> 120000 Fedora/input/checks/package_ntp_installed= .xml > mode change 100644 =3D> 120000 > Fedora/input/checks/package_openssh-server_removed.xml > mode change 100644 =3D> 120000 RHEL/6/input/checks/package_ntp_installed= .xml > create mode 120000 RHEL/7/input/checks/package_ntp_installed.xml > create mode 100644 shared/oval/package_ntp_installed.xml > = > diff --git a/Fedora/input/checks/package_ntp_installed.xml > b/Fedora/input/checks/package_ntp_installed.xml > deleted file mode 100644 > index 389f166..0000000 > --- a/Fedora/input/checks/package_ntp_installed.xml > +++ /dev/null > @@ -1,25 +0,0 @@ > - > - > - - version=3D"1"> > - > - Package ntp Installed > - > - Fedora 19 > - > - The RPM package ntp should be installed. > - > - > - - test_ref=3D"test_package_ntp_installed" /> > - > - > - - id=3D"test_package_ntp_installed" version=3D"1" > - comment=3D"package ntp is installed"> > - > - > - > - ntp > - > - > diff --git a/Fedora/input/checks/package_ntp_installed.xml > b/Fedora/input/checks/package_ntp_installed.xml > new file mode 120000 > index 0000000..7432e41 > --- /dev/null > +++ b/Fedora/input/checks/package_ntp_installed.xml > @@ -0,0 +1 @@ > +../../../shared/oval/package_ntp_installed.xml > \ No newline at end of file > diff --git a/Fedora/input/checks/package_openssh-server_removed.xml > b/Fedora/input/checks/package_openssh-server_removed.xml > deleted file mode 100644 > index 785681d..0000000 > --- a/Fedora/input/checks/package_openssh-server_removed.xml > +++ /dev/null > @@ -1,25 +0,0 @@ > - > - > - - version=3D"1"> > - > - Package openssh-server Removed > - > - Fedora 19 > - > - The RPM package openssh-server should be > removed. > - > - > - - test_ref=3D"test_package_openssh-server_removed" /> > - > - > - - id=3D"test_package_openssh-server_removed" version=3D"1" > - comment=3D"package openssh-server is removed"> > - > - > - > - openssh-server > - > - > diff --git a/Fedora/input/checks/package_openssh-server_removed.xml > b/Fedora/input/checks/package_openssh-server_removed.xml > new file mode 120000 > index 0000000..f7e880d > --- /dev/null > +++ b/Fedora/input/checks/package_openssh-server_removed.xml > @@ -0,0 +1 @@ > +../../../shared/oval/package_openssh-server_removed.xml > \ No newline at end of file > diff --git a/RHEL/6/input/checks/package_ntp_installed.xml > b/RHEL/6/input/checks/package_ntp_installed.xml > deleted file mode 100644 > index 2495849..0000000 > --- a/RHEL/6/input/checks/package_ntp_installed.xml > +++ /dev/null > @@ -1,26 +0,0 @@ > - > - > - - version=3D"1"> > - > - Package ntp Installed > - > - Red Hat Enterprise Linux 6 > - > - The RPM package ntp should be installed. > - ref_url=3D"test_attestation"/> > - > - > - - test_ref=3D"test_package_ntp_installed" /> > - > - > - - id=3D"test_package_ntp_installed" version=3D"1" > - comment=3D"package ntp is installed"> > - > - > - > - ntp > - > - > diff --git a/RHEL/6/input/checks/package_ntp_installed.xml > b/RHEL/6/input/checks/package_ntp_installed.xml > new file mode 120000 > index 0000000..e9413c8 > --- /dev/null > +++ b/RHEL/6/input/checks/package_ntp_installed.xml > @@ -0,0 +1 @@ > +../../../../shared/oval/package_ntp_installed.xml > \ No newline at end of file > diff --git a/RHEL/7/input/checks/package_ntp_installed.xml > b/RHEL/7/input/checks/package_ntp_installed.xml > new file mode 120000 > index 0000000..e9413c8 > --- /dev/null > +++ b/RHEL/7/input/checks/package_ntp_installed.xml > @@ -0,0 +1 @@ > +../../../../shared/oval/package_ntp_installed.xml > \ No newline at end of file > diff --git a/shared/oval/package_ntp_installed.xml > b/shared/oval/package_ntp_installed.xml > new file mode 100644 > index 0000000..ee8d0ac > --- /dev/null > +++ b/shared/oval/package_ntp_installed.xml > @@ -0,0 +1,28 @@ > + > + > + + version=3D"1"> > + > + Package ntp Installed > + > + Fedora 19 > + Red Hat Enterprise Linux 6 > + Red Hat Enterprise Linux 7 > + > + The RPM package ntp should be installed. > + ref_url=3D"test_attestation"/> > + > + > + + test_ref=3D"test_package_ntp_installed" /> > + > + > + + id=3D"test_package_ntp_installed" version=3D"1" > + comment=3D"package ntp is installed"> > + > + > + > + ntp > + > + > diff --git a/shared/oval/package_openssh-server_removed.xml > b/shared/oval/package_openssh-server_removed.xml > index 311463e..b72eb32 100644 > --- a/shared/oval/package_openssh-server_removed.xml > +++ b/shared/oval/package_openssh-server_removed.xml > @@ -5,6 +5,7 @@ > > Package openssh-server Removed > > + Fedora 19 > Red Hat Enterprise Linux 6 > Red Hat Enterprise Linux 7 > > -- > 1.7.1 > = > _______________________________________________ > scap-security-guide mailing list > scap-security-guide(a)lists.fedorahosted.org > https://lists.fedorahosted.org/mailman/listinfo/scap-security-guide >=20 --===============4782849754531608507==--