From 001768c043e0d0bd909d7276919ae08664d04e7c Mon Sep 17 00:00:00 2001
From: Joseph Schorr <joseph.schorr@coreos.com>
Date: Tue, 20 Nov 2018 14:14:34 +0200
Subject: [PATCH] Make security status for manifests without legacy images more
 clear in the UI

---
 data/registry_model/datatypes.py               |  1 +
 data/registry_model/registry_oci_model.py      |  2 +-
 .../manifest-security-view.component.html      | 18 ++++++++++++++----
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/data/registry_model/datatypes.py b/data/registry_model/datatypes.py
index 4ec21d68e..e7d79ea17 100644
--- a/data/registry_model/datatypes.py
+++ b/data/registry_model/datatypes.py
@@ -293,6 +293,7 @@ class SecurityScanStatus(Enum):
   SCANNED = 'scanned'
   FAILED = 'failed'
   QUEUED = 'queued'
+  UNSUPPORTED = 'unsupported'
 
 
 class ManifestLayer(namedtuple('ManifestLayer', ['layer_info', 'blob'])):
diff --git a/data/registry_model/registry_oci_model.py b/data/registry_model/registry_oci_model.py
index bd2edac56..1ebe58881 100644
--- a/data/registry_model/registry_oci_model.py
+++ b/data/registry_model/registry_oci_model.py
@@ -362,7 +362,7 @@ class OCIModel(SharedModel, RegistryDataInterface):
     if isinstance(manifest_or_legacy_image, Manifest):
       image = oci.shared.get_legacy_image_for_manifest(manifest_or_legacy_image._db_id)
       if image is None:
-        return None
+        return SecurityScanStatus.UNSUPPORTED
     else:
       try:
         image = database.Image.get(id=manifest_or_legacy_image._db_id)
diff --git a/static/js/directives/ui/manifest-security-view/manifest-security-view.component.html b/static/js/directives/ui/manifest-security-view/manifest-security-view.component.html
index 66a06327f..c55e4a8b6 100644
--- a/static/js/directives/ui/manifest-security-view/manifest-security-view.component.html
+++ b/static/js/directives/ui/manifest-security-view/manifest-security-view.component.html
@@ -10,7 +10,7 @@
     <span ng-if="!$ctrl.getSecurityStatus($ctrl.repository, $ctrl.manifestDigest).loading">
         <!-- Queued -->
         <span class="scanning" ng-if="$ctrl.getSecurityStatus($ctrl.repository, $ctrl.manifestDigest).status == 'queued'"
-            data-title="The image for this tag is queued to be scanned for vulnerabilities"
+            data-title="The manifest for this tag is queued to be scanned for vulnerabilities"
             bs-tooltip>
         <i class="fa fa-ellipsis-h"></i>
         Queued
@@ -18,16 +18,26 @@
 
         <!-- Scan Failed -->
         <span class="failed-scan" ng-if="$ctrl.getSecurityStatus($ctrl.repository, $ctrl.manifestDigest).status == 'failed'"
-            data-title="The image for this tag could not be scanned for vulnerabilities"
+            data-title="The manifest for this tag could not be scanned for vulnerabilities"
             bs-tooltip>
         <span class="donut-chart" width="22" data="[{'index': 0, 'value': 1, 'color': '#eee'}]"></span>
         Unable to scan
         </span>
 
+        <!-- Unsupported -->
+        <span class="failed-scan"
+            ng-if="$ctrl.getSecurityStatus($ctrl.repository, $ctrl.manifestDigest).status == 'unsupported'"
+            data-title="The manifest for this tag has an operating system or package manager unsupported by Quay Security Scanner"
+            bs-tooltip
+            bindonce>
+        <span class="donut-chart" width="22" data="[{'index': 0, 'value': 1, 'color': '#eee'}]"></span>
+        Unsupported
+        </span>
+
         <!-- No Features -->
         <span class="failed-scan"
             ng-if="$ctrl.getSecurityStatus($ctrl.repository, $ctrl.manifestDigest).status == 'scanned' && !$ctrl.getSecurityStatus($ctrl.repository, $ctrl.manifestDigest).hasFeatures"
-            data-title="The image for this tag has an operating system or package manager unsupported by Quay Security Scanner"
+            data-title="The manifest for this tag has an operating system or package manager unsupported by Quay Security Scanner"
             bs-tooltip
             bindonce>
         <span class="donut-chart" width="22" data="[{'index': 0, 'value': 1, 'color': '#eee'}]"></span>
@@ -37,7 +47,7 @@
         <!-- Features and No Vulns -->
         <span class="no-vulns"
             ng-if="$ctrl.getSecurityStatus($ctrl.repository, $ctrl.manifestDigest).status == 'scanned' && $ctrl.getSecurityStatus($ctrl.repository, $ctrl.manifestDigest).hasFeatures && !$ctrl.getSecurityStatus($ctrl.repository, $ctrl.manifestDigest).hasVulnerabilities"
-            data-title="The image for this tag has no vulnerabilities as found in our database"
+            data-title="The manifest for this tag has no vulnerabilities as found in our database"
             bs-tooltip
             bindonce>
         <a bo-href-i="/repository/{{ $ctrl.repository.namespace }}/{{ $ctrl.repository.name }}/manifest/{{ tag.manifest_digest }}?tab=vulnerabilities">