Skip to content

Commit

Permalink
Improve return codes
Browse files Browse the repository at this point in the history 
Always return non-zero code, when sending failed

Fixes #22
  • Loading branch information
@AsamK
AsamK committed Jul 14, 2016
1 parent 9f075da commit 0f0d8a8
Showing 1 changed file with 65 additions and 46 deletions.
111 changes: 65 additions & 46 deletions src/main/java/org/asamk/signal/Main.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@ public static void main(String[] args) {
System.exit(1);
}

int res = handleCommands(ns);
System.exit(res);
}

private static int handleCommands(Namespace ns) {
final String username = ns.getString("username");
Manager m;
Signal ts;
Expand All @@ -87,8 +92,7 @@ public static void main(String[] args) {
if (dBusConn != null) {
dBusConn.disconnect();
}
System.exit(3);
return;
return 3;
}
} else {
String settingsPath = ns.getString("config");
Expand All @@ -109,8 +113,7 @@ public static void main(String[] args) {
m.load();
} catch (Exception e) {
System.err.println("Error loading state file \"" + m.getFileName() + "\": " + e.getMessage());
System.exit(2);
return;
return 2;
}
}
}
Expand All @@ -119,7 +122,7 @@ public static void main(String[] args) {
case "register":
if (dBusConn != null) {
System.err.println("register is not yet implemented via dbus");
System.exit(1);
return 1;
}
if (!m.userHasKeys()) {
m.createNewIdentity();
Expand All @@ -128,33 +131,33 @@ public static void main(String[] args) {
m.register(ns.getBoolean("voice"));
} catch (IOException e) {
System.err.println("Request verify error: " + e.getMessage());
System.exit(3);
return 3;
}
break;
case "verify":
if (dBusConn != null) {
System.err.println("verify is not yet implemented via dbus");
System.exit(1);
return 1;
}
if (!m.userHasKeys()) {
System.err.println("User has no keys, first call register.");
System.exit(1);
return 1;
}
if (m.isRegistered()) {
System.err.println("User registration is already verified");
System.exit(1);
return 1;
}
try {
m.verifyAccount(ns.getString("verificationCode"));
} catch (IOException e) {
System.err.println("Verify error: " + e.getMessage());
System.exit(3);
return 3;
}
break;
case "link":
if (dBusConn != null) {
System.err.println("link is not yet implemented via dbus");
System.exit(1);
return 1;
}

// When linking, username is null and we always have to create keys
Expand All @@ -170,48 +173,48 @@ public static void main(String[] args) {
System.out.println("Associated with: " + m.getUsername());
} catch (TimeoutException e) {
System.err.println("Link request timed out, please try again.");
System.exit(3);
return 3;
} catch (IOException e) {
System.err.println("Link request error: " + e.getMessage());
System.exit(3);
return 3;
} catch (InvalidKeyException e) {
e.printStackTrace();
System.exit(3);
return 2;
} catch (UserAlreadyExists e) {
System.err.println("The user " + e.getUsername() + " already exists\nDelete \"" + e.getFileName() + "\" before trying again.");
System.exit(3);
return 1;
}
break;
case "addDevice":
if (dBusConn != null) {
System.err.println("link is not yet implemented via dbus");
System.exit(1);
return 1;
}
if (!m.isRegistered()) {
System.err.println("User is not registered.");
System.exit(1);
return 1;
}
try {
m.addDeviceLink(new URI(ns.getString("uri")));
} catch (IOException e) {
e.printStackTrace();
System.exit(3);
return 3;
} catch (InvalidKeyException e) {
e.printStackTrace();
System.exit(2);
return 2;
} catch (URISyntaxException e) {
e.printStackTrace();
System.exit(2);
return 2;
}
break;
case "listDevices":
if (dBusConn != null) {
System.err.println("listDevices is not yet implemented via dbus");
System.exit(1);
return 1;
}
if (!m.isRegistered()) {
System.err.println("User is not registered.");
System.exit(1);
return 1;
}
try {
List<DeviceInfo> devices = m.getLinkedDevices();
Expand All @@ -223,48 +226,52 @@ public static void main(String[] args) {
}
} catch (IOException e) {
e.printStackTrace();
System.exit(3);
return 3;
}
break;
case "removeDevice":
if (dBusConn != null) {
System.err.println("removeDevice is not yet implemented via dbus");
System.exit(1);
return 1;
}
if (!m.isRegistered()) {
System.err.println("User is not registered.");
System.exit(1);
return 1;
}
try {
int deviceId = ns.getInt("deviceId");
m.removeLinkedDevices(deviceId);
} catch (IOException e) {
e.printStackTrace();
System.exit(3);
return 3;
}
break;
case "send":
if (dBusConn == null && !m.isRegistered()) {
System.err.println("User is not registered.");
System.exit(1);
return 1;
}

if (ns.getBoolean("endsession")) {
if (ns.getList("recipient") == null) {
System.err.println("No recipients given");
System.err.println("Aborting sending.");
System.exit(1);
return 1;
}
try {
ts.sendEndSessionMessage(ns.<String>getList("recipient"));
} catch (IOException e) {
handleIOException(e);
return 3;
} catch (EncapsulatedExceptions e) {
handleEncapsulatedExceptions(e);
return 3;
} catch (AssertionError e) {
handleAssertionError(e);
return 1;
} catch (DBusExecutionException e) {
handleDBusExecutionException(e);
return 1;
}
} else {
String messageText = ns.getString("message");
Expand All @@ -274,7 +281,7 @@ public static void main(String[] args) {
} catch (IOException e) {
System.err.println("Failed to read message from stdin: " + e.getMessage());
System.err.println("Aborting sending.");
System.exit(1);
return 1;
}
}

Expand All @@ -291,18 +298,23 @@ public static void main(String[] args) {
}
} catch (IOException e) {
handleIOException(e);
return 3;
} catch (EncapsulatedExceptions e) {
handleEncapsulatedExceptions(e);
return 3;
} catch (AssertionError e) {
handleAssertionError(e);
return 1;
} catch (GroupNotFoundException e) {
handleGroupNotFoundException(e);
return 1;
} catch (AttachmentInvalidException e) {
System.err.println("Failed to add attachment: " + e.getMessage());
System.err.println("Aborting sending.");
System.exit(1);
return 1;
} catch (DBusExecutionException e) {
handleDBusExecutionException(e);
return 1;
}
}

Expand Down Expand Up @@ -330,18 +342,19 @@ public void handle(Signal.MessageReceived s) {
});
} catch (DBusException e) {
e.printStackTrace();
return 1;
}
while (true) {
try {
Thread.sleep(10000);
} catch (InterruptedException e) {
System.exit(0);
return 0;
}
}
}
if (!m.isRegistered()) {
System.err.println("User is not registered.");
System.exit(1);
return 1;
}
int timeout = 5;
if (ns.getInt("timeout") != null) {
Expand All @@ -356,42 +369,47 @@ public void handle(Signal.MessageReceived s) {
m.receiveMessages(timeout, returnOnTimeout, new ReceiveMessageHandler(m));
} catch (IOException e) {
System.err.println("Error while receiving messages: " + e.getMessage());
System.exit(3);
return 3;
} catch (AssertionError e) {
handleAssertionError(e);
return 1;
}
break;
case "quitGroup":
if (dBusConn != null) {
System.err.println("quitGroup is not yet implemented via dbus");
System.exit(1);
return 1;
}
if (!m.isRegistered()) {
System.err.println("User is not registered.");
System.exit(1);
return 1;
}

try {
m.sendQuitGroupMessage(decodeGroupId(ns.getString("group")));
} catch (IOException e) {
handleIOException(e);
return 3;
} catch (EncapsulatedExceptions e) {
handleEncapsulatedExceptions(e);
return 3;
} catch (AssertionError e) {
handleAssertionError(e);
return 1;
} catch (GroupNotFoundException e) {
handleGroupNotFoundException(e);
return 1;
}

break;
case "updateGroup":
if (dBusConn != null) {
System.err.println("updateGroup is not yet implemented via dbus");
System.exit(1);
return 1;
}
if (!m.isRegistered()) {
System.err.println("User is not registered.");
System.exit(1);
return 1;
}

try {
Expand All @@ -405,25 +423,28 @@ public void handle(Signal.MessageReceived s) {
}
} catch (IOException e) {
handleIOException(e);
return 3;
} catch (AttachmentInvalidException e) {
System.err.println("Failed to add avatar attachment for group\": " + e.getMessage());
System.err.println("Aborting sending.");
System.exit(1);
return 1;
} catch (GroupNotFoundException e) {
handleGroupNotFoundException(e);
return 1;
} catch (EncapsulatedExceptions e) {
handleEncapsulatedExceptions(e);
return 3;
}

break;
case "daemon":
if (dBusConn != null) {
System.err.println("Stop it.");
System.exit(1);
return 1;
}
if (!m.isRegistered()) {
System.err.println("User is not registered.");
System.exit(1);
return 1;
}
DBusConnection conn = null;
try {
Expand All @@ -439,15 +460,16 @@ public void handle(Signal.MessageReceived s) {
conn.requestBusName(SIGNAL_BUSNAME);
} catch (DBusException e) {
e.printStackTrace();
System.exit(3);
return 2;
}
try {
m.receiveMessages(3600, false, new DbusReceiveMessageHandler(m, conn));
} catch (IOException e) {
System.err.println("Error while receiving messages: " + e.getMessage());
System.exit(3);
return 3;
} catch (AssertionError e) {
handleAssertionError(e);
return 1;
}
} finally {
if (conn != null) {
Expand All @@ -457,7 +479,7 @@ public void handle(Signal.MessageReceived s) {

break;
}
System.exit(0);
return 0;
} finally {
if (dBusConn != null) {
dBusConn.disconnect();
Expand All @@ -468,13 +490,11 @@ public void handle(Signal.MessageReceived s) {
private static void handleGroupNotFoundException(GroupNotFoundException e) {
System.err.println("Failed to send to group: " + e.getMessage());
System.err.println("Aborting sending.");
System.exit(1);
}

private static void handleDBusExecutionException(DBusExecutionException e) {
System.err.println("Cannot connect to dbus: " + e.getMessage());
System.err.println("Aborting.");
System.exit(1);
}

private static byte[] decodeGroupId(String groupId) {
Expand Down Expand Up @@ -617,7 +637,6 @@ private static void handleAssertionError(AssertionError e) {
System.err.println("Failed to send/receive message (Assertion): " + e.getMessage());
e.printStackTrace();
System.err.println("If you use an Oracle JRE please check if you have unlimited strength crypto enabled, see README");
System.exit(1);
}

private static void handleEncapsulatedExceptions(EncapsulatedExceptions e) {
Expand Down

0 comments on commit 0f0d8a8

Please sign in to comment.