Clean up base package

[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 08fe6a41e30b4dd0bebbbb1c17cb91fc4722286b..0e1830c785db1695d9a7561113ba660aecac18e8 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/TrustCommand.java
+++ b/src/main/java/org/asamk/signal/commands/TrustCommand.java
@@ -7,16 +7,24 @@ 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.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;

+import org.asamk.signal.output.OutputWriter;
+import org.asamk.signal.util.CommandUtil;

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

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

 
 

+import java.util.Base64;

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

-public class TrustCommand implements LocalCommand {
+public class TrustCommand implements JsonRpcLocalCommand {
+
+    @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);
+        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.")
         var mutTrust = subparser.addMutuallyExclusiveGroup();
         mutTrust.addArgument("-a", "--trust-all-known-keys")
                 .help("Trust all known keys of this user, only use this for testing.")


@@ -26,53 +34,56 @@ public class TrustCommand implements LocalCommand {
     }
 
     @Override
     }
 
     @Override

-    public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
-        var number = ns.getString("number");
-        if (ns.getBoolean("trust_all_known_keys")) {
-            var res = m.trustIdentityAllKeys(number);
+    public void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) throws CommandException {
+        var recipentString = ns.getString("recipient");
+        var recipient = CommandUtil.getSingleRecipientIdentifier(recipentString, m.getSelfNumber());
+        if (Boolean.TRUE.equals(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.");
             }
         } else {
             if (!res) {
                 throw new UserErrorException("Failed to set the trust for this number, make sure the number is correct.");
             }
         } 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 {
+            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");
+            }
+
+            safetyNumber = safetyNumber.replaceAll(" ", "");
+            if (safetyNumber.length() == 66) {
+                byte[] fingerprintBytes;
+                try {
+                    fingerprintBytes = Hex.toByteArray(safetyNumber.toLowerCase(Locale.ROOT));
+                } catch (Exception e) {

                     throw new UserErrorException(
                     throw new UserErrorException(

-                            "Safety number has invalid format, either specify the old hex fingerprint or the new safety number");
+                            "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 {
                 }
             } else {

-                throw new UserErrorException(
-                        "You need to specify the fingerprint/safety number you have verified with -v SAFETY_NUMBER");
+                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);
+                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.");
+                }

             }
         }
     }
             }
         }
     }