Implement jsonRpc command

[signal-cli] / src / main / java / org / asamk / signal / Main.java

diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java
index 88ae06caaa621d4dfdbc940984c128d1c86770ae..e07475003146f5af717598d89b01b92314ee41d2 100644 (file)
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -21,6 +21,11 @@ import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.ArgumentParserException;
 import net.sourceforge.argparse4j.inf.Namespace;
 
 import net.sourceforge.argparse4j.inf.ArgumentParserException;
 import net.sourceforge.argparse4j.inf.Namespace;
 

+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
+import org.asamk.signal.commands.exceptions.UntrustedKeyErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;

 import org.asamk.signal.manager.LibSignalLogger;
 import org.asamk.signal.util.SecurityProvider;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.asamk.signal.manager.LibSignalLogger;
 import org.asamk.signal.util.SecurityProvider;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;


@@ -30,6 +35,8 @@ import java.security.Security;
 public class Main {
 
     public static void main(String[] args) {
 public class Main {
 
     public static void main(String[] args) {

+        // enable unlimited strength crypto via Policy, supported on relevant JREs
+        Security.setProperty("crypto.policy", "unlimited");

         installSecurityProviderWorkaround();
 
         // Configuring the logger needs to happen before any logger is initialized
         installSecurityProviderWorkaround();
 
         // Configuring the logger needs to happen before any logger is initialized


@@ -39,8 +46,14 @@ public class Main {
 
         var ns = parser.parseArgsOrFail(args);
 
 
         var ns = parser.parseArgsOrFail(args);
 

-        var res = new App(ns).init();
-        System.exit(res);
+        int status = 0;
+        try {
+            new App(ns).init();
+        } catch (CommandException e) {
+            System.err.println(e.getMessage());
+            status = getStatusForError(e);
+        }
+        System.exit(status);

     }
 
     private static void installSecurityProviderWorkaround() {
     }
 
     private static void installSecurityProviderWorkaround() {


@@ -78,4 +91,18 @@ public class Main {
             System.setProperty("org.slf4j.simpleLogger.showDateTime", "false");
         }
     }
             System.setProperty("org.slf4j.simpleLogger.showDateTime", "false");
         }
     }

+
+    private static int getStatusForError(final CommandException e) {
+        if (e instanceof UserErrorException) {
+            return 1;
+        } else if (e instanceof UnexpectedErrorException) {
+            return 2;
+        } else if (e instanceof IOErrorException) {
+            return 3;
+        } else if (e instanceof UntrustedKeyErrorException) {
+            return 4;
+        } else {
+            return 2;
+        }
+    }

 }
 }