Add option to use models library to run.py

Author: smowton

security-scanner/mkbench.py

@@ -126,6 +126,7 @@ def install_class_file(pathname,output_dir,class_temp_dir):
         shutil.copyfile(pathname,class_pathname)
 
     prof["duration"] = time.time() - prof_start_time
+    prof["count"] = 1
     return prof
 
 
@@ -187,55 +188,58 @@ def install_war_file(pathname,output_dir,temp_dir,class_temp_dir):
     return prof
 
 
-def build_classes_configuration(app_binary_dir,output_dir,temp_dir):
+def build_classes_configuration(app_binary_dirs, output_dir, temp_dir):
     prof = {}
     prof_start_time = time.time()
 
     prof["unpack"] = {"duration": 0.0}
     prof["collect"] = {"duration": 0.0}
+    prof["install"] = { "count": 0, "duration": 0.0, "fullname": { "duration": 0.0 } }
+
+    def add_prof_install(arg1, arg2):
+        return {
+            "count": arg1["count"] + arg2["count"],
+            "duration": arg1["duration"] + arg2["duration"],
+            "fullname": {"duration": arg1["fullname"]["duration"] + arg2["fullname"]["duration"]}
+        }
 
     class_temp_dir = os.path.join(temp_dir, "FULLNAME")
 
-    files = []
-    prof["collect"] = collect_java_files(app_binary_dir,"class",files)
+    for app_binary_dir in app_binary_dirs:
 
-    prof["install"] = { "count": len(files), "duration": 0.0, "fullname": { "duration": 0.0 } }
+        files = []
+        prof_collect = collect_java_files(app_binary_dir,"class",files)
+        prof["collect"]["duration"] += prof_collect["duration"]
 
-    for fname in files:
-        prof_install = install_class_file(fname,output_dir,class_temp_dir)
+        for fname in files:
+            prof_install = install_class_file(fname,output_dir,class_temp_dir)
+            prof["install"] = add_prof_install(prof["install"], prof_install)
 
-        prof["install"]["duration"] += prof_install["duration"]
-        prof["install"]["fullname"]["duration"] += prof_install["fullname"]["duration"]
+        temp_dir_counter = 0
 
-    temp_dir_counter = 0
+        files = []
+        prof_collect = collect_java_files(app_binary_dir,"jar",files)
+        prof["collect"]["duration"] += prof_collect["duration"]
 
-    files = []
-    prof_collect = collect_java_files(app_binary_dir,"jar",files)
-    prof["collect"]["duration"] += prof_collect["duration"]
+        for fname in files:
+            prof_install = install_jar_file(fname,output_dir,_make_temp_unpack_dir(os.path.join(temp_dir,"JAR"),fname,temp_dir_counter),class_temp_dir)
+            temp_dir_counter += 1
 
-    for fname in files:
-        prof_install = install_jar_file(fname,output_dir,_make_temp_unpack_dir(os.path.join(temp_dir,"JAR"),fname,temp_dir_counter),class_temp_dir)
-        temp_dir_counter += 1
+            prof["unpack"]["duration"] += prof_install["unpack"]["duration"]
+            prof["collect"]["duration"] += prof_install["collect"]["duration"]
+            prof["install"] = add_prof_install(prof["install"], prof_install["install"])
 
-        prof["unpack"]["duration"] += prof_install["unpack"]["duration"]
-        prof["collect"]["duration"] += prof_install["collect"]["duration"]
-        prof["install"]["count"] += prof_install["install"]["count"]
-        prof["install"]["duration"] += prof_install["install"]["duration"]
-        prof["install"]["fullname"]["duration"] += prof_install["install"]["fullname"]["duration"]
-
-    files = []
-    prof_collect = collect_java_files(app_binary_dir, "war", files)
-    prof["collect"]["duration"] += prof_collect["duration"]
+        files = []
+        prof_collect = collect_java_files(app_binary_dir, "war", files)
+        prof["collect"]["duration"] += prof_collect["duration"]
 
-    for fname in files:
-        prof_install = install_war_file(fname,output_dir,_make_temp_unpack_dir(os.path.join(temp_dir,"WAR"),fname,temp_dir_counter),class_temp_dir)
-        temp_dir_counter += 1
+        for fname in files:
+            prof_install = install_war_file(fname,output_dir,_make_temp_unpack_dir(os.path.join(temp_dir,"WAR"),fname,temp_dir_counter),class_temp_dir)
+            temp_dir_counter += 1
 
-        prof["unpack"]["duration"] += prof_install["unpack"]["duration"]
-        prof["collect"]["duration"] += prof_install["collect"]["duration"]
-        prof["install"]["count"] += prof_install["install"]["count"]
-        prof["install"]["duration"] += prof_install["install"]["duration"]
-        prof["install"]["fullname"]["duration"] += prof_install["install"]["fullname"]["duration"]
+            prof["unpack"]["duration"] += prof_install["unpack"]["duration"]
+            prof["collect"]["duration"] += prof_install["collect"]["duration"]
+            prof["install"] = add_prof_install(prof["install"], prof_install["install"])
 
     prof["duration"] = time.time() - prof_start_time
     return prof

security-scanner/run.py

@@ -57,6 +57,7 @@ def __parse_cmd_line():
     parser.add_argument("--verbosity", type=int, default=9,
                         help="It specifies how many debugging messages will be printed to the standard output stream "
                              "during the analysis.")
+    parser.add_argument("--use-models-library", action="store_true", help="Add the Diffblue models library to the application JAR")
     parser.add_argument("--data-flow-insensitive-instrumentation", action="store_true",
                         help="If specified, then the tool 'security-analyser' will use the data-flow insensitive "
                              "instrumentation of the checked properties into the output GOTO programs. In that case"
@@ -82,8 +83,15 @@ def evaluate(cmdline):
 
     print("Collecting Java CLASS files to analyse:")
 
+    input_search_dirs = [cmdline.install_dir]
+    if cmdline.use_models_library:
+      input_search_dirs.append(os.path.join(__get_my_dir(), "../benchmarks/LIBRARIES/models/model/target/classes"))
+      if not os.path.exists(input_search_dirs[-1]):
+        repo_root = os.path.realpath(os.path.join(__get_my_dir(), ".."))
+        raise Exception("Models library not found at %s; consider running 'make' in %s" % (input_search_dirs[-1], repo_root))
+
     prof["install_classes"] = mkbench.build_classes_configuration(
-        cmdline.install_dir,
+        input_search_dirs,
         os.path.abspath(os.path.join(cmdline.temp_dir,"BIN","CLASSES")),
         os.path.abspath(os.path.join(cmdline.temp_dir,"BIN","UNPACK"))
         )