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.ErrorUtils;
+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 org.whispersystems.signalservice.api.util.InvalidNumberException;
+import java.util.Base64;
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) {
- 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.")
}
@Override
- public int handleCommand(final Namespace ns, final Manager m) {
- 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;
+ try {
+ res = m.trustIdentityAllKeys(recipient);
+ } catch (UnregisteredRecipientException e) {
+ throw new UserErrorException("The user " + e.getSender().getIdentifier() + " is not registered.");
+ }
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 {
- 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) {
- 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;
+ 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(
+ "Failed to parse the fingerprint, make sure the fingerprint is a correctly encoded hex string without additional characters.");
+ }
+ boolean res;
+ try {
+ res = m.trustIdentityVerified(recipient, fingerprintBytes);
+ } catch (UnregisteredRecipientException e) {
+ throw new UserErrorException("The user " + e.getSender().getIdentifier() + " is not registered.");
+ }
+ 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(recipient, safetyNumber);
+ } catch (UnregisteredRecipientException e) {
+ throw new UserErrorException("The user " + e.getSender().getIdentifier() + " is not registered.");
+ }
+ 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 {
- System.err.println(
- "You need to specify the fingerprint/safety number you have verified with -v SAFETY_NUMBER");
- return 1;
+ 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;
+ try {
+ res = m.trustIdentityVerifiedSafetyNumber(recipient, scannableSafetyNumber);
+ } catch (UnregisteredRecipientException e) {
+ throw new UserErrorException("The user " + e.getSender().getIdentifier() + " is not registered.");
+ }
+ 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.");
+ }
}
}
- return 0;
}
}
git.nmode.ca / signal-cli / blobdiff
