Framework extended to reproduce Sakai's issue (introduced config file "jars.json" with explicit set of JARs to be used).

Author: marek-trtik

regression/december_demo_sprint/Sakai/APP/jars.json

@@ -0,0 +1,6 @@
+[
+  "sakai-velocity-tool-12-SNAPSHOT.jar",
+  "sakai-kernel-util-12-SNAPSHOT.jar",
+  "sakai-assignment-api-12-SNAPSHOT.jar"
+]
+

regression/december_demo_sprint/goto-analyzer/run.py

@@ -48,7 +48,7 @@ def parse_cmd_line():
                         help="When specified, the directories -T and -R are deleted at the beginning of the analysis. "
                              "This has an effect to running the analysis from scratch without reuse of any data "
                              "computed in the previous run of the analyser of the specified benchmark.")
-    parser.add_argument("--timeout", type=int, default=300,
+    parser.add_argument("--timeout", type=int, default=900,
                          help="A timeout in seconds for the goto-analyser. It means that it is NOT a timeout for "
                               "whole the analysis. Namely, it does not include preprocessing steps of WAR/JAR file "
                               "for goto-analyses nor saving results from the analysis. Also, since goto-analyser "

regression/december_demo_sprint/goto-analyzer/scripts/analyser.py

@@ -1,6 +1,7 @@
 import os
 import shutil
 import time
+import json
 
 
 def __get_my_dir(): return os.path.dirname(os.path.realpath(__file__))
@@ -75,9 +76,32 @@ def run_goto_analyser(
 
     classpath = os.path.relpath(os.path.abspath(os.path.join(__get_my_dir(),rt_dir)),results_dir)
 
-    for jar in jars_cfg["jars"]:
-        if not (jar == root_jar):
-            classpath += ":" + os.path.relpath(jar, results_dir)
+    explicit_jars_list = []
+    explicit_jars_fname = os.path.join(os.path.dirname(taint_json_file),"jars.json")
+    if os.path.exists(explicit_jars_fname) and os.path.isfile(explicit_jars_fname):
+        explicit_jars_file = open(explicit_jars_fname, "r")
+        try:
+            explicit_jars_list = json.load(explicit_jars_file)
+        except:
+            print("ERROR: Incorrect format of JSON file: " + explicit_jars_file)
+            print("ERROR: Terminating the analysis of the Java web application with FAILURE.")
+            return
+        explicit_jars_file.close()
+
+    if len(explicit_jars_list) == 0:
+        for jar in jars_cfg["jars"]:
+            if not (jar == root_jar):
+                classpath += ":" + os.path.relpath(jar, results_dir)
+    else:
+        for jar in jars_cfg["jars"]:
+            found = False
+            for jar_name in explicit_jars_list:
+                if jar_name in jar:
+                    found = True
+                    break
+            if found and not (jar == root_jar):
+                classpath += ":" + os.path.relpath(jar, results_dir)
+
     if not os.path.exists(results_dir):
         os.makedirs(results_dir)