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

Jump to bottom

Update html report with oval details #2055

Merged
merged 2 commits into from
Dec 6, 2023
Merged

Update html report with oval details #2055

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58c96ec
Update html report with oval details
Xeicker Nov 23, 2023
22e0b72
Rename results column in report oval details
Xeicker Nov 28, 2023
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
64 changes: 59 additions & 5 deletions xsl/xccdf-report-oval-details.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,16 +99,21 @@ Authors:
<table class="table table-striped table-bordered">
<!-- table head (possibly item-type-specific) -->
<thead>
<xsl:apply-templates mode='item-head' select='key("oval-items", $items[1]/@item_id)'/>
<xsl:apply-templates mode='item-head' select='key("oval-items", $items[1]/@item_id)'>
<xsl:with-param name='resultColumn' select='"true"'/>
</xsl:apply-templates>
</thead>

<!-- table body (possibly item-type-specific) -->
<!-- limited to 100 lines -->
<tbody>
<xsl:for-each select='$items'>
<xsl:if test="not(position() > 100)">
<xsl:variable name="currentResult" select="@result" />
<xsl:for-each select='key("oval-items", @item_id)'>
<xsl:apply-templates select='.' mode='item-body'/>
<xsl:apply-templates select='.' mode='item-body'>
<xsl:with-param name="result" select="$currentResult"/>
</xsl:apply-templates>
</xsl:for-each>
</xsl:if>
</xsl:for-each>
Expand Down Expand Up @@ -217,7 +222,9 @@ Authors:
<!-- generic item visualisation -->

<xsl:template mode='item-head' match='*'>
<xsl:param name="resultColumn" select="false"/>
<tr>
<xsl:if test='$resultColumn="true"'><th>Result</th></xsl:if>
<xsl:for-each select='*'>
<xsl:variable name='label' select='translate(local-name(), "_", " ")'/>
<xsl:variable name='first_letter' select='translate(substring($label,1,1), "abcdefghijklmnopqrstuvwxyz", "ABCDEFGHIJKLMNOPQRSTUVWXYZ")'/>
Expand All @@ -228,7 +235,22 @@ Authors:
</xsl:template>

<xsl:template mode='item-body' match='*'>
<xsl:param name="result"/>
<tr>
<td>
<xsl:choose>
<xsl:when test="$result='true'">
<span class="label label-success">
<xsl:value-of select="$result"/>
</span>
</xsl:when>
<xsl:otherwise>
<span class="label label-danger">
<xsl:value-of select="$result"/>
</span>
</xsl:otherwise>
</xsl:choose>
</td>
<xsl:for-each select='*'>
<td>
<xsl:if test='@datatype="int" or @datatype="boolean"'><xsl:attribute name='role'>num</xsl:attribute></xsl:if>
Expand All @@ -241,12 +263,27 @@ Authors:
<!-- UNIX file item visualisation -->

<xsl:template mode='item-head' match='ovalunixsc:file_item'>
<tr><th>Path</th><th>Type</th><th>UID</th><th>GID</th><th>Size (B)</th><th>Permissions</th></tr>
<tr><th>Result</th><th>Path</th><th>Type</th><th>UID</th><th>GID</th><th>Size (B)</th><th>Permissions</th></tr>
</xsl:template>

<xsl:template mode='item-body' match='ovalunixsc:file_item'>
<xsl:param name="result"/>
<xsl:variable name='path' select='concat(ovalunixsc:path, "/", ovalunixsc:filename)'/>
<tr>
<td>
<xsl:choose>
<xsl:when test="$result='true'">
<span class="label label-success">
<xsl:value-of select="$result"/>
</span>
</xsl:when>
<xsl:otherwise>
<span class="label label-danger">
<xsl:value-of select="$result"/>
</span>
</xsl:otherwise>
</xsl:choose>
</td>
<td><xsl:value-of select='$path'/></td>
<td><xsl:value-of select='ovalunixsc:type'/></td>
<td><xsl:value-of select='ovalunixsc:user_id'/></td>
Expand Down Expand Up @@ -289,12 +326,29 @@ Authors:
<!-- textfilecontent visualisation -->

<xsl:template mode='item-head' match='ovalindsc:textfilecontent_item'>
<tr><th>Path</th><th>Content</th></tr>
<tr><th>Result</th><th>Path</th><th>Content</th></tr>
</xsl:template>

<xsl:template mode='item-body' match='ovalindsc:textfilecontent_item'>
<xsl:param name="result"/>
<xsl:variable name='path' select='concat(ovalindsc:path, "/", ovalindsc:filename)'/>
<tr><td><xsl:value-of select='$path'/></td><td><xsl:value-of select='ovalindsc:text'/></td></tr>
<tr>
<td>
<xsl:choose>
<xsl:when test="$result='true'">
<span class="label label-success">
<xsl:value-of select="$result"/>
</span>
</xsl:when>
<xsl:otherwise>
<span class="label label-danger">
<xsl:value-of select="$result"/>
</span>
</xsl:otherwise>
</xsl:choose>
</td>
<td><xsl:value-of select='$path'/></td><td><xsl:value-of select='ovalindsc:text'/></td>
</tr>
</xsl:template>

</xsl:stylesheet>