Merge pull request #1198 from jsalado/dev

Kiuwan import improvements

Author: aaronweaver

dojo/tools/kiuwan/parser.py

@@ -8,9 +8,9 @@
 
 class Severityfilter():
     def __init__(self):
-        self.severity_mapping = {'Normal': 'Info',
+        self.severity_mapping = {'Very Low': 'Info',
                                  'Low': 'Low',
-                                 'Medium': 'Medium',
+                                 'Normal': 'Medium',
                                  'High': 'High',
                                  'Very High': 'Critical'
                                  }
@@ -46,19 +46,22 @@ def __init__(self, filename, test):
             severityfilter.eval_column(row['Priority'])
             findingdict['severity'] = severityfilter.severity
             findingdict['title'] = row['Rule']
-            findingdict['description'] = "**Source file** : " + row['Source file'] + "\n\n" + \
-                                        "**Vulnerability type** : " + row['Vulnerability type'] + "\n\n" + \
-                                        "**Status** : " + row['Status'] + "\n\n" + \
+            findingdict['file'] = row['File']
+            findingdict['line_number'] = row['Line number']
+            findingdict['description'] = "**Vulnerability type** : " + row['Vulnerability type'] + "\n\n" + \
                                         "**CWE Scope** : " + row['CWE Scope'] + "\n\n" + \
-                                        "**Line text** : " + row['Line text'] + "\n\n" + \
-                                        "**Normative** : " + row['Normative'] + "\n\n" + \
                                         "**Line number** : " + row['Line number'] + "\n\n" + \
+                                        "**Code at line number** : " + row['Line text'] + "\n\n" + \
+                                        "**Normative** : " + row['Normative'] + "\n\n" + \
                                         "**Rule code** : " + row['Rule code'] + "\n\n" + \
-                                        "**File** : " + row['File'] + "\n\n" + \
-                                        "**Source line text** : " + row['Source line text'] + "\n\n" + \
-                                        "**Source line number** : " + row['Source line number'] + "\n"
+                                        "**Status** : " + row['Status'] + "\n\n" + \
+                                        "**Source file** : " + row['Source file'] + "\n\n" + \
+                                        "**Source line number** : " + row['Source line number'] + "\n\n" + \
+                                        "**Code at sorce line number** : " + row['Source line text'] + "\n"
 
             finding.title = findingdict['title']
+            finding.file_path = findingdict['file']
+            finding.line = findingdict['line_number']
             finding.description = findingdict['description']
             finding.references = "Not provided!"
             finding.mitigation = "Not provided!"