fix #2 #3 #5

Author: waderwu

.gradle/7.4/executionHistory/executionHistory.bin

@@ -17,8 +17,10 @@ Options:
   --allow-phantom                       Allow phantom classes.
   -d <directory>                        Specify where to generate output fact files.
   -i <archive>                          Find classes in <archive>.
+  -i-dir <directory>                    Find classes/jar in <directory>.
   -l <archive>                          Find library classes in <archive>.
   -ld <archive>                         Find dependency classes in <archive>.
+  -ld-dir <directory>                   Find dependency classes/jar in <directory>.
   -lsystem                              Find classes in default system classes.
   --facts-subset <subset>               Produce facts only for a subset of the given classes [APP, APP_N_DEPS, PLATFORM].
   --ignore-factgen-errors               Continue with the analysis even if fact generation fails.
@@ -50,7 +52,11 @@ java -jar soot-fact-generator.jar -i input.jar  -l /usr/lib/jvm/java-8-oracle/jr
 其中
 - `-i` 指定待分析的jar包
 - `-l` 指定依赖库
--  `--generate-jimple` 表示生成中间语言jimple
--  `--allow-phantom` 大概是允许解析依赖不存在的类
--  `--full` 表示对所有class进行解析
--  `-d` 指定输出目录
+- `--generate-jimple` 表示生成中间语言jimple
+- `--allow-phantom` 大概是允许解析依赖不存在的类
+- `--full` 表示对所有class进行解析
+- `-d` 指定输出目录
+
+另外还额外增加了
+- `-i-dir` 指定待分析的jar目录
+- `-ld-dir` 指定待分析的依赖目录

.gradle/7.4/executionHistory/executionHistory.lock

@@ -86,20 +86,27 @@ else if ((isJar || isAar || isZip || isWar) && entryName.endsWith(".xml")) {
                 XMLFactGenerator.processFile(xmlTmpFile, db, "", parameters._debug);
             }
         };
+
         if (isWar) {
             System.out.println("Processing WAR: " + filename);
             // Process WAR inputs.
             parameters.processFatArchives(tmpDirs);
-        }
-
-        if (isSpringBoot) {
+        }else if (isSpringBoot) {
             System.out.println("Processing springBoot: " + filename);
             parameters.processSpringBootArchives(tmpDirs, filename);
-        }
-
-        if (isJar || isApk || isZip || isWar)
+            parameters.getInputs().forEach(file -> {
+                try{
+//                    System.out.println(file);
+                    artScanner.processArchive(file, classSet::add, gProc);
+                }catch (Exception e){
+                    e.printStackTrace();
+                }
+            });
+            artScanner.processArchive(filename, classSet::add, gProc);
+        }else if (isJar || isApk || isZip || isWar)
+        {
             artScanner.processArchive(filename, classSet::add, gProc);
-        else if (isClass) {
+        } else if (isClass) {
             File f = new File(filename);
             try (FileInputStream fis = new FileInputStream(f)) {
                 artScanner.processClass(fis, f, classSet::add);

.gradle/7.4/fileHashes/fileHashes.bin

@@ -161,13 +161,13 @@ protected int processNextArg(String[] args, int i) throws DoopErrorCodeException
             i = shift(args, i);
             _inputs.add(args[i]);
             break;
-        case "-idir":
+        case "-i-dir":
             i = shift(args, i);
             File inputDir = new File(args[i]);
             File[] files = inputDir.listFiles();
             if (files != null) {
                 for (File file : files) {
-                    if (file.getName().endsWith(".jar")) {
+                    if (file.getName().endsWith(".jar") || file.getName().endsWith(".class")) {
                         try{
                             _inputs.add(file.getCanonicalPath());
                         }catch (Exception e){
@@ -191,6 +191,22 @@ protected int processNextArg(String[] args, int i) throws DoopErrorCodeException
             i = shift(args, i);
             _dependencies.add(args[i]);
             break;
+        case "-ld-dir":
+            i = shift(args, i);
+            File dependencyDir = new File(args[i]);
+            File[] dependencies = dependencyDir.listFiles();
+            if (dependencies != null) {
+                for (File file : dependencies) {
+                    if (file.getName().endsWith(".jar") || file.getName().endsWith(".class")) {
+                        try{
+                            _dependencies.add(file.getCanonicalPath());
+                        }catch (Exception e){
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            }
+            break;
         case "-d":
             i = shift(args, i);
             setOutputDir(args[i]);

.gradle/7.4/fileHashes/fileHashes.lock

@@ -91,6 +91,9 @@ public static void processFile(File xmlFile, Database db, String topDir, boolean
 
     private void parse(boolean debug) throws IOException, SAXException, ParserConfigurationException {
         SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setFeature("http://xml.org/sax/features/external-general-entities", false);
+        spf.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+        spf.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
         spf.setNamespaceAware(true);
         XMLReader xmlReader = spf.newSAXParser().getXMLReader();
         xmlReader.setContentHandler(this);

.gradle/7.4/fileHashes/resourceHashesCache.bin

@@ -73,6 +73,7 @@ private static void addBasicClasses(Scene scene) {
          * input fact generation thus leading to different analysis results
          */
         scene.addBasicClass("sun.net.www.protocol.ftp.FtpURLConnection", SootClass.HIERARCHY);
+        scene.addBasicClass("io.netty.channel.ChannelFutureListener", SootClass.HIERARCHY);
         scene.addBasicClass("javax.crypto.extObjectInputStream");
         /*
          * For simulating the FileSystem class, we need the implementation

.gradle/buildOutputCleanup/buildOutputCleanup.lock

@@ -35,6 +35,11 @@ public static void main(String[] args) throws Exception {
             return;
         }
 
+        if ((args.length == 1) && (args[0].equals("--help") || args[0].equals("-h"))){
+            SootParameters.showHelp();
+            return;
+        }
+
         try {
             produceFacts(args);
         } catch (Exception ex) {
@@ -187,7 +192,10 @@ private static void invokeSoot(SootParameters sootParameters, Database db, Set<S
             Options.v().set_main_class(mainClass);
 
         if (sootParameters._mode == SootParameters.Mode.FULL)
+        {
             Options.v().set_full_resolver(true);
+            Options.v().set_whole_program(true);
+        }
 
         if (sootParameters._allowPhantom)
             Options.v().set_allow_phantom_refs(true);

.gradle/file-system.probe

@@ -90,9 +90,10 @@ static void showHelp() {
         System.err.println("  --allow-phantom                       Allow phantom classes.");
         System.err.println("  -d <directory>                        Specify where to generate output fact files.");
         System.err.println("  -i <archive>                          Find classes in <archive>.");
-        System.err.println("  -idir <directory>                     Find classes/jar in <directory>.");
+        System.err.println("  -i-dir <directory>                    Find classes/jar in <directory>.");
         System.err.println("  -l <archive>                          Find library classes in <archive>.");
         System.err.println("  -ld <archive>                         Find dependency classes in <archive>.");
+        System.err.println("  -ld-dir <directory>                   Find dependency classes/jar in <directory>.");
         System.err.println("  -lsystem                              Find classes in default system classes.");
         System.err.println("  --facts-subset <subset>               Produce facts only for a subset of the given classes " + Arrays.asList(Parameters.FactsSubSet.values()) + ".");
         System.err.println("  --ignore-factgen-errors               Continue with the analysis even if fact generation fails.");