Fix encodings UvfMetadataPayload.

Author: chenkins

hub/src/main/java/ch/iterate/hub/crypto/uvf/UvfMetadataPayload.java

@@ -100,7 +100,7 @@ public String toJSON() throws JsonProcessingException {
     }
 
     public static UvfMetadataPayload create() {
-        final String kid = new AlphanumericRandomStringService(4).random();
+        final String kid = Base64URL.encode(new AlphanumericRandomStringService(4).random()).toString();
         final byte[] rawSeed = new byte[32];
         FastSecureRandomProvider.get().provide().nextBytes(rawSeed);
         final byte[] kdfSalt = new byte[32];
@@ -109,12 +109,12 @@ public static UvfMetadataPayload create() {
                 .withFileFormat("AES-256-GCM-32k")
                 .withNameFormat("AES-SIV-512-B64URL")
                 .withSeeds(new HashMap<String, String>() {{
-                    put(kid, Base64URL.encode(rawSeed).toString());
+                    put(kid, Base64.getEncoder().encodeToString(rawSeed));
                 }})
                 .withLatestSeed(kid)
                 .withinitialSeed(kid)
                 .withKdf("HKDF-SHA512")
-                .withKdfSalt(Base64URL.encode(kdfSalt).toString());
+                .withKdfSalt(Base64.getEncoder().encodeToString(kdfSalt));
     }
 
     public byte[] computeRootDirId() {

hub/src/test/java/ch/iterate/hub/crypto/uvf/UvfMetadataPayloadTest.java

@@ -4,8 +4,13 @@
 
 package ch.iterate.hub.crypto.uvf;
 
+import ch.cyberduck.core.AbstractPath;
+import ch.cyberduck.core.Path;
+import ch.cyberduck.core.cryptomator.UVFVault;
 import ch.cyberduck.core.cryptomator.random.FastSecureRandomProvider;
+import ch.cyberduck.core.exception.BackgroundException;
 
+import org.cryptomator.cryptolib.api.UVFMasterkey;
 import org.cryptomator.cryptolib.common.ECKeyPair;
 import org.cryptomator.cryptolib.common.P384KeyPair;
 import org.junit.jupiter.api.Test;
@@ -15,6 +20,7 @@
 import java.security.spec.InvalidKeySpecException;
 import java.text.ParseException;
 import java.util.Base64;
+import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.UUID;
 
@@ -177,4 +183,18 @@ public void computeRootDirIdHash() throws ParseException, JOSEException, JsonPro
         final String hash = meta.computeRootDirIdHash(rootDirId);
         assertEquals("6DYU3E5BTPAZ4DWEQPQK3AIHX2DXSPHG", hash);
     }
+
+    @Test
+    public void testUVFMasterkeyFromUvfMetadataPayload() throws JsonProcessingException {
+        final UvfMetadataPayload uvmetadataPayload = UvfMetadataPayload.create();
+        UVFMasterkey.fromDecryptedPayload(uvmetadataPayload.toJSON());
+    }
+
+    @Test
+    public void testUvfVaultLoadFromMetadataPayload() throws JsonProcessingException, BackgroundException {
+        final UvfMetadataPayload uvfMetadataPayload = UvfMetadataPayload.create();
+        final String decryptedPayload = uvfMetadataPayload.toJSON();
+        final UVFVault uvfVault = new UVFVault(new Path("/", EnumSet.of(AbstractPath.Type.directory)), decryptedPayload, null, null);
+        uvfVault.load(null, null);
+    }
 }