Remove AssignUsernameCommand
This commit is contained in:
Ravi Khadiwala
ravi-signal
parent
2ce3270d21
commit
a80c020146
|
|
@ -233,7 +233,6 @@ import org.whispersystems.textsecuregcm.util.logging.UncaughtExceptionHandler;
|
||||||
import org.whispersystems.textsecuregcm.websocket.AuthenticatedConnectListener;
|
import org.whispersystems.textsecuregcm.websocket.AuthenticatedConnectListener;
|
||||||
import org.whispersystems.textsecuregcm.websocket.ProvisioningConnectListener;
|
import org.whispersystems.textsecuregcm.websocket.ProvisioningConnectListener;
|
||||||
import org.whispersystems.textsecuregcm.websocket.WebSocketAccountAuthenticator;
|
import org.whispersystems.textsecuregcm.websocket.WebSocketAccountAuthenticator;
|
||||||
import org.whispersystems.textsecuregcm.workers.AssignUsernameCommand;
|
|
||||||
import org.whispersystems.textsecuregcm.workers.CertificateCommand;
|
import org.whispersystems.textsecuregcm.workers.CertificateCommand;
|
||||||
import org.whispersystems.textsecuregcm.workers.CheckDynamicConfigurationCommand;
|
import org.whispersystems.textsecuregcm.workers.CheckDynamicConfigurationCommand;
|
||||||
import org.whispersystems.textsecuregcm.workers.DeleteUserCommand;
|
import org.whispersystems.textsecuregcm.workers.DeleteUserCommand;
|
||||||
|
|
@ -292,7 +291,6 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
|
||||||
bootstrap.addCommand(new ServerVersionCommand());
|
bootstrap.addCommand(new ServerVersionCommand());
|
||||||
bootstrap.addCommand(new CheckDynamicConfigurationCommand());
|
bootstrap.addCommand(new CheckDynamicConfigurationCommand());
|
||||||
bootstrap.addCommand(new SetUserDiscoverabilityCommand());
|
bootstrap.addCommand(new SetUserDiscoverabilityCommand());
|
||||||
bootstrap.addCommand(new AssignUsernameCommand());
|
|
||||||
bootstrap.addCommand(new UnlinkDeviceCommand());
|
bootstrap.addCommand(new UnlinkDeviceCommand());
|
||||||
bootstrap.addCommand(new ScheduledApnPushNotificationSenderServiceCommand());
|
bootstrap.addCommand(new ScheduledApnPushNotificationSenderServiceCommand());
|
||||||
bootstrap.addCommand(new MessagePersisterServiceCommand());
|
bootstrap.addCommand(new MessagePersisterServiceCommand());
|
||||||
|
|
|
||||||
|
|
@ -1,237 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright 2013 Signal Messenger, LLC
|
|
||||||
* SPDX-License-Identifier: AGPL-3.0-only
|
|
||||||
*/
|
|
||||||
|
|
||||||
package org.whispersystems.textsecuregcm.workers;
|
|
||||||
|
|
||||||
import static com.codahale.metrics.MetricRegistry.name;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.databind.DeserializationFeature;
|
|
||||||
import io.dropwizard.core.Application;
|
|
||||||
import io.dropwizard.core.cli.EnvironmentCommand;
|
|
||||||
import io.dropwizard.core.setup.Environment;
|
|
||||||
import io.lettuce.core.resource.ClientResources;
|
|
||||||
import java.time.Clock;
|
|
||||||
import java.util.Base64;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.UUID;
|
|
||||||
import java.util.concurrent.CompletionException;
|
|
||||||
import java.util.concurrent.ExecutorService;
|
|
||||||
import java.util.concurrent.Executors;
|
|
||||||
import java.util.concurrent.ScheduledExecutorService;
|
|
||||||
import net.sourceforge.argparse4j.inf.Namespace;
|
|
||||||
import net.sourceforge.argparse4j.inf.Subparser;
|
|
||||||
import org.whispersystems.textsecuregcm.WhisperServerConfiguration;
|
|
||||||
import org.whispersystems.textsecuregcm.auth.ExternalServiceCredentialsGenerator;
|
|
||||||
import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicConfiguration;
|
|
||||||
import org.whispersystems.textsecuregcm.controllers.SecureStorageController;
|
|
||||||
import org.whispersystems.textsecuregcm.controllers.SecureValueRecovery2Controller;
|
|
||||||
import org.whispersystems.textsecuregcm.push.ClientPresenceManager;
|
|
||||||
import org.whispersystems.textsecuregcm.redis.FaultTolerantRedisCluster;
|
|
||||||
import org.whispersystems.textsecuregcm.securestorage.SecureStorageClient;
|
|
||||||
import org.whispersystems.textsecuregcm.securevaluerecovery.SecureValueRecovery2Client;
|
|
||||||
import org.whispersystems.textsecuregcm.storage.Account;
|
|
||||||
import org.whispersystems.textsecuregcm.storage.AccountLockManager;
|
|
||||||
import org.whispersystems.textsecuregcm.storage.Accounts;
|
|
||||||
import org.whispersystems.textsecuregcm.storage.AccountsManager;
|
|
||||||
import org.whispersystems.textsecuregcm.storage.DynamicConfigurationManager;
|
|
||||||
import org.whispersystems.textsecuregcm.storage.KeysManager;
|
|
||||||
import org.whispersystems.textsecuregcm.storage.MessagesCache;
|
|
||||||
import org.whispersystems.textsecuregcm.storage.MessagesDynamoDb;
|
|
||||||
import org.whispersystems.textsecuregcm.storage.MessagesManager;
|
|
||||||
import org.whispersystems.textsecuregcm.storage.PhoneNumberIdentifiers;
|
|
||||||
import org.whispersystems.textsecuregcm.storage.Profiles;
|
|
||||||
import org.whispersystems.textsecuregcm.storage.ProfilesManager;
|
|
||||||
import org.whispersystems.textsecuregcm.storage.RegistrationRecoveryPasswords;
|
|
||||||
import org.whispersystems.textsecuregcm.storage.RegistrationRecoveryPasswordsManager;
|
|
||||||
import org.whispersystems.textsecuregcm.storage.ReportMessageDynamoDb;
|
|
||||||
import org.whispersystems.textsecuregcm.storage.ReportMessageManager;
|
|
||||||
import org.whispersystems.textsecuregcm.storage.UsernameHashNotAvailableException;
|
|
||||||
import org.whispersystems.textsecuregcm.storage.UsernameReservationNotFoundException;
|
|
||||||
import org.whispersystems.textsecuregcm.util.ExceptionUtils;
|
|
||||||
import reactor.core.scheduler.Scheduler;
|
|
||||||
import reactor.core.scheduler.Schedulers;
|
|
||||||
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
|
|
||||||
import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
|
|
||||||
import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
|
|
||||||
|
|
||||||
public class AssignUsernameCommand extends EnvironmentCommand<WhisperServerConfiguration> {
|
|
||||||
|
|
||||||
public AssignUsernameCommand() {
|
|
||||||
super(new Application<>() {
|
|
||||||
@Override
|
|
||||||
public void run(WhisperServerConfiguration configuration, Environment environment) {
|
|
||||||
|
|
||||||
}
|
|
||||||
}, "assign-username-hash", "assign a username hash to an account");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void configure(Subparser subparser) {
|
|
||||||
super.configure(subparser);
|
|
||||||
|
|
||||||
subparser.addArgument("-u", "--usernameHash")
|
|
||||||
.dest("usernameHash")
|
|
||||||
.type(String.class)
|
|
||||||
.required(true)
|
|
||||||
.help("The username hash to assign");
|
|
||||||
|
|
||||||
subparser.addArgument("-e", "--encryptedUsername")
|
|
||||||
.dest("encryptedUsername")
|
|
||||||
.type(String.class)
|
|
||||||
.required(false)
|
|
||||||
.help("The encrypted username for the username link");
|
|
||||||
|
|
||||||
subparser.addArgument("-a", "--aci")
|
|
||||||
.dest("aci")
|
|
||||||
.type(String.class)
|
|
||||||
.required(true)
|
|
||||||
.help("The ACI of the account to which to assign the username");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void run(Environment environment, Namespace namespace,
|
|
||||||
WhisperServerConfiguration configuration)
|
|
||||||
throws Exception {
|
|
||||||
environment.getObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
|
|
||||||
|
|
||||||
final AwsCredentialsProvider awsCredentialsProvider = configuration.getAwsCredentialsConfiguration().build();
|
|
||||||
|
|
||||||
ScheduledExecutorService dynamicConfigurationExecutor = environment.lifecycle()
|
|
||||||
.scheduledExecutorService(name(getClass(), "dynamicConfiguration-%d")).threads(1).build();
|
|
||||||
|
|
||||||
DynamicConfigurationManager<DynamicConfiguration> dynamicConfigurationManager = configuration.getAppConfig().build(
|
|
||||||
DynamicConfiguration.class, dynamicConfigurationExecutor, awsCredentialsProvider);
|
|
||||||
dynamicConfigurationManager.start();
|
|
||||||
|
|
||||||
final ClientResources.Builder redisClientResourcesBuilder = ClientResources.builder();
|
|
||||||
|
|
||||||
FaultTolerantRedisCluster cacheCluster = configuration.getCacheClusterConfiguration().build("main_cache_cluster",
|
|
||||||
redisClientResourcesBuilder);
|
|
||||||
|
|
||||||
Scheduler messageDeliveryScheduler = Schedulers.fromExecutorService(
|
|
||||||
environment.lifecycle().executorService("messageDelivery-%d").maxThreads(4)
|
|
||||||
.build());
|
|
||||||
ExecutorService keyspaceNotificationDispatchExecutor = environment.lifecycle()
|
|
||||||
.executorService(name(getClass(), "keyspaceNotification-%d")).maxThreads(4).build();
|
|
||||||
ExecutorService messageDeletionExecutor = environment.lifecycle()
|
|
||||||
.executorService(name(getClass(), "messageDeletion-%d")).maxThreads(4).build();
|
|
||||||
ExecutorService secureValueRecoveryExecutor = environment.lifecycle()
|
|
||||||
.executorService(name(getClass(), "secureValueRecoveryService-%d")).maxThreads(1).minThreads(1).build();
|
|
||||||
ExecutorService storageServiceExecutor = environment.lifecycle()
|
|
||||||
.executorService(name(getClass(), "storageService-%d")).maxThreads(1).minThreads(1).build();
|
|
||||||
ExecutorService accountLockExecutor = environment.lifecycle()
|
|
||||||
.executorService(name(getClass(), "accountLock-%d")).minThreads(1).maxThreads(1).build();
|
|
||||||
ExecutorService clientPresenceExecutor = environment.lifecycle()
|
|
||||||
.executorService(name(getClass(), "clientPresence-%d")).minThreads(1).maxThreads(1).build();
|
|
||||||
ScheduledExecutorService secureValueRecoveryServiceRetryExecutor = environment.lifecycle()
|
|
||||||
.scheduledExecutorService(name(getClass(), "secureValueRecoveryServiceRetry-%d")).threads(1).build();
|
|
||||||
ScheduledExecutorService storageServiceRetryExecutor = environment.lifecycle()
|
|
||||||
.scheduledExecutorService(name(getClass(), "storageServiceRetry-%d")).threads(1).build();
|
|
||||||
|
|
||||||
ExternalServiceCredentialsGenerator storageCredentialsGenerator = SecureStorageController.credentialsGenerator(
|
|
||||||
configuration.getSecureStorageServiceConfiguration());
|
|
||||||
ExternalServiceCredentialsGenerator secureValueRecoveryCredentialsGenerator = SecureValueRecovery2Controller.credentialsGenerator(
|
|
||||||
configuration.getSvr2Configuration());
|
|
||||||
|
|
||||||
DynamoDbAsyncClient dynamoDbAsyncClient = configuration.getDynamoDbClientConfiguration()
|
|
||||||
.buildAsyncClient(awsCredentialsProvider);
|
|
||||||
|
|
||||||
DynamoDbClient dynamoDbClient = configuration.getDynamoDbClientConfiguration()
|
|
||||||
.buildSyncClient(awsCredentialsProvider);
|
|
||||||
|
|
||||||
RegistrationRecoveryPasswords registrationRecoveryPasswords = new RegistrationRecoveryPasswords(
|
|
||||||
configuration.getDynamoDbTables().getRegistrationRecovery().getTableName(),
|
|
||||||
configuration.getDynamoDbTables().getRegistrationRecovery().getExpiration(),
|
|
||||||
dynamoDbClient,
|
|
||||||
dynamoDbAsyncClient
|
|
||||||
);
|
|
||||||
|
|
||||||
RegistrationRecoveryPasswordsManager registrationRecoveryPasswordsManager = new RegistrationRecoveryPasswordsManager(registrationRecoveryPasswords);
|
|
||||||
|
|
||||||
Accounts accounts = new Accounts(
|
|
||||||
dynamoDbClient,
|
|
||||||
dynamoDbAsyncClient,
|
|
||||||
configuration.getDynamoDbTables().getAccounts().getTableName(),
|
|
||||||
configuration.getDynamoDbTables().getAccounts().getPhoneNumberTableName(),
|
|
||||||
configuration.getDynamoDbTables().getAccounts().getPhoneNumberIdentifierTableName(),
|
|
||||||
configuration.getDynamoDbTables().getAccounts().getUsernamesTableName(),
|
|
||||||
configuration.getDynamoDbTables().getDeletedAccounts().getTableName());
|
|
||||||
PhoneNumberIdentifiers phoneNumberIdentifiers = new PhoneNumberIdentifiers(dynamoDbClient,
|
|
||||||
configuration.getDynamoDbTables().getPhoneNumberIdentifiers().getTableName());
|
|
||||||
Profiles profiles = new Profiles(dynamoDbClient, dynamoDbAsyncClient,
|
|
||||||
configuration.getDynamoDbTables().getProfiles().getTableName());
|
|
||||||
KeysManager keys = new KeysManager(
|
|
||||||
dynamoDbAsyncClient,
|
|
||||||
configuration.getDynamoDbTables().getEcKeys().getTableName(),
|
|
||||||
configuration.getDynamoDbTables().getKemKeys().getTableName(),
|
|
||||||
configuration.getDynamoDbTables().getEcSignedPreKeys().getTableName(),
|
|
||||||
configuration.getDynamoDbTables().getKemLastResortKeys().getTableName()
|
|
||||||
);
|
|
||||||
MessagesDynamoDb messagesDynamoDb = new MessagesDynamoDb(dynamoDbClient, dynamoDbAsyncClient,
|
|
||||||
configuration.getDynamoDbTables().getMessages().getTableName(),
|
|
||||||
configuration.getDynamoDbTables().getMessages().getExpiration(),
|
|
||||||
messageDeletionExecutor);
|
|
||||||
FaultTolerantRedisCluster messagesCluster = configuration.getMessageCacheConfiguration()
|
|
||||||
.getRedisClusterConfiguration().build("messages", redisClientResourcesBuilder);
|
|
||||||
FaultTolerantRedisCluster clientPresenceCluster = configuration.getClientPresenceClusterConfiguration()
|
|
||||||
.build("client_presence", redisClientResourcesBuilder);
|
|
||||||
FaultTolerantRedisCluster rateLimitersCluster = configuration.getRateLimitersCluster().build("rate_limiters",
|
|
||||||
redisClientResourcesBuilder);
|
|
||||||
SecureValueRecovery2Client secureValueRecovery2Client = new SecureValueRecovery2Client(
|
|
||||||
secureValueRecoveryCredentialsGenerator, secureValueRecoveryExecutor, secureValueRecoveryServiceRetryExecutor,
|
|
||||||
configuration.getSvr2Configuration());
|
|
||||||
SecureStorageClient secureStorageClient = new SecureStorageClient(storageCredentialsGenerator,
|
|
||||||
storageServiceExecutor, storageServiceRetryExecutor, configuration.getSecureStorageServiceConfiguration());
|
|
||||||
ClientPresenceManager clientPresenceManager = new ClientPresenceManager(clientPresenceCluster,
|
|
||||||
Executors.newSingleThreadScheduledExecutor(), keyspaceNotificationDispatchExecutor);
|
|
||||||
MessagesCache messagesCache = new MessagesCache(messagesCluster, keyspaceNotificationDispatchExecutor,
|
|
||||||
messageDeliveryScheduler, messageDeletionExecutor, Clock.systemUTC());
|
|
||||||
ProfilesManager profilesManager = new ProfilesManager(profiles, cacheCluster);
|
|
||||||
ReportMessageDynamoDb reportMessageDynamoDb = new ReportMessageDynamoDb(dynamoDbClient,
|
|
||||||
configuration.getDynamoDbTables().getReportMessage().getTableName(),
|
|
||||||
configuration.getReportMessageConfiguration().getReportTtl());
|
|
||||||
ReportMessageManager reportMessageManager = new ReportMessageManager(reportMessageDynamoDb, rateLimitersCluster,
|
|
||||||
configuration.getReportMessageConfiguration().getCounterTtl());
|
|
||||||
MessagesManager messagesManager = new MessagesManager(messagesDynamoDb, messagesCache,
|
|
||||||
reportMessageManager, messageDeletionExecutor);
|
|
||||||
AccountLockManager accountLockManager = new AccountLockManager(dynamoDbClient,
|
|
||||||
configuration.getDynamoDbTables().getDeletedAccountsLock().getTableName());
|
|
||||||
AccountsManager accountsManager = new AccountsManager(accounts, phoneNumberIdentifiers, cacheCluster,
|
|
||||||
accountLockManager, keys, messagesManager, profilesManager,
|
|
||||||
secureStorageClient, secureValueRecovery2Client, clientPresenceManager,
|
|
||||||
registrationRecoveryPasswordsManager, accountLockExecutor, clientPresenceExecutor,
|
|
||||||
Clock.systemUTC());
|
|
||||||
|
|
||||||
final String usernameHash = namespace.getString("usernameHash");
|
|
||||||
final String encryptedUsername = namespace.getString("encryptedUsername");
|
|
||||||
final UUID accountIdentifier = UUID.fromString(namespace.getString("aci"));
|
|
||||||
|
|
||||||
accountsManager.getByAccountIdentifier(accountIdentifier).ifPresentOrElse(account -> {
|
|
||||||
try {
|
|
||||||
final AccountsManager.UsernameReservation reservation = accountsManager.reserveUsernameHash(account,
|
|
||||||
List.of(Base64.getUrlDecoder().decode(usernameHash))).join();
|
|
||||||
final Account result = accountsManager.confirmReservedUsernameHash(
|
|
||||||
account,
|
|
||||||
reservation.reservedUsernameHash(),
|
|
||||||
encryptedUsername == null ? null : Base64.getUrlDecoder().decode(encryptedUsername)).join();
|
|
||||||
System.out.println("New username hash: " + Base64.getUrlEncoder().encodeToString(result.getUsernameHash().orElseThrow()));
|
|
||||||
System.out.println("New username link handle: " + result.getUsernameLinkHandle().toString());
|
|
||||||
} catch (final CompletionException e) {
|
|
||||||
if (ExceptionUtils.unwrap(e) instanceof UsernameHashNotAvailableException) {
|
|
||||||
throw new IllegalArgumentException("Username hash already taken");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ExceptionUtils.unwrap(e) instanceof UsernameReservationNotFoundException) {
|
|
||||||
throw new IllegalArgumentException("Username hash reservation not found");
|
|
||||||
}
|
|
||||||
|
|
||||||
throw e;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
() -> {
|
|
||||||
throw new IllegalArgumentException("Account not found");
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue