package org.asamk.signal.util;
-import org.asamk.signal.PlainTextWriter;
-import org.asamk.signal.manager.groups.GroupIdFormatException;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
-import org.asamk.signal.manager.groups.NotAGroupMemberException;
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.manager.api.RecipientIdentifier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.whispersystems.signalservice.api.messages.SendMessageResult;
-import org.whispersystems.signalservice.api.util.InvalidNumberException;
+import org.whispersystems.signalservice.api.push.exceptions.ProofRequiredException;
-import java.io.IOException;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static org.asamk.signal.util.Util.getLegacyIdentifier;
public class ErrorUtils {
+ private final static Logger logger = LoggerFactory.getLogger(ErrorUtils.class);
+
private ErrorUtils() {
}
- public static void handleAssertionError(AssertionError e) {
- System.err.println("Failed to send/receive message (Assertion): " + e.getMessage());
- e.printStackTrace();
- System.err.println(
- "If you use an Oracle JRE please check if you have unlimited strength crypto enabled, see README");
+ public static void handleSendMessageResults(
+ Map<RecipientIdentifier, List<SendMessageResult>> mapResults
+ ) throws CommandException {
+ List<String> errors = getErrorMessagesFromSendMessageResults(mapResults);
+ handleSendMessageResultErrors(errors);
}
- public static int handleTimestampAndSendMessageResults(
- PlainTextWriter writer,
- long timestamp,
- List<SendMessageResult> results
- ) throws IOException {
- if (timestamp != 0) {
- writer.println("{}", timestamp);
- }
+ public static void handleSendMessageResults(
+ Collection<SendMessageResult> results
+ ) throws CommandException {
var errors = getErrorMessagesFromSendMessageResults(results);
- return handleSendMessageResultErrors(errors);
+ handleSendMessageResultErrors(errors);
+ }
+
+ public static List<String> getErrorMessagesFromSendMessageResults(final Map<RecipientIdentifier, List<SendMessageResult>> mapResults) {
+ return mapResults.values()
+ .stream()
+ .flatMap(results -> getErrorMessagesFromSendMessageResults(results).stream())
+ .collect(Collectors.toList());
}
- public static List<String> getErrorMessagesFromSendMessageResults(List<SendMessageResult> results) {
+ public static List<String> getErrorMessagesFromSendMessageResults(Collection<SendMessageResult> results) {
var errors = new ArrayList<String>();
for (var result : results) {
var error = getErrorMessageFromSendMessageResult(result);
}
public static String getErrorMessageFromSendMessageResult(SendMessageResult result) {
- if (result.isNetworkFailure()) {
- return String.format("Network failure for \"%s\"", result.getAddress().getLegacyIdentifier());
+ var identifier = getLegacyIdentifier(result.getAddress());
+ if (result.getProofRequiredFailure() != null) {
+ final var failure = result.getProofRequiredFailure();
+ return String.format(
+ "CAPTCHA proof required for sending to \"%s\", available options \"%s\" with challenge token \"%s\", or wait \"%d\" seconds.\n"
+ + (
+ failure.getOptions().contains(ProofRequiredException.Option.RECAPTCHA)
+ ? """
+ To get the captcha token, go to https://signalcaptchas.org/challenge/generate.html
+ Check the developer tools (F12) console for a failed redirect to signalcaptcha://
+ Everything after signalcaptcha:// is the captcha token.
+ Use the following command to submit the captcha token:
+ signal-cli submitRateLimitChallenge --challenge CHALLENGE_TOKEN --captcha CAPTCHA_TOKEN"""
+ : ""
+ ),
+ identifier,
+ failure.getOptions()
+ .stream()
+ .map(ProofRequiredException.Option::toString)
+ .collect(Collectors.joining(", ")),
+ failure.getToken(),
+ failure.getRetryAfterSeconds());
+ } else if (result.isNetworkFailure()) {
+ return String.format("Network failure for \"%s\"", identifier);
} else if (result.isUnregisteredFailure()) {
- return String.format("Unregistered user \"%s\"", result.getAddress().getLegacyIdentifier());
+ return String.format("Unregistered user \"%s\"", identifier);
} else if (result.getIdentityFailure() != null) {
- return String.format("Untrusted Identity for \"%s\"", result.getAddress().getLegacyIdentifier());
+ return String.format("Untrusted Identity for \"%s\"", identifier);
}
return null;
}
- private static int handleSendMessageResultErrors(List<String> errors) {
+ private static void handleSendMessageResultErrors(List<String> errors) throws CommandException {
if (errors.size() == 0) {
- return 0;
+ return;
}
- System.err.println("Failed to send (some) messages:");
+ var message = new StringBuilder();
+ message.append("Failed to send (some) messages:\n");
for (var error : errors) {
- System.err.println(error);
+ message.append(error).append("\n");
}
- return 3;
- }
-
- public static void handleIOException(IOException e) {
- System.err.println("Failed to send message: " + e.getMessage());
- }
-
- public static void handleGroupNotFoundException(GroupNotFoundException e) {
- System.err.println("Failed to send to group: " + e.getMessage());
- System.err.println("Aborting sending.");
- }
-
- public static void handleNotAGroupMemberException(NotAGroupMemberException e) {
- System.err.println("Failed to send to group: " + e.getMessage());
- System.err.println("Update the group on another device to readd the user to this group.");
- System.err.println("Aborting sending.");
- }
-
- public static void handleGroupIdFormatException(GroupIdFormatException e) {
- System.err.println(e.getMessage());
- System.err.println("Aborting sending.");
- }
-
- public static void handleInvalidNumberException(InvalidNumberException e) {
- System.err.println("Failed to parse recipient: " + e.getMessage());
- System.err.println("Aborting sending.");
+ throw new IOErrorException(message.toString(), null);
}
}
git.nmode.ca / signal-cli / blobdiff
