Replace Base64 class from libsignal with java.util.Base64

diff --git a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
index db78f454c93851485f2066ae07e6e56254e4b339..6ce21acd4c0c5f76f5ec3cade5156b5898b4e4aa 100644 (file)
--- a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
@@ -36,9 +36,9 @@ import org.whispersystems.signalservice.api.messages.multidevice.VerifiedMessage
 import org.whispersystems.signalservice.api.messages.multidevice.ViewOnceOpenMessage;
 import org.whispersystems.signalservice.api.messages.shared.SharedContact;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
-import org.whispersystems.util.Base64;
 
 import java.io.File;
+import java.util.Base64;
 import java.util.List;
 
 public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
@@ -244,10 +244,12 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
                         for (StickerPackOperationMessage m : stickerPackOperationMessages) {
                             System.out.println(" - " + m.getType().toString());
                             if (m.getPackId().isPresent()) {
-                                System.out.println("   packId: " + Base64.encodeBytes(m.getPackId().get()));
+                                System.out.println("   packId: " + Base64.getEncoder()
+                                        .encodeToString(m.getPackId().get()));
                             }
                             if (m.getPackKey().isPresent()) {
-                                System.out.println("   packKey: " + Base64.encodeBytes(m.getPackKey().get()));
+                                System.out.println("   packKey: " + Base64.getEncoder()
+                                        .encodeToString(m.getPackKey().get()));
                             }
                         }
                     }
@@ -257,8 +259,8 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
                         System.out.println("Received message request response:");
                         System.out.println("  Type: " + requestResponseMessage.getType());
                         if (requestResponseMessage.getGroupId().isPresent()) {
-                            System.out.println("  Group id: " + Base64.encodeBytes(requestResponseMessage.getGroupId()
-                                    .get()));
+                            System.out.println("  Group id: " + Base64.getEncoder()
+                                    .encodeToString(requestResponseMessage.getGroupId().get()));
                         }
                         if (requestResponseMessage.getPerson().isPresent()) {
                             System.out.println("  Person: " + requestResponseMessage.getPerson()
@@ -418,8 +420,8 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         if (message.getSticker().isPresent()) {
             final SignalServiceDataMessage.Sticker sticker = message.getSticker().get();
             System.out.println("Sticker:");
-            System.out.println(" - Pack id: " + Base64.encodeBytes(sticker.getPackId()));
-            System.out.println(" - Pack key: " + Base64.encodeBytes(sticker.getPackKey()));
+            System.out.println(" - Pack id: " + Base64.getEncoder().encodeToString(sticker.getPackId()));
+            System.out.println(" - Pack key: " + Base64.getEncoder().encodeToString(sticker.getPackKey()));
             System.out.println(" - Sticker id: " + sticker.getStickerId());
             // TODO also download sticker image ??
         }

diff --git a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
index 9d718abbd903250b037ec3d050c66b2f84cddc88..e2002258a245db55da73598a56ba44a23808d392 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
@@ -20,9 +20,9 @@ import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.util.Base64;
 
 import java.io.IOException;
+import java.util.Base64;
 import java.util.concurrent.TimeUnit;
 
 import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
@@ -81,7 +81,7 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
                             messageReceived.getMessage()));
                     if (messageReceived.getGroupId().length > 0) {
                         System.out.println("Group info:");
-                        System.out.println("  Id: " + Base64.encodeBytes(messageReceived.getGroupId()));
+                        System.out.println("  Id: " + Base64.getEncoder().encodeToString(messageReceived.getGroupId()));
                     }
                     if (messageReceived.getAttachments().size() > 0) {
                         System.out.println("Attachments: ");
@@ -130,7 +130,7 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
                             syncReceived.getMessage()));
                     if (syncReceived.getGroupId().length > 0) {
                         System.out.println("Group info:");
-                        System.out.println("  Id: " + Base64.encodeBytes(syncReceived.getGroupId()));
+                        System.out.println("  Id: " + Base64.getEncoder().encodeToString(syncReceived.getGroupId()));
                     }
                     if (syncReceived.getAttachments().size() > 0) {
                         System.out.println("Attachments: ");

diff --git a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
index b5da274e60a69b075dc5fb565ea93efb7fb795f5..de8564f05a83eabac586bdfbd568b731ee8e08fc 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
@@ -7,9 +7,9 @@ import org.asamk.Signal;
 import org.asamk.signal.manager.groups.GroupIdFormatException;
 import org.asamk.signal.util.Util;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
-import org.whispersystems.util.Base64;
 
 import java.util.ArrayList;
+import java.util.Base64;
 import java.util.List;
 
 import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
@@ -58,7 +58,7 @@ public class UpdateGroupCommand implements DbusCommand {
         try {
             byte[] newGroupId = signal.updateGroup(groupId, groupName, groupMembers, groupAvatar);
             if (groupId.length != newGroupId.length) {
-                System.out.println("Creating new group \"" + Base64.encodeBytes(newGroupId) + "\" …");
+                System.out.println("Creating new group \"" + Base64.getEncoder().encodeToString(newGroupId) + "\" …");
             }
             return 0;
         } catch (AssertionError e) {

diff --git a/src/main/java/org/asamk/signal/json/JsonGroupInfo.java b/src/main/java/org/asamk/signal/json/JsonGroupInfo.java
index 79967955352a1d547909e75e0aec71fae929e92b..bc3e7e0eca35326cb4f013576d8247e1caea543f 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonGroupInfo.java
+++ b/src/main/java/org/asamk/signal/json/JsonGroupInfo.java
@@ -4,9 +4,9 @@ import org.asamk.signal.manager.groups.GroupUtils;
 import org.whispersystems.signalservice.api.messages.SignalServiceGroup;
 import org.whispersystems.signalservice.api.messages.SignalServiceGroupV2;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
-import org.whispersystems.util.Base64;
 
 import java.util.ArrayList;
+import java.util.Base64;
 import java.util.List;
 
 class JsonGroupInfo {
@@ -17,7 +17,7 @@ class JsonGroupInfo {
     String type;
 
     JsonGroupInfo(SignalServiceGroup groupInfo) {
-        this.groupId = Base64.encodeBytes(groupInfo.getGroupId());
+        this.groupId = Base64.getEncoder().encodeToString(groupInfo.getGroupId());
         if (groupInfo.getMembers().isPresent()) {
             this.members = new ArrayList<>(groupInfo.getMembers().get().size());
             for (SignalServiceAddress address : groupInfo.getMembers().get()) {
@@ -36,6 +36,6 @@ class JsonGroupInfo {
     }
 
     JsonGroupInfo(byte[] groupId) {
-        this.groupId = Base64.encodeBytes(groupId);
+        this.groupId = Base64.getEncoder().encodeToString(groupId);
     }
 }

diff --git a/src/main/java/org/asamk/signal/json/JsonSticker.java b/src/main/java/org/asamk/signal/json/JsonSticker.java
index 228d2883912eac6c0e11e2fb8cafb17726bc5d52..ea7a581598741170b2f298b958b64fda3d469bc3 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonSticker.java
+++ b/src/main/java/org/asamk/signal/json/JsonSticker.java
@@ -1,7 +1,8 @@
 package org.asamk.signal.json;
 
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
-import org.whispersystems.util.Base64;
+
+import java.util.Base64;
 
 public class JsonSticker {
 
@@ -10,8 +11,8 @@ public class JsonSticker {
     int stickerId;
 
     public JsonSticker(SignalServiceDataMessage.Sticker sticker) {
-        this.packId = Base64.encodeBytes(sticker.getPackId());
-        this.packKey = Base64.encodeBytes(sticker.getPackKey());
+        this.packId = Base64.getEncoder().encodeToString(sticker.getPackId());
+        this.packKey = Base64.getEncoder().encodeToString(sticker.getPackKey());
         this.stickerId = sticker.getStickerId();
         // TODO also download sticker image ??
     }

diff --git a/src/main/java/org/asamk/signal/manager/DeviceLinkInfo.java b/src/main/java/org/asamk/signal/manager/DeviceLinkInfo.java
index 779642b6333b419ab73de848cb922f39f6e0ce62..b8b27eaa60240759736654c88a8715f112a57a08 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/DeviceLinkInfo.java
+++ b/src/main/java/org/asamk/signal/manager/DeviceLinkInfo.java
@@ -3,13 +3,12 @@ package org.asamk.signal.manager;
 import org.whispersystems.libsignal.InvalidKeyException;
 import org.whispersystems.libsignal.ecc.Curve;
 import org.whispersystems.libsignal.ecc.ECPublicKey;
-import org.whispersystems.util.Base64;
 
-import java.io.IOException;
 import java.net.URI;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -20,7 +19,7 @@ public class DeviceLinkInfo {
     final String deviceIdentifier;
     final ECPublicKey deviceKey;
 
-    public static DeviceLinkInfo parseDeviceLinkUri(URI linkUri) throws IOException, InvalidKeyException {
+    public static DeviceLinkInfo parseDeviceLinkUri(URI linkUri) throws InvalidKeyException {
         final String rawQuery = linkUri.getRawQuery();
         if (isEmpty(rawQuery)) {
             throw new RuntimeException("Invalid device link uri");
@@ -34,7 +33,13 @@ public class DeviceLinkInfo {
             throw new RuntimeException("Invalid device link uri");
         }
 
-        ECPublicKey deviceKey = Curve.decodePoint(Base64.decode(publicKeyEncoded), 0);
+        final byte[] publicKeyBytes;
+        try {
+            publicKeyBytes = Base64.getDecoder().decode(publicKeyEncoded);
+        } catch (IllegalArgumentException e) {
+            throw new RuntimeException("Invalid device link uri", e);
+        }
+        ECPublicKey deviceKey = Curve.decodePoint(publicKeyBytes, 0);
 
         return new DeviceLinkInfo(deviceIdentifier, deviceKey);
     }
@@ -57,9 +62,10 @@ public class DeviceLinkInfo {
     }
 
     public String createDeviceLinkUri() {
+        final String deviceKeyString = Base64.getEncoder().encodeToString(deviceKey.serialize()).replace("=", "");
         return "tsdevice:/?uuid="
                 + URLEncoder.encode(deviceIdentifier, StandardCharsets.UTF_8)
                 + "&pub_key="
-                + URLEncoder.encode(Base64.encodeBytesWithoutPadding(deviceKey.serialize()), StandardCharsets.UTF_8);
+                + URLEncoder.encode(deviceKeyString, StandardCharsets.UTF_8);
     }
 }

diff --git a/src/main/java/org/asamk/signal/manager/groups/GroupId.java b/src/main/java/org/asamk/signal/manager/groups/GroupId.java
index 9a15de65e5a2f1bca706b25b4f78d0582bbd0aa4..f56e5d38f9c311cac91f74657d2576d182cfe70e 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/groups/GroupId.java
+++ b/src/main/java/org/asamk/signal/manager/groups/GroupId.java
@@ -1,8 +1,7 @@
 package org.asamk.signal.manager.groups;
 
-import org.whispersystems.util.Base64;
-
 import java.util.Arrays;
+import java.util.Base64;
 
 public abstract class GroupId {
 
@@ -43,7 +42,7 @@ public abstract class GroupId {
     }
 
     public String toBase64() {
-        return Base64.encodeBytes(id);
+        return Base64.getEncoder().encodeToString(id);
     }
 
     @Override

diff --git a/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 9721ebea10a053745ac22a7da06e3e0cb9892c09..9922ca57d05f0f3e54d91d77af1ae38281038b7e 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -41,7 +41,6 @@ import org.whispersystems.libsignal.util.Pair;
 import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess;
 import org.whispersystems.signalservice.api.kbs.MasterKey;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
-import org.whispersystems.util.Base64;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -53,6 +52,7 @@ import java.nio.channels.Channels;
 import java.nio.channels.ClosedChannelException;
 import java.nio.channels.FileChannel;
 import java.nio.channels.FileLock;
+import java.util.Base64;
 import java.util.Collection;
 import java.util.UUID;
 import java.util.stream.Collectors;
@@ -200,8 +200,8 @@ public class SignalAccount implements Closeable {
             }
             final ProfileKey profileKey;
             try {
-                profileKey = new ProfileKey(Base64.decode(profileKeyString));
-            } catch (InvalidInputException | IOException e) {
+                profileKey = new ProfileKey(Base64.getDecoder().decode(profileKeyString));
+            } catch (InvalidInputException ignored) {
                 continue;
             }
             contact.profileKey = null;
@@ -264,7 +264,7 @@ public class SignalAccount implements Closeable {
         JsonNode pinMasterKeyNode = rootNode.get("pinMasterKey");
         pinMasterKey = pinMasterKeyNode == null || pinMasterKeyNode.isNull()
                 ? null
-                : new MasterKey(Base64.decode(pinMasterKeyNode.asText()));
+                : new MasterKey(Base64.getDecoder().decode(pinMasterKeyNode.asText()));
         if (rootNode.has("signalingKey")) {
             signalingKey = Utils.getNotNullNode(rootNode, "signalingKey").asText();
         }
@@ -280,7 +280,8 @@ public class SignalAccount implements Closeable {
         }
         if (rootNode.has("profileKey")) {
             try {
-                profileKey = new ProfileKey(Base64.decode(Utils.getNotNullNode(rootNode, "profileKey").asText()));
+                profileKey = new ProfileKey(Base64.getDecoder()
+                        .decode(Utils.getNotNullNode(rootNode, "profileKey").asText()));
             } catch (InvalidInputException e) {
                 throw new IOException(
                         "Config file contains an invalid profileKey, needs to be base64 encoded array of 32 bytes",
@@ -395,11 +396,12 @@ public class SignalAccount implements Closeable {
                 .put("isMultiDevice", isMultiDevice)
                 .put("password", password)
                 .put("registrationLockPin", registrationLockPin)
-                .put("pinMasterKey", pinMasterKey == null ? null : Base64.encodeBytes(pinMasterKey.serialize()))
+                .put("pinMasterKey",
+                        pinMasterKey == null ? null : Base64.getEncoder().encodeToString(pinMasterKey.serialize()))
                 .put("signalingKey", signalingKey)
                 .put("preKeyIdOffset", preKeyIdOffset)
                 .put("nextSignedPreKeyId", nextSignedPreKeyId)
-                .put("profileKey", Base64.encodeBytes(profileKey.serialize()))
+                .put("profileKey", Base64.getEncoder().encodeToString(profileKey.serialize()))
                 .put("registered", registered)
                 .putPOJO("axolotlStore", signalProtocolStore)
                 .putPOJO("groupStore", groupStore)

diff --git a/src/main/java/org/asamk/signal/manager/storage/groups/JsonGroupStore.java b/src/main/java/org/asamk/signal/manager/storage/groups/JsonGroupStore.java
index 5c06aeeeb112cee9db873cebfe2afa1ce2a7300f..8d0ae6301603e457307c9668716b4eea5b65aa19 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/storage/groups/JsonGroupStore.java
+++ b/src/main/java/org/asamk/signal/manager/storage/groups/JsonGroupStore.java
@@ -23,13 +23,13 @@ import org.signal.zkgroup.InvalidInputException;
 import org.signal.zkgroup.groups.GroupMasterKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.util.Base64;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Base64;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
@@ -161,7 +161,8 @@ public class JsonGroupStore {
                     final GroupInfoV2 groupV2 = (GroupInfoV2) group;
                     jgen.writeStartObject();
                     jgen.writeStringField("groupId", groupV2.getGroupId().toBase64());
-                    jgen.writeStringField("masterKey", Base64.encodeBytes(groupV2.getMasterKey().serialize()));
+                    jgen.writeStringField("masterKey",
+                            Base64.getEncoder().encodeToString(groupV2.getMasterKey().serialize()));
                     jgen.writeBooleanField("blocked", groupV2.isBlocked());
                     jgen.writeEndObject();
                 } else {
@@ -186,15 +187,15 @@ public class JsonGroupStore {
                     // a v2 group
                     GroupIdV2 groupId = GroupIdV2.fromBase64(n.get("groupId").asText());
                     try {
-                        GroupMasterKey masterKey = new GroupMasterKey(Base64.decode(n.get("masterKey").asText()));
+                        GroupMasterKey masterKey = new GroupMasterKey(Base64.getDecoder()
+                                .decode(n.get("masterKey").asText()));
                         g = new GroupInfoV2(groupId, masterKey);
-                    } catch (InvalidInputException e) {
+                    } catch (InvalidInputException | IllegalArgumentException e) {
                         throw new AssertionError("Invalid master key for group " + groupId.toBase64());
                     }
                     g.setBlocked(n.get("blocked").asBoolean(false));
                 } else {
-                    GroupInfoV1 gv1 = jsonProcessor.treeToValue(n, GroupInfoV1.class);
-                    g = gv1;
+                    g = jsonProcessor.treeToValue(n, GroupInfoV1.class);
                 }
                 groups.put(g.getGroupId(), g);
             }

diff --git a/src/main/java/org/asamk/signal/manager/storage/profiles/ProfileStore.java b/src/main/java/org/asamk/signal/manager/storage/profiles/ProfileStore.java
index bff2f17eac9c056fc964cc93f027d8401789b0d5..516b57dc4004d4c8d346c13af94d7f1e689f66e1 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/storage/profiles/ProfileStore.java
+++ b/src/main/java/org/asamk/signal/manager/storage/profiles/ProfileStore.java
@@ -17,10 +17,10 @@ import org.signal.zkgroup.profiles.ProfileKey;
 import org.signal.zkgroup.profiles.ProfileKeyCredential;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.util.UuidUtil;
-import org.whispersystems.util.Base64;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Base64;
 import java.util.List;
 import java.util.UUID;
 
@@ -104,14 +104,14 @@ public class ProfileStore {
                     final SignalServiceAddress serviceAddress = new SignalServiceAddress(uuid, name);
                     ProfileKey profileKey = null;
                     try {
-                        profileKey = new ProfileKey(Base64.decode(entry.get("profileKey").asText()));
+                        profileKey = new ProfileKey(Base64.getDecoder().decode(entry.get("profileKey").asText()));
                     } catch (InvalidInputException ignored) {
                     }
                     ProfileKeyCredential profileKeyCredential = null;
                     if (entry.hasNonNull("profileKeyCredential")) {
                         try {
-                            profileKeyCredential = new ProfileKeyCredential(Base64.decode(entry.get(
-                                    "profileKeyCredential").asText()));
+                            profileKeyCredential = new ProfileKeyCredential(Base64.getDecoder()
+                                    .decode(entry.get("profileKeyCredential").asText()));
                         } catch (Throwable ignored) {
                         }
                     }
@@ -145,12 +145,13 @@ public class ProfileStore {
                 if (address.getUuid().isPresent()) {
                     json.writeStringField("uuid", address.getUuid().get().toString());
                 }
-                json.writeStringField("profileKey", Base64.encodeBytes(profileEntry.getProfileKey().serialize()));
+                json.writeStringField("profileKey",
+                        Base64.getEncoder().encodeToString(profileEntry.getProfileKey().serialize()));
                 json.writeNumberField("lastUpdateTimestamp", profileEntry.getLastUpdateTimestamp());
                 json.writeObjectField("profile", profileEntry.getProfile());
                 if (profileEntry.getProfileKeyCredential() != null) {
                     json.writeStringField("profileKeyCredential",
-                            Base64.encodeBytes(profileEntry.getProfileKeyCredential().serialize()));
+                            Base64.getEncoder().encodeToString(profileEntry.getProfileKeyCredential().serialize()));
                 }
                 json.writeEndObject();
             }

diff --git a/src/main/java/org/asamk/signal/manager/storage/protocol/JsonIdentityKeyStore.java b/src/main/java/org/asamk/signal/manager/storage/protocol/JsonIdentityKeyStore.java
index 19131e13cfcb583061c716d7bf6ce320bd55a633..06db55600bc3569f7b0407f8cd09730489cb27bf 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/storage/protocol/JsonIdentityKeyStore.java
+++ b/src/main/java/org/asamk/signal/manager/storage/protocol/JsonIdentityKeyStore.java
@@ -19,10 +19,10 @@ import org.whispersystems.libsignal.SignalProtocolAddress;
 import org.whispersystems.libsignal.state.IdentityKeyStore;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.util.UuidUtil;
-import org.whispersystems.util.Base64;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Base64;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
@@ -196,7 +196,8 @@ public class JsonIdentityKeyStore implements IdentityKeyStore {
 
             try {
                 int localRegistrationId = node.get("registrationId").asInt();
-                IdentityKeyPair identityKeyPair = new IdentityKeyPair(Base64.decode(node.get("identityKey").asText()));
+                IdentityKeyPair identityKeyPair = new IdentityKeyPair(Base64.getDecoder()
+                        .decode(node.get("identityKey").asText()));
 
                 JsonIdentityKeyStore keyStore = new JsonIdentityKeyStore(identityKeyPair, localRegistrationId);
 
@@ -216,13 +217,14 @@ public class JsonIdentityKeyStore implements IdentityKeyStore {
                                 ? Utils.getSignalServiceAddressFromIdentifier(trustedKeyName)
                                 : new SignalServiceAddress(uuid, trustedKeyName);
                         try {
-                            IdentityKey id = new IdentityKey(Base64.decode(trustedKey.get("identityKey").asText()), 0);
+                            IdentityKey id = new IdentityKey(Base64.getDecoder()
+                                    .decode(trustedKey.get("identityKey").asText()), 0);
                             TrustLevel trustLevel = trustedKey.has("trustLevel") ? TrustLevel.fromInt(trustedKey.get(
                                     "trustLevel").asInt()) : TrustLevel.TRUSTED_UNVERIFIED;
                             Date added = trustedKey.has("addedTimestamp") ? new Date(trustedKey.get("addedTimestamp")
                                     .asLong()) : new Date();
                             keyStore.saveIdentity(serviceAddress, id, trustLevel, added);
-                        } catch (InvalidKeyException | IOException e) {
+                        } catch (InvalidKeyException e) {
                             logger.warn("Error while decoding key for {}: {}", trustedKeyName, e.getMessage());
                         }
                     }
@@ -244,7 +246,13 @@ public class JsonIdentityKeyStore implements IdentityKeyStore {
             json.writeStartObject();
             json.writeNumberField("registrationId", jsonIdentityKeyStore.getLocalRegistrationId());
             json.writeStringField("identityKey",
-                    Base64.encodeBytes(jsonIdentityKeyStore.getIdentityKeyPair().serialize()));
+                    Base64.getEncoder().encodeToString(jsonIdentityKeyStore.getIdentityKeyPair().serialize()));
+            json.writeStringField("identityPrivateKey",
+                    Base64.getEncoder()
+                            .encodeToString(jsonIdentityKeyStore.getIdentityKeyPair().getPrivateKey().serialize()));
+            json.writeStringField("identityPublicKey",
+                    Base64.getEncoder()
+                            .encodeToString(jsonIdentityKeyStore.getIdentityKeyPair().getPublicKey().serialize()));
             json.writeArrayFieldStart("trustedKeys");
             for (IdentityInfo trustedKey : jsonIdentityKeyStore.identities) {
                 json.writeStartObject();
@@ -254,7 +262,8 @@ public class JsonIdentityKeyStore implements IdentityKeyStore {
                 if (trustedKey.getAddress().getUuid().isPresent()) {
                     json.writeStringField("uuid", trustedKey.getAddress().getUuid().get().toString());
                 }
-                json.writeStringField("identityKey", Base64.encodeBytes(trustedKey.identityKey.serialize()));
+                json.writeStringField("identityKey",
+                        Base64.getEncoder().encodeToString(trustedKey.identityKey.serialize()));
                 json.writeNumberField("trustLevel", trustedKey.trustLevel.ordinal());
                 json.writeNumberField("addedTimestamp", trustedKey.added.getTime());
                 json.writeEndObject();
@@ -263,5 +272,4 @@ public class JsonIdentityKeyStore implements IdentityKeyStore {
             json.writeEndObject();
         }
     }
-
 }

diff --git a/src/main/java/org/asamk/signal/manager/storage/protocol/JsonPreKeyStore.java b/src/main/java/org/asamk/signal/manager/storage/protocol/JsonPreKeyStore.java
index 9ec4b64fc74b9a522c49519e95c1e8d744fd1c0c..8529d0dd139f6d98151b4f1a6e1395e336965c9b 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/storage/protocol/JsonPreKeyStore.java
+++ b/src/main/java/org/asamk/signal/manager/storage/protocol/JsonPreKeyStore.java
@@ -13,9 +13,9 @@ import org.slf4j.LoggerFactory;
 import org.whispersystems.libsignal.InvalidKeyIdException;
 import org.whispersystems.libsignal.state.PreKeyRecord;
 import org.whispersystems.libsignal.state.PreKeyStore;
-import org.whispersystems.util.Base64;
 
 import java.io.IOException;
+import java.util.Base64;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -72,12 +72,9 @@ class JsonPreKeyStore implements PreKeyStore {
             Map<Integer, byte[]> preKeyMap = new HashMap<>();
             if (node.isArray()) {
                 for (JsonNode preKey : node) {
-                    Integer preKeyId = preKey.get("id").asInt();
-                    try {
-                        preKeyMap.put(preKeyId, Base64.decode(preKey.get("record").asText()));
-                    } catch (IOException e) {
-                        logger.warn("Error while decoding prekey for {}: {}", preKeyId, e.getMessage());
-                    }
+                    final int preKeyId = preKey.get("id").asInt();
+                    final byte[] preKeyRecord = Base64.getDecoder().decode(preKey.get("record").asText());
+                    preKeyMap.put(preKeyId, preKeyRecord);
                 }
             }
 
@@ -85,7 +82,6 @@ class JsonPreKeyStore implements PreKeyStore {
             keyStore.addPreKeys(preKeyMap);
 
             return keyStore;
-
         }
     }
 
@@ -99,7 +95,7 @@ class JsonPreKeyStore implements PreKeyStore {
             for (Map.Entry<Integer, byte[]> preKey : jsonPreKeyStore.store.entrySet()) {
                 json.writeStartObject();
                 json.writeNumberField("id", preKey.getKey());
-                json.writeStringField("record", Base64.encodeBytes(preKey.getValue()));
+                json.writeStringField("record", Base64.getEncoder().encodeToString(preKey.getValue()));
                 json.writeEndObject();
             }
             json.writeEndArray();

diff --git a/src/main/java/org/asamk/signal/manager/storage/protocol/JsonSessionStore.java b/src/main/java/org/asamk/signal/manager/storage/protocol/JsonSessionStore.java
index 79790598cf036eed5cc28eae78600eecb9154a71..de84c8958d619086942e8b0e7eeba8494d70dff0 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/storage/protocol/JsonSessionStore.java
+++ b/src/main/java/org/asamk/signal/manager/storage/protocol/JsonSessionStore.java
@@ -16,10 +16,10 @@ import org.whispersystems.libsignal.state.SessionRecord;
 import org.whispersystems.libsignal.state.SessionStore;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.util.UuidUtil;
-import org.whispersystems.util.Base64;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Base64;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.UUID;
@@ -150,13 +150,9 @@ class JsonSessionStore implements SessionStore {
                             ? Utils.getSignalServiceAddressFromIdentifier(sessionName)
                             : new SignalServiceAddress(uuid, sessionName);
                     final int deviceId = session.get("deviceId").asInt();
-                    final String record = session.get("record").asText();
-                    try {
-                        SessionInfo sessionInfo = new SessionInfo(serviceAddress, deviceId, Base64.decode(record));
-                        sessionStore.sessions.add(sessionInfo);
-                    } catch (IOException e) {
-                        logger.warn("Error while decoding session for {}: {}", sessionName, e.getMessage());
-                    }
+                    final byte[] record = Base64.getDecoder().decode(session.get("record").asText());
+                    SessionInfo sessionInfo = new SessionInfo(serviceAddress, deviceId, record);
+                    sessionStore.sessions.add(sessionInfo);
                 }
             }
 
@@ -180,7 +176,7 @@ class JsonSessionStore implements SessionStore {
                     json.writeStringField("uuid", sessionInfo.address.getUuid().get().toString());
                 }
                 json.writeNumberField("deviceId", sessionInfo.deviceId);
-                json.writeStringField("record", Base64.encodeBytes(sessionInfo.sessionRecord));
+                json.writeStringField("record", Base64.getEncoder().encodeToString(sessionInfo.sessionRecord));
                 json.writeEndObject();
             }
             json.writeEndArray();

diff --git a/src/main/java/org/asamk/signal/manager/storage/protocol/JsonSignedPreKeyStore.java b/src/main/java/org/asamk/signal/manager/storage/protocol/JsonSignedPreKeyStore.java
index 005436205f660cb021c6d937e0664a441633d058..a45287b4a790fb189a4ba6a6b78c2cfe73e47448 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/storage/protocol/JsonSignedPreKeyStore.java
+++ b/src/main/java/org/asamk/signal/manager/storage/protocol/JsonSignedPreKeyStore.java
@@ -13,9 +13,9 @@ import org.slf4j.LoggerFactory;
 import org.whispersystems.libsignal.InvalidKeyIdException;
 import org.whispersystems.libsignal.state.SignedPreKeyRecord;
 import org.whispersystems.libsignal.state.SignedPreKeyStore;
-import org.whispersystems.util.Base64;
 
 import java.io.IOException;
+import java.util.Base64;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -89,12 +89,9 @@ class JsonSignedPreKeyStore implements SignedPreKeyStore {
             Map<Integer, byte[]> preKeyMap = new HashMap<>();
             if (node.isArray()) {
                 for (JsonNode preKey : node) {
-                    Integer preKeyId = preKey.get("id").asInt();
-                    try {
-                        preKeyMap.put(preKeyId, Base64.decode(preKey.get("record").asText()));
-                    } catch (IOException e) {
-                        logger.warn("Error while decoding prekey for {}: {}", preKeyId, e.getMessage());
-                    }
+                    final int preKeyId = preKey.get("id").asInt();
+                    final byte[] preKeyRecord = Base64.getDecoder().decode(preKey.get("record").asText());
+                    preKeyMap.put(preKeyId, preKeyRecord);
                 }
             }
 
@@ -102,7 +99,6 @@ class JsonSignedPreKeyStore implements SignedPreKeyStore {
             keyStore.addSignedPreKeys(preKeyMap);
 
             return keyStore;
-
         }
     }
 
@@ -116,7 +112,7 @@ class JsonSignedPreKeyStore implements SignedPreKeyStore {
             for (Map.Entry<Integer, byte[]> signedPreKey : jsonPreKeyStore.store.entrySet()) {
                 json.writeStartObject();
                 json.writeNumberField("id", signedPreKey.getKey());
-                json.writeStringField("record", Base64.encodeBytes(signedPreKey.getValue()));
+                json.writeStringField("record", Base64.getEncoder().encodeToString(signedPreKey.getValue()));
                 json.writeEndObject();
             }
             json.writeEndArray();

diff --git a/src/main/java/org/asamk/signal/manager/storage/stickers/StickerStore.java b/src/main/java/org/asamk/signal/manager/storage/stickers/StickerStore.java
index 10cd2e99a1a681db90832b4eda531041f88b7664..710be035e967f02e8f77a0ff6b168f3d38242a69 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/storage/stickers/StickerStore.java
+++ b/src/main/java/org/asamk/signal/manager/storage/stickers/StickerStore.java
@@ -6,22 +6,18 @@ import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
-import org.whispersystems.util.Base64;
-
 import java.io.IOException;
+import java.util.Base64;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
 public class StickerStore {
 
-    private static final ObjectMapper jsonProcessor = new ObjectMapper();
-
     @JsonSerialize(using = StickersSerializer.class)
     @JsonDeserialize(using = StickersDeserializer.class)
     private final Map<byte[], Sticker> stickers = new HashMap<>();
@@ -44,8 +40,8 @@ public class StickerStore {
             jgen.writeStartArray(stickers.size());
             for (Sticker sticker : stickers) {
                 jgen.writeStartObject();
-                jgen.writeStringField("packId", Base64.encodeBytes(sticker.getPackId()));
-                jgen.writeStringField("packKey", Base64.encodeBytes(sticker.getPackKey()));
+                jgen.writeStringField("packId", Base64.getEncoder().encodeToString(sticker.getPackId()));
+                jgen.writeStringField("packKey", Base64.getEncoder().encodeToString(sticker.getPackKey()));
                 jgen.writeBooleanField("installed", sticker.isInstalled());
                 jgen.writeEndObject();
             }
@@ -62,8 +58,8 @@ public class StickerStore {
             Map<byte[], Sticker> stickers = new HashMap<>();
             JsonNode node = jsonParser.getCodec().readTree(jsonParser);
             for (JsonNode n : node) {
-                byte[] packId = Base64.decode(n.get("packId").asText());
-                byte[] packKey = Base64.decode(n.get("packKey").asText());
+                byte[] packId = Base64.getDecoder().decode(n.get("packId").asText());
+                byte[] packKey = Base64.getDecoder().decode(n.get("packKey").asText());
                 boolean installed = n.get("installed").asBoolean(false);
                 stickers.put(packId, new Sticker(packId, packKey, installed));
             }

diff --git a/src/main/java/org/asamk/signal/manager/util/KeyUtils.java b/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
index 171e7a427ae29a087639de8d60587356b0eb6058..3285e65abbb511f487f65fb1d9350bcee32b8057 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
+++ b/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
@@ -13,9 +13,9 @@ import org.whispersystems.libsignal.state.PreKeyRecord;
 import org.whispersystems.libsignal.state.SignedPreKeyRecord;
 import org.whispersystems.libsignal.util.Medium;
 import org.whispersystems.signalservice.api.kbs.MasterKey;
-import org.whispersystems.util.Base64;
 
 import java.util.ArrayList;
+import java.util.Base64;
 import java.util.List;
 
 public class KeyUtils {
@@ -82,7 +82,7 @@ public class KeyUtils {
 
     private static String getSecret(int size) {
         byte[] secret = getSecretBytes(size);
-        return Base64.encodeBytes(secret);
+        return Base64.getEncoder().encodeToString(secret);
     }
 
     public static byte[] getSecretBytes(int size) {

diff --git a/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java b/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
index 13ce3cb2a0acac5324de5e20d1d8d7d4fa767dd3..b91e864a43471d1e31ae85c7eeb87bcf8f7a7b2d 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
+++ b/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
@@ -5,9 +5,8 @@ import org.signal.zkgroup.profiles.ProfileKey;
 import org.whispersystems.signalservice.api.crypto.InvalidCiphertextException;
 import org.whispersystems.signalservice.api.crypto.ProfileCipher;
 import org.whispersystems.signalservice.api.profiles.SignalServiceProfile;
-import org.whispersystems.util.Base64;
 
-import java.io.IOException;
+import java.util.Base64;
 
 public class ProfileUtils {
 
@@ -20,17 +19,18 @@ public class ProfileUtils {
             try {
                 name = encryptedProfile.getName() == null
                         ? null
-                        : new String(profileCipher.decryptName(Base64.decode(encryptedProfile.getName())));
-            } catch (IOException e) {
+                        : new String(profileCipher.decryptName(Base64.getDecoder().decode(encryptedProfile.getName())));
+            } catch (IllegalArgumentException e) {
                 name = null;
             }
             String unidentifiedAccess;
             try {
                 unidentifiedAccess = encryptedProfile.getUnidentifiedAccess() == null
-                        || !profileCipher.verifyUnidentifiedAccess(Base64.decode(encryptedProfile.getUnidentifiedAccess()))
+                        || !profileCipher.verifyUnidentifiedAccess(Base64.getDecoder()
+                        .decode(encryptedProfile.getUnidentifiedAccess()))
                         ? null
                         : encryptedProfile.getUnidentifiedAccess();
-            } catch (IOException e) {
+            } catch (IllegalArgumentException e) {
                 unidentifiedAccess = null;
             }
             return new SignalProfile(encryptedProfile.getIdentityKey(),