Functionality to render stats and vulnerbilities on new page

Author: MFrikken

src/main/java/com/codeboy/Main.java

@@ -1,19 +1,13 @@
 package com.codeboy;
 
-import com.codeboy.controller.FileController;
 import com.codeboy.controller.ViewController;
-import com.codeboy.controller.VulnerabilityController;
-import com.codeboy.controller.WeaknessController;
-import com.codeboy.utility.FileReaderUtility;
-import com.codeboy.utility.JavaScriptBridge;
 import javafx.application.Application;
 import javafx.scene.Scene;
 import javafx.scene.image.Image;
 import javafx.scene.layout.StackPane;
 import javafx.scene.web.WebEngine;
 import javafx.scene.web.WebView;
 import javafx.stage.Stage;
-import netscape.javascript.JSObject;
 
 import java.awt.*;
 import java.io.File;
@@ -30,18 +24,20 @@ public static void main(String[] args) {
     public void start(Stage stage) {
         WebView webView = new WebView();
         WebEngine webEngine = webView.getEngine();
+        webEngine.setJavaScriptEnabled(true);
 
-        ViewController viewController = new ViewController(webEngine);
+        new ViewController(webEngine);
 
         webEngine.setOnError(event -> LOGGER.warning("[Frontend] An error occured on the frontend: " + event.getMessage()));
+
         File htmlFile = new File(getClass().getResource("/html/index.html").getFile());
         webEngine.load(htmlFile.toURI().toString());
-        webEngine.setJavaScriptEnabled(true);
 
         StackPane root = new StackPane(webView);
         Scene scene = new Scene(root, 1500, 900);
         stage.setScene(scene);
         stage.setTitle("CodeBoy Desktop");
+
         if (Taskbar.isTaskbarSupported()) {
             Taskbar taskbar = Taskbar.getTaskbar();
 
@@ -55,6 +51,4 @@ public void start(Stage stage) {
         }
         stage.show();
     }
-
-
 }

src/main/java/com/codeboy/controller/ViewController.java

@@ -2,40 +2,40 @@
 
 import com.codeboy.utility.FileReaderUtility;
 import com.codeboy.utility.JavaScriptBridge;
-import javafx.concurrent.Worker;
 import javafx.scene.web.WebEngine;
 import netscape.javascript.JSObject;
 
-import java.io.File;
-import java.util.function.Consumer;
-
-// TODO:
-// https://stackoverflow.com/questions/32564195/load-a-new-page-in-javafx-webview
 public class ViewController {
 
-    private JSObject window;
+    private final WebEngine webEngine;
 
     public ViewController(WebEngine webEngine) {
+        this.webEngine = webEngine;
         webEngine.getLoadWorker().stateProperty().addListener((obs, oldState, newState) -> {
             if (newState == javafx.concurrent.Worker.State.SUCCEEDED) {
-                JSObject window = (JSObject) webEngine.executeScript("window");
-                window.setMember("viewController", new ViewController(webEngine));
-                window.setMember("fileController", FileController.getInstance());
-                window.setMember("weaknessController", WeaknessController.getInstance());
-                window.setMember("vulnerabilityController", VulnerabilityController.getInstance());
-                window.setMember("fileReader", FileReaderUtility.getInstance());
-
-                // TODO: remove later - just for debugging purposes
-                window.setMember("javascriptBridge", new JavaScriptBridge());
-                webEngine.executeScript("""
-                            console.log = function(msg) {
-                                javascriptBridge.log(msg);
-                            };
-                            console.error = function(msg) {
-                                javascriptBridge.error(msg);
-                            };
-                        """);
+                injectJavaControllers();
             }
         });
     }
+
+    private void injectJavaControllers() {
+        JSObject window = (JSObject) webEngine.executeScript("window");
+
+        window.setMember("viewController", this);
+        window.setMember("fileController", FileController.getInstance());
+        window.setMember("weaknessController", WeaknessController.getInstance());
+        window.setMember("vulnerabilityController", VulnerabilityController.getInstance());
+        window.setMember("fileReader", FileReaderUtility.getInstance());
+
+        // TODO: remove later - just for debugging purposes
+        window.setMember("javascriptBridge", new JavaScriptBridge());
+        webEngine.executeScript("""
+                    console.log = function(msg) {
+                        javascriptBridge.log(msg);
+                    };
+                    console.error = function(msg) {
+                        javascriptBridge.error(msg);
+                    };
+                """);
+    }
 }

src/main/java/com/codeboy/controller/VulnerabilityController.java

@@ -1,10 +1,14 @@
 package com.codeboy.controller;
 
 import com.codeboy.dto.VulnerabilityDto;
+import com.codeboy.model.vulnerability.VulnerabilityModel;
 import com.codeboy.service.VulnerabilityService;
+import com.codeboy.utility.JsonParser;
+
+import java.util.List;
 
 public class VulnerabilityController {
-    private static VulnerabilityController instance; 
+    private static VulnerabilityController instance;
     private static VulnerabilityService vulnerabilityService;
 
     private VulnerabilityController() {
@@ -20,4 +24,12 @@ public static VulnerabilityController getInstance() {
     public VulnerabilityDto getById(Integer id) {
         return vulnerabilityService.getById(id);
     }
+
+    public String getAll() {
+        return JsonParser.asJsonString(vulnerabilityService.getAll());
+    }
+
+    public String fetchStatistics() {
+        return JsonParser.asJsonString(vulnerabilityService.getStatistics());
+    }
 }

src/main/java/com/codeboy/controller/WeaknessController.java

@@ -1,6 +1,6 @@
 package com.codeboy.controller;
 
-import com.codeboy.model.weakness.WeaknessDto;
+import com.codeboy.dto.WeaknessDto;
 import com.codeboy.service.WeaknessService;
 
 public class WeaknessController {

src/main/java/com/codeboy/dao/WeaknessDao.java

@@ -94,7 +94,7 @@ public List<WeaknessModel> readAll() {
     public List<WeaknessModel> fetchAllByVulnerabilityId(Integer vulnerabilityId) {
         EntityManager entityManager = JPAManager.getEntityManager();
 
-        String query = "SELECT w FROM WeaknessModel WHERE w.vulnerability_id = :vulnerabilityId";
+        String query = "SELECT w FROM WeaknessModel w WHERE w.vulnerability.id = :vulnerabilityId";
 
         try {
             List<WeaknessModel> weaknessModels = entityManager.createQuery(query, WeaknessModel.class)

src/main/java/com/codeboy/dto/VulnerabilityDto.java

@@ -5,28 +5,81 @@
 
 import java.util.List;
 
-public class VulnerabilityDto extends VulnerabilityModel {
-    private List<WeaknessModel> weaknesses;
+public class VulnerabilityDto {
+    private String id;
+    public String category;
+    public String name;
+    public String description;
+    public String cve;
+    public String severity;
+    public String locationFile;
+    public String locationLineStart;
+    public String locationLineEnd;
+    private List<WeaknessDto> weaknesses;
 
-    public VulnerabilityDto(Integer id, String category, String name, String description, String cve, String severity, String locationFile, String locationLineStart, List<WeaknessModel> weaknesses) {
-        super(category, name, description, cve, severity, locationFile, locationLineStart);
+    public VulnerabilityDto(String id, String category, String name, String description, String cve, String severity, String locationFile, String locationLineStart, List<WeaknessDto> weaknesses) {
+        this.id = id;
+        this.category = category;
+        this.name = name;
+        this.description = description;
+        this.cve = cve;
+        this.severity = severity;
+        this.locationFile = locationFile;
+        this.locationLineStart = locationLineStart;
         this.weaknesses = weaknesses;
     }
 
-    public VulnerabilityDto(VulnerabilityModel vulnerability, List<WeaknessModel> weaknesses) {
-        super(
+    public static VulnerabilityDto from(VulnerabilityModel vulnerability, List<WeaknessDto> weaknesses) {
+        return new VulnerabilityDto(
+                String.valueOf(vulnerability.getId()),
                 vulnerability.getCategory(),
                 vulnerability.getName(),
                 vulnerability.getDescription(),
                 vulnerability.getCve(),
                 vulnerability.getSeverity(),
                 vulnerability.getLocationFile(),
-                vulnerability.getLocationLineStart()
+                vulnerability.getLocationLineStart(),
+                weaknesses
         );
-        this.weaknesses = weaknesses;
     }
 
-    public List<WeaknessModel> getWeaknesses() {
+    public String getId() {
+        return id;
+    }
+
+    public String getCategory() {
+        return category;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public String getCve() {
+        return cve;
+    }
+
+    public String getSeverity() {
+        return severity;
+    }
+
+    public String getLocationFile() {
+        return locationFile;
+    }
+
+    public String getLocationLineStart() {
+        return locationLineStart;
+    }
+
+    public String getLocationLineEnd() {
+        return locationLineEnd;
+    }
+
+    public List<WeaknessDto> getWeaknesses() {
         return this.weaknesses;
     }
 
@@ -41,4 +94,10 @@ public VulnerabilityModel toModel() {
                 this.getLocationLineStart()
         );
     }
+
+    @Override
+    public String toString() {
+        return "id: " + this.id + ", severity: " + this.severity + ", category: " + this.category + ", name: " + this.name;
+    }
 }
+

…/codeboy/model/weakness/WeaknessDto.java …in/java/com/codeboy/dto/WeaknessDto.javasrc/main/java/com/codeboy/model/weakness/WeaknessDto.java renamed to src/main/java/com/codeboy/dto/WeaknessDto.java src/main/java/com/codeboy/model/weakness/WeaknessDto.java renamed to src/main/java/com/codeboy/dto/WeaknessDto.java

@@ -1,6 +1,7 @@
-package com.codeboy.model.weakness;
+package com.codeboy.dto;
 
 import com.codeboy.model.vulnerability.VulnerabilityModel;
+import com.codeboy.model.weakness.WeaknessModel;
 import com.codeboy.utility.JsonParser;
 
 /**

src/main/java/com/codeboy/model/vulnerability/VulnerabilityModel.java

@@ -1,5 +1,6 @@
 package com.codeboy.model.vulnerability;
 
+import com.codeboy.dto.WeaknessDto;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.codeboy.dto.VulnerabilityDto;
 import com.codeboy.model.weakness.WeaknessModel;
@@ -119,8 +120,8 @@ public String asSQLValues() {
         );
     }
 
-    public VulnerabilityDto toDto(List<WeaknessModel> weaknesses) {
-        return new VulnerabilityDto(this, weaknesses);
+    public VulnerabilityDto toDto(List<WeaknessDto> weaknessDtos) {
+        return VulnerabilityDto.from(this, weaknessDtos);
     }
 
     private String escape(String s) {

src/main/java/com/codeboy/model/weakness/WeaknessModel.java

@@ -1,5 +1,6 @@
 package com.codeboy.model.weakness;
 
+import com.codeboy.dto.WeaknessDto;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.codeboy.model.vulnerability.VulnerabilityModel;
 import com.codeboy.utility.JsonParser;
@@ -48,7 +49,7 @@ public WeaknessModel(VulnerabilityModel vulnerability, String type, String name,
     public String getValue() { return value; }
     public String getUrl() { return url; }
 
-    public WeaknessDto toWeaknessDto() {
+    public WeaknessDto toDto() {
         return new WeaknessDto(type, name, value, url);
     }
 

src/main/java/com/codeboy/service/VulnerabilityService.java

@@ -1,11 +1,13 @@
 package com.codeboy.service;
 
 import com.codeboy.dto.VulnerabilityDto;
+import com.codeboy.dto.WeaknessDto;
 import com.codeboy.model.vulnerability.VulnerabilityModel;
 import com.codeboy.model.weakness.WeaknessModel;
 import com.codeboy.repository.VulnerabilityRepository;
 import com.codeboy.repository.WeaknessRepository;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
@@ -25,11 +27,22 @@ public HashMap<String, Integer> getStatistics() {
 
     public VulnerabilityDto getById(Integer id) {
         VulnerabilityModel vulnerability = this.vulnerabilityRepository.getByID(id);
-        List<WeaknessModel> weaknesses = this.weaknessRepository.getAllByVulnerabilityId(id);
+        List<WeaknessDto> weaknesses = this.weaknessRepository.getAllByVulnerabilityId(vulnerability.getId()).stream()
+                .map(WeaknessModel::toDto)
+                .toList();
         return vulnerability.toDto(weaknesses);
     }
 
-    public void getAll() {
-        // TODO: implement method
+    public List<VulnerabilityDto> getAll() {
+        List<VulnerabilityModel> models = this.vulnerabilityRepository.getAll();
+        if (models == null || models.isEmpty()) {
+            throw new RuntimeException("No VulnerabilityModels found");
+        }
+        List<VulnerabilityDto> dtos = new ArrayList<>();
+        for (VulnerabilityModel vulnerabilityModel : models) {
+            List<WeaknessModel> weaknessModels = weaknessRepository.getAllByVulnerabilityId(vulnerabilityModel.getId());
+            dtos.add(vulnerabilityModel.toDto(weaknessModels.stream().map(WeaknessModel::toDto).toList()));
+        }
+        return dtos;
     }
 }