From 34a8090328b790b7fec69cd934a4ca16084a5ec7 Mon Sep 17 00:00:00 2001
From: Joseph Schorr <josephschorr@users.noreply.github.com>
Date: Fri, 22 Apr 2016 13:21:35 -0400
Subject: [PATCH] Fix handling of Defcon 1

Fixes #1397
---
 static/css/directives/ui/image-feature-view.css       | 2 +-
 static/css/directives/ui/image-vulnerability-view.css | 2 +-
 static/directives/repo-view/repo-panel-tags.html      | 2 +-
 static/js/directives/repo-view/repo-panel-tags.js     | 2 +-
 util/secscan/__init__.py                              | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/static/css/directives/ui/image-feature-view.css b/static/css/directives/ui/image-feature-view.css
index 2970ef1da..53f95d7d4 100644
--- a/static/css/directives/ui/image-feature-view.css
+++ b/static/css/directives/ui/image-feature-view.css
@@ -115,6 +115,6 @@
 }
 
 .image-feature-view-element .defcon1 {
-  background-color: #FF8181;
+  background-color: #FB5151;
   color: white;
 }
diff --git a/static/css/directives/ui/image-vulnerability-view.css b/static/css/directives/ui/image-vulnerability-view.css
index 94eee65ae..f4025da96 100644
--- a/static/css/directives/ui/image-vulnerability-view.css
+++ b/static/css/directives/ui/image-vulnerability-view.css
@@ -199,6 +199,6 @@
 }
 
 .image-vulnerability-view-element .defcon1 {
-  background-color: #FF8181;
+  background-color: #FB5151;
   color: white;
 }
\ No newline at end of file
diff --git a/static/directives/repo-view/repo-panel-tags.html b/static/directives/repo-view/repo-panel-tags.html
index 1729e8903..2310dd53d 100644
--- a/static/directives/repo-view/repo-panel-tags.html
+++ b/static/directives/repo-view/repo-panel-tags.html
@@ -21,7 +21,7 @@
    <div class="co-alert co-alert-danger" ng-if="hasDefcon1">
      One or more of your tags has an <strong>extremely critical</strong> vulnerability which should be addressed immediately:
      <a href="{{ vuln.Link }}" ng-repeat="(key, vuln) in defcon1" style="margin-left: 10px;" target="_blank">
-       {{ vuln.ID }}
+       {{ vuln.Name }}
      </a>
    </div>
 
diff --git a/static/js/directives/repo-view/repo-panel-tags.js b/static/js/directives/repo-view/repo-panel-tags.js
index 9f7eff4e8..4d516be78 100644
--- a/static/js/directives/repo-view/repo-panel-tags.js
+++ b/static/js/directives/repo-view/repo-panel-tags.js
@@ -168,7 +168,7 @@ angular.module('quay').directive('repoPanelTags', function () {
 
             VulnerabilityService.forEachVulnerability(resp, function(vuln) {
               if (VulnerabilityService.LEVELS[vuln.Severity].index == 0) {
-                $scope.defcon1[vuln.ID] = v;
+                $scope.defcon1[vuln.Name] = vuln;
                 $scope.hasDefcon1 = true;
               }
 
diff --git a/util/secscan/__init__.py b/util/secscan/__init__.py
index 417c16f0d..92a41da08 100644
--- a/util/secscan/__init__.py
+++ b/util/secscan/__init__.py
@@ -78,7 +78,7 @@ PRIORITY_LEVELS = {
    'description': 'Critical is a world-burning problem, exploitable for nearly all people in ' +
                   'a installation of the package. Includes remote root privilege escalations, ' +
                   'or massive data loss.',
-   'banner_required': True
+   'banner_required': False
  },
 
  'Defcon1': {