summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastien Delafond <seb@debian.org>2017-08-10 21:07:00 +0000
committerSebastien Delafond <seb@debian.org>2017-08-10 21:07:00 +0000
commitad201b4007815f9bcfe05522930aeb1c5c2727c4 (patch)
tree5ac46f3dcaf79f66597b76a25bc2087f4a9b7e28
parent0a6b82d1716127945bfbbba1a976ca1fd137e1f6 (diff)
Expose "ignored" & "postponed" no-dsa sub-states to the web UI
git-svn-id: svn+ssh://svn.debian.org/svn/secure-testing@54581 e39458fd-73e7-0310-bf30-c45bca0a0e42
-rwxr-xr-x[-rw-r--r--]bin/tracker_service.py10
-rw-r--r--lib/python/security_db.py4
2 files changed, 9 insertions, 5 deletions
diff --git a/bin/tracker_service.py b/bin/tracker_service.py
index fdb755dc67..c74809ddd8 100644..100755
--- a/bin/tracker_service.py
+++ b/bin/tracker_service.py
@@ -615,9 +615,13 @@ to improve our documentation and procedures, so feedback is welcome.""")])])
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:
diff --git a/lib/python/security_db.py b/lib/python/security_db.py
index f36ee49657..d059f3e7d1 100644
--- a/lib/python/security_db.py
+++ b/lib/python/security_db.py
@@ -121,7 +121,7 @@ BugForSourcePackage = namedtuple(
# 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 @@ def getBugsForSourcePackage(cursor, pkg):
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.

© 2014-2024 Faster IT GmbH | imprint | privacy policy