marvin.weiler/signal-cli-with-http-logging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve behavior, when authorization fails

Browse Source 
- register command should still be possible, to regain authorization
- reset uuid after registering, otherwise the verify request will fail
This commit is contained in:
AsamK 2020-03-24 18:15:21 +01:00
parent 9546a79308
commit 995de3ef5b
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/asamk/signal/Main.java
View File

@ -38,6 +38,7 @@ import org.asamk.signal.util.SecurityProvider;
import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.freedesktop.dbus.DBusConnection; import org.freedesktop.dbus.DBusConnection;
import org.freedesktop.dbus.exceptions.DBusException; import org.freedesktop.dbus.exceptions.DBusException;
import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;
import org.whispersystems.signalservice.api.util.PhoneNumberFormatter; import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
import java.io.File; import java.io.File;
@ -105,6 +106,12 @@ public class Main {
ts = m; ts = m;
try { try {
m.init(); m.init();
} catch (AuthorizationFailedException e) {
if (!"register".equals(ns.getString("command"))) {
// Register command should still be possible, if current authorization fails
System.err.println("Authorization failed, was the number registered elsewhere?");
return 2;
}
} catch (Exception e) { } catch (Exception e) {
System.err.println("Error loading state file: " + e.getMessage()); System.err.println("Error loading state file: " + e.getMessage());
return 2; return 2;

7
src/main/java/org/asamk/signal/manager/Manager.java
View File

@ -99,7 +99,6 @@ import org.whispersystems.signalservice.api.messages.multidevice.VerifiedMessage
import org.whispersystems.signalservice.api.profiles.SignalServiceProfile; import org.whispersystems.signalservice.api.profiles.SignalServiceProfile;
import org.whispersystems.signalservice.api.push.ContactTokenDetails; import org.whispersystems.signalservice.api.push.ContactTokenDetails;
import org.whispersystems.signalservice.api.push.SignalServiceAddress; import org.whispersystems.signalservice.api.push.SignalServiceAddress;
import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;
import org.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptions; import org.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptions;
import org.whispersystems.signalservice.api.push.exceptions.NetworkFailureException; import org.whispersystems.signalservice.api.push.exceptions.NetworkFailureException;
import org.whispersystems.signalservice.api.push.exceptions.UnregisteredUserException; import org.whispersystems.signalservice.api.push.exceptions.UnregisteredUserException;
@ -215,7 +214,6 @@ public class Manager implements Signal {
migrateLegacyConfigs(); migrateLegacyConfigs();
accountManager = getSignalServiceAccountManager(); accountManager = getSignalServiceAccountManager();
try {
if (account.isRegistered()) { if (account.isRegistered()) {
if (accountManager.getPreKeysCount() < BaseConfig.PREKEY_MINIMUM_COUNT) { if (accountManager.getPreKeysCount() < BaseConfig.PREKEY_MINIMUM_COUNT) {
refreshPreKeys(); refreshPreKeys();
@ -226,10 +224,6 @@ public class Manager implements Signal {
account.save(); account.save();
} }
} }
} catch (AuthorizationFailedException e) {
System.err.println("Authorization failed, was the number registered elsewhere?");
throw e;
}
} }
private void migrateLegacyConfigs() { private void migrateLegacyConfigs() {
@ -279,6 +273,7 @@ public class Manager implements Signal {
createNewIdentity(); createNewIdentity();
} }
account.setPassword(KeyUtils.createPassword()); account.setPassword(KeyUtils.createPassword());
account.setUuid(null);
accountManager = getSignalServiceAccountManager(); accountManager = getSignalServiceAccountManager();
if (voiceVerification) { if (voiceVerification) {