Merge pull request diffblue#204 from diffblue/feature/include_tomcat_classes

SEC-63 : Introduced option --use-tomcat-library.

Author: marek-trtik

security-scanner/run.py

@@ -11,6 +11,10 @@
 
 def __get_my_dir(): return os.path.dirname(os.path.realpath(__file__))
 
+def __get_benchmark_library_dir(): return os.path.join(__get_my_dir(), "../benchmarks/LIBRARIES")
+def __get_diffblue_models_library_dir(): return os.path.join(__get_benchmark_library_dir(), "models/model/target/classes")
+def __get_tomcat_library_dir(): return os.path.join(__get_benchmark_library_dir(), "apache-tomcat-9/lib")
+
 
 def __parse_cmd_line():
     parser = argparse.ArgumentParser(
@@ -50,14 +54,17 @@ def __parse_cmd_line():
                         help="If specified, then the analyser will save statistics in HTML format together "
                              "with in JSON format (which is always saved).")
     parser.add_argument("--dump-html-slice", action="store_true",
-                        help="If specified, then the analyser will save the sliced GOTO program in HTML format together "
-                             "with in JSON format (which is always saved).")
+                        help="If specified, then the analyser will save the sliced GOTO program in HTML format "
+                             "together with in JSON format (which is always saved).")
     parser.add_argument("--dump-html-program", action="store_true",
                         help="If specified, then the analysed program is dumped in HTML format.")
     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("--use-models-library", action="store_true",
+                        help="Add the Diffblue models library to the application JAR.")
+    parser.add_argument("--use-tomcat-library", action="store_true",
+                        help="Add the Tomcat 9 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"
@@ -85,10 +92,9 @@ def evaluate(cmdline):
 
     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))
+        input_search_dirs.append(__get_diffblue_models_library_dir())
+    if cmdline.use_tomcat_library:
+        input_search_dirs.append(__get_tomcat_library_dir())
 
     prof["install_classes"] = mkbench.build_classes_configuration(
         input_search_dirs,
@@ -218,6 +224,14 @@ def __main():
               analyser.get_symex_pathname() + "'.")
         return
 
+    if cmdline.use_models_library and not os.path.isdir(__get_diffblue_models_library_dir()):
+        print("ERROR: Models library not found at %s; consider running 'make' in %s" % (
+                __get_diffblue_models_library_dir(), os.path.realpath(os.path.join(__get_my_dir(), ".."))))
+        return
+    if cmdline.use_tomcat_library and not os.path.isdir(__get_tomcat_library_dir()):
+        print("ERROR: Tomcat 9 library was not found at " + __get_tomcat_library_dir() + "")
+        return
+
     if not os.path.exists(cmdline.results_dir):
         os.makedirs(cmdline.results_dir)
     if not os.path.exists(cmdline.temp_dir):