Moving Scanner-Core dependency from scanner-core 5.5.0 to 6.2.3 and fix deserialization issues

pom.xml

@@ -125,7 +125,7 @@
         <dependency>
             <groupId>de.rub.nds</groupId>
             <artifactId>scanner-core</artifactId>
-            <version>5.5.0</version>
+            <version>6.2.3</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

src/main/java/de/rub/nds/crawler/data/ScanJobDescription.java

@@ -12,9 +12,12 @@
 import java.io.IOException;
 import java.io.Serializable;
 import java.util.Optional;
+import java.util.UUID;
 
 public class ScanJobDescription implements Serializable {
 
+    private final UUID id = UUID.randomUUID();
+
     private final ScanTarget scanTarget;
 
     // Metadata
@@ -52,6 +55,10 @@ public ScanJobDescription(ScanTarget scanTarget, BulkScan bulkScan, JobStatus st
                 status);
     }
 
+    public UUID getId() {
+        return id;
+    }
+
     private void readObject(java.io.ObjectInputStream in)
             throws IOException, ClassNotFoundException {
         // handle deserialization, cf. https://stackoverflow.com/a/3960558

src/main/java/de/rub/nds/crawler/data/ScanResult.java

@@ -8,6 +8,7 @@
  */
 package de.rub.nds.crawler.data;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import de.rub.nds.crawler.constant.JobStatus;
 import java.io.Serializable;
@@ -26,8 +27,12 @@ public class ScanResult implements Serializable {
 
     private final Document result;
 
+    @JsonCreator
     private ScanResult(
-            String bulkScan, ScanTarget scanTarget, JobStatus jobStatus, Document result) {
+            @JsonProperty("bulkScan") String bulkScan,
+            @JsonProperty("scanTarget") ScanTarget scanTarget,
+            @JsonProperty("resultStatus") JobStatus jobStatus,
+            @JsonProperty("result") Document result) {
         this.id = UUID.randomUUID().toString();
         this.bulkScan = bulkScan;
         this.scanTarget = scanTarget;

src/main/java/de/rub/nds/crawler/persistence/IPersistenceProvider.java

@@ -11,6 +11,7 @@
 import de.rub.nds.crawler.data.BulkScan;
 import de.rub.nds.crawler.data.ScanJobDescription;
 import de.rub.nds.crawler.data.ScanResult;
+import java.util.List;
 
 /**
  * Persistence provider interface. Exposes methods to write out the different stages of a task to a
@@ -40,4 +41,24 @@ public interface IPersistenceProvider {
      * @param bulkScan The bulk scan to update.
      */
     void updateBulkScan(BulkScan bulkScan);
+
+    /**
+     * Retrieve scan results for a specific target hostname or IP.
+     *
+     * @param dbName The database name where the scan results are stored.
+     * @param collectionName The collection name where the scan results are stored.
+     * @param target The hostname or IP address to search for.
+     * @return A list of scan results matching the target.
+     */
+    List<ScanResult> getScanResultsByTarget(String dbName, String collectionName, String target);
+
+    /**
+     * Retrieve a specific scan result by its ID.
+     *
+     * @param dbName The database name where the scan result is stored.
+     * @param collectionName The collection name where the scan result is stored.
+     * @param id The ID of the scan result to retrieve.
+     * @return The scan result, or null if not found.
+     */
+    ScanResult getScanResultById(String dbName, String collectionName, String id);
 }

src/main/java/de/rub/nds/crawler/persistence/MongoPersistenceProvider.java

@@ -35,7 +35,9 @@
 import java.math.BigDecimal;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import org.apache.commons.lang3.tuple.Pair;
@@ -270,4 +272,75 @@ public void insertScanResult(ScanResult scanResult, ScanJobDescription scanJobDe
             }
         }
     }
+
+    @Override
+    public List<ScanResult> getScanResultsByTarget(
+            String dbName, String collectionName, String target) {
+        LOGGER.info(
+                "Retrieving scan results for target {} from collection: {}.{}",
+                target,
+                dbName,
+                collectionName);
+
+        try {
+            var collection = resultCollectionCache.getUnchecked(Pair.of(dbName, collectionName));
+
+            // Create a query that matches either hostname or IP
+            var query = new org.bson.Document();
+            var orQuery = new ArrayList<org.bson.Document>();
+            orQuery.add(new org.bson.Document("scanTarget.hostname", target));
+            orQuery.add(new org.bson.Document("scanTarget.ip", target));
+            query.append("$or", orQuery);
+
+            var iterable = collection.find(query);
+
+            List<ScanResult> results = new ArrayList<>();
+            iterable.forEach(results::add);
+
+            LOGGER.info(
+                    "Retrieved {} scan results for target {} from collection: {}.{}",
+                    results.size(),
+                    target,
+                    dbName,
+                    collectionName);
+
+            return results;
+        } catch (Exception e) {
+            LOGGER.error("Exception while retrieving scan results from MongoDB: ", e);
+            throw new RuntimeException("Failed to retrieve scan results for target: " + target, e);
+        }
+    }
+
+    @Override
+    public ScanResult getScanResultById(String dbName, String collectionName, String id) {
+        LOGGER.info(
+                "Retrieving scan result with ID {} from collection: {}.{}",
+                id,
+                dbName,
+                collectionName);
+
+        try {
+            var collection = resultCollectionCache.getUnchecked(Pair.of(dbName, collectionName));
+            var result = collection.findOneById(id);
+
+            if (result == null) {
+                LOGGER.warn(
+                        "No scan result found with ID: {} in collection: {}.{}",
+                        id,
+                        dbName,
+                        collectionName);
+            } else {
+                LOGGER.info(
+                        "Retrieved scan result with ID: {} from collection: {}.{}",
+                        id,
+                        dbName,
+                        collectionName);
+            }
+
+            return result;
+        } catch (Exception e) {
+            LOGGER.error("Exception while retrieving scan result from MongoDB: ", e);
+            throw new RuntimeException("Failed to retrieve scan result with ID: " + id, e);
+        }
+    }
 }

src/test/java/de/rub/nds/crawler/dummy/DummyPersistenceProvider.java

@@ -13,6 +13,7 @@
 import de.rub.nds.crawler.data.ScanResult;
 import de.rub.nds.crawler.persistence.IPersistenceProvider;
 import java.util.ArrayList;
+import java.util.LinkedList;
 import java.util.List;
 
 public class DummyPersistenceProvider implements IPersistenceProvider {
@@ -31,4 +32,18 @@ public void insertBulkScan(BulkScan bulkScan) {
 
     @Override
     public void updateBulkScan(BulkScan bulkScan) {}
+
+    @Override
+    public List<ScanResult> getScanResultsByTarget(
+            String dbName, String collectionName, String target) {
+        return new LinkedList<>();
+    }
+
+    @Override
+    public ScanResult getScanResultById(String dbName, String collectionName, String id) {
+        return results.stream()
+                .filter(result -> result.getId().equals(id))
+                .findFirst()
+                .orElse(null);
+    }
 }