[Openvas-commits] r11693 - in trunk/gsa: . src/html

[scm-commit@wald.intevation.org]

Author: hdoreau
Date: 2011-09-26 19:12:17 +0200 (Mon, 26 Sep 2011)
New Revision: 11693

Modified:
   trunk/gsa/ChangeLog
   trunk/gsa/src/html/omp.xsl
Log:
* src/html/omp/xsl (get_info_response): Improve error messages for
unknown elements.


Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog	2011-09-26 16:00:19 UTC (rev 11692)
+++ trunk/gsa/ChangeLog	2011-09-26 17:12:17 UTC (rev 11693)
@@ -1,3 +1,8 @@
+2011-09-26  Henri Doreau <henri.doreau at greenbone.net>
+
+	* src/html/omp/xsl (get_info_response): Improve error messages for
+	unknown elements.
+
 2011-09-26  Matthew Mundell <matthew.mundell at greenbone.net>
 
 	* src/gsad_omp.c (get_report_omp): Correct format specifier.

Modified: trunk/gsa/src/html/omp.xsl
===================================================================
--- trunk/gsa/src/html/omp.xsl	2011-09-26 16:00:19 UTC (rev 11692)
+++ trunk/gsa/src/html/omp.xsl	2011-09-26 17:12:17 UTC (rev 11693)
@@ -8310,7 +8310,31 @@
       <xsl:otherwise>
         <div class="gb_window_part_center">Get details</div>
         <div class="gb_window_part_content">
-          <h1>Information unavailable (unknown element)</h1>
+          <h1>Unknown element</h1>
+          <p>
+            <xsl:value-of select="@status_text"/>
+          </p>
+          <xsl:choose>
+            <xsl:when test="contains (@status_text, 'cpe:/')">
+              <p>
+                This is not necessarily an error. This CPE was likely referenced
+                by one or more CVE but isn't present in the official CPE dictionary.
+              </p>
+            </xsl:when>
+            <xsl:when test="contains (@status_text, 'CVE-')">
+              <p>
+                Please ensure that your SCAP data is up to date. If the
+                problem persists after a sync, please report this as a bug.
+              </p>
+            </xsl:when>
+            <xsl:otherwise>
+              <p>
+                Unknown element type. Ensure that the URL is correct and
+                especially that the <code>info_type</code> and
+                <code>info_name</code> parameters are consistent.
+              </p>
+            </xsl:otherwise>
+          </xsl:choose>
         </div>
       </xsl:otherwise>
     </xsl:choose>