Merge pull request diffblue#172 from diffblue/feature/slicer_integration_in_python

SEC-17: Extension of the Python driver script w.r.t. calling of the slicer.

Author: marek-trtik

security-scanner/analyser.py

@@ -1,7 +1,7 @@
 import os
 import time
 import json
-import shutil
+import utility
 
 
 def __get_my_dir(): return os.path.dirname(os.path.realpath(__file__))
@@ -109,12 +109,44 @@ def run_program_slicing(
         timeout,
         verbosity
         ):
-    prof = {}
+    prof = {"calling_slicer": []}
     prof_start_time = time.time()
 
-    # TODO: once the slicer in "goto-instrument" tool is available, then provide proper implementation here!
-    #       Until then we assume the slicing removes nothing from the instrumented program.
-    shutil.copyfile(json_cfg_fname, os.path.join(os.path.dirname(json_cfg_fname),"sliced_goto_programs.json"))
+    with open(json_cfg_fname) as data_file:
+        cfgs = json.load(data_file)
+
+    result = []
+    for cfg in cfgs:
+        src_plain_fname = os.path.splitext(os.path.basename(cfg["goto_binary_file"]))[0]
+        src_idx_name = int(src_plain_fname[src_plain_fname.rfind("_")+1:])
+        dst_goto_program_fname = os.path.join(results_dir, "sliced_goto_program_" + str(src_idx_name) + ".gbf")
+
+        command = (
+            get_goto_instrument_pathname() + " " +
+            "--full-slice " +
+            "--verbosity " + str(1) + " " +
+            cfg["goto_binary_file"] + " " +
+            "-o " + dst_goto_program_fname
+            )
+        prof_calling_goto_instrument_start_time = time.time()
+        print("Invoking 'goto-instrument' ...")
+        with utility.PushCwd(results_dir) as cwd:
+            if verbosity >= 9:
+                print("CWD: " + cwd.get())
+                print("CMD: " + command)
+            # TODO: Uncomment the next line when the slicer is functional!
+            # os.system(command)
+        prof["calling_slicer"].append({
+            "gbf_idx": src_idx_name,
+            "duration": time.time() - prof_calling_goto_instrument_start_time
+            })
+
+        result.append(cfg.copy())
+        # TODO: Uncomment the next line when the slicer is functional!
+        # result[-1]["goto_binary_file"] = dst_goto_program_fname
+
+    with open(os.path.join(results_dir, "sliced_goto_programs.json"), "w") as results_json:
+        results_json.write(json.dumps(result, sort_keys=False, indent=4))
 
     prof["duration"] = time.time() - prof_start_time
     return prof
@@ -175,7 +207,7 @@ def run_search_for_error_traces(
             get_cbmc_pathname() + " " +
             cfg["goto_binary_file"] + " " +
             " --trace --lazy-methods --json-ui --unwind 10 " +
-            "--verbosity " + str(1) + " "
+            "--verbosity " + str(verbosity) + " "
             "> \"cbmc_results.json\""
             )
         prof["calling_cbmc"] = {}

security-scanner/utility.py

@@ -0,0 +1,19 @@
+import os
+
+
+class PushCwd:
+    def __init__(self, dirname):
+        self._cwd = os.path.realpath(dirname)
+        self._old_cwd = None
+
+    def __enter__(self):
+        self._old_cwd = os.getcwd()
+        os.chdir(self._cwd)
+        return self
+
+    def __exit__(self, _, __, ___):
+        if self._old_cwd is not None:
+            os.chdir(self._old_cwd)
+
+    def get(self):
+        return self._cwd