Serialization only through fields (#450)

* changed mapper to only serialize fields, not getter

* fixed override annotations and removed comment

* imporved visibility of fields in json report

* fixed json for client reports

* updated bom version

Author: ic0ns

TLS-Client-Scanner/src/main/java/de/rub/nds/tlsscanner/clientscanner/report/ClientReportSerializer.java

@@ -8,7 +8,9 @@
  */
 package de.rub.nds.tlsscanner.clientscanner.report;
 
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.databind.Module;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
@@ -35,6 +37,8 @@ public static void serialize(OutputStream stream, ClientReport scanReport) {
                 mapper.registerModule(modules);
             }
             mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
+            mapper.setVisibility(PropertyAccessor.GETTER, Visibility.NONE);
+            mapper.setVisibility(PropertyAccessor.FIELD, Visibility.ANY);
             mapper.configOverride(BigDecimal.class)
                     .setFormat(JsonFormat.Value.forShape(JsonFormat.Shape.STRING));
             mapper.writeValue(stream, scanReport);

TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/report/ServerReport.java

@@ -217,7 +217,6 @@ public synchronized List<InvalidCurveResponse> getInvalidCurveTestResultList() {
         return listResult == null ? null : listResult.getList();
     }
 
-    // TODO when is this NOTTESTEDYET set???
     public synchronized List<RaccoonAttackProbabilities> getRaccoonAttackProbabilities() {
         if (getResult(TlsAnalyzedProperty.RACCOON_ATTACK_PROBABILITIES)
                 == TestResults.NOT_TESTED_YET) {
@@ -269,10 +268,8 @@ public synchronized List<SimulatedClientResult> getSimulatedClientsResultList()
 
     public synchronized List<ApplicationProtocol> getSupportedApplicationProtocols() {
         ListResult<ApplicationProtocol> listResult =
-                (ListResult<ApplicationProtocol>)
-                        getListResult(
-                                TlsAnalyzedProperty.SUPPORTED_APPLICATIONS,
-                                ApplicationProtocol.class);
+                getListResult(
+                        TlsAnalyzedProperty.SUPPORTED_APPLICATIONS, ApplicationProtocol.class);
         return listResult == null ? null : listResult.getList();
     }
 
@@ -300,18 +297,22 @@ public synchronized Map<NamedGroup, NamedGroupWitness> getSupportedNamedGroupsWi
         return mapResult == null ? null : mapResult.getMap();
     }
 
+    @Override
     public synchronized int getScore() {
         return score;
     }
 
+    @Override
     public synchronized void setScore(int score) {
         this.score = score;
     }
 
+    @Override
     public synchronized ScoreReport getScoreReport() {
         return scoreReport;
     }
 
+    @Override
     public synchronized void setScoreReport(ScoreReport scoreReport) {
         this.scoreReport = scoreReport;
     }

TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/report/ServerReportSerializer.java

@@ -8,7 +8,9 @@
  */
 package de.rub.nds.tlsscanner.serverscanner.report;
 
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.databind.Module;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
@@ -46,9 +48,13 @@ public static void serialize(OutputStream stream, ServerReport scanReport) {
                 mapper.registerModule(modules);
             }
             mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
+            mapper.setVisibility(PropertyAccessor.GETTER, Visibility.NONE);
+            mapper.setVisibility(PropertyAccessor.FIELD, Visibility.ANY);
+
             mapper.configOverride(BigDecimal.class)
                     .setFormat(JsonFormat.Value.forShape(JsonFormat.Shape.STRING));
             mapper.writeValue(stream, scanReport);
+
         } catch (IOException ex) {
             LOGGER.error(ex);
         }

pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.rub.nds</groupId>
         <artifactId>protocol-toolkit-bom</artifactId>
-        <version>4.4.1</version>
+        <version>4.4.3</version>
     </parent>
 
     <groupId>de.rub.nds.tls.scanner</groupId>