Handle rate limit exception correctly when querying 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 9e59ad86ce34734cd4ef74ca13d47b5969713817..7f18507adf32538ed3df1a3f10f86a2f7e01bdb1 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/TrustCommand.java
+++ b/src/main/java/org/asamk/signal/commands/TrustCommand.java
@@ -4,15 +4,13 @@ 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.manager.api.IdentityVerificationCode;
+import org.asamk.signal.manager.api.UnregisteredRecipientException;
+import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.util.CommandUtil;
-import org.asamk.signal.util.Hex;
-
-import java.util.Base64;
-import java.util.Locale;
 
 public class TrustCommand implements JsonRpcLocalCommand {
 
@@ -35,14 +33,21 @@ public class TrustCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
-        var recipentString = ns.getString("recipient");
-        var recipient = CommandUtil.getSingleRecipientIdentifier(recipentString, m.getSelfNumber());
-        if (ns.getBoolean("trust-all-known-keys")) {
-            boolean res = m.trustIdentityAllKeys(recipient);
-            if (!res) {
-                throw new UserErrorException("Failed to set the trust for this number, make sure the number is correct.");
+        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 {
             var safetyNumber = ns.getString("verified-safety-number");
@@ -51,39 +56,22 @@ public class TrustCommand implements JsonRpcLocalCommand {
                         "You need to specify the fingerprint/safety number you have verified with -v SAFETY_NUMBER");
             }
 
-            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 = m.trustIdentityVerified(recipient, fingerprintBytes);
-                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 = m.trustIdentityVerifiedSafetyNumber(recipient, safetyNumber);
-                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 {
-                final byte[] scannableSafetyNumber;
-                try {
-                    scannableSafetyNumber = Base64.getDecoder().decode(safetyNumber);
-                } catch (IllegalArgumentException e) {
-                    throw new UserErrorException(
-                            "Safety number has invalid format, either specify the old hex fingerprint or the new safety number");
-                }
-                boolean res = m.trustIdentityVerifiedSafetyNumber(recipient, scannableSafetyNumber);
+            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 the safety number of this phone number, make sure the phone number and the safety number are correct.");
+                            "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.");
             }
         }
     }