From a941b26a2dd0215e2ddab9b381288ce6a7890e99 Mon Sep 17 00:00:00 2001
From: Joseph Schorr <josephschorr@users.noreply.github.com>
Date: Thu, 10 Mar 2016 15:02:38 -0500
Subject: [PATCH] Better handling of defcon1

---
 static/css/directives/ui/image-feature-view.css       | 5 +++++
 static/css/directives/ui/image-vulnerability-view.css | 5 +++++
 static/directives/image-feature-view.html             | 2 +-
 static/directives/image-vulnerability-view.html       | 2 +-
 static/js/directives/ui/image-vulnerability-view.js   | 6 +++++-
 static/js/services/image-metadata-service.js          | 2 +-
 static/js/services/vulnerability-service.js           | 6 +++---
 7 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/static/css/directives/ui/image-feature-view.css b/static/css/directives/ui/image-feature-view.css
index 8f19cf88b..2970ef1da 100644
--- a/static/css/directives/ui/image-feature-view.css
+++ b/static/css/directives/ui/image-feature-view.css
@@ -113,3 +113,8 @@
 .image-feature-view-element .vuln-summary i.fa {
   margin-right: 6px;
 }
+
+.image-feature-view-element .defcon1 {
+  background-color: #FF8181;
+  color: white;
+}
diff --git a/static/css/directives/ui/image-vulnerability-view.css b/static/css/directives/ui/image-vulnerability-view.css
index 25616d6e2..5895d2492 100644
--- a/static/css/directives/ui/image-vulnerability-view.css
+++ b/static/css/directives/ui/image-vulnerability-view.css
@@ -192,4 +192,9 @@
   margin: 0px;
   margin-left: 2px;
   margin-right: 2px;
+}
+
+.image-vulnerability-view-element .defcon1 {
+  background-color: #FF8181;
+  color: white;
 }
\ No newline at end of file
diff --git a/static/directives/image-feature-view.html b/static/directives/image-feature-view.html
index e7ac3a969..20864f6c4 100644
--- a/static/directives/image-feature-view.html
+++ b/static/directives/image-feature-view.html
@@ -92,7 +92,7 @@
       <td class="hidden-xs options-col"></td>
      </thead>
      <tbody ng-repeat="feature in orderedFeatures.visibleEntries" bindonce>
-       <tr>
+       <tr ng-class="feature.primarySeverity.index == 0 ? 'defcon1' : ''">
          <td class="single-col">
           <span bo-text="feature.name"></span>
          </td>
diff --git a/static/directives/image-vulnerability-view.html b/static/directives/image-vulnerability-view.html
index 7ca4c694c..6fb89f6e2 100644
--- a/static/directives/image-vulnerability-view.html
+++ b/static/directives/image-vulnerability-view.html
@@ -98,7 +98,7 @@
       <td class="hidden-xs options-col"></td>
      </thead>
      <tbody ng-repeat="vuln in orderedVulnerabilities.visibleEntries" bindonce>
-       <tr>
+       <tr ng-class="vuln.severityInfo.index == 0 ? 'defcon1' : ''">
         <td class="caret-col">
           <span ng-click="toggleDetails(vuln)">
             <i class="fa"
diff --git a/static/js/directives/ui/image-vulnerability-view.js b/static/js/directives/ui/image-vulnerability-view.js
index 3af07b060..4ada44d3f 100644
--- a/static/js/directives/ui/image-vulnerability-view.js
+++ b/static/js/directives/ui/image-vulnerability-view.js
@@ -28,11 +28,15 @@ angular.module('quay').directive('imageVulnerabilityView', function () {
       };
 
       $scope.getDistro = function(vuln) {
+        if (vuln['severity'] == 'Defcon 1') {
+          return 'the Quay Engineering Team';
+        }
+
         return vuln['namespace'].split(':', 1);
       };
 
       $scope.getSeverityTooltip = function(vuln) {
-        var distro = vuln['namespace'].split(':', 1);
+        var distro = $scope.getDistro(vuln);
 
         if (vuln.scoreDivergence != 'adjusted-lower') {
           return 'Marked with a ' + vuln['severity'] + ' severity by ' + distro;
diff --git a/static/js/services/image-metadata-service.js b/static/js/services/image-metadata-service.js
index 074ce776b..ac04ab7a1 100644
--- a/static/js/services/image-metadata-service.js
+++ b/static/js/services/image-metadata-service.js
@@ -47,7 +47,7 @@ angular.module('quay').factory('ImageMetadataService', ['UtilService', function(
 
   metadataService.getDockerfileCommand = function(command) {
     if (!command) { return ''; }
-    command = command.join(' ').split(' ')
+    command = command.join(' ').split(' ');
 
     // ["/bin/sh", "-c", "#(nop)", "RUN", "foo"]
     if (command[0] != '/bin/sh' || command[1] != '-c') { return ''; }
diff --git a/static/js/services/vulnerability-service.js b/static/js/services/vulnerability-service.js
index 7ab7ee108..cddefec90 100644
--- a/static/js/services/vulnerability-service.js
+++ b/static/js/services/vulnerability-service.js
@@ -133,15 +133,15 @@ angular.module('quay').factory('VulnerabilityService', ['Config', 'ApiService',
         };
 
         // Save the highest vulnerability severity for this feature.
-        highestSeverityIndex = Math.min(severity['index'], highestSeverityIndex)
+        highestSeverityIndex = Math.min(severity['index'], highestSeverityIndex);
 
         // Add the score and (if necessary) the fixable scores.
         score += exponentialScore;
-        severityCountMap[severity['index']]++
+        severityCountMap[severity['index']]++;
         vulnerabilities.push(vuln_object);
 
         if (vuln.FixedBy) {
-          fixableCountMap[severity['index']]++
+          fixableCountMap[severity['index']]++;
           fixableScore += exponentialScore;
           fixable.push(vuln_object)
         }