This should take care of presenting the "check text"
related to satisfying SRG items that are accompanied
by a presentation of evidence and assertion that they
are met/unmeetable (versus those that contain actionable
guidance for admins).
Jeffrey Blank (3):
ensure guide generation does not trample other tempfiles
include check instructions in SRG mapping tables
adding new column with check instructions
RHEL6/Makefile | 4 ++--
RHEL6/transforms/table-add-srgitems.xslt | 2 +-
RHEL6/transforms/table-srgmap.xslt | 6 ++++++
3 files changed, 9 insertions(+), 3 deletions(-)
Show replies by date
Signed-off-by: Jeffrey Blank <blank(a)eclipse.ncsc.mil>
---
RHEL6/Makefile | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/RHEL6/Makefile b/RHEL6/Makefile
index f805db7..02d4bdc 100644
--- a/RHEL6/Makefile
+++ b/RHEL6/Makefile
@@ -34,8 +34,8 @@ checks:
guide: shorthand2xccdf
# remove auxiliary Groups which are only for use in tables, and not guide output.
# specifying a nonexistent profile, "allrules," to make oscap print all Rules
- xsltproc -o $(OUT)/unlinked-rhel6-xccdf.xml $(TRANS)/xccdf-removeaux.xslt
$(OUT)/unlinked-rhel6-xccdf.xml
- oscap xccdf generate guide --profile allrules $(OUT)/unlinked-rhel6-xccdf.xml >
$(OUT)/rhel6-guide.html
+ xsltproc -o $(OUT)/unlinked-rhel6-xccdf-guide.xml $(TRANS)/xccdf-removeaux.xslt
$(OUT)/unlinked-rhel6-xccdf.xml
+ oscap xccdf generate guide --profile allrules $(OUT)/unlinked-rhel6-xccdf-guide.xml >
$(OUT)/rhel6-guide.html
# example, if needed: for converting XCCDF into shorthand
#xccdf2shorthand:
--
1.7.1
Signed-off-by: Jeffrey Blank <blank(a)eclipse.ncsc.mil>
---
RHEL6/transforms/table-srgmap.xslt | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/RHEL6/transforms/table-srgmap.xslt b/RHEL6/transforms/table-srgmap.xslt
index 53a3fef..872adfc 100644
--- a/RHEL6/transforms/table-srgmap.xslt
+++ b/RHEL6/transforms/table-srgmap.xslt
@@ -63,6 +63,7 @@
<td>Rule ID</td>
<td>Rule Title</td>
<td>Rule Desc</td>
+ <td>Rule Check</td>
</xsl:when>
<xsl:otherwise>
<td>Rules Mapped</td>
@@ -140,6 +141,7 @@
<td> <xsl:value-of select="$item/@id"/> </td>
<td> <xsl:value-of select="$item/cdf:title"/> </td>
<td> <xsl:apply-templates select="$item/cdf:description"/>
</td>
+ <td> <xsl:apply-templates
select="$item/cdf:check/cdf:check-content"/> </td>
</tr>
</xsl:if>
</xsl:for-each>
@@ -173,4 +175,8 @@
<xsl:apply-templates select="@*|node()" />
</xsl:template>
+ <xsl:template match="cdf:check-content">
+ <xsl:apply-templates select="@*|node()" />
+ </xsl:template>
+
</xsl:stylesheet>
--
1.7.1
Signed-off-by: Jeffrey Blank <blank(a)eclipse.ncsc.mil>
---
RHEL6/transforms/table-add-srgitems.xslt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/RHEL6/transforms/table-add-srgitems.xslt
b/RHEL6/transforms/table-add-srgitems.xslt
index af40bb4..3f99b74 100644
--- a/RHEL6/transforms/table-add-srgitems.xslt
+++ b/RHEL6/transforms/table-add-srgitems.xslt
@@ -25,7 +25,7 @@
<td> <xsl:value-of select="$title" /> </td>
<td> <xsl:value-of select="td[4]" /> </td>
<td> <xsl:value-of select="td[7]" /> </td>
- <td> <xsl:value-of select="td[7]" /> </td>
+ <td> <xsl:value-of select="td[8]" /> </td>
<td> <xsl:value-of select="$srg_id" /> </td>
<td> <xsl:value-of select="$cci_id" /> </td>
<td>
--
1.7.1