added better template for exploit mitigations

pdf_generator/pre_processing/rest.py

@@ -6,7 +6,7 @@ DEFAULT_URL = 'http://localhost:5000'
 
 
 def create_request_url(firmware_uid, server_url):
-    return '{}/rest/firmware/{}'.format(server_url if server_url else DEFAULT_URL, firmware_uid)
+    return '{}/rest/firmware/{}?summary=true'.format(server_url if server_url else DEFAULT_URL, firmware_uid)
 
 
 def request_firmware_data(request_url):

pdf_generator/templates/default/exploit_mitigations.tex

@@ -7,10 +7,38 @@
     \hline
 
     \BLOCK{if selected_analysis['summary']}
-        Summary
+        NX
+        &
         \BLOCK{for selected_summary in selected_analysis['summary']}
-            & \VAR{selected_summary | filter_chars} \\
-        \BLOCK{endfor}
+            \BLOCK{if selected_summary | contains('NX')}
+                \VAR{selected_summary | filter_chars} (\VAR{ selected_analysis['summary'][selected_summary] | elements_count })
+            \BLOCK{endif}
+        \BLOCK{endfor} \\
         \hline
+        Canary
+        &
+        \BLOCK{for selected_summary in selected_analysis['summary']}
+            \BLOCK{if selected_summary | contains('Canary')}
+                \VAR{selected_summary | filter_chars} (\VAR{ selected_analysis['summary'][selected_summary] | elements_count })
+            \BLOCK{endif}
+        \BLOCK{endfor} \\
+        \hline
+        PIE
+        &
+        \BLOCK{for selected_summary in selected_analysis['summary']}
+            \BLOCK{if selected_summary | contains('PIE')}
+                \VAR{selected_summary | filter_chars} (\VAR{ selected_analysis['summary'][selected_summary] | elements_count })
+            \BLOCK{endif}
+        \BLOCK{endfor} \\
+        \hline
+        RELRO
+        &
+        \BLOCK{for selected_summary in selected_analysis['summary']}
+            \BLOCK{if selected_summary | contains('RELRO')}
+                \VAR{selected_summary | filter_chars} (\VAR{ selected_analysis['summary'][selected_summary] | elements_count })
+            \BLOCK{endif}
+        \BLOCK{endfor} \\
+        \hline
+
     \BLOCK{endif}
-\end{longtable}
\ No newline at end of file
+\end{longtable}

pdf_generator/tex_generation/template_engine.py

@@ -98,6 +98,12 @@ def split_output_lines(output_value, max_length=92):
     return output
 
 
+def item_contains_string(item, string):
+    if not isinstance(item, str):
+        return False
+    return string in item
+
+
 def create_jinja_environment(templates_to_use='default'):
     template_directory = Path(Path(__file__).parent.parent, 'templates', templates_to_use)
     environment = jinja2.Environment(
@@ -128,6 +134,7 @@ def _add_filters_to_jinja(environment):
     environment.filters['filter_list'] = filter_chars_in_list
     environment.filters['split_hash'] = split_hash
     environment.filters['split_output_lines'] = split_output_lines
+    environment.filters['contains'] = item_contains_string
 
 
 class Engine: