Add option to specify location of models.jar

Author: Owen Jones

driver/run.py

@@ -15,14 +15,15 @@
 def _get_my_dir(): return os.path.dirname(os.path.realpath(__file__))
 
 
-def _get_common_libraries():
+def _get_common_libraries(diffblue_models_library_location):
 
     def get_benchmark_library_dir():
         return os.path.abspath(os.path.join(_get_my_dir(), "../benchmarks/LIBRARIES"))
 
-    def get_diffblue_models_library_props():
+    def get_diffblue_models_library_props(pathname):
         props = {"diffblue_models_library": {"paths": [], "error": None}}
-        pathname = os.path.join(get_benchmark_library_dir(), "models", "model", "target", "models.jar")
+        if pathname is None:
+            pathname = os.path.join(get_benchmark_library_dir(), "models", "model", "target", "models.jar")
         if os.path.isfile(pathname):
             props["diffblue_models_library"]["paths"].append(pathname)
         else:
@@ -82,7 +83,7 @@ def get_javax_xxe_library_props():
         return props
 
     result = {}
-    result.update(get_diffblue_models_library_props())
+    result.update(get_diffblue_models_library_props(diffblue_models_library_location))
     result.update(get_java_runtime_library())
     result.update(get_apache_tomcat_props())
     result.update(get_spring_framework_props())
@@ -162,6 +163,9 @@ def create_parser():
     parser.add_argument("--use-models-library", action="store_true",
                         help="Add the Diffblue Models Library's JAR file to the classpath of the security-scanner. "
                              "It will be put in front of the JARs of the analysed web application.")
+    parser.add_argument("--models-library-location", type=str,
+                        help="Absolute path of the models library. Only works if --use-models-library is set. (Will be "
+                             "removed soon)")
     parser.add_argument("--use-java-runtime-library", action="store_true",
                         help="Add the Java standard library to the classpath. First, there will be attempt to add "
                              "OpenJDK version of the library. If it is not found (e.g. not installed), then the "
@@ -428,7 +432,7 @@ def __main():
               analyser.get_missing_binary_error_message())
         return
 
-    common_libraries = _get_common_libraries()
+    common_libraries = _get_common_libraries(cmdline.models_library_location)
 
     if cmdline.use_models_library:
         if common_libraries["diffblue_models_library"]["error"] is not None: