X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/ce7aa580b6f0580cdcf7fd68fcc8efba737d21ed..7c7fc76a649678e9f77f1fcaeaaf4efdf9cc3cd9:/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java
diff --git a/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java b/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java
index 8a96dad0..5f4f4463 100644
--- a/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java
@@ -1,251 +1,30 @@
-/*
- Copyright (C) 2015-2021 AsamK and contributors
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see .
- */
package org.asamk.signal.manager;
-import org.asamk.signal.manager.config.ServiceConfig;
-import org.asamk.signal.manager.config.ServiceEnvironment;
-import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
-import org.asamk.signal.manager.helper.PinHelper;
-import org.asamk.signal.manager.storage.SignalAccount;
-import org.asamk.signal.manager.storage.identities.TrustNewIdentity;
-import org.asamk.signal.manager.util.KeyUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.whispersystems.libsignal.util.KeyHelper;
-import org.whispersystems.libsignal.util.guava.Optional;
-import org.whispersystems.signalservice.api.KeyBackupServicePinException;
-import org.whispersystems.signalservice.api.KeyBackupSystemNoDataException;
-import org.whispersystems.signalservice.api.SignalServiceAccountManager;
-import org.whispersystems.signalservice.api.groupsv2.ClientZkOperations;
-import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;
-import org.whispersystems.signalservice.api.kbs.MasterKey;
-import org.whispersystems.signalservice.api.push.SignalServiceAddress;
-import org.whispersystems.signalservice.api.util.UuidUtil;
-import org.whispersystems.signalservice.internal.ServiceResponse;
-import org.whispersystems.signalservice.internal.push.LockedException;
-import org.whispersystems.signalservice.internal.push.RequestVerificationCodeResponse;
-import org.whispersystems.signalservice.internal.push.VerifyAccountResponse;
-import org.whispersystems.signalservice.internal.util.DynamicCredentialsProvider;
+import org.asamk.signal.manager.api.CaptchaRequiredException;
+import org.asamk.signal.manager.api.IncorrectPinException;
+import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
+import org.asamk.signal.manager.api.PinLockMissingException;
+import org.asamk.signal.manager.api.PinLockedException;
+import org.asamk.signal.manager.api.RateLimitException;
+import org.asamk.signal.manager.api.VerificationMethodNotAvailableException;
import java.io.Closeable;
-import java.io.File;
import java.io.IOException;
-import java.util.Locale;
-
-public class RegistrationManager implements Closeable {
-
- private final static Logger logger = LoggerFactory.getLogger(RegistrationManager.class);
-
- private SignalAccount account;
- private final PathConfig pathConfig;
- private final ServiceEnvironmentConfig serviceEnvironmentConfig;
- private final String userAgent;
-
- private final SignalServiceAccountManager accountManager;
- private final PinHelper pinHelper;
-
- private RegistrationManager(
- SignalAccount account,
- PathConfig pathConfig,
- ServiceEnvironmentConfig serviceEnvironmentConfig,
- String userAgent
- ) {
- this.account = account;
- this.pathConfig = pathConfig;
- this.serviceEnvironmentConfig = serviceEnvironmentConfig;
- this.userAgent = userAgent;
-
- GroupsV2Operations groupsV2Operations;
- try {
- groupsV2Operations = new GroupsV2Operations(ClientZkOperations.create(serviceEnvironmentConfig.getSignalServiceConfiguration()));
- } catch (Throwable ignored) {
- groupsV2Operations = null;
- }
- this.accountManager = new SignalServiceAccountManager(serviceEnvironmentConfig.getSignalServiceConfiguration(),
- new DynamicCredentialsProvider(
- // Using empty UUID, because registering doesn't work otherwise
- null, account.getUsername(), account.getPassword(), SignalServiceAddress.DEFAULT_DEVICE_ID),
- userAgent,
- groupsV2Operations,
- ServiceConfig.AUTOMATIC_NETWORK_RETRY);
- final var keyBackupService = accountManager.getKeyBackupService(ServiceConfig.getIasKeyStore(),
- serviceEnvironmentConfig.getKeyBackupConfig().getEnclaveName(),
- serviceEnvironmentConfig.getKeyBackupConfig().getServiceId(),
- serviceEnvironmentConfig.getKeyBackupConfig().getMrenclave(),
- 10);
- this.pinHelper = new PinHelper(keyBackupService);
- }
-
- public static RegistrationManager init(
- String number, File settingsPath, ServiceEnvironment serviceEnvironment, String userAgent
- ) throws IOException {
- var pathConfig = PathConfig.createDefault(settingsPath);
-
- final var serviceConfiguration = ServiceConfig.getServiceEnvironmentConfig(serviceEnvironment, userAgent);
- if (!SignalAccount.userExists(pathConfig.dataPath(), number)) {
- var identityKey = KeyUtils.generateIdentityKeyPair();
- var registrationId = KeyHelper.generateRegistrationId(false);
-
- var profileKey = KeyUtils.createProfileKey();
- var account = SignalAccount.create(pathConfig.dataPath(),
- number,
- identityKey,
- registrationId,
- profileKey,
- TrustNewIdentity.ON_FIRST_USE);
-
- return new RegistrationManager(account, pathConfig, serviceConfiguration, userAgent);
- }
-
- var account = SignalAccount.load(pathConfig.dataPath(), number, true, TrustNewIdentity.ON_FIRST_USE);
-
- return new RegistrationManager(account, pathConfig, serviceConfiguration, userAgent);
- }
-
- public void register(boolean voiceVerification, String captcha) throws IOException {
- final ServiceResponse response;
- if (voiceVerification) {
- response = accountManager.requestVoiceVerificationCode(getDefaultLocale(),
- Optional.fromNullable(captcha),
- Optional.absent(),
- Optional.absent());
- } else {
- response = accountManager.requestSmsVerificationCode(false,
- Optional.fromNullable(captcha),
- Optional.absent(),
- Optional.absent());
- }
- handleResponseException(response);
- }
-
- private Locale getDefaultLocale() {
- final var locale = Locale.getDefault();
- try {
- Locale.LanguageRange.parse(locale.getLanguage() + "-" + locale.getCountry());
- } catch (IllegalArgumentException e) {
- logger.debug("Invalid locale, ignoring: {}", locale);
- return null;
- }
-
- return locale;
- }
-
- public Manager verifyAccount(
- String verificationCode, String pin
- ) throws IOException, LockedException, KeyBackupSystemNoDataException, KeyBackupServicePinException {
- verificationCode = verificationCode.replace("-", "");
- VerifyAccountResponse response;
- MasterKey masterKey;
- try {
- response = verifyAccountWithCode(verificationCode, null);
-
- masterKey = null;
- pin = null;
- } catch (LockedException e) {
- if (pin == null) {
- throw e;
- }
-
- var registrationLockData = pinHelper.getRegistrationLockData(pin, e);
- if (registrationLockData == null) {
- throw e;
- }
-
- var registrationLock = registrationLockData.getMasterKey().deriveRegistrationLock();
- try {
- response = verifyAccountWithCode(verificationCode, registrationLock);
- } catch (LockedException _e) {
- throw new AssertionError("KBS Pin appeared to matched but reg lock still failed!");
- }
- masterKey = registrationLockData.getMasterKey();
- }
-
- //accountManager.setGcmId(Optional.of(GoogleCloudMessaging.getInstance(this).register(REGISTRATION_ID)));
- account.finishRegistration(UuidUtil.parseOrNull(response.getUuid()), masterKey, pin);
-
- ManagerImpl m = null;
- try {
- m = new ManagerImpl(account, pathConfig, serviceEnvironmentConfig, userAgent);
- account = null;
-
- m.refreshPreKeys();
- if (response.isStorageCapable()) {
- m.retrieveRemoteStorage();
- }
- // Set an initial empty profile so user can be added to groups
- try {
- m.setProfile(null, null, null, null, null);
- } catch (NoClassDefFoundError e) {
- logger.warn("Failed to set default profile: {}", e.getMessage());
- }
- final var result = m;
- m = null;
+public interface RegistrationManager extends Closeable {
- return result;
- } finally {
- if (m != null) {
- m.close();
- }
- }
- }
+ void register(
+ boolean voiceVerification,
+ String captcha,
+ final boolean forceRegister
+ ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, RateLimitException, VerificationMethodNotAvailableException;
- private VerifyAccountResponse verifyAccountWithCode(
- final String verificationCode, final String registrationLock
- ) throws IOException {
- final ServiceResponse response;
- if (registrationLock == null) {
- response = accountManager.verifyAccount(verificationCode,
- account.getLocalRegistrationId(),
- true,
- account.getSelfUnidentifiedAccessKey(),
- account.isUnrestrictedUnidentifiedAccess(),
- ServiceConfig.capabilities,
- account.isDiscoverableByPhoneNumber());
- } else {
- response = accountManager.verifyAccountWithRegistrationLockPin(verificationCode,
- account.getLocalRegistrationId(),
- true,
- registrationLock,
- account.getSelfUnidentifiedAccessKey(),
- account.isUnrestrictedUnidentifiedAccess(),
- ServiceConfig.capabilities,
- account.isDiscoverableByPhoneNumber());
- }
- handleResponseException(response);
- return response.getResult().get();
- }
+ void verifyAccount(
+ String verificationCode,
+ String pin
+ ) throws IOException, PinLockedException, IncorrectPinException, PinLockMissingException;
- @Override
- public void close() throws IOException {
- if (account != null) {
- account.close();
- account = null;
- }
- }
+ void deleteLocalAccountData() throws IOException;
- private void handleResponseException(final ServiceResponse response) throws IOException {
- final var throwableOptional = response.getExecutionError().or(response.getApplicationError());
- if (throwableOptional.isPresent()) {
- if (throwableOptional.get() instanceof IOException) {
- throw (IOException) throwableOptional.get();
- } else {
- throw new IOException(throwableOptional.get());
- }
- }
- }
+ boolean isRegistered();
}