X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/48b2c7ff8ad7b653c3a0cb42775a5850f593d0a0..6f407ab5094a1d492d7fd54d2988606f12b7f7e8:/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 eb99386b..a130c03c 100644
--- a/src/main/java/org/asamk/signal/commands/TrustCommand.java
+++ b/src/main/java/org/asamk/signal/commands/TrustCommand.java
@@ -4,23 +4,25 @@ import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
-import org.asamk.signal.OutputWriter;
 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.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 {
-
-    public TrustCommand(final OutputWriter outputWriter) {
+    @Override
+    public String getName() {
+        return "trust";
     }
 
-    public static void attachToSubparser(final Subparser subparser) {
+    @Override
+    public void attachToSubparser(final Subparser subparser) {
         subparser.help("Set the trust level of a given number.");
-        subparser.addArgument("number").help("Specify the phone number, for which to set the trust.").required(true);
+        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.")
@@ -30,59 +32,45 @@ public class TrustCommand implements LocalCommand {
     }
 
     @Override
-    public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
-        var number = ns.getString("number");
-        if (ns.getBoolean("trust-all-known-keys")) {
-            boolean res;
+    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 {
-                res = m.trustIdentityAllKeys(number);
-            } catch (InvalidNumberException e) {
-                throw new UserErrorException("Failed to parse recipient: " + e.getMessage());
-            }
-            if (!res) {
-                throw new UserErrorException("Failed to set the trust for this number, make sure the number is correct.");
+                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 {
             var 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) {
-                        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());
-                    }
-                    if (!res) {
-                        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());
-                    }
-                    if (!res) {
-                        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 {
-                    throw new UserErrorException(
-                            "Safety number has invalid format, either specify the old hex fingerprint or the new safety number");
-                }
-            } else {
+            if (safetyNumber == null) {
                 throw new UserErrorException(
                         "You need to specify the fingerprint/safety number you have verified with -v SAFETY_NUMBER");
             }
+
+            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.");
+            }
         }
     }
 }