diff --git a/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java index 88a3e9007..e13159f8f 100644 --- a/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java +++ b/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java @@ -20,7 +20,6 @@ import com.google.common.base.Optional; import com.yammer.dropwizard.Service; import com.yammer.dropwizard.config.Bootstrap; import com.yammer.dropwizard.config.Environment; -import com.yammer.dropwizard.config.FilterBuilder; import com.yammer.dropwizard.db.DatabaseConfiguration; import com.yammer.dropwizard.jdbi.DBIFactory; import com.yammer.dropwizard.migrations.MigrationsBundle; @@ -28,7 +27,7 @@ import com.yammer.metrics.reporting.GraphiteReporter; import net.spy.memcached.MemcachedClient; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.skife.jdbi.v2.DBI; -import org.whispersystems.textsecuregcm.auth.AccountAuthenticator; +import org.whispersystems.textsecuregcm.auth.DeviceAuthenticator; import org.whispersystems.textsecuregcm.auth.FederatedPeerAuthenticator; import org.whispersystems.textsecuregcm.auth.MultiBasicAuthProvider; import org.whispersystems.textsecuregcm.configuration.NexmoConfiguration; @@ -52,7 +51,7 @@ import org.whispersystems.textsecuregcm.push.PushSender; import org.whispersystems.textsecuregcm.sms.NexmoSmsSender; import org.whispersystems.textsecuregcm.sms.SmsSender; import org.whispersystems.textsecuregcm.sms.TwilioSmsSender; -import org.whispersystems.textsecuregcm.storage.Account; +import org.whispersystems.textsecuregcm.storage.Device; import org.whispersystems.textsecuregcm.storage.Accounts; import org.whispersystems.textsecuregcm.storage.AccountsManager; import org.whispersystems.textsecuregcm.storage.DirectoryManager; @@ -67,7 +66,6 @@ import org.whispersystems.textsecuregcm.util.CORSHeaderFilter; import org.whispersystems.textsecuregcm.util.UrlSigner; import org.whispersystems.textsecuregcm.workers.DirectoryCommand; -import java.io.IOException; import java.security.Security; import java.util.concurrent.TimeUnit; @@ -111,7 +109,7 @@ public class WhisperServerService extends Service { PendingAccountsManager pendingAccountsManager = new PendingAccountsManager(pendingAccounts, memcachedClient); PendingDevicesManager pendingDevicesManager = new PendingDevicesManager(pendingDevices, memcachedClient); AccountsManager accountsManager = new AccountsManager(accounts, directory, memcachedClient); - AccountAuthenticator accountAuthenticator = new AccountAuthenticator(accountsManager ); + DeviceAuthenticator deviceAuthenticator = new DeviceAuthenticator(accountsManager ); FederatedClientManager federatedClientManager = new FederatedClientManager(config.getFederationConfiguration()); StoredMessageManager storedMessageManager = new StoredMessageManager(storedMessages); RateLimiters rateLimiters = new RateLimiters(config.getLimitsConfiguration(), memcachedClient); @@ -126,8 +124,8 @@ public class WhisperServerService extends Service { environment.addProvider(new MultiBasicAuthProvider<>(new FederatedPeerAuthenticator(config.getFederationConfiguration()), FederatedPeer.class, - accountAuthenticator, - Account.class, "WhisperServer")); + deviceAuthenticator, + Device.class, "WhisperServer")); environment.addResource(new AccountController(pendingAccountsManager, accountsManager, rateLimiters, smsSender)); environment.addResource(new DeviceController(pendingDevicesManager, accountsManager, rateLimiters)); @@ -136,7 +134,7 @@ public class WhisperServerService extends Service { environment.addResource(new KeysController(rateLimiters, keys, accountsManager, federatedClientManager)); environment.addResource(new FederationController(keys, accountsManager, pushSender, urlSigner)); - environment.addServlet(new MessageController(rateLimiters, accountAuthenticator, + environment.addServlet(new MessageController(rateLimiters, deviceAuthenticator, pushSender, federatedClientManager), MessageController.PATH); diff --git a/src/main/java/org/whispersystems/textsecuregcm/auth/AccountAuthenticator.java b/src/main/java/org/whispersystems/textsecuregcm/auth/AccountAuthenticator.java deleted file mode 100644 index 58b517de6..000000000 --- a/src/main/java/org/whispersystems/textsecuregcm/auth/AccountAuthenticator.java +++ /dev/null @@ -1,74 +0,0 @@ -/** - * Copyright (C) 2013 Open WhisperSystems - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero 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 Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package org.whispersystems.textsecuregcm.auth; - -import com.google.common.base.Optional; -import com.yammer.dropwizard.auth.AuthenticationException; -import com.yammer.dropwizard.auth.Authenticator; -import com.yammer.dropwizard.auth.basic.BasicCredentials; -import com.yammer.metrics.Metrics; -import com.yammer.metrics.core.Meter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.whispersystems.textsecuregcm.storage.Account; -import org.whispersystems.textsecuregcm.storage.AccountsManager; - -import java.util.concurrent.TimeUnit; - -public class AccountAuthenticator implements Authenticator { - - private final Meter authenticationFailedMeter = Metrics.newMeter(AccountAuthenticator.class, - "authentication", "failed", - TimeUnit.MINUTES); - - private final Meter authenticationSucceededMeter = Metrics.newMeter(AccountAuthenticator.class, - "authentication", "succeeded", - TimeUnit.MINUTES); - - private final Logger logger = LoggerFactory.getLogger(AccountAuthenticator.class); - - private final AccountsManager accountsManager; - - public AccountAuthenticator(AccountsManager accountsManager) { - this.accountsManager = accountsManager; - } - - @Override - public Optional authenticate(BasicCredentials basicCredentials) - throws AuthenticationException - { - AuthorizationHeader authorizationHeader; - try { - authorizationHeader = AuthorizationHeader.fromUserAndPassword(basicCredentials.getUsername(), basicCredentials.getPassword()); - } catch (InvalidAuthorizationHeaderException iahe) { - return Optional.absent(); - } - Optional account = accountsManager.get(authorizationHeader.getNumber(), authorizationHeader.getDeviceId()); - - if (!account.isPresent()) { - return Optional.absent(); - } - - if (account.get().getAuthenticationCredentials().verify(basicCredentials.getPassword())) { - authenticationSucceededMeter.mark(); - return account; - } - - authenticationFailedMeter.mark(); - return Optional.absent(); - } -} diff --git a/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java b/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java index e7db1f073..65aa88330 100644 --- a/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java +++ b/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java @@ -31,7 +31,7 @@ import org.whispersystems.textsecuregcm.entities.GcmRegistrationId; import org.whispersystems.textsecuregcm.limits.RateLimiters; import org.whispersystems.textsecuregcm.sms.SmsSender; import org.whispersystems.textsecuregcm.sms.TwilioSmsSender; -import org.whispersystems.textsecuregcm.storage.Account; +import org.whispersystems.textsecuregcm.storage.Device; import org.whispersystems.textsecuregcm.storage.AccountsManager; import org.whispersystems.textsecuregcm.storage.PendingAccountsManager; import org.whispersystems.textsecuregcm.util.Util; @@ -134,19 +134,19 @@ public class AccountController { throw new WebApplicationException(Response.status(403).build()); } - Account account = new Account(); - account.setNumber(number); - account.setAuthenticationCredentials(new AuthenticationCredentials(password)); - account.setSignalingKey(accountAttributes.getSignalingKey()); - account.setSupportsSms(accountAttributes.getSupportsSms()); - account.setFetchesMessages(accountAttributes.getFetchesMessages()); - account.setDeviceId(0); + Device device = new Device(); + device.setNumber(number); + device.setAuthenticationCredentials(new AuthenticationCredentials(password)); + device.setSignalingKey(accountAttributes.getSignalingKey()); + device.setSupportsSms(accountAttributes.getSupportsSms()); + device.setFetchesMessages(accountAttributes.getFetchesMessages()); + device.setDeviceId(0); - accounts.createResetNumber(account); + accounts.createResetNumber(device); pendingAccounts.remove(number); - logger.debug("Stored account..."); + logger.debug("Stored device..."); } catch (InvalidAuthorizationHeaderException e) { logger.info("Bad Authorization Header", e); throw new WebApplicationException(Response.status(401).build()); @@ -159,36 +159,36 @@ public class AccountController { @PUT @Path("/gcm/") @Consumes(MediaType.APPLICATION_JSON) - public void setGcmRegistrationId(@Auth Account account, @Valid GcmRegistrationId registrationId) { - account.setApnRegistrationId(null); - account.setGcmRegistrationId(registrationId.getGcmRegistrationId()); - accounts.update(account); + public void setGcmRegistrationId(@Auth Device device, @Valid GcmRegistrationId registrationId) { + device.setApnRegistrationId(null); + device.setGcmRegistrationId(registrationId.getGcmRegistrationId()); + accounts.update(device); } @Timed @DELETE @Path("/gcm/") - public void deleteGcmRegistrationId(@Auth Account account) { - account.setGcmRegistrationId(null); - accounts.update(account); + public void deleteGcmRegistrationId(@Auth Device device) { + device.setGcmRegistrationId(null); + accounts.update(device); } @Timed @PUT @Path("/apn/") @Consumes(MediaType.APPLICATION_JSON) - public void setApnRegistrationId(@Auth Account account, @Valid ApnRegistrationId registrationId) { - account.setApnRegistrationId(registrationId.getApnRegistrationId()); - account.setGcmRegistrationId(null); - accounts.update(account); + public void setApnRegistrationId(@Auth Device device, @Valid ApnRegistrationId registrationId) { + device.setApnRegistrationId(registrationId.getApnRegistrationId()); + device.setGcmRegistrationId(null); + accounts.update(device); } @Timed @DELETE @Path("/apn/") - public void deleteApnRegistrationId(@Auth Account account) { - account.setApnRegistrationId(null); - accounts.update(account); + public void deleteApnRegistrationId(@Auth Device device) { + device.setApnRegistrationId(null); + accounts.update(device); } @Timed diff --git a/src/main/java/org/whispersystems/textsecuregcm/controllers/AttachmentController.java b/src/main/java/org/whispersystems/textsecuregcm/controllers/AttachmentController.java index 38d0fd8a7..4b4b01f99 100644 --- a/src/main/java/org/whispersystems/textsecuregcm/controllers/AttachmentController.java +++ b/src/main/java/org/whispersystems/textsecuregcm/controllers/AttachmentController.java @@ -26,7 +26,7 @@ import org.whispersystems.textsecuregcm.entities.AttachmentUri; import org.whispersystems.textsecuregcm.federation.FederatedClientManager; import org.whispersystems.textsecuregcm.federation.NoSuchPeerException; import org.whispersystems.textsecuregcm.limits.RateLimiters; -import org.whispersystems.textsecuregcm.storage.Account; +import org.whispersystems.textsecuregcm.storage.Device; import org.whispersystems.textsecuregcm.util.Conversions; import org.whispersystems.textsecuregcm.util.UrlSigner; @@ -38,7 +38,6 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import java.io.IOException; -import java.net.URISyntaxException; import java.net.URL; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; @@ -65,8 +64,8 @@ public class AttachmentController { @Timed @GET @Produces(MediaType.APPLICATION_JSON) - public Response allocateAttachment(@Auth Account account) throws RateLimitExceededException { - rateLimiters.getAttachmentLimiter().validate(account.getNumber()); + public Response allocateAttachment(@Auth Device device) throws RateLimitExceededException { + rateLimiters.getAttachmentLimiter().validate(device.getNumber()); long attachmentId = generateAttachmentId(); URL url = urlSigner.getPreSignedUrl(attachmentId, HttpMethod.PUT); @@ -79,7 +78,7 @@ public class AttachmentController { @GET @Produces(MediaType.APPLICATION_JSON) @Path("/{attachmentId}") - public Response redirectToAttachment(@Auth Account account, + public Response redirectToAttachment(@Auth Device device, @PathParam("attachmentId") long attachmentId, @QueryParam("relay") String relay) { diff --git a/src/main/java/org/whispersystems/textsecuregcm/controllers/DeviceController.java b/src/main/java/org/whispersystems/textsecuregcm/controllers/DeviceController.java index 2e9fecdf9..831201bee 100644 --- a/src/main/java/org/whispersystems/textsecuregcm/controllers/DeviceController.java +++ b/src/main/java/org/whispersystems/textsecuregcm/controllers/DeviceController.java @@ -27,7 +27,7 @@ import org.whispersystems.textsecuregcm.auth.AuthorizationHeader; import org.whispersystems.textsecuregcm.auth.InvalidAuthorizationHeaderException; import org.whispersystems.textsecuregcm.entities.AccountAttributes; import org.whispersystems.textsecuregcm.limits.RateLimiters; -import org.whispersystems.textsecuregcm.storage.Account; +import org.whispersystems.textsecuregcm.storage.Device; import org.whispersystems.textsecuregcm.storage.AccountsManager; import org.whispersystems.textsecuregcm.storage.PendingDevicesManager; import org.whispersystems.textsecuregcm.util.VerificationCode; @@ -66,14 +66,15 @@ public class DeviceController { @Timed @GET + @Path("/provisioning_code") @Produces(MediaType.APPLICATION_JSON) - public VerificationCode createDeviceToken(@Auth Account account) + public VerificationCode createDeviceToken(@Auth Device device) throws RateLimitExceededException { - rateLimiters.getVerifyLimiter().validate(account.getNumber()); //TODO: New limiter? + rateLimiters.getVerifyLimiter().validate(device.getNumber()); //TODO: New limiter? VerificationCode verificationCode = generateVerificationCode(); - pendingDevices.store(account.getNumber(), verificationCode.getVerificationCode()); + pendingDevices.store(device.getNumber(), verificationCode.getVerificationCode()); return verificationCode; } @@ -88,7 +89,7 @@ public class DeviceController { @Valid AccountAttributes accountAttributes) throws RateLimitExceededException { - Account account; + Device device; try { AuthorizationHeader header = AuthorizationHeader.fromFullHeader(authorizationHeader); String number = header.getNumber(); @@ -104,24 +105,24 @@ public class DeviceController { throw new WebApplicationException(Response.status(403).build()); } - account = new Account(); - account.setNumber(number); - account.setAuthenticationCredentials(new AuthenticationCredentials(password)); - account.setSignalingKey(accountAttributes.getSignalingKey()); - account.setSupportsSms(accountAttributes.getSupportsSms()); - account.setFetchesMessages(accountAttributes.getFetchesMessages()); + device = new Device(); + device.setNumber(number); + device.setAuthenticationCredentials(new AuthenticationCredentials(password)); + device.setSignalingKey(accountAttributes.getSignalingKey()); + device.setSupportsSms(accountAttributes.getSupportsSms()); + device.setFetchesMessages(accountAttributes.getFetchesMessages()); - accounts.createAccountOnExistingNumber(account); + accounts.createAccountOnExistingNumber(device); pendingDevices.remove(number); - logger.debug("Stored new device account..."); + logger.debug("Stored new device device..."); } catch (InvalidAuthorizationHeaderException e) { logger.info("Bad Authorization Header", e); throw new WebApplicationException(Response.status(401).build()); } - return account.getDeviceId(); + return device.getDeviceId(); } @VisibleForTesting protected VerificationCode generateVerificationCode() { diff --git a/src/main/java/org/whispersystems/textsecuregcm/controllers/DirectoryController.java b/src/main/java/org/whispersystems/textsecuregcm/controllers/DirectoryController.java index a1b367f17..336a5d4d5 100644 --- a/src/main/java/org/whispersystems/textsecuregcm/controllers/DirectoryController.java +++ b/src/main/java/org/whispersystems/textsecuregcm/controllers/DirectoryController.java @@ -18,12 +18,11 @@ package org.whispersystems.textsecuregcm.controllers; import com.google.common.base.Optional; import com.yammer.dropwizard.auth.Auth; -import com.yammer.metrics.annotation.Metered; import com.yammer.metrics.annotation.Timed; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.whispersystems.textsecuregcm.limits.RateLimiters; -import org.whispersystems.textsecuregcm.storage.Account; +import org.whispersystems.textsecuregcm.storage.Device; import org.whispersystems.textsecuregcm.entities.ClientContact; import org.whispersystems.textsecuregcm.entities.ClientContactTokens; import org.whispersystems.textsecuregcm.entities.ClientContacts; @@ -61,10 +60,10 @@ public class DirectoryController { @GET @Path("/{token}") @Produces(MediaType.APPLICATION_JSON) - public Response getTokenPresence(@Auth Account account, @PathParam("token") String token) + public Response getTokenPresence(@Auth Device device, @PathParam("token") String token) throws RateLimitExceededException { - rateLimiters.getContactsLimiter().validate(account.getNumber()); + rateLimiters.getContactsLimiter().validate(device.getNumber()); try { Optional contact = directory.get(Base64.decodeWithoutPadding(token)); @@ -83,10 +82,10 @@ public class DirectoryController { @Path("/tokens") @Produces(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON) - public ClientContacts getContactIntersection(@Auth Account account, @Valid ClientContactTokens contacts) + public ClientContacts getContactIntersection(@Auth Device device, @Valid ClientContactTokens contacts) throws RateLimitExceededException { - rateLimiters.getContactsLimiter().validate(account.getNumber(), contacts.getContacts().size()); + rateLimiters.getContactsLimiter().validate(device.getNumber(), contacts.getContacts().size()); try { List tokens = new LinkedList<>(); diff --git a/src/main/java/org/whispersystems/textsecuregcm/controllers/FederationController.java b/src/main/java/org/whispersystems/textsecuregcm/controllers/FederationController.java index 20d2ebdd7..d3f11a9af 100644 --- a/src/main/java/org/whispersystems/textsecuregcm/controllers/FederationController.java +++ b/src/main/java/org/whispersystems/textsecuregcm/controllers/FederationController.java @@ -32,7 +32,7 @@ import org.whispersystems.textsecuregcm.entities.RelayMessage; import org.whispersystems.textsecuregcm.entities.UnstructuredPreKeyList; import org.whispersystems.textsecuregcm.federation.FederatedPeer; import org.whispersystems.textsecuregcm.push.PushSender; -import org.whispersystems.textsecuregcm.storage.Account; +import org.whispersystems.textsecuregcm.storage.Device; import org.whispersystems.textsecuregcm.storage.AccountsManager; import org.whispersystems.textsecuregcm.storage.Keys; import org.whispersystems.textsecuregcm.util.Pair; @@ -124,7 +124,7 @@ public class FederationController { deviceIds.second().add(message.getDestinationDeviceId()); } - Map, Account> accountCache = new HashMap<>(); + Map, Device> accountCache = new HashMap<>(); List numbersMissingDevices = new LinkedList<>(); pushSender.fillLocalAccountsCache(destinations, accountCache, numbersMissingDevices); @@ -132,15 +132,15 @@ public class FederationController { List failure = new LinkedList<>(numbersMissingDevices); for (RelayMessage message : messages) { - Account account = accountCache.get(new Pair<>(message.getDestination(), message.getDestinationDeviceId())); - if (account == null) + Device device = accountCache.get(new Pair<>(message.getDestination(), message.getDestinationDeviceId())); + if (device == null) continue; OutgoingMessageSignal signal = OutgoingMessageSignal.parseFrom(message.getOutgoingMessageSignal()) .toBuilder() .setRelay(peer.getName()) .build(); try { - pushSender.sendMessage(account, signal); + pushSender.sendMessage(device, signal); } catch (NoSuchUserException e) { logger.info("No such user", e); failure.add(message.getDestination()); @@ -169,14 +169,14 @@ public class FederationController { public ClientContacts getUserTokens(@Auth FederatedPeer peer, @PathParam("offset") int offset) { - List numberList = accounts.getAllMasterAccounts(offset, ACCOUNT_CHUNK_SIZE); + List numberList = accounts.getAllMasterAccounts(offset, ACCOUNT_CHUNK_SIZE); List clientContacts = new LinkedList<>(); - for (Account account : numberList) { - byte[] token = Util.getContactToken(account.getNumber()); - ClientContact clientContact = new ClientContact(token, null, account.getSupportsSms()); + for (Device device : numberList) { + byte[] token = Util.getContactToken(device.getNumber()); + ClientContact clientContact = new ClientContact(token, null, device.getSupportsSms()); - if (!account.isActive()) + if (!device.isActive()) clientContact.setInactive(true); clientContacts.add(clientContact); diff --git a/src/main/java/org/whispersystems/textsecuregcm/controllers/KeysController.java b/src/main/java/org/whispersystems/textsecuregcm/controllers/KeysController.java index d1ec83648..1c4b6bb6f 100644 --- a/src/main/java/org/whispersystems/textsecuregcm/controllers/KeysController.java +++ b/src/main/java/org/whispersystems/textsecuregcm/controllers/KeysController.java @@ -27,7 +27,7 @@ import org.whispersystems.textsecuregcm.entities.UnstructuredPreKeyList; import org.whispersystems.textsecuregcm.federation.FederatedClientManager; import org.whispersystems.textsecuregcm.federation.NoSuchPeerException; import org.whispersystems.textsecuregcm.limits.RateLimiters; -import org.whispersystems.textsecuregcm.storage.Account; +import org.whispersystems.textsecuregcm.storage.Device; import org.whispersystems.textsecuregcm.storage.AccountsManager; import org.whispersystems.textsecuregcm.storage.Keys; @@ -66,13 +66,13 @@ public class KeysController { @Timed @PUT @Consumes(MediaType.APPLICATION_JSON) - public void setKeys(@Auth Account account, @Valid PreKeyList preKeys) { - keys.store(account.getNumber(), account.getDeviceId(), preKeys.getLastResortKey(), preKeys.getKeys()); + public void setKeys(@Auth Device device, @Valid PreKeyList preKeys) { + keys.store(device.getNumber(), device.getDeviceId(), preKeys.getLastResortKey(), preKeys.getKeys()); } - public List getKeys(Account account, String number, String relay) throws RateLimitExceededException + private List getKeys(Device device, String number, String relay) throws RateLimitExceededException { - rateLimiters.getPreKeysLimiter().validate(account.getNumber() + "__" + number); + rateLimiters.getPreKeysLimiter().validate(device.getNumber() + "__" + number); try { UnstructuredPreKeyList keyList; @@ -95,15 +95,15 @@ public class KeysController { @GET @Path("/{number}") @Produces(MediaType.APPLICATION_JSON) - public Response get(@Auth Account account, + public Response get(@Auth Device device, @PathParam("number") String number, @QueryParam("multikeys") Optional multikey, @QueryParam("relay") String relay) throws RateLimitExceededException { if (!multikey.isPresent()) - return Response.ok(getKeys(account, number, relay).get(0)).type(MediaType.APPLICATION_JSON).build(); + return Response.ok(getKeys(device, number, relay).get(0)).type(MediaType.APPLICATION_JSON).build(); else - return Response.ok(getKeys(account, number, relay)).type(MediaType.APPLICATION_JSON).build(); + return Response.ok(getKeys(device, number, relay)).type(MediaType.APPLICATION_JSON).build(); } } diff --git a/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java b/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java index 22ccdbf63..9d431c832 100644 --- a/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java +++ b/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java @@ -28,7 +28,7 @@ import com.yammer.metrics.core.Timer; import com.yammer.metrics.core.TimerContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.whispersystems.textsecuregcm.auth.AccountAuthenticator; +import org.whispersystems.textsecuregcm.auth.DeviceAuthenticator; import org.whispersystems.textsecuregcm.auth.AuthorizationHeader; import org.whispersystems.textsecuregcm.auth.InvalidAuthorizationHeaderException; import org.whispersystems.textsecuregcm.entities.IncomingMessage; @@ -41,7 +41,7 @@ import org.whispersystems.textsecuregcm.federation.FederatedClientManager; import org.whispersystems.textsecuregcm.federation.NoSuchPeerException; import org.whispersystems.textsecuregcm.limits.RateLimiters; import org.whispersystems.textsecuregcm.push.PushSender; -import org.whispersystems.textsecuregcm.storage.Account; +import org.whispersystems.textsecuregcm.storage.Device; import org.whispersystems.textsecuregcm.util.Base64; import org.whispersystems.textsecuregcm.util.IterablePair; import org.whispersystems.textsecuregcm.util.Pair; @@ -74,19 +74,19 @@ public class MessageController extends HttpServlet { private final Logger logger = LoggerFactory.getLogger(MessageController.class); private final RateLimiters rateLimiters; - private final AccountAuthenticator accountAuthenticator; + private final DeviceAuthenticator deviceAuthenticator; private final PushSender pushSender; private final FederatedClientManager federatedClientManager; private final ObjectMapper objectMapper; private final ExecutorService executor; public MessageController(RateLimiters rateLimiters, - AccountAuthenticator accountAuthenticator, + DeviceAuthenticator deviceAuthenticator, PushSender pushSender, FederatedClientManager federatedClientManager) { this.rateLimiters = rateLimiters; - this.accountAuthenticator = accountAuthenticator; + this.deviceAuthenticator = deviceAuthenticator; this.pushSender = pushSender; this.federatedClientManager = federatedClientManager; this.objectMapper = new ObjectMapper(); @@ -98,13 +98,13 @@ public class MessageController extends HttpServlet { TimerContext timerContext = timer.time(); try { - Account sender = authenticate(req); + Device sender = authenticate(req); IncomingMessageList messages = parseIncomingMessages(req); rateLimiters.getMessagesLimiter().validate(sender.getNumber()); - Map, Account> accountCache = new HashMap<>(); + Map, Device> accountCache = new HashMap<>(); List numbersMissingDevices = new LinkedList<>(); List incomingMessages = messages.getMessages(); @@ -140,7 +140,7 @@ public class MessageController extends HttpServlet { private void handleAsyncDelivery(final TimerContext timerContext, final AsyncContext context, final IterablePair listPair, - final Map, Account> accountCache, + final Map, Device> accountCache, final List numbersMissingDevices) { executor.submit(new Runnable() { @@ -223,7 +223,7 @@ public class MessageController extends HttpServlet { @Nullable private List getOutgoingMessageSignals(String sourceNumber, List incomingMessages, - Map, Account> accountCache, + Map, Device> accountCache, List numbersMissingDevices) { List outgoingMessages = new LinkedList<>(); @@ -310,13 +310,13 @@ public class MessageController extends HttpServlet { return messages; } - private Account authenticate(HttpServletRequest request) throws AuthenticationException { + private Device authenticate(HttpServletRequest request) throws AuthenticationException { try { AuthorizationHeader authorizationHeader = AuthorizationHeader.fromFullHeader(request.getHeader("Authorization")); BasicCredentials credentials = new BasicCredentials(authorizationHeader.getNumber() + "." + authorizationHeader.getDeviceId(), authorizationHeader.getPassword() ); - Optional account = accountAuthenticator.authenticate(credentials); + Optional account = deviceAuthenticator.authenticate(credentials); if (account.isPresent()) return account.get(); else throw new AuthenticationException("Bad credentials"); @@ -332,7 +332,7 @@ public class MessageController extends HttpServlet { // @POST // @Consumes(MediaType.APPLICATION_JSON) // @Produces(MediaType.APPLICATION_JSON) -// public MessageResponse sendMessage(@Auth Account sender, IncomingMessageList messages) +// public MessageResponse sendMessage(@Auth Device sender, IncomingMessageList messages) // throws IOException // { // List success = new LinkedList<>(); diff --git a/src/main/java/org/whispersystems/textsecuregcm/push/PushSender.java b/src/main/java/org/whispersystems/textsecuregcm/push/PushSender.java index bd38cdc21..0e11b0515 100644 --- a/src/main/java/org/whispersystems/textsecuregcm/push/PushSender.java +++ b/src/main/java/org/whispersystems/textsecuregcm/push/PushSender.java @@ -23,7 +23,7 @@ import org.whispersystems.textsecuregcm.configuration.GcmConfiguration; import org.whispersystems.textsecuregcm.controllers.NoSuchUserException; import org.whispersystems.textsecuregcm.entities.EncryptedOutgoingMessage; import org.whispersystems.textsecuregcm.entities.MessageProtos; -import org.whispersystems.textsecuregcm.storage.Account; +import org.whispersystems.textsecuregcm.storage.Device; import org.whispersystems.textsecuregcm.storage.AccountsManager; import org.whispersystems.textsecuregcm.storage.DirectoryManager; import org.whispersystems.textsecuregcm.storage.StoredMessageManager; @@ -68,67 +68,67 @@ public class PushSender { * @param accountCache Map from <number, deviceId> to account * @param numbersMissingDevices list of numbers missing devices */ - public void fillLocalAccountsCache(Map>> destinations, Map, Account> accountCache, List numbersMissingDevices) { + public void fillLocalAccountsCache(Map>> destinations, Map, Device> accountCache, List numbersMissingDevices) { for (Map.Entry>> destination : destinations.entrySet()) { if (destination.getValue().first()) { String number = destination.getKey(); - List accountList = accounts.getAllByNumber(number); + List deviceList = accounts.getAllByNumber(number); Set deviceIdsIncluded = destination.getValue().second(); - if (accountList.size() != deviceIdsIncluded.size()) + if (deviceList.size() != deviceIdsIncluded.size()) numbersMissingDevices.add(number); else { - for (Account account : accountList) { - if (!deviceIdsIncluded.contains(account.getDeviceId())) { + for (Device device : deviceList) { + if (!deviceIdsIncluded.contains(device.getDeviceId())) { numbersMissingDevices.add(number); break; } } - for (Account account : accountList) - accountCache.put(new Pair<>(number, account.getDeviceId()), account); + for (Device device : deviceList) + accountCache.put(new Pair<>(number, device.getDeviceId()), device); } } } } - public void sendMessage(Account account, MessageProtos.OutgoingMessageSignal outgoingMessage) + public void sendMessage(Device device, MessageProtos.OutgoingMessageSignal outgoingMessage) throws IOException, NoSuchUserException { - String signalingKey = account.getSignalingKey(); + String signalingKey = device.getSignalingKey(); EncryptedOutgoingMessage message = new EncryptedOutgoingMessage(outgoingMessage, signalingKey); - if (account.getGcmRegistrationId() != null) sendGcmMessage(account, message); - else if (account.getApnRegistrationId() != null) sendApnMessage(account, message); - else if (account.getFetchesMessages()) storeFetchedMessage(account, message); + if (device.getGcmRegistrationId() != null) sendGcmMessage(device, message); + else if (device.getApnRegistrationId() != null) sendApnMessage(device, message); + else if (device.getFetchesMessages()) storeFetchedMessage(device, message); else throw new NoSuchUserException("No push identifier!"); } - private void sendGcmMessage(Account account, EncryptedOutgoingMessage outgoingMessage) + private void sendGcmMessage(Device device, EncryptedOutgoingMessage outgoingMessage) throws IOException, NoSuchUserException { try { - String canonicalId = gcmSender.sendMessage(account.getGcmRegistrationId(), + String canonicalId = gcmSender.sendMessage(device.getGcmRegistrationId(), outgoingMessage); if (canonicalId != null) { - account.setGcmRegistrationId(canonicalId); - accounts.update(account); + device.setGcmRegistrationId(canonicalId); + accounts.update(device); } } catch (NoSuchUserException e) { logger.debug("No Such User", e); - account.setGcmRegistrationId(null); - accounts.update(account); + device.setGcmRegistrationId(null); + accounts.update(device); throw new NoSuchUserException("User no longer exists in GCM."); } } - private void sendApnMessage(Account account, EncryptedOutgoingMessage outgoingMessage) + private void sendApnMessage(Device device, EncryptedOutgoingMessage outgoingMessage) throws IOException { - apnSender.sendMessage(account.getApnRegistrationId(), outgoingMessage); + apnSender.sendMessage(device.getApnRegistrationId(), outgoingMessage); } - private void storeFetchedMessage(Account account, EncryptedOutgoingMessage outgoingMessage) throws IOException { - storedMessageManager.storeMessage(account, outgoingMessage); + private void storeFetchedMessage(Device device, EncryptedOutgoingMessage outgoingMessage) throws IOException { + storedMessageManager.storeMessage(device, outgoingMessage); } } diff --git a/src/main/java/org/whispersystems/textsecuregcm/storage/Accounts.java b/src/main/java/org/whispersystems/textsecuregcm/storage/Accounts.java index 11263e6f0..2165a179a 100644 --- a/src/main/java/org/whispersystems/textsecuregcm/storage/Accounts.java +++ b/src/main/java/org/whispersystems/textsecuregcm/storage/Accounts.java @@ -58,15 +58,15 @@ public abstract class Accounts { GCM_ID + ", " + APN_ID + ", " + SUPPORTS_SMS + ") " + "VALUES (:number, :device_id, :auth_token, :salt, :signaling_key, :fetches_messages, :gcm_id, :apn_id, :supports_sms)") @GetGeneratedKeys - abstract long insertStep(@AccountBinder Account account); + abstract long insertStep(@AccountBinder Device device); @SqlQuery("SELECT " + DEVICE_ID + " FROM accounts WHERE " + NUMBER + " = :number ORDER BY " + DEVICE_ID + " DESC LIMIT 1 FOR UPDATE") abstract long getHighestDeviceId(@Bind("number") String number); @Transaction(TransactionIsolationLevel.SERIALIZABLE) - public long insert(@AccountBinder Account account) { - account.setDeviceId(getHighestDeviceId(account.getNumber()) + 1); - return insertStep(account); + public long insert(@AccountBinder Device device) { + device.setDeviceId(getHighestDeviceId(device.getNumber()) + 1); + return insertStep(device); } @SqlUpdate("DELETE FROM accounts WHERE " + NUMBER + " = :number RETURNING id") @@ -76,41 +76,41 @@ public abstract class Accounts { SIGNALING_KEY + " = :signaling_key, " + GCM_ID + " = :gcm_id, " + APN_ID + " = :apn_id, " + FETCHES_MESSAGES + " = :fetches_messages, " + SUPPORTS_SMS + " = :supports_sms " + "WHERE " + NUMBER + " = :number AND " + DEVICE_ID + " = :device_id") - abstract void update(@AccountBinder Account account); + abstract void update(@AccountBinder Device device); @Mapper(AccountMapper.class) @SqlQuery("SELECT * FROM accounts WHERE " + NUMBER + " = :number AND " + DEVICE_ID + " = :device_id") - abstract Account get(@Bind("number") String number, @Bind("device_id") long deviceId); + abstract Device get(@Bind("number") String number, @Bind("device_id") long deviceId); @SqlQuery("SELECT COUNT(DISTINCT " + NUMBER + ") from accounts") abstract long getNumberCount(); @Mapper(AccountMapper.class) @SqlQuery("SELECT * FROM accounts WHERE " + DEVICE_ID + " = 1 OFFSET :offset LIMIT :limit") - abstract List getAllFirstAccounts(@Bind("offset") int offset, @Bind("limit") int length); + abstract List getAllFirstAccounts(@Bind("offset") int offset, @Bind("limit") int length); @Mapper(AccountMapper.class) @SqlQuery("SELECT * FROM accounts WHERE " + DEVICE_ID + " = 1") - public abstract Iterator getAllFirstAccounts(); + public abstract Iterator getAllFirstAccounts(); @Mapper(AccountMapper.class) @SqlQuery("SELECT * FROM accounts WHERE " + NUMBER + " = :number") - public abstract List getAllByNumber(@Bind("number") String number); + public abstract List getAllByNumber(@Bind("number") String number); @Transaction(TransactionIsolationLevel.SERIALIZABLE) - public long insertClearingNumber(Account account) { - removeAccountsByNumber(account.getNumber()); - account.setDeviceId(getHighestDeviceId(account.getNumber()) + 1); - return insertStep(account); + public long insertClearingNumber(Device device) { + removeAccountsByNumber(device.getNumber()); + device.setDeviceId(getHighestDeviceId(device.getNumber()) + 1); + return insertStep(device); } - public static class AccountMapper implements ResultSetMapper { + public static class AccountMapper implements ResultSetMapper { @Override - public Account map(int i, ResultSet resultSet, StatementContext statementContext) + public Device map(int i, ResultSet resultSet, StatementContext statementContext) throws SQLException { - return new Account(resultSet.getLong(ID), resultSet.getString(NUMBER), resultSet.getLong(DEVICE_ID), + return new Device(resultSet.getLong(ID), resultSet.getString(NUMBER), resultSet.getLong(DEVICE_ID), resultSet.getString(AUTH_TOKEN), resultSet.getString(SALT), resultSet.getString(SIGNALING_KEY), resultSet.getString(GCM_ID), resultSet.getString(APN_ID), @@ -125,23 +125,23 @@ public abstract class Accounts { public static class AccountBinderFactory implements BinderFactory { @Override public Binder build(Annotation annotation) { - return new Binder() { + return new Binder() { @Override public void bind(SQLStatement sql, AccountBinder accountBinder, - Account account) + Device device) { - sql.bind(ID, account.getId()); - sql.bind(NUMBER, account.getNumber()); - sql.bind(DEVICE_ID, account.getDeviceId()); - sql.bind(AUTH_TOKEN, account.getAuthenticationCredentials() + sql.bind(ID, device.getId()); + sql.bind(NUMBER, device.getNumber()); + sql.bind(DEVICE_ID, device.getDeviceId()); + sql.bind(AUTH_TOKEN, device.getAuthenticationCredentials() .getHashedAuthenticationToken()); - sql.bind(SALT, account.getAuthenticationCredentials().getSalt()); - sql.bind(SIGNALING_KEY, account.getSignalingKey()); - sql.bind(GCM_ID, account.getGcmRegistrationId()); - sql.bind(APN_ID, account.getApnRegistrationId()); - sql.bind(SUPPORTS_SMS, account.getSupportsSms() ? 1 : 0); - sql.bind(FETCHES_MESSAGES, account.getFetchesMessages() ? 1 : 0); + sql.bind(SALT, device.getAuthenticationCredentials().getSalt()); + sql.bind(SIGNALING_KEY, device.getSignalingKey()); + sql.bind(GCM_ID, device.getGcmRegistrationId()); + sql.bind(APN_ID, device.getApnRegistrationId()); + sql.bind(SUPPORTS_SMS, device.getSupportsSms() ? 1 : 0); + sql.bind(FETCHES_MESSAGES, device.getFetchesMessages() ? 1 : 0); } }; } diff --git a/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java b/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java index e8d699255..0b1ed9063 100644 --- a/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java +++ b/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java @@ -44,84 +44,84 @@ public class AccountsManager { return accounts.getNumberCount(); } - public List getAllMasterAccounts(int offset, int length) { + public List getAllMasterAccounts(int offset, int length) { return accounts.getAllFirstAccounts(offset, length); } - public Iterator getAllMasterAccounts() { + public Iterator getAllMasterAccounts() { return accounts.getAllFirstAccounts(); } - /** Creates a new Account and NumberData, clearing all existing accounts/data on the given number */ - public void createResetNumber(Account account) { - long id = accounts.insertClearingNumber(account); - account.setId(id); + /** Creates a new Device and NumberData, clearing all existing accounts/data on the given number */ + public void createResetNumber(Device device) { + long id = accounts.insertClearingNumber(device); + device.setId(id); if (memcachedClient != null) { - memcachedClient.set(getKey(account.getNumber(), account.getDeviceId()), 0, account); + memcachedClient.set(getKey(device.getNumber(), device.getDeviceId()), 0, device); } - updateDirectory(account); + updateDirectory(device); } - /** Creates a new Account for an existing NumberData (setting the deviceId) */ - public void createAccountOnExistingNumber(Account account) { - long id = accounts.insert(account); - account.setId(id); + /** Creates a new Device for an existing NumberData (setting the deviceId) */ + public void createAccountOnExistingNumber(Device device) { + long id = accounts.insert(device); + device.setId(id); if (memcachedClient != null) { - memcachedClient.set(getKey(account.getNumber(), account.getDeviceId()), 0, account); + memcachedClient.set(getKey(device.getNumber(), device.getDeviceId()), 0, device); } - updateDirectory(account); + updateDirectory(device); } - public void update(Account account) { + public void update(Device device) { if (memcachedClient != null) { - memcachedClient.set(getKey(account.getNumber(), account.getDeviceId()), 0, account); + memcachedClient.set(getKey(device.getNumber(), device.getDeviceId()), 0, device); } - accounts.update(account); - updateDirectory(account); + accounts.update(device); + updateDirectory(device); } - public Optional get(String number, long deviceId) { - Account account = null; + public Optional get(String number, long deviceId) { + Device device = null; if (memcachedClient != null) { - account = (Account)memcachedClient.get(getKey(number, deviceId)); + device = (Device)memcachedClient.get(getKey(number, deviceId)); } - if (account == null) { - account = accounts.get(number, deviceId); + if (device == null) { + device = accounts.get(number, deviceId); - if (account != null && memcachedClient != null) { - memcachedClient.set(getKey(number, deviceId), 0, account); + if (device != null && memcachedClient != null) { + memcachedClient.set(getKey(number, deviceId), 0, device); } } - if (account != null) return Optional.of(account); + if (device != null) return Optional.of(device); else return Optional.absent(); } - public List getAllByNumber(String number) { + public List getAllByNumber(String number) { return accounts.getAllByNumber(number); } - private void updateDirectory(Account account) { - if (account.getDeviceId() != 1) + private void updateDirectory(Device device) { + if (device.getDeviceId() != 1) return; - if (account.isActive()) { - byte[] token = Util.getContactToken(account.getNumber()); - ClientContact clientContact = new ClientContact(token, null, account.getSupportsSms()); + if (device.isActive()) { + byte[] token = Util.getContactToken(device.getNumber()); + ClientContact clientContact = new ClientContact(token, null, device.getSupportsSms()); directory.add(clientContact); } else { - directory.remove(account.getNumber()); + directory.remove(device.getNumber()); } } private String getKey(String number, long accountId) { - return Account.class.getSimpleName() + Account.MEMCACHE_VERION + number + accountId; + return Device.class.getSimpleName() + Device.MEMCACHE_VERION + number + accountId; } } diff --git a/src/main/java/org/whispersystems/textsecuregcm/storage/Account.java b/src/main/java/org/whispersystems/textsecuregcm/storage/Device.java similarity index 92% rename from src/main/java/org/whispersystems/textsecuregcm/storage/Account.java rename to src/main/java/org/whispersystems/textsecuregcm/storage/Device.java index 0e30f8165..45412c171 100644 --- a/src/main/java/org/whispersystems/textsecuregcm/storage/Account.java +++ b/src/main/java/org/whispersystems/textsecuregcm/storage/Device.java @@ -22,7 +22,7 @@ import org.whispersystems.textsecuregcm.util.Util; import java.io.Serializable; -public class Account implements Serializable { +public class Device implements Serializable { public static final int MEMCACHE_VERION = 1; @@ -42,11 +42,11 @@ public class Account implements Serializable { private boolean supportsSms; private boolean fetchesMessages; - public Account() {} + public Device() {} - public Account(long id, String number, long deviceId, String hashedAuthenticationToken, String salt, - String signalingKey, String gcmRegistrationId, String apnRegistrationId, - boolean supportsSms, boolean fetchesMessages) + public Device(long id, String number, long deviceId, String hashedAuthenticationToken, String salt, + String signalingKey, String gcmRegistrationId, String apnRegistrationId, + boolean supportsSms, boolean fetchesMessages) { this.id = id; this.number = number; diff --git a/src/main/java/org/whispersystems/textsecuregcm/storage/Keys.java b/src/main/java/org/whispersystems/textsecuregcm/storage/Keys.java index 772a66eab..a4d13475e 100644 --- a/src/main/java/org/whispersystems/textsecuregcm/storage/Keys.java +++ b/src/main/java/org/whispersystems/textsecuregcm/storage/Keys.java @@ -79,10 +79,10 @@ public abstract class Keys { } @Transaction(TransactionIsolationLevel.SERIALIZABLE) - public UnstructuredPreKeyList get(String number, List accounts) { + public UnstructuredPreKeyList get(String number, List devices) { List preKeys = new LinkedList<>(); - for (Account account : accounts) { - PreKey preKey = retrieveFirst(number, account.getDeviceId()); + for (Device device : devices) { + PreKey preKey = retrieveFirst(number, device.getDeviceId()); if (preKey != null) preKeys.add(preKey); } diff --git a/src/main/java/org/whispersystems/textsecuregcm/storage/StoredMessageManager.java b/src/main/java/org/whispersystems/textsecuregcm/storage/StoredMessageManager.java index 09ca1ceed..a680d0ce2 100644 --- a/src/main/java/org/whispersystems/textsecuregcm/storage/StoredMessageManager.java +++ b/src/main/java/org/whispersystems/textsecuregcm/storage/StoredMessageManager.java @@ -27,11 +27,11 @@ public class StoredMessageManager { this.storedMessages = storedMessages; } - public void storeMessage(Account account, EncryptedOutgoingMessage outgoingMessage) throws IOException { - storedMessages.insert(account.getId(), outgoingMessage.serialize()); + public void storeMessage(Device device, EncryptedOutgoingMessage outgoingMessage) throws IOException { + storedMessages.insert(device.getId(), outgoingMessage.serialize()); } - public List getStoredMessage(Account account) { - return storedMessages.getMessagesForAccountId(account.getId()); + public List getStoredMessage(Device device) { + return storedMessages.getMessagesForAccountId(device.getId()); } } diff --git a/src/main/java/org/whispersystems/textsecuregcm/workers/DirectoryUpdater.java b/src/main/java/org/whispersystems/textsecuregcm/workers/DirectoryUpdater.java index e2e294e54..f848f647e 100644 --- a/src/main/java/org/whispersystems/textsecuregcm/workers/DirectoryUpdater.java +++ b/src/main/java/org/whispersystems/textsecuregcm/workers/DirectoryUpdater.java @@ -22,7 +22,7 @@ import org.slf4j.LoggerFactory; import org.whispersystems.textsecuregcm.entities.ClientContact; import org.whispersystems.textsecuregcm.federation.FederatedClient; import org.whispersystems.textsecuregcm.federation.FederatedClientManager; -import org.whispersystems.textsecuregcm.storage.Account; +import org.whispersystems.textsecuregcm.storage.Device; import org.whispersystems.textsecuregcm.storage.AccountsManager; import org.whispersystems.textsecuregcm.storage.DirectoryManager; import org.whispersystems.textsecuregcm.storage.DirectoryManager.BatchOperationHandle; @@ -53,22 +53,22 @@ public class DirectoryUpdater { BatchOperationHandle batchOperation = directory.startBatchOperation(); try { - Iterator accounts = accountsManager.getAllMasterAccounts(); + Iterator accounts = accountsManager.getAllMasterAccounts(); if (accounts == null) return; while (accounts.hasNext()) { - Account account = accounts.next(); - if (account.isActive()) { - byte[] token = Util.getContactToken(account.getNumber()); - ClientContact clientContact = new ClientContact(token, null, account.getSupportsSms()); + Device device = accounts.next(); + if (device.isActive()) { + byte[] token = Util.getContactToken(device.getNumber()); + ClientContact clientContact = new ClientContact(token, null, device.getSupportsSms()); directory.add(batchOperation, clientContact); logger.debug("Adding local token: " + Base64.encodeBytesWithoutPadding(token)); } else { - directory.remove(batchOperation, account.getNumber()); + directory.remove(batchOperation, device.getNumber()); } } } finally { diff --git a/src/test/org/whispersystems/textsecuregcm/tests/controllers/AccountControllerTest.java b/src/test/org/whispersystems/textsecuregcm/tests/controllers/AccountControllerTest.java index 74c01bc74..349d5d919 100644 --- a/src/test/org/whispersystems/textsecuregcm/tests/controllers/AccountControllerTest.java +++ b/src/test/org/whispersystems/textsecuregcm/tests/controllers/AccountControllerTest.java @@ -11,15 +11,12 @@ import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.whispersystems.textsecuregcm.controllers.AccountController; -import org.whispersystems.textsecuregcm.controllers.DeviceController; -import org.whispersystems.textsecuregcm.entities.AccountAttributes; import org.whispersystems.textsecuregcm.limits.RateLimiter; import org.whispersystems.textsecuregcm.limits.RateLimiters; import org.whispersystems.textsecuregcm.sms.SmsSender; -import org.whispersystems.textsecuregcm.storage.Account; +import org.whispersystems.textsecuregcm.storage.Device; import org.whispersystems.textsecuregcm.storage.AccountsManager; import org.whispersystems.textsecuregcm.storage.PendingAccountsManager; -import org.whispersystems.textsecuregcm.storage.PendingDevicesManager; import org.whispersystems.textsecuregcm.tests.util.AuthHelper; import org.whispersystems.textsecuregcm.util.VerificationCode; @@ -80,10 +77,10 @@ public class AccountControllerTest extends ResourceTest { Mockito.doAnswer(new Answer() { @Override public Object answer(InvocationOnMock invocation) throws Throwable { - ((Account)invocation.getArguments()[0]).setDeviceId(2); + ((Device)invocation.getArguments()[0]).setDeviceId(2); return null; } - }).when(accountsManager).createAccountOnExistingNumber(any(Account.class)); + }).when(accountsManager).createAccountOnExistingNumber(any(Device.class)); addResource(new DumbVerificationAccountController(pendingAccountsManager, accountsManager, rateLimiters, smsSender)); } @@ -110,7 +107,7 @@ public class AccountControllerTest extends ResourceTest { assertThat(response.getStatus()).isEqualTo(204); - verify(accountsManager).createResetNumber(isA(Account.class)); + verify(accountsManager).createResetNumber(isA(Device.class)); ArgumentCaptor number = ArgumentCaptor.forClass(String.class); verify(pendingAccountsManager).remove(number.capture()); diff --git a/src/test/org/whispersystems/textsecuregcm/tests/controllers/DeviceControllerTest.java b/src/test/org/whispersystems/textsecuregcm/tests/controllers/DeviceControllerTest.java index 4ce00dde0..32e285afb 100644 --- a/src/test/org/whispersystems/textsecuregcm/tests/controllers/DeviceControllerTest.java +++ b/src/test/org/whispersystems/textsecuregcm/tests/controllers/DeviceControllerTest.java @@ -27,7 +27,7 @@ import org.whispersystems.textsecuregcm.controllers.DeviceController; import org.whispersystems.textsecuregcm.entities.AccountAttributes; import org.whispersystems.textsecuregcm.limits.RateLimiter; import org.whispersystems.textsecuregcm.limits.RateLimiters; -import org.whispersystems.textsecuregcm.storage.Account; +import org.whispersystems.textsecuregcm.storage.Device; import org.whispersystems.textsecuregcm.storage.AccountsManager; import org.whispersystems.textsecuregcm.storage.PendingDevicesManager; import org.whispersystems.textsecuregcm.tests.util.AuthHelper; @@ -75,17 +75,17 @@ public class DeviceControllerTest extends ResourceTest { Mockito.doAnswer(new Answer() { @Override public Object answer(InvocationOnMock invocation) throws Throwable { - ((Account) invocation.getArguments()[0]).setDeviceId(2); + ((Device) invocation.getArguments()[0]).setDeviceId(2); return null; } - }).when(accountsManager).createAccountOnExistingNumber(any(Account.class)); + }).when(accountsManager).createAccountOnExistingNumber(any(Device.class)); addResource(new DumbVerificationDeviceController(pendingDevicesManager, accountsManager, rateLimiters)); } @Test public void validDeviceRegisterTest() throws Exception { - VerificationCode deviceCode = client().resource("/v1/devices/") + VerificationCode deviceCode = client().resource("/v1/devices/provisioning_code") .header("Authorization", AuthHelper.getAuthHeader(AuthHelper.VALID_NUMBER, AuthHelper.VALID_PASSWORD)) .get(VerificationCode.class); @@ -98,7 +98,7 @@ public class DeviceControllerTest extends ResourceTest { .put(Long.class); assertThat(deviceId).isNotEqualTo(AuthHelper.DEFAULT_DEVICE_ID); - ArgumentCaptor newAccount = ArgumentCaptor.forClass(Account.class); + ArgumentCaptor newAccount = ArgumentCaptor.forClass(Device.class); verify(accountsManager).createAccountOnExistingNumber(newAccount.capture()); assertThat(deviceId).isEqualTo(newAccount.getValue().getDeviceId()); diff --git a/src/test/org/whispersystems/textsecuregcm/tests/controllers/KeyControllerTest.java b/src/test/org/whispersystems/textsecuregcm/tests/controllers/KeyControllerTest.java index ca1be41a1..88a3be63c 100644 --- a/src/test/org/whispersystems/textsecuregcm/tests/controllers/KeyControllerTest.java +++ b/src/test/org/whispersystems/textsecuregcm/tests/controllers/KeyControllerTest.java @@ -9,12 +9,11 @@ import org.whispersystems.textsecuregcm.entities.PreKey; import org.whispersystems.textsecuregcm.entities.UnstructuredPreKeyList; import org.whispersystems.textsecuregcm.limits.RateLimiter; import org.whispersystems.textsecuregcm.limits.RateLimiters; -import org.whispersystems.textsecuregcm.storage.Account; +import org.whispersystems.textsecuregcm.storage.Device; import org.whispersystems.textsecuregcm.storage.AccountsManager; import org.whispersystems.textsecuregcm.storage.Keys; import org.whispersystems.textsecuregcm.tests.util.AuthHelper; -import javax.jws.WebResult; import java.util.Arrays; import java.util.LinkedList; import java.util.List; @@ -31,7 +30,7 @@ public class KeyControllerTest extends ResourceTest { private final PreKey SAMPLE_KEY2 = new PreKey(2, EXISTS_NUMBER, 2, 5667, "test3", "test4", false); private final Keys keys = mock(Keys.class); - Account[] fakeAccount; + Device[] fakeDevice; @Override protected void setUpResources() { @@ -41,20 +40,20 @@ public class KeyControllerTest extends ResourceTest { RateLimiter rateLimiter = mock(RateLimiter.class ); AccountsManager accounts = mock(AccountsManager.class); - fakeAccount = new Account[2]; - fakeAccount[0] = mock(Account.class); - fakeAccount[1] = mock(Account.class); + fakeDevice = new Device[2]; + fakeDevice[0] = mock(Device.class); + fakeDevice[1] = mock(Device.class); when(rateLimiters.getPreKeysLimiter()).thenReturn(rateLimiter); when(keys.get(eq(EXISTS_NUMBER), anyList())).thenReturn(new UnstructuredPreKeyList(Arrays.asList(SAMPLE_KEY, SAMPLE_KEY2))); when(keys.get(eq(NOT_EXISTS_NUMBER), anyList())).thenReturn(null); - when(fakeAccount[0].getDeviceId()).thenReturn(AuthHelper.DEFAULT_DEVICE_ID); - when(fakeAccount[1].getDeviceId()).thenReturn((long) 2); + when(fakeDevice[0].getDeviceId()).thenReturn(AuthHelper.DEFAULT_DEVICE_ID); + when(fakeDevice[1].getDeviceId()).thenReturn((long) 2); - when(accounts.getAllByNumber(EXISTS_NUMBER)).thenReturn(Arrays.asList(fakeAccount[0], fakeAccount[1])); - when(accounts.getAllByNumber(NOT_EXISTS_NUMBER)).thenReturn(new LinkedList()); + when(accounts.getAllByNumber(EXISTS_NUMBER)).thenReturn(Arrays.asList(fakeDevice[0], fakeDevice[1])); + when(accounts.getAllByNumber(NOT_EXISTS_NUMBER)).thenReturn(new LinkedList()); addResource(new KeysController(rateLimiters, keys, accounts, null)); } @@ -72,7 +71,7 @@ public class KeyControllerTest extends ResourceTest { assertThat(result.getId() == 0); assertThat(result.getNumber() == null); - verify(keys).get(eq(EXISTS_NUMBER), eq(Arrays.asList(fakeAccount))); + verify(keys).get(eq(EXISTS_NUMBER), eq(Arrays.asList(fakeDevice))); verifyNoMoreInteractions(keys); List results = client().resource(String.format("/v1/keys/%s?multikeys", EXISTS_NUMBER)) @@ -96,7 +95,7 @@ public class KeyControllerTest extends ResourceTest { assertThat(result.getId() == 1); assertThat(result.getNumber() == null); - verify(keys, times(2)).get(eq(EXISTS_NUMBER), eq(Arrays.asList(fakeAccount[0], fakeAccount[1]))); + verify(keys, times(2)).get(eq(EXISTS_NUMBER), eq(Arrays.asList(fakeDevice[0], fakeDevice[1]))); verifyNoMoreInteractions(keys); } @@ -108,7 +107,7 @@ public class KeyControllerTest extends ResourceTest { assertThat(response.getClientResponseStatus().getStatusCode()).isEqualTo(404); - verify(keys).get(NOT_EXISTS_NUMBER, new LinkedList()); + verify(keys).get(NOT_EXISTS_NUMBER, new LinkedList()); } @Test diff --git a/src/test/org/whispersystems/textsecuregcm/tests/util/AuthHelper.java b/src/test/org/whispersystems/textsecuregcm/tests/util/AuthHelper.java index deb9182dc..be0637b19 100644 --- a/src/test/org/whispersystems/textsecuregcm/tests/util/AuthHelper.java +++ b/src/test/org/whispersystems/textsecuregcm/tests/util/AuthHelper.java @@ -1,13 +1,13 @@ package org.whispersystems.textsecuregcm.tests.util; import com.google.common.base.Optional; -import org.whispersystems.textsecuregcm.auth.AccountAuthenticator; +import org.whispersystems.textsecuregcm.auth.DeviceAuthenticator; import org.whispersystems.textsecuregcm.auth.AuthenticationCredentials; import org.whispersystems.textsecuregcm.auth.FederatedPeerAuthenticator; import org.whispersystems.textsecuregcm.auth.MultiBasicAuthProvider; import org.whispersystems.textsecuregcm.configuration.FederationConfiguration; import org.whispersystems.textsecuregcm.federation.FederatedPeer; -import org.whispersystems.textsecuregcm.storage.Account; +import org.whispersystems.textsecuregcm.storage.Device; import org.whispersystems.textsecuregcm.storage.AccountsManager; import org.whispersystems.textsecuregcm.util.Base64; @@ -23,19 +23,19 @@ public class AuthHelper { public static final String INVVALID_NUMBER = "+14151111111"; public static final String INVALID_PASSWORD = "bar"; - public static MultiBasicAuthProvider getAuthenticator() { + public static MultiBasicAuthProvider getAuthenticator() { AccountsManager accounts = mock(AccountsManager.class); - Account account = mock(Account.class); + Device device = mock(Device.class); AuthenticationCredentials credentials = mock(AuthenticationCredentials.class); when(credentials.verify("foo")).thenReturn(true); - when(account.getAuthenticationCredentials()).thenReturn(credentials); - when(accounts.get(VALID_NUMBER, DEFAULT_DEVICE_ID)).thenReturn(Optional.of(account)); + when(device.getAuthenticationCredentials()).thenReturn(credentials); + when(accounts.get(VALID_NUMBER, DEFAULT_DEVICE_ID)).thenReturn(Optional.of(device)); return new MultiBasicAuthProvider<>(new FederatedPeerAuthenticator(new FederationConfiguration()), FederatedPeer.class, - new AccountAuthenticator(accounts), - Account.class, "WhisperServer"); + new DeviceAuthenticator(accounts), + Device.class, "WhisperServer"); } public static String getAuthHeader(String number, String password) {