Skip to content

Fixing inverted fields in HTML report (backport maint-1.3) #2267

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

Merged
merged 2 commits into from
Oct 14, 2025
Merged

Fixing inverted fields in HTML report (backport maint-1.3) #2267

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f99f6e
fixing 'object does not exist' report template
Arden97 Oct 10, 2025
441ff80
select correct var
Arden97 Oct 13, 2025
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
52 changes: 29 additions & 23 deletions xsl/xccdf-report-oval-details.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,23 +146,10 @@ Authors:
</thead>
<tbody>
<tr>
<xsl:variable name='variable_id' select='$object_info/*/@var_ref'/>
<xsl:if test='$variable_id'>
<td>
<xsl:choose>
<xsl:when test='count(ovalres:tested_variable)>1'>
<table>
<xsl:apply-templates mode='tableintable' select='ovalres:tested_variable'/>
</table>
</xsl:when>
<xsl:when test='count(ovalres:tested_variable)=1'>
<xsl:apply-templates mode='normal' select='ovalres:tested_variable'/>
</xsl:when>
</xsl:choose>
<xsl:apply-templates mode='message' select='key("ovalsys-object",$object_id)'/>
</td>
</xsl:if>
<xsl:apply-templates mode='object' select='$object_info[1]'/>
<xsl:apply-templates mode='object' select='$object_info[1]'>
<xsl:with-param name="tested_var" select="ovalres:tested_variable"/>
<xsl:with-param name="object_id" select="$object_id"/>
</xsl:apply-templates>
</tr>
</tbody>
</table>
Expand All @@ -188,13 +175,32 @@ Authors:
</xsl:template>

<xsl:template mode='object' match='*[starts-with(namespace-uri(), "http://oval.mitre.org/XMLSchema/oval-definitions") and contains(local-name(), "_object")]'>
<xsl:param name="tested_var"/>
<xsl:param name="object_id"/>

<xsl:for-each select='*'>
<xsl:if test='not(*) and not(normalize-space()) and not(@var_ref)'><td>no value</td></xsl:if>
<xsl:if test='* or normalize-space()'>
<td>
<xsl:value-of select='.'/>
</td>
</xsl:if>
<td>
<xsl:choose>
<xsl:when test="@var_ref">
<xsl:variable name="matching_var" select="$tested_var[@variable_id = current()/@var_ref]"/>
<xsl:choose>
<xsl:when test="count($matching_var) > 1">
<table>
<xsl:apply-templates mode='tableintable' select="$matching_var"/>
</table>
</xsl:when>
<xsl:otherwise>
<xsl:apply-templates mode='normal' select="$matching_var"/>
</xsl:otherwise>
</xsl:choose>
<xsl:apply-templates mode='message' select='key("ovalsys-object", $object_id)'/>
</xsl:when>

<xsl:otherwise>
<xsl:value-of select="."/>
</xsl:otherwise>
</xsl:choose>
</td>
</xsl:for-each>
</xsl:template>

Expand Down
Loading