[PATCH] added new columns for severity and check content into STIG tables * also combined duplicative xccdf2table-stig transforms into parameterized version
Shawn Wells
shawn at redhat.com
Thu Jul 19 23:18:42 UTC 2012
On 7/19/12 6:53 PM, Jeffrey Blank wrote:
> Signed-off-by: Jeffrey Blank <blank at eclipse.ncsc.mil>
> ---
> RHEL6/Makefile | 4 +-
> RHEL6/transforms/xccdf2table-stig-addnotes.xslt | 172 -----------------------
> RHEL6/transforms/xccdf2table-stig.xslt | 84 ++++++++++--
> 3 files changed, 75 insertions(+), 185 deletions(-)
> delete mode 100644 RHEL6/transforms/xccdf2table-stig-addnotes.xslt
>
> diff --git a/RHEL6/Makefile b/RHEL6/Makefile
> index 21676e0..9811369 100644
> --- a/RHEL6/Makefile
> +++ b/RHEL6/Makefile
> @@ -57,8 +57,8 @@ table-stigs:
> xsltproc -o $(OUT)/rhel5-table-stig.html $(TRANS)/xccdf2table-stig.xslt $(REFS)/disa-stig-rhel5-v1r0.6-xccdf.xml
> xsltproc -o $(OUT)/rhel5-table-stig-manual.html $(TRANS)/xccdf2table-stig.xslt $(REFS)/disa-stig-rhel5-v1r0.6-xccdf-manual.xml
> xsltproc --html -o $(OUT)/rhel5-table-stig-manual-ccisorted.html $(TRANS)/table-sortbyref.xslt $(OUT)/rhel5-table-stig-manual.html
> - xsltproc -o $(OUT)/rhel5-table-stig-manual-withnotes.html $(TRANS)/xccdf2table-stig-addnotes.xslt $(REFS)/disa-stig-rhel5-v1r0.6-xccdf-manual.xml
> - xsltproc -o $(OUT)/rhel6-xccdf-stigformat.xml $(TRANS)/xccdf2stigformat.xslt $(OUT)/rhel6-xccdf.xml
> + xsltproc -stringparam notes "../$(IN)/auxiliary/transition_notes.xml" -o $(OUT)/rhel5-table-stig-manual-withnotes.html $(TRANS)/xccdf2table-stig.xslt $(REFS)/disa-stig-rhel5-v1r0.6-xccdf-manual.xml
> + xsltproc -o $(OUT)/rhel6-xccdf-stigformat.xml $(TRANS)/xccdf2stigformat.xslt $(OUT)/rhel6-xccdf.xml
> xsltproc -stringparam profile "stig-server" -o $(OUT)/rhel6-table-stig-server.html $(TRANS)/xccdf2table-profileccirefs.xslt $(OUT)/rhel6-xccdf-stigformat.xml
>
> tables: table-refs table-profilenistrefs table-srgmap table-stigs
> diff --git a/RHEL6/transforms/xccdf2table-stig-addnotes.xslt b/RHEL6/transforms/xccdf2table-stig-addnotes.xslt
> deleted file mode 100644
> index bd6cb0f..0000000
> --- a/RHEL6/transforms/xccdf2table-stig-addnotes.xslt
> +++ /dev/null
> @@ -1,172 +0,0 @@
> -<?xml version="1.0" encoding="utf-8" standalone="yes"?>
> -<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cdf="http://checklists.nist.gov/xccdf/1.1" xmlns:xhtml="http://www.w3.org/1999/xhtml">
> -
> -<!-- the file for notes is hard-coded below -->
> -
> -<xsl:variable name="notefile">../input/auxiliary/transition_notes.xml</xsl:variable>
> -<xsl:variable name="notegroup" select="document($notefile)/notegroup" />
> -
> -<xsl:include href="constants.xslt"/>
> -
> - <xsl:template match="/">
> - <html>
> - <head>
> - <title>Rules In <xsl:value-of select="/cdf:Benchmark/cdf:title" /> with Notes for Transition to RHEL 6 Consensus</title>
> - </head>
> - <body>
> - <br/>
> - <br/>
> - <div style="text-align: center; font-size: x-large; font-weight:bold">
> - Rules In <i><xsl:value-of select="/cdf:Benchmark/cdf:title" /></i> with Notes for Transition to RHEL 6 Consensus
> - </div>
> - <br/>
> - <br/>
> - <xsl:apply-templates select="cdf:Benchmark"/>
> - </body>
> - </html>
> - </xsl:template>
> -
> -
> - <xsl:template match="cdf:Benchmark">
> - <style type="text/css">
> - table
> - {
> - border-collapse:collapse;
> - }
> - table,th, td
> - {
> - border: 1px solid black;
> - vertical-align: top;
> - padding: 3px;
> - }
> - thead
> - {
> - display: table-header-group;
> - font-weight: bold;
> - }
> - </style>
> - <table>
> - <thead>
> - <td>V-ID</td>
> - <td>GEN-ID</td>
> - <td>Title</td>
> - <td>Description</td>
> - <td>Fixtext</td>
> - <td>Notes</td>
> - </thead>
> -
> - <xsl:apply-templates select=".//cdf:Group" />
> - </table>
> - </xsl:template>
> -
> -
> - <xsl:template name="rule-output">
> - <xsl:param name="vulnid"/>
> - <tr>
> - <td><xsl:value-of select="@id"/></td>
> - <!--<td> <xsl:value-of select="cdf:ident" /></td>-->
> - <td> <xsl:value-of select="cdf:title" /></td>
> - <td> <xsl:value-of select="cdf:Rule/cdf:title" /></td>
> - <td> <xsl:call-template name="extract-vulndiscussion"><xsl:with-param name="desc" select="cdf:Rule/cdf:description"/></xsl:call-template> </td>
> - <td> <xsl:apply-templates select="cdf:Rule/cdf:fixtext"/> </td>
> - <td> <xsl:call-template name="print-notes"><xsl:with-param name="vulnid" select="@id"/></xsl:call-template> </td>
> - </tr>
> - </xsl:template>
> -
> -
> - <xsl:template match="cdf:Group">
> - <xsl:call-template name="rule-output" select="cdf:Rule">
> - <xsl:with-param name="vulnid" select="@id" />
> - </xsl:call-template>
> - </xsl:template>
> -
> -
> - <xsl:template name="print-notes">
> - <xsl:param name="vulnid"/>
> - <xsl:for-each select="$notegroup/note">
> - <table>
> - <xsl:call-template name="search_vulnidlist" select="note">
> - <xsl:with-param name="vulnid_sought" select="$vulnid" />
> - <xsl:with-param name="vulnid_list" select="@ref" />
> - </xsl:call-template>
> - </table>
> - </xsl:for-each>
> -
> - </xsl:template>
> -
> -
> - <xsl:template name="search_vulnidlist">
> - <xsl:param name="vulnid_sought"/>
> - <xsl:param name="vulnid_list"/>
> - <xsl:variable name="delim" select="','" />
> - <xsl:choose>
> - <xsl:when test="$delim and contains($vulnid_list, $delim)">
> - <xsl:call-template name="note-output" >
> - <xsl:with-param name="vulnid_sought" select="$vulnid_sought" />
> - <xsl:with-param name="vulnid_found" select="substring-before($vulnid_list, $delim)" />
> - </xsl:call-template>
> -
> - <!-- recurse for additional vuln ids in list -->
> - <xsl:call-template name="search_vulnidlist">
> - <xsl:with-param name="vulnid_sought" select="$vulnid_sought" />
> - <xsl:with-param name="vulnid_list" select="substring-after($vulnid_list, $delim)" />
> - </xsl:call-template>
> - </xsl:when>
> -
> - <xsl:otherwise>
> - <xsl:call-template name="note-output" >
> - <xsl:with-param name="vulnid_sought" select="$vulnid_sought" />
> - <xsl:with-param name="vulnid_found" select="$vulnid_list" />
> - </xsl:call-template>
> - </xsl:otherwise>
> -
> - </xsl:choose>
> - </xsl:template>
> -
> -
> - <!-- output note text if vuln ID matches -->
> - <xsl:template name="note-output">
> - <xsl:param name="vulnid_sought"/>
> - <xsl:param name="vulnid_found"/>
> -
> - <xsl:variable name="vulnid_expanded" select="concat('V-', $vulnid_found)" />
> - <xsl:if test="$vulnid_sought=$vulnid_expanded">
> - <tr><td><xsl:value-of select="@auth"/>: <xsl:value-of select="." /></td></tr>
> - </xsl:if>
> -
> - </xsl:template>
> -
> -
> - <!-- return only the text between the "VulnDiscussion" (non-XCCDF) tags -->
> - <!-- this should be removed as soon as SRGs include only a description instead of odd tags -->
> - <xsl:template name="extract-vulndiscussion">
> - <xsl:param name="desc"/>
> - <xsl:variable name="desc_info" select="substring-before($desc, '</VulnDiscussion>')"/>
> - <xsl:value-of select="substring-after($desc_info, '<VulnDiscussion>')"/>
> - </xsl:template>
> -
> -
> -
> -
> - <!-- getting rid of XHTML namespace -->
> - <xsl:template match="xhtml:*">
> - <xsl:element name="{local-name()}">
> - <xsl:apply-templates select="node()|@*"/>
> - </xsl:element>
> - </xsl:template>
> -
> - <xsl:template match="@*|node()">
> - <xsl:copy>
> - <xsl:apply-templates select="@*|node()"/>
> - </xsl:copy>
> - </xsl:template>
> -
> - <xsl:template match="cdf:description">
> - <xsl:apply-templates select="@*|node()" />
> - </xsl:template>
> -
> - <xsl:template match="cdf:rationale">
> - <xsl:apply-templates select="@*|node()" />
> - </xsl:template>
> -
> -</xsl:stylesheet>
> diff --git a/RHEL6/transforms/xccdf2table-stig.xslt b/RHEL6/transforms/xccdf2table-stig.xslt
> index dea169d..95e5d3a 100644
> --- a/RHEL6/transforms/xccdf2table-stig.xslt
> +++ b/RHEL6/transforms/xccdf2table-stig.xslt
> @@ -1,25 +1,24 @@
> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cdf="http://checklists.nist.gov/xccdf/1.1" xmlns:xhtml="http://www.w3.org/1999/xhtml">
>
> -<!-- this style sheet expects parameter $ref, which is the abbreviation of the ref to be shown -->
> +<!-- setting the external variable $notes identifies a file from which to add notes,
> + but set to nothing by default -->
> +<xsl:param name="notes" select="''" />
>
> -<!-- optionally, the style sheet can receive parameter $delim, will result in splitting of references onto
> - separate rows of output -->
> -
> -<xsl:param name="delim"/>
> +<xsl:variable name="notegroup" select="document($notes)/notegroup" />
>
> <xsl:include href="constants.xslt"/>
>
> <xsl:template match="/">
> <html>
> <head>
> - <title>Rules In <xsl:value-of select="/cdf:Benchmark/cdf:title" /> with Notes for Transition to RHEL 6 Consensus</title>
> + <title>Rules In <xsl:value-of select="/cdf:Benchmark/cdf:title" /><xsl:if test="$notes"> with Notes for Transition to RHEL 6 Consensus</xsl:if></title>
> </head>
> <body>
> <br/>
> <br/>
> <div style="text-align: center; font-size: x-large; font-weight:bold">
> - Rules In <i><xsl:value-of select="/cdf:Benchmark/cdf:title" /></i> with Notes for Transition to RHEL 6 Consensus
> + Rules In <i><xsl:value-of select="/cdf:Benchmark/cdf:title" /></i><xsl:if test="$notes"> with Notes for Transition to RHEL 6 Consensus</xsl:if>
> </div>
> <br/>
> <br/>
> @@ -49,13 +48,16 @@
> </style>
> <table>
> <thead>
> - <td>CCI</td>
> <td>V-ID</td>
> <td>GEN-ID</td>
> + <td>CAT</td>
> <td>Title</td>
> <td>Description</td>
> + <td>Check Procedures</td>
> <td>Fixtext</td>
> + <xsl:if test='$notes'>
> <td>Notes</td>
> + </xsl:if>
> </thead>
>
> <xsl:apply-templates select=".//cdf:Group" />
> @@ -66,15 +68,19 @@
> <xsl:template name="rule-output">
> <xsl:param name="vulnid"/>
> <tr>
> - <td> <xsl:value-of select="cdf:Rule/cdf:ident" /></td>
> <td><xsl:value-of select="@id"/></td>
> + <!--<td> <xsl:value-of select="cdf:ident" /></td>-->
> <td> <xsl:value-of select="cdf:title" /></td>
> + <td> <xsl:value-of select="cdf:Rule/@severity" /></td>
> <td> <xsl:value-of select="cdf:Rule/cdf:title" /></td>
> <td> <xsl:call-template name="extract-vulndiscussion"><xsl:with-param name="desc" select="cdf:Rule/cdf:description"/></xsl:call-template> </td>
> + <td> <xsl:value-of select="cdf:Rule/cdf:check/cdf:check-content"/> </td>
> <td> <xsl:value-of select="cdf:Rule/cdf:fixtext"/> </td>
> - <td> </td>
> + <xsl:if test='$notes'>
> + <td> <xsl:call-template name="print-notes"><xsl:with-param name="vulnid" select="@id"/></xsl:call-template> </td>
> + </xsl:if>
> </tr>
> - </xsl:template>
> + </xsl:template>
>
>
> <xsl:template match="cdf:Group">
> @@ -84,6 +90,62 @@
> </xsl:template>
>
>
> + <xsl:template name="print-notes">
> + <xsl:param name="vulnid"/>
> + <xsl:for-each select="$notegroup/note">
> + <table>
> + <xsl:call-template name="search_vulnidlist" select="note">
> + <xsl:with-param name="vulnid_sought" select="$vulnid" />
> + <xsl:with-param name="vulnid_list" select="@ref" />
> + </xsl:call-template>
> + </table>
> + </xsl:for-each>
> +
> + </xsl:template>
> +
> +
> + <xsl:template name="search_vulnidlist">
> + <xsl:param name="vulnid_sought"/>
> + <xsl:param name="vulnid_list"/>
> + <xsl:variable name="delim" select="','" />
> + <xsl:choose>
> + <xsl:when test="$delim and contains($vulnid_list, $delim)">
> + <xsl:call-template name="note-output" >
> + <xsl:with-param name="vulnid_sought" select="$vulnid_sought" />
> + <xsl:with-param name="vulnid_found" select="substring-before($vulnid_list, $delim)" />
> + </xsl:call-template>
> +
> + <!-- recurse for additional vuln ids in list -->
> + <xsl:call-template name="search_vulnidlist">
> + <xsl:with-param name="vulnid_sought" select="$vulnid_sought" />
> + <xsl:with-param name="vulnid_list" select="substring-after($vulnid_list, $delim)" />
> + </xsl:call-template>
> + </xsl:when>
> +
> + <xsl:otherwise>
> + <xsl:call-template name="note-output" >
> + <xsl:with-param name="vulnid_sought" select="$vulnid_sought" />
> + <xsl:with-param name="vulnid_found" select="$vulnid_list" />
> + </xsl:call-template>
> + </xsl:otherwise>
> +
> + </xsl:choose>
> + </xsl:template>
> +
> +
> + <!-- output note text if vuln ID matches -->
> + <xsl:template name="note-output">
> + <xsl:param name="vulnid_sought"/>
> + <xsl:param name="vulnid_found"/>
> +
> + <xsl:variable name="vulnid_expanded" select="concat('V-', $vulnid_found)" />
> + <xsl:if test="$vulnid_sought=$vulnid_expanded">
> + <tr><td><xsl:value-of select="@auth"/>: <xsl:value-of select="." /></td></tr>
> + </xsl:if>
> +
> + </xsl:template>
> +
> +
> <!-- return only the text between the "VulnDiscussion" (non-XCCDF) tags -->
> <!-- this should be removed as soon as SRGs include only a description instead of odd tags -->
> <xsl:template name="extract-vulndiscussion">
Ack. Since I applied the patch locally I went ahead and pushed it too.
Should we update the wiki to point to the manual-withnotes? Tree off my
people page is updated to reflect commits from today incl. this.
-Shawn
More information about the scap-security-guide
mailing list