fix warning 'FixedBy' when I scanning a image (#6)

joelee2012 · Feb 18, 2020 · 6abdadd · 6abdadd
1 parent 6612637
commit 6abdadd
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/claircli/report.py b/claircli/report.py
@@ -45,9 +45,9 @@ def process_data(self, threshold='Unknown', white_list=None):
 
         def is_approved(vulne, feature):
             vname = vulne['Name'].replace(':', '-')
-            return (vname in approved and feature['Name'] == approved[vname]) \
-                or (SEVERITY_INDEX[vulne['Severity']]
-                    > SEVERITY_INDEX[threshold])
+            return (vname in approved and feature[
+                'Name'] == approved[vname]) or (SEVERITY_INDEX[vulne[
+                    'Severity']] > SEVERITY_INDEX[threshold])
 
         for feature in layer_data.get('Features', []):
             for vulnerability in feature.get('Vulnerabilities', []):
@@ -62,8 +62,7 @@ def is_approved(vulne, feature):
                         'FeatureVersion': feature['Version'],
                         'AddedBy': feature['AddedBy'],
                         'Status': status}
-                for key in ['Name', 'NamespaceName', 'Description',
-                            'Link', 'Severity', 'FixedBy']:
+                for key in vulnerability.keys():
                     temp[key] = vulnerability[key]
                 vulnerabilities.append(temp)
         data['Vulnerabilities'] = sorted(