Correct corruption of database by ValueSerializer #50

jorabin · Aug 24, 2023 · e2d7464 · e2d7464
1 parent bc38b85
commit e2d7464
Showing 1 changed file with 5 additions and 17 deletions.
diff --git a/jackson/src/main/java/org/linguafranca/pwdb/kdbx/jackson/converter/ValueSerializer.java b/jackson/src/main/java/org/linguafranca/pwdb/kdbx/jackson/converter/ValueSerializer.java
@@ -30,15 +30,7 @@
 
 public class ValueSerializer extends StdSerializer<EntryClasses.StringProperty.Value>{
 
-    private StreamEncryptor encryptor;
-
-    public ValueSerializer() {
-        super(ValueSerializer.class, false);
-    }
-
-    public ValueSerializer(Class<EntryClasses.StringProperty.Value> v) {
-        super(v);
-    }
+    private final StreamEncryptor encryptor;
 
     public ValueSerializer(StreamEncryptor encryptor) {
         super(ValueSerializer.class, false);
@@ -52,8 +44,9 @@ public void serialize(Value value, JsonGenerator gen, SerializerProvider provide
         final ToXmlGenerator xmlGenerator = (ToXmlGenerator) gen;
         xmlGenerator.writeStartObject();
 
+        String stringToWrite = value.getText();
         //We need to encrypt and convert to base64 every protected element
-        if(value.getProtectOnOutput()) {
+        if (value.getProtectOnOutput()) {
             xmlGenerator.setNextIsAttribute(true);
             gen.writeStringField("Protected", "True"); 
             String plain = value.getText();
@@ -63,17 +56,12 @@ public void serialize(Value value, JsonGenerator gen, SerializerProvider provide
             //Cipher
             byte[] encrypted = encryptor.encrypt(plain.getBytes()); 
             //Convert to base64
-            String base64 = new String(Base64.encodeBase64(encrypted));
-
-            //Destroy from memory the plain value
-            plain = null;
-            value.setText(base64);
-
+            stringToWrite = new String(Base64.encodeBase64(encrypted));
         }
 
         xmlGenerator.setNextIsAttribute(false);
         xmlGenerator.setNextIsUnwrapped(true);
-        xmlGenerator.writeStringField("text",value.getText());
+        xmlGenerator.writeStringField("text", stringToWrite);
 
         gen.writeEndObject();