Add CommandException to abstract cli return codes for errors

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

diff --git a/src/main/java/org/asamk/signal/commands/TrustCommand.java b/src/main/java/org/asamk/signal/commands/TrustCommand.java
index 13fb63d4fcab30c15390aa5c2486c5f7d6f3bfaa..08fe6a41e30b4dd0bebbbb1c17cb91fc4722286b 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/TrustCommand.java
+++ b/src/main/java/org/asamk/signal/commands/TrustCommand.java
@@ -1,11 +1,14 @@
 package org.asamk.signal.commands;
 
 import net.sourceforge.argparse4j.impl.Arguments;
 package org.asamk.signal.commands;
 
 import net.sourceforge.argparse4j.impl.Arguments;

-import net.sourceforge.argparse4j.inf.MutuallyExclusiveGroup;

 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;

+
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.UserErrorException;

 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.util.Hex;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.util.Hex;

+import org.whispersystems.signalservice.api.util.InvalidNumberException;

 
 import java.util.Locale;
 
 
 import java.util.Locale;
 


@@ -13,62 +16,64 @@ public class TrustCommand implements LocalCommand {
 
     @Override
     public void attachToSubparser(final Subparser subparser) {
 
     @Override
     public void attachToSubparser(final Subparser subparser) {

-        subparser.addArgument("number")
-                .help("Specify the phone number, for which to set the trust.")
-                .required(true);
-        MutuallyExclusiveGroup mutTrust = subparser.addMutuallyExclusiveGroup();
+        subparser.addArgument("number").help("Specify the phone number, for which to set the trust.").required(true);
+        var mutTrust = subparser.addMutuallyExclusiveGroup();

         mutTrust.addArgument("-a", "--trust-all-known-keys")
                 .help("Trust all known keys of this user, only use this for testing.")
                 .action(Arguments.storeTrue());
         mutTrust.addArgument("-a", "--trust-all-known-keys")
                 .help("Trust all known keys of this user, only use this for testing.")
                 .action(Arguments.storeTrue());

-        mutTrust.addArgument("-v", "--verified-fingerprint")
-                .help("Specify the fingerprint of the key, only use this option if you have verified the fingerprint.");
+        mutTrust.addArgument("-v", "--verified-safety-number", "--verified-fingerprint")
+                .help("Specify the safety number of the key, only use this option if you have verified the safety number.");

     }
 
     @Override
     }
 
     @Override

-    public int handleCommand(final Namespace ns, final Manager m) {
-        if (!m.isRegistered()) {
-            System.err.println("User is not registered.");
-            return 1;
-        }
-        String number = ns.getString("number");
+    public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
+        var number = ns.getString("number");

         if (ns.getBoolean("trust_all_known_keys")) {
         if (ns.getBoolean("trust_all_known_keys")) {

-            boolean res = m.trustIdentityAllKeys(number);
+            var res = m.trustIdentityAllKeys(number);

             if (!res) {
             if (!res) {

-                System.err.println("Failed to set the trust for this number, make sure the number is correct.");
-                return 1;
+                throw new UserErrorException("Failed to set the trust for this number, make sure the number is correct.");

             }
         } else {
             }
         } else {

-            String fingerprint = ns.getString("verified_fingerprint");
-            if (fingerprint != null) {
-                fingerprint = fingerprint.replaceAll(" ", "");
-                if (fingerprint.length() == 66) {
+            var safetyNumber = ns.getString("verified_safety_number");
+            if (safetyNumber != null) {
+                safetyNumber = safetyNumber.replaceAll(" ", "");
+                if (safetyNumber.length() == 66) {

                     byte[] fingerprintBytes;
                     try {
                     byte[] fingerprintBytes;
                     try {

-                        fingerprintBytes = Hex.toByteArray(fingerprint.toLowerCase(Locale.ROOT));
+                        fingerprintBytes = Hex.toByteArray(safetyNumber.toLowerCase(Locale.ROOT));

                     } catch (Exception e) {
                     } catch (Exception e) {

-                        System.err.println("Failed to parse the fingerprint, make sure the fingerprint is a correctly encoded hex string without additional characters.");
-                        return 1;
+                        throw new UserErrorException(
+                                "Failed to parse the fingerprint, make sure the fingerprint is a correctly encoded hex string without additional characters.");
+                    }
+                    boolean res;
+                    try {
+                        res = m.trustIdentityVerified(number, fingerprintBytes);
+                    } catch (InvalidNumberException e) {
+                        throw new UserErrorException("Failed to parse recipient: " + e.getMessage());

                     }
                     }

-                    boolean res = m.trustIdentityVerified(number, fingerprintBytes);

                     if (!res) {
                     if (!res) {

-                        System.err.println("Failed to set the trust for the fingerprint of this number, make sure the number and the fingerprint are correct.");
-                        return 1;
+                        throw new UserErrorException(
+                                "Failed to set the trust for the fingerprint of this number, make sure the number and the fingerprint are correct.");
+                    }
+                } else if (safetyNumber.length() == 60) {
+                    boolean res;
+                    try {
+                        res = m.trustIdentityVerifiedSafetyNumber(number, safetyNumber);
+                    } catch (InvalidNumberException e) {
+                        throw new UserErrorException("Failed to parse recipient: " + e.getMessage());

                     }
                     }

-                } else if (fingerprint.length() == 60) {
-                    boolean res = m.trustIdentityVerifiedSafetyNumber(number, fingerprint);

                     if (!res) {
                     if (!res) {

-                        System.err.println("Failed to set the trust for the safety number of this phone number, make sure the phone number and the safety number are correct.");
-                        return 1;
+                        throw new UserErrorException(
+                                "Failed to set the trust for the safety number of this phone number, make sure the phone number and the safety number are correct.");

                     }
                 } else {
                     }
                 } else {

-                    System.err.println("Fingerprint has invalid format, either specify the old hex fingerprint or the new safety number");
-                    return 1;
+                    throw new UserErrorException(
+                            "Safety number has invalid format, either specify the old hex fingerprint or the new safety number");

                 }
             } else {
                 }
             } else {

-                System.err.println("You need to specify the fingerprint you have verified with -v FINGERPRINT");
-                return 1;
+                throw new UserErrorException(
+                        "You need to specify the fingerprint/safety number you have verified with -v SAFETY_NUMBER");

             }
         }
             }
         }

-        return 0;

     }
 }
     }
 }