minor bugfixes (#440)

Author: lucacapacci

packages/reporting-lib/src/reporting_lib/htmlgen.py

@@ -300,6 +300,16 @@ def parse_depscan_report(self, depscan_report):
             previous_line = line
             line = current_line.strip()
 
+            # ---- Dirty fix for unusually structured sections ----
+
+            if current_location != self.REACHABLE_FLOWS_DATA and last_seen_reachable_flows  in [self.REACHABLE_FLOWS, None]:
+                if line.startswith("#") or self.string_matches_regex(line, r'<span class="r\d+">#\d+<\/span><span class="r\d+">.*<\/span>'):
+                    current_location = self.REACHABLE_FLOWS_DATA
+
+            if current_location != self.NON_REACHABLE_FLOWS_DATA and last_seen_reachable_flows == self.NON_REACHABLE_FLOWS:
+                if line.startswith("#") or self.string_matches_regex(line, r'<span class="r\d+">#\d+<\/span><span class="r\d+">.*<\/span>'):
+                    current_location = self.NON_REACHABLE_FLOWS_DATA
+
             # ---- Location identification: Secure Design Tips ----
 
             if line == self.SECURE_DESIGN_TIPS or self.string_matches_span_pattern(
@@ -314,9 +324,10 @@ def parse_depscan_report(self, depscan_report):
             # ---- Data population: Secure Design Tips ----
 
             if current_location == self.SECURE_DESIGN_TIPS:
-                if sections_tree[self.SECURE_DESIGN_TIPS][self.SUMMARY] != "":
-                    sections_tree[self.SECURE_DESIGN_TIPS][self.SUMMARY] += "\n"
-                sections_tree[self.SECURE_DESIGN_TIPS][self.SUMMARY] += line
+                if line not in sections_tree[self.SECURE_DESIGN_TIPS][self.SUMMARY]:
+                    if sections_tree[self.SECURE_DESIGN_TIPS][self.SUMMARY] != "":
+                        sections_tree[self.SECURE_DESIGN_TIPS][self.SUMMARY] += "\n"
+                    sections_tree[self.SECURE_DESIGN_TIPS][self.SUMMARY] += line
                 continue
 
             # ---- Location identification: INFO ----
@@ -719,14 +730,6 @@ def parse_depscan_report(self, depscan_report):
                 last_seen_reachable_flows = self.REACHABLE_FLOWS
                 continue
 
-            if current_location != self.REACHABLE_FLOWS_DATA and last_seen_reachable_flows  in [self.REACHABLE_FLOWS, None]:
-                if line.startswith("#") or self.string_matches_regex(line, r'<span class="r\d+">#\d+<\/span><span class="r\d+">.*<\/span>'):
-                    current_location = self.REACHABLE_FLOWS_DATA
-
-            if current_location != self.NON_REACHABLE_FLOWS_DATA and last_seen_reachable_flows == self.NON_REACHABLE_FLOWS:
-                if line.startswith("#") or self.string_matches_regex(line, r'<span class="r\d+">#\d+<\/span><span class="r\d+">.*<\/span>'):
-                    current_location = self.NON_REACHABLE_FLOWS_DATA
-
             # ---- Data population: Reachable Flows ----
 
             if current_location == self.REACHABLE_FLOWS_RECOMMENDATION: