Extend getUserStatus command for usernames

[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 58c7371fd322be498544e49111308c85b1104bd4..a130c03cae98fc452b365f483e63a0b49df4d2d8 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/TrustCommand.java
+++ b/src/main/java/org/asamk/signal/commands/TrustCommand.java
@@ -1,23 +1,29 @@
 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.manager.Manager;

-import org.asamk.signal.util.ErrorUtils;
-import org.asamk.signal.util.Hex;
-import org.whispersystems.signalservice.api.util.InvalidNumberException;
+import org.asamk.signal.manager.api.IdentityVerificationCode;
+import org.asamk.signal.manager.api.UnregisteredRecipientException;
+import org.asamk.signal.output.OutputWriter;
+import org.asamk.signal.util.CommandUtil;

 
 

-import java.util.Locale;
+public class TrustCommand implements JsonRpcLocalCommand {

 
 

-public class TrustCommand implements LocalCommand {
+    @Override
+    public String getName() {
+        return "trust";
+    }

 
     @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.help("Set the trust level of a given number.");
+        subparser.addArgument("recipient").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());


@@ -26,63 +32,45 @@ public class TrustCommand implements LocalCommand {
     }
 
     @Override
     }
 
     @Override

-    public int handleCommand(final Namespace ns, final Manager m) {
-        String number = ns.getString("number");
-        if (ns.getBoolean("trust_all_known_keys")) {
-            boolean res = m.trustIdentityAllKeys(number);
-            if (!res) {
-                System.err.println("Failed to set the trust for this number, make sure the number is correct.");
-                return 1;
+    public void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) throws CommandException {
+        var recipientString = ns.getString("recipient");
+        var recipient = CommandUtil.getSingleRecipientIdentifier(recipientString, m.getSelfNumber());
+        if (Boolean.TRUE.equals(ns.getBoolean("trust-all-known-keys"))) {
+            try {
+                final var res = m.trustIdentityAllKeys(recipient);
+                if (!res) {
+                    throw new UserErrorException(
+                            "Failed to set the trust for this number, make sure the number is correct.");
+                }
+            } catch (UnregisteredRecipientException e) {
+                throw new UserErrorException("The user " + e.getSender().getIdentifier() + " is not registered.");

             }
         } else {
             }
         } else {

-            String safetyNumber = ns.getString("verified_safety_number");
-            if (safetyNumber != null) {
-                safetyNumber = safetyNumber.replaceAll(" ", "");
-                if (safetyNumber.length() == 66) {
-                    byte[] fingerprintBytes;
-                    try {
-                        fingerprintBytes = Hex.toByteArray(safetyNumber.toLowerCase(Locale.ROOT));
-                    } 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;
-                    }
-                    boolean res;
-                    try {
-                        res = m.trustIdentityVerified(number, fingerprintBytes);
-                    } catch (InvalidNumberException e) {
-                        ErrorUtils.handleInvalidNumberException(e);
-                        return 1;
-                    }
-                    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;
-                    }
-                } else if (safetyNumber.length() == 60) {
-                    boolean res;
-                    try {
-                        res = m.trustIdentityVerifiedSafetyNumber(number, safetyNumber);
-                    } catch (InvalidNumberException e) {
-                        ErrorUtils.handleInvalidNumberException(e);
-                        return 1;
-                    }
-                    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;
-                    }
-                } else {
-                    System.err.println(
-                            "Safety number has invalid format, either specify the old hex fingerprint or the new safety number");
-                    return 1;
-                }
-            } else {
-                System.err.println(
+            var safetyNumber = ns.getString("verified-safety-number");
+            if (safetyNumber == null) {
+                throw new UserErrorException(

                         "You need to specify the fingerprint/safety number you have verified with -v SAFETY_NUMBER");
                         "You need to specify the fingerprint/safety number you have verified with -v SAFETY_NUMBER");

-                return 1;
+            }
+
+            final IdentityVerificationCode verificationCode;
+            try {
+                verificationCode = IdentityVerificationCode.parse(safetyNumber);
+            } catch (Exception e) {
+                throw new UserErrorException(
+                        "Safety number has invalid format, either specify the old hex fingerprint or the new safety number");
+            }
+
+            try {
+                final var res = m.trustIdentityVerified(recipient, verificationCode);
+                if (!res) {
+                    throw new UserErrorException(
+                            "Failed to set the trust for this number, make sure the number and the fingerprint/safety number are correct.");
+                }
+            } catch (UnregisteredRecipientException e) {
+                throw new UserErrorException("The user " + e.getSender().getIdentifier() + " is not registered.");

             }
         }
             }
         }

-        return 0;

     }
 }
     }
 }