Improve exception handling

diff --git a/src/main/java/org/asamk/Signal.java b/src/main/java/org/asamk/Signal.java
index e115bb7c0d03b8832c8971d8fa44548236a7fbac..9a868109387d91c6bf0a0cbd7a124aaf6e953e0c 100644 (file)
--- a/src/main/java/org/asamk/Signal.java
+++ b/src/main/java/org/asamk/Signal.java
@@ -12,13 +12,13 @@ import java.io.IOException;
 import java.util.List;
 
 public interface Signal extends DBusInterface {
 import java.util.List;
 
 public interface Signal extends DBusInterface {

-    void sendMessage(String message, List<String> attachments, String recipient) throws EncapsulatedExceptions, AttachmentInvalidException, IOException, UntrustedIdentityException;
+    void sendMessage(String message, List<String> attachments, String recipient) throws EncapsulatedExceptions, AttachmentInvalidException, IOException;

 
 

-    void sendMessage(String message, List<String> attachments, List<String> recipients) throws EncapsulatedExceptions, AttachmentInvalidException, IOException, UntrustedIdentityException;
+    void sendMessage(String message, List<String> attachments, List<String> recipients) throws EncapsulatedExceptions, AttachmentInvalidException, IOException;

 
 

-    void sendEndSessionMessage(List<String> recipients) throws IOException, EncapsulatedExceptions, UntrustedIdentityException;
+    void sendEndSessionMessage(List<String> recipients) throws IOException, EncapsulatedExceptions;

 
 

-    void sendGroupMessage(String message, List<String> attachments, byte[] groupId) throws EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException, IOException, UntrustedIdentityException;
+    void sendGroupMessage(String message, List<String> attachments, byte[] groupId) throws EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException, IOException;

 
     class MessageReceived extends DBusSignal {
         private long timestamp;
 
     class MessageReceived extends DBusSignal {
         private long timestamp;

diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java
index 16df90d88f5ea02fbb786ffb3d81893cdbf441ef..14eb985aa59d25e6b6370a427b841eb05ffd66be 100644 (file)
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -265,8 +265,6 @@ public class Main {
                             handleAssertionError(e);
                         } catch (DBusExecutionException e) {
                             handleDBusExecutionException(e);
                             handleAssertionError(e);
                         } catch (DBusExecutionException e) {
                             handleDBusExecutionException(e);

-                        } catch (UntrustedIdentityException e) {
-                            e.printStackTrace();

                         }
                     } else {
                         String messageText = ns.getString("message");
                         }
                     } else {
                         String messageText = ns.getString("message");


@@ -305,8 +303,6 @@ public class Main {
                             System.exit(1);
                         } catch (DBusExecutionException e) {
                             handleDBusExecutionException(e);
                             System.exit(1);
                         } catch (DBusExecutionException e) {
                             handleDBusExecutionException(e);

-                        } catch (UntrustedIdentityException e) {
-                            e.printStackTrace();

                         }
                     }
 
                         }
                     }
 


@@ -385,8 +381,6 @@ public class Main {
                         handleAssertionError(e);
                     } catch (GroupNotFoundException e) {
                         handleGroupNotFoundException(e);
                         handleAssertionError(e);
                     } catch (GroupNotFoundException e) {
                         handleGroupNotFoundException(e);

-                    } catch (UntrustedIdentityException e) {
-                        e.printStackTrace();

                     }
 
                     break;
                     }
 
                     break;


@@ -419,8 +413,6 @@ public class Main {
                         handleGroupNotFoundException(e);
                     } catch (EncapsulatedExceptions e) {
                         handleEncapsulatedExceptions(e);
                         handleGroupNotFoundException(e);
                     } catch (EncapsulatedExceptions e) {
                         handleEncapsulatedExceptions(e);

-                    } catch (UntrustedIdentityException e) {
-                        e.printStackTrace();

                     }
 
                     break;
                     }
 
                     break;

diff --git a/src/main/java/org/asamk/signal/Manager.java b/src/main/java/org/asamk/signal/Manager.java
index 7672e19c4d70220a226bd9b618925bfa1668bbe1..2edeb921af0dbc69972b1def4d132ae623ea49bc 100644 (file)
--- a/src/main/java/org/asamk/signal/Manager.java
+++ b/src/main/java/org/asamk/signal/Manager.java
@@ -47,8 +47,7 @@ import org.whispersystems.signalservice.api.messages.*;
 import org.whispersystems.signalservice.api.messages.multidevice.*;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.TrustStore;
 import org.whispersystems.signalservice.api.messages.multidevice.*;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.TrustStore;

-import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;
-import org.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptions;
+import org.whispersystems.signalservice.api.push.exceptions.*;

 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
 import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
 import org.whispersystems.signalservice.internal.push.SignalServiceProtos;


@@ -489,7 +488,7 @@ class Manager implements Signal {
     @Override
     public void sendGroupMessage(String messageText, List<String> attachments,
                                  byte[] groupId)
     @Override
     public void sendGroupMessage(String messageText, List<String> attachments,
                                  byte[] groupId)

-            throws IOException, EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException, UntrustedIdentityException {
+            throws IOException, EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException {

         final SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder().withBody(messageText);
         if (attachments != null) {
             messageBuilder.withAttachments(getSignalServiceAttachments(attachments));
         final SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder().withBody(messageText);
         if (attachments != null) {
             messageBuilder.withAttachments(getSignalServiceAttachments(attachments));


@@ -513,7 +512,7 @@ class Manager implements Signal {
         sendMessage(message, membersSend);
     }
 
         sendMessage(message, membersSend);
     }
 

-    public void sendQuitGroupMessage(byte[] groupId) throws GroupNotFoundException, IOException, EncapsulatedExceptions, UntrustedIdentityException {
+    public void sendQuitGroupMessage(byte[] groupId) throws GroupNotFoundException, IOException, EncapsulatedExceptions {

         SignalServiceGroup group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.QUIT)
                 .withId(groupId)
                 .build();
         SignalServiceGroup group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.QUIT)
                 .withId(groupId)
                 .build();


@@ -532,7 +531,7 @@ class Manager implements Signal {
         sendMessage(message, g.members);
     }
 
         sendMessage(message, g.members);
     }
 

-    public byte[] sendUpdateGroupMessage(byte[] groupId, String name, Collection<String> members, String avatarFile) throws IOException, EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException, UntrustedIdentityException {
+    public byte[] sendUpdateGroupMessage(byte[] groupId, String name, Collection<String> members, String avatarFile) throws IOException, EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException {

         GroupInfo g;
         if (groupId == null) {
             // Create new group
         GroupInfo g;
         if (groupId == null) {
             // Create new group


@@ -594,7 +593,7 @@ class Manager implements Signal {
 
     @Override
     public void sendMessage(String message, List<String> attachments, String recipient)
 
     @Override
     public void sendMessage(String message, List<String> attachments, String recipient)

-            throws EncapsulatedExceptions, AttachmentInvalidException, IOException, UntrustedIdentityException {
+            throws EncapsulatedExceptions, AttachmentInvalidException, IOException {

         List<String> recipients = new ArrayList<>(1);
         recipients.add(recipient);
         sendMessage(message, attachments, recipients);
         List<String> recipients = new ArrayList<>(1);
         recipients.add(recipient);
         sendMessage(message, attachments, recipients);


@@ -603,7 +602,7 @@ class Manager implements Signal {
     @Override
     public void sendMessage(String messageText, List<String> attachments,
                             List<String> recipients)
     @Override
     public void sendMessage(String messageText, List<String> attachments,
                             List<String> recipients)

-            throws IOException, EncapsulatedExceptions, AttachmentInvalidException, UntrustedIdentityException {
+            throws IOException, EncapsulatedExceptions, AttachmentInvalidException {

         final SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder().withBody(messageText);
         if (attachments != null) {
             messageBuilder.withAttachments(getSignalServiceAttachments(attachments));
         final SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder().withBody(messageText);
         if (attachments != null) {
             messageBuilder.withAttachments(getSignalServiceAttachments(attachments));


@@ -614,7 +613,7 @@ class Manager implements Signal {
     }
 
     @Override
     }
 
     @Override

-    public void sendEndSessionMessage(List<String> recipients) throws IOException, EncapsulatedExceptions, UntrustedIdentityException {
+    public void sendEndSessionMessage(List<String> recipients) throws IOException, EncapsulatedExceptions {

         SignalServiceDataMessage message = SignalServiceDataMessage.newBuilder()
                 .asEndSessionMessage()
                 .build();
         SignalServiceDataMessage message = SignalServiceDataMessage.newBuilder()
                 .asEndSessionMessage()
                 .build();


@@ -627,8 +626,6 @@ class Manager implements Signal {
         SignalServiceSyncMessage message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
         try {
             sendMessage(message);
         SignalServiceSyncMessage message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
         try {
             sendMessage(message);

-        } catch (EncapsulatedExceptions encapsulatedExceptions) {
-            encapsulatedExceptions.printStackTrace();

         } catch (UntrustedIdentityException e) {
             e.printStackTrace();
         }
         } catch (UntrustedIdentityException e) {
             e.printStackTrace();
         }


@@ -639,65 +636,74 @@ class Manager implements Signal {
         SignalServiceSyncMessage message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
         try {
             sendMessage(message);
         SignalServiceSyncMessage message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
         try {
             sendMessage(message);

-        } catch (EncapsulatedExceptions encapsulatedExceptions) {
-            encapsulatedExceptions.printStackTrace();

         } catch (UntrustedIdentityException e) {
             e.printStackTrace();
         }
     }
 
     private void sendMessage(SignalServiceSyncMessage message)
         } catch (UntrustedIdentityException e) {
             e.printStackTrace();
         }
     }
 
     private void sendMessage(SignalServiceSyncMessage message)

-            throws IOException, EncapsulatedExceptions, UntrustedIdentityException {
+            throws IOException, UntrustedIdentityException {

         SignalServiceMessageSender messageSender = new SignalServiceMessageSender(URL, TRUST_STORE, username, password,
                 deviceId, signalProtocolStore, USER_AGENT, Optional.<SignalServiceMessageSender.EventListener>absent());
         messageSender.sendMessage(message);
     }
 
     private void sendMessage(SignalServiceDataMessage message, Collection<String> recipients)
         SignalServiceMessageSender messageSender = new SignalServiceMessageSender(URL, TRUST_STORE, username, password,
                 deviceId, signalProtocolStore, USER_AGENT, Optional.<SignalServiceMessageSender.EventListener>absent());
         messageSender.sendMessage(message);
     }
 
     private void sendMessage(SignalServiceDataMessage message, Collection<String> recipients)

-            throws IOException, EncapsulatedExceptions, UntrustedIdentityException {
+            throws EncapsulatedExceptions, IOException {
+        Set<SignalServiceAddress> recipientsTS = new HashSet<>(recipients.size());
+        for (String recipient : recipients) {
+            try {
+                recipientsTS.add(getPushAddress(recipient));
+            } catch (InvalidNumberException e) {
+                System.err.println("Failed to add recipient \"" + recipient + "\": " + e.getMessage());
+                System.err.println("Aborting sending.");
+                save();
+                return;
+            }
+        }
+

         try {
             SignalServiceMessageSender messageSender = new SignalServiceMessageSender(URL, TRUST_STORE, username, password,
                     deviceId, signalProtocolStore, USER_AGENT, Optional.<SignalServiceMessageSender.EventListener>absent());
 
         try {
             SignalServiceMessageSender messageSender = new SignalServiceMessageSender(URL, TRUST_STORE, username, password,
                     deviceId, signalProtocolStore, USER_AGENT, Optional.<SignalServiceMessageSender.EventListener>absent());
 

-            Set<SignalServiceAddress> recipientsTS = new HashSet<>(recipients.size());
-            for (String recipient : recipients) {
-                try {
-                    recipientsTS.add(getPushAddress(recipient));
-                } catch (InvalidNumberException e) {
-                    System.err.println("Failed to add recipient \"" + recipient + "\": " + e.getMessage());
-                    System.err.println("Aborting sending.");
-                    save();
-                    return;
-                }
-            }
-

             if (message.getGroupInfo().isPresent()) {
                 messageSender.sendMessage(new ArrayList<>(recipientsTS), message);
             } else {
                 // Send to all individually, so sync messages are sent correctly
             if (message.getGroupInfo().isPresent()) {
                 messageSender.sendMessage(new ArrayList<>(recipientsTS), message);
             } else {
                 // Send to all individually, so sync messages are sent correctly

+                List<UntrustedIdentityException> untrustedIdentities = new LinkedList<>();
+                List<UnregisteredUserException> unregisteredUsers = new LinkedList<>();
+                List<NetworkFailureException> networkExceptions = new LinkedList<>();

                 for (SignalServiceAddress address : recipientsTS) {
                 for (SignalServiceAddress address : recipientsTS) {

-                    messageSender.sendMessage(address, message);
+                    try {
+                        messageSender.sendMessage(address, message);
+                    } catch (UntrustedIdentityException e) {
+                        untrustedIdentities.add(e);
+                    } catch (UnregisteredUserException e) {
+                        unregisteredUsers.add(e);
+                    } catch (PushNetworkException e) {
+                        networkExceptions.add(new NetworkFailureException(address.getNumber(), e));
+                    }
+                }
+                if (!untrustedIdentities.isEmpty() || !unregisteredUsers.isEmpty() || !networkExceptions.isEmpty()) {
+                    throw new EncapsulatedExceptions(untrustedIdentities, unregisteredUsers, networkExceptions);

                 }
             }
                 }
             }

-
+        } finally {

             if (message.isEndSession()) {
                 for (SignalServiceAddress recipient : recipientsTS) {
                     handleEndSession(recipient.getNumber());
                 }
             }
             if (message.isEndSession()) {
                 for (SignalServiceAddress recipient : recipientsTS) {
                     handleEndSession(recipient.getNumber());
                 }
             }

-        } finally {

             save();
         }
     }
 
             save();
         }
     }
 

-    private SignalServiceContent decryptMessage(SignalServiceEnvelope envelope) {
+    private SignalServiceContent decryptMessage(SignalServiceEnvelope envelope) throws NoSessionException, LegacyMessageException, InvalidVersionException, InvalidMessageException, DuplicateMessageException, InvalidKeyException, InvalidKeyIdException, org.whispersystems.libsignal.UntrustedIdentityException {

         SignalServiceCipher cipher = new SignalServiceCipher(new SignalServiceAddress(username), signalProtocolStore);
         try {
             return cipher.decrypt(envelope);
         } catch (Exception e) {
         SignalServiceCipher cipher = new SignalServiceCipher(new SignalServiceAddress(username), signalProtocolStore);
         try {
             return cipher.decrypt(envelope);
         } catch (Exception e) {

-            // TODO handle all exceptions
-            e.printStackTrace();
-            return null;
+            throw e;

         }
     }
 
         }
     }
 


@@ -781,7 +787,14 @@ class Manager implements Signal {
                 try {
                     envelope = messagePipe.read(timeoutSeconds, TimeUnit.SECONDS);
                     if (!envelope.isReceipt()) {
                 try {
                     envelope = messagePipe.read(timeoutSeconds, TimeUnit.SECONDS);
                     if (!envelope.isReceipt()) {

-                        content = decryptMessage(envelope);
+                        Exception exception;
+                        try {
+                            content = decryptMessage(envelope);
+                        } catch (Exception e) {
+                            exception = e;
+                            // TODO pass exception to handler instead
+                            e.printStackTrace();
+                        }

                         if (content != null) {
                             if (content.getDataMessage().isPresent()) {
                                 SignalServiceDataMessage message = content.getDataMessage().get();
                         if (content != null) {
                             if (content.getDataMessage().isPresent()) {
                                 SignalServiceDataMessage message = content.getDataMessage().get();


@@ -798,8 +811,6 @@ class Manager implements Signal {
                                     if (rm.isContactsRequest()) {
                                         try {
                                             sendContacts();
                                     if (rm.isContactsRequest()) {
                                         try {
                                             sendContacts();

-                                        } catch (EncapsulatedExceptions encapsulatedExceptions) {
-                                            encapsulatedExceptions.printStackTrace();

                                         } catch (UntrustedIdentityException e) {
                                             e.printStackTrace();
                                         }
                                         } catch (UntrustedIdentityException e) {
                                             e.printStackTrace();
                                         }


@@ -807,8 +818,6 @@ class Manager implements Signal {
                                     if (rm.isGroupsRequest()) {
                                         try {
                                             sendGroups();
                                     if (rm.isGroupsRequest()) {
                                         try {
                                             sendGroups();

-                                        } catch (EncapsulatedExceptions encapsulatedExceptions) {
-                                            encapsulatedExceptions.printStackTrace();

                                         } catch (UntrustedIdentityException e) {
                                             e.printStackTrace();
                                         }
                                         } catch (UntrustedIdentityException e) {
                                             e.printStackTrace();
                                         }


@@ -1007,7 +1016,7 @@ class Manager implements Signal {
         return false;
     }
 
         return false;
     }
 

-    private void sendGroups() throws IOException, EncapsulatedExceptions, UntrustedIdentityException {
+    private void sendGroups() throws IOException, UntrustedIdentityException {

         File groupsFile = File.createTempFile("multidevice-group-update", ".tmp");
 
         try {
         File groupsFile = File.createTempFile("multidevice-group-update", ".tmp");
 
         try {


@@ -1037,7 +1046,7 @@ class Manager implements Signal {
         }
     }
 
         }
     }
 

-    private void sendContacts() throws IOException, EncapsulatedExceptions, UntrustedIdentityException {
+    private void sendContacts() throws IOException, UntrustedIdentityException {

         File contactsFile = File.createTempFile("multidevice-contact-update", ".tmp");
 
         try {
         File contactsFile = File.createTempFile("multidevice-contact-update", ".tmp");
 
         try {