[Secure-testing-commits] r54581 - bin lib/python

[Sebastien Delafond]

Author: seb
Date: 2017-08-10 21:07:00 +0000 (Thu, 10 Aug 2017)
New Revision: 54581

Modified:
   bin/tracker_service.py
   lib/python/security_db.py
Log:
Expose "ignored" & "postponed" no-dsa sub-states to the web UI

Modified: bin/tracker_service.py
===================================================================
--- bin/tracker_service.py	2017-08-10 21:06:58 UTC (rev 54580)
+++ bin/tracker_service.py	2017-08-10 21:07:00 UTC (rev 54581)
@@ -615,9 +615,13 @@
                 return self.make_purple('unknown')
             if per_release.vulnerable == 1:
                 if per_release.state == 'no-dsa':
-                    return self.make_mouseover(
-                        (self.make_yellow('vulnerable (no DSA)'),),
-                        text=per_release.reason)
+                    if per_release.reason:
+                        text = 'vulnerable (no DSA, %s)' % per_release.reason
+                    else:
+                        text = 'vulnerable (no DSA)'
+                    hint = per_release.comment
+                    return self.make_mouseover((self.make_yellow(text),),
+                                               text=hint)
                 else:
                     return self.make_red('vulnerable')
             if per_release.vulnerable == 2:


Property changes on: bin/tracker_service.py
___________________________________________________________________
Added: svn:executable
   + *

Modified: lib/python/security_db.py
===================================================================
--- lib/python/security_db.py	2017-08-10 21:06:58 UTC (rev 54580)
+++ lib/python/security_db.py	2017-08-10 21:07:00 UTC (rev 54581)
@@ -121,7 +121,7 @@
 # The reason field holds no-dsa substates, which can be ignored/postponed
 BugForSourcePackageRelease = namedtuple(
     "BugForSourcePackageRelease",
-    "release subrelease version vulnerable state reason")
+    "release subrelease version vulnerable state comment reason")
 
 # Internally used by getBugsForSourcePackage().
 BugsForSourcePackage_internal = namedtuple(
@@ -195,7 +195,7 @@
 
             bug = BugForSourcePackageRelease(
                 best_row.release, best_row.subrelease, best_row.version,
-                best_row.vulnerable, state, reason)
+                best_row.vulnerable, state, comment, reason)
             releases[best_row.release] = bug
 
         # Compute global_state.