walkero
/
flawfinder
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Add links to CWE entries when producing HTML, and tweak output report

This commit is contained in:
David A. Wheeler 2014-07-19 16:20:14 -04:00
parent 5c66efaf2b
commit f9a6fdd314
1 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
flawfinder
View File

@ -294,6 +294,9 @@ def print_multi_line(text):
position = starting_position position = starting_position
print nextword, # Print remainder (can be overlong if no spaces) print nextword, # Print remainder (can be overlong if no spaces)
# This matches references to CWE identifiers, so we can HTMLize them.
# We don't refer to CWE-1 through CWE-9, so we'll only match on 2+ digits.
link_cwe_pattern = re.compile(r'(CWE-([1-9][0-9]+))([,()])')
class Hit: class Hit:
""" """
@ -368,12 +371,16 @@ class Hit:
print "(%(category)s)" % self, print "(%(category)s)" % self,
if output_format: print "<i>", if output_format: print "<i>",
print h("%(name)s:" % self), print h("%(name)s:" % self),
main_text = h("%(warning)s. " % self)
if output_format: # Create HTML link to CWE definitions
main_text = link_cwe_pattern.sub(
r'<a href="http://cwe.mitre.org/data/definitions/\2.html">\1</a>\3',
main_text)
if single_line: if single_line:
print h("%(warning)s." % self), print main_text,
if self.suggestion: print h(self.suggestion)+".", if self.suggestion: print h(self.suggestion)+".",
print h(self.note), print h(self.note),
else: else:
main_text = h("%(warning)s. " % self)
if self.suggestion: main_text = main_text + h(self.suggestion) + ". " if self.suggestion: main_text = main_text + h(self.suggestion) + ". "
main_text = main_text + h(self.note) main_text = main_text + h(self.note)
print print
@ -1781,11 +1788,11 @@ def show_final_results():
count_per_level[i] = 0 count_per_level[i] = 0
for i in range(0,6): # Initialize count_per_level for i in range(0,6): # Initialize count_per_level
count_per_level_and_up[i] = 0 count_per_level_and_up[i] = 0
if show_immediately: # Separate the final results. if show_immediately or not quiet: # Separate the final results.
print print
if showheading: if showheading:
if output_format: if output_format:
print "<h1>Final Results</h1>" print "<h2>Final Results</h2>"
else: else:
print "FINAL RESULTS:" print "FINAL RESULTS:"
print print
@ -1805,15 +1812,6 @@ def show_final_results():
count = count + 1 count = count + 1
if output_format: print "</ul>" if output_format: print "</ul>"
diff_file.close() diff_file.close()
if showheading:
if output_format:
print "<p>"
if count > 0:
print "Hits not in original histlist =", count
else:
print "No hits found that weren't already in the hitlist."
if output_format:
print "<br>"
else: else:
if output_format: print "<ul>" if output_format: print "<ul>"
for h in hitlist: for h in hitlist:
@ -1821,7 +1819,13 @@ def show_final_results():
count_per_level[h.level] = count_per_level[h.level] + 1 count_per_level[h.level] = count_per_level[h.level] + 1
if output_format: print "</ul>" if output_format: print "</ul>"
count = len(hitlist) count = len(hitlist)
# Done with list, show the post-hitlist summary.
if showheading: if showheading:
if output_format:
print "<h2>Analysis Summary</h2>"
else:
print
print "ANALYSIS SUMMARY:"
if output_format: if output_format:
print "<p>" print "<p>"
else: else:
@ -1832,7 +1836,6 @@ def show_final_results():
print "No hits found." print "No hits found."
if output_format: if output_format:
print "<br>" print "<br>"
if showheading:
# Compute the amount of time spent, and lines analyzed/second. # Compute the amount of time spent, and lines analyzed/second.
# By computing time here, we also include the time for # By computing time here, we also include the time for
# producing the list of hits, which is reasonable. # producing the list of hits, which is reasonable.