Merge pull request #20 from hangga/devel-build-report

update : move report files

Author: hangga

src/main/java/io/github/hangga/delvelin/cwedetectors/GeneralScanner.java

@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -11,9 +12,23 @@
 
 public class GeneralScanner {
 
-    private final List<BaseDetector> detectors = Arrays.asList(
+//    private final List<BaseDetector> detectors = Arrays.asList(
+//        new ThreadDetector(),
+//        //        new NonAtomicDetector(),
+//        new HardCodedSecretDetector(),
+//        new NonThreadSafeDetector(),
+//        new XSSDetector(),
+//        new SQLInjectionDetector(),
+//        new CmdInjectionDetector(),
+//        new WeakCryptographicDetector(),
+//        new InsecureHttpDetector(),
+//        new OsvDetector()
+//        // add new detector here
+//    );
+
+    private final List<BaseDetector> detectors = new ArrayList<>(Arrays.asList(
         new ThreadDetector(),
-        //        new NonAtomicDetector(),
+        // new NonAtomicDetector(),
         new HardCodedSecretDetector(),
         new NonThreadSafeDetector(),
         new XSSDetector(),
@@ -23,7 +38,8 @@ public class GeneralScanner {
         new InsecureHttpDetector(),
         new OsvDetector()
         // add new detector here
-    );
+    ));
+
 
     private boolean shouldSkipLine(String line) {
         return line.startsWith("import") || line.startsWith("public void") || line.startsWith("private void") || line.startsWith("protected void") ||

src/main/java/io/github/hangga/delvelin/properties/Config.java

@@ -9,5 +9,5 @@ public class Config {
 
     public static OutputFileFormat outputFileFormat = OutputFileFormat.LOG;
 
-    public static String VERSION = "0.2.0-beta";
+    public static String VERSION = "0.2.1-beta";
 }

src/main/java/io/github/hangga/delvelin/utils/FileUtil.java

@@ -35,22 +35,55 @@ public static String extract(Path path) throws IOException {
         return new String(Files.readAllBytes(path));
     }
 
+//    public static void saveOutputFile(String content, String extName) {
+//        Path path = FileUtil.getBasePath();
+//        Path outputPath = Paths.get(path.toString(), "vulnerability-report" + extName);
+//        try {
+//            Files.write(outputPath, content.getBytes());
+//            if (Desktop.isDesktopSupported() && extName.equalsIgnoreCase(".html") && Config.isAutoLaunchBrowser) {
+//                Desktop.getDesktop()
+//                    .browse(outputPath.toUri());
+//            } else {
+//                System.out.println("Report saved: file://" + outputPath.toAbsolutePath());
+//            }
+//        } catch (IOException e) {
+//            throw new RuntimeException("Failed to save HTML report to file: " + path, e);
+//        }
+//    }
+
     public static void saveOutputFile(String content, String extName) {
-        Path path = FileUtil.getBasePath();
-        Path outputPath = Paths.get(path.toString(), "vulnerability-report" + extName);
+        Path basePath;
+
+        if (Files.exists(Paths.get("target", "surefire-reports"))) {
+            basePath = Paths.get("target", "surefire-reports"); // Maven Surefire (Unit Test)
+        } else if (Files.exists(Paths.get("target", "failsafe-reports"))) {
+            basePath = Paths.get("target", "failsafe-reports"); // Maven Failsafe (Integration Test)
+        } else if (Files.exists(Paths.get("build", "reports", "tests", "test"))) {
+            basePath = Paths.get("build", "reports", "tests", "test"); // Gradle JUnit
+        } else {
+            basePath = FileUtil.getBasePath(); // Fallback jika tidak ditemukan
+        }
+
+        saveFile(content, extName, basePath);
+    }
+
+    private static void saveFile(String content, String extName, Path basePath) {
         try {
+            Files.createDirectories(basePath);
+            Path outputPath = basePath.resolve("vulnerability-report" + extName);
             Files.write(outputPath, content.getBytes());
+
             if (Desktop.isDesktopSupported() && extName.equalsIgnoreCase(".html") && Config.isAutoLaunchBrowser) {
-                Desktop.getDesktop()
-                    .browse(outputPath.toUri());
+                Desktop.getDesktop().browse(outputPath.toUri());
             } else {
                 System.out.println("Report saved: file://" + outputPath.toAbsolutePath());
             }
         } catch (IOException e) {
-            throw new RuntimeException("Failed to save HTML report to file: " + path, e);
+            throw new RuntimeException("Failed to save report to file: " + basePath, e);
         }
     }
 
+
     public static void saveOutputCustom(String content, String extName) {
         JFileChooser fileChooser = getJFileChooser(extName);
         // Show save dialog and get the user's choice