mirror of
https://github.com/oxen-io/session-android.git
synced 2025-10-26 00:58:51 +00:00
Add account management interface to libtextsecure api
This commit is contained in:
Moxie Marlinspike
@@ -7,7 +7,6 @@ import android.os.IBinder;
|
||||
import android.os.PowerManager;
|
||||
import android.util.Log;
|
||||
|
||||
import org.thoughtcrime.securesms.push.PushServiceSocketFactory;
|
||||
import org.thoughtcrime.securesms.util.DirectoryHelper;
|
||||
|
||||
import java.util.concurrent.Executor;
|
||||
|
||||
@@ -1,83 +0,0 @@
|
||||
package org.thoughtcrime.securesms.service;
|
||||
|
||||
import android.app.Service;
|
||||
import android.content.Intent;
|
||||
import android.os.IBinder;
|
||||
import android.util.Log;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.google.android.gms.common.ConnectionResult;
|
||||
import com.google.android.gms.common.GooglePlayServicesUtil;
|
||||
import com.google.android.gms.gcm.GoogleCloudMessaging;
|
||||
|
||||
import org.thoughtcrime.securesms.R;
|
||||
import org.thoughtcrime.securesms.push.PushServiceSocketFactory;
|
||||
import org.thoughtcrime.securesms.util.Dialogs;
|
||||
import org.thoughtcrime.securesms.util.TextSecurePreferences;
|
||||
import org.whispersystems.textsecure.push.PushServiceSocket;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.sql.Connection;
|
||||
import java.util.concurrent.ExecutorService;
|
||||
import java.util.concurrent.Executors;
|
||||
|
||||
public class GcmRegistrationService extends Service implements Runnable {
|
||||
|
||||
private static final String TAG = GcmRegistrationService.class.getSimpleName();
|
||||
|
||||
public static final String REGISTRATION_ID = "312334754206";
|
||||
|
||||
private ExecutorService executor;
|
||||
|
||||
@Override
|
||||
public void onCreate() {
|
||||
super.onCreate();
|
||||
this.executor = Executors.newSingleThreadExecutor();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int onStartCommand(Intent intent, int flats, int startId) {
|
||||
executor.execute(this);
|
||||
return START_NOT_STICKY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
Log.w(TAG, "Running GCM Registration Service...");
|
||||
try {
|
||||
String registrationId = TextSecurePreferences.getGcmRegistrationId(this);
|
||||
|
||||
if (registrationId == null) {
|
||||
Log.w(TAG, "GCM registrationId expired, reregistering...");
|
||||
int result = GooglePlayServicesUtil.isGooglePlayServicesAvailable(this);
|
||||
|
||||
if (result != ConnectionResult.SUCCESS) {
|
||||
Log.w(TAG, "Unable to register with GCM! " + result);
|
||||
return;
|
||||
}
|
||||
|
||||
String gcmId = GoogleCloudMessaging.getInstance(this).register(REGISTRATION_ID);
|
||||
PushServiceSocket socket = PushServiceSocketFactory.create(this);
|
||||
|
||||
socket.registerGcmId(gcmId);
|
||||
TextSecurePreferences.setGcmRegistrationId(this, gcmId);
|
||||
|
||||
stopSelf();
|
||||
}
|
||||
} catch (IOException e) {
|
||||
Log.w(TAG, e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDestroy() {
|
||||
super.onDestroy();
|
||||
executor.shutdown();
|
||||
}
|
||||
|
||||
@Override
|
||||
public IBinder onBind(Intent intent) {
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,230 +0,0 @@
|
||||
package org.thoughtcrime.securesms.service;
|
||||
|
||||
import android.app.Service;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.os.IBinder;
|
||||
import android.util.Log;
|
||||
|
||||
import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
|
||||
import org.thoughtcrime.securesms.push.PushServiceSocketFactory;
|
||||
import org.thoughtcrime.securesms.util.TextSecurePreferences;
|
||||
import org.whispersystems.libaxolotl.IdentityKeyPair;
|
||||
import org.whispersystems.libaxolotl.InvalidKeyIdException;
|
||||
import org.whispersystems.libaxolotl.state.PreKeyRecord;
|
||||
import org.whispersystems.libaxolotl.state.SignedPreKeyRecord;
|
||||
import org.whispersystems.libaxolotl.state.SignedPreKeyStore;
|
||||
import org.thoughtcrime.securesms.crypto.MasterSecret;
|
||||
import org.thoughtcrime.securesms.crypto.PreKeyUtil;
|
||||
import org.whispersystems.textsecure.push.PushServiceSocket;
|
||||
import org.whispersystems.textsecure.push.SignedPreKeyEntity;
|
||||
import org.thoughtcrime.securesms.crypto.storage.TextSecurePreKeyStore;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Arrays;
|
||||
import java.util.Comparator;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.Executor;
|
||||
import java.util.concurrent.Executors;
|
||||
|
||||
public class PreKeyService extends Service {
|
||||
|
||||
private static final String TAG = PreKeyService.class.getSimpleName();
|
||||
public static final String REFRESH_ACTION = "org.thoughtcrime.securesms.PreKeyService.REFRESH";
|
||||
public static final String CLEAN_ACTION = "org.thoughtcrime.securesms.PreKeyService.CLEAN";
|
||||
public static final String CREATE_SIGNED_ACTION = "org.thoughtcrime.securesms.PreKeyService.CREATE_SIGNED";
|
||||
|
||||
private static final int PREKEY_MINIMUM = 10;
|
||||
|
||||
private final Executor executor = Executors.newSingleThreadExecutor();
|
||||
|
||||
public static void initiateRefresh(Context context, MasterSecret masterSecret) {
|
||||
Intent intent = new Intent(context, PreKeyService.class);
|
||||
intent.setAction(PreKeyService.REFRESH_ACTION);
|
||||
intent.putExtra("master_secret", masterSecret);
|
||||
context.startService(intent);
|
||||
}
|
||||
|
||||
public static void initiateClean(Context context, MasterSecret masterSecret) {
|
||||
Intent intent = new Intent(context, PreKeyService.class);
|
||||
intent.setAction(PreKeyService.CLEAN_ACTION);
|
||||
intent.putExtra("master_secret", masterSecret);
|
||||
context.startService(intent);
|
||||
}
|
||||
|
||||
public static void initiateCreateSigned(Context context, MasterSecret masterSecret) {
|
||||
Intent intent = new Intent(context, PreKeyService.class);
|
||||
intent.setAction(PreKeyService.CREATE_SIGNED_ACTION);
|
||||
intent.putExtra("master_secret", masterSecret);
|
||||
context.startService(intent);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int onStartCommand(Intent intent, int flats, int startId) {
|
||||
if (intent == null) return START_NOT_STICKY;
|
||||
if (intent.getAction() == null) return START_NOT_STICKY;
|
||||
|
||||
MasterSecret masterSecret = intent.getParcelableExtra("master_secret");
|
||||
|
||||
if (masterSecret == null) {
|
||||
Log.w(TAG, "No master secret!");
|
||||
return START_NOT_STICKY;
|
||||
}
|
||||
|
||||
switch (intent.getAction()) {
|
||||
case REFRESH_ACTION: executor.execute(new RefreshTask(this, masterSecret)); break;
|
||||
case CLEAN_ACTION: executor.execute(new CleanSignedPreKeysTask(this, masterSecret)); break;
|
||||
case CREATE_SIGNED_ACTION: executor.execute(new CreateSignedPreKeyTask(this, masterSecret)); break;
|
||||
}
|
||||
|
||||
return START_NOT_STICKY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IBinder onBind(Intent intent) {
|
||||
return null;
|
||||
}
|
||||
|
||||
private static class CreateSignedPreKeyTask implements Runnable {
|
||||
|
||||
private final Context context;
|
||||
private final MasterSecret masterSecret;
|
||||
|
||||
public CreateSignedPreKeyTask(Context context, MasterSecret masterSecret) {
|
||||
this.context = context;
|
||||
this.masterSecret = masterSecret;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
if (TextSecurePreferences.isSignedPreKeyRegistered(context)) {
|
||||
Log.w(TAG, "Signed prekey already registered...");
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
IdentityKeyPair identityKeyPair = IdentityKeyUtil.getIdentityKeyPair(context, masterSecret);
|
||||
SignedPreKeyRecord signedPreKeyRecord = PreKeyUtil.generateSignedPreKey(context, masterSecret, identityKeyPair);
|
||||
PushServiceSocket socket = PushServiceSocketFactory.create(context);
|
||||
|
||||
socket.setCurrentSignedPreKey(signedPreKeyRecord);
|
||||
TextSecurePreferences.setSignedPreKeyRegistered(context, true);
|
||||
} catch (IOException e) {
|
||||
Log.w(TAG, e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static class CleanSignedPreKeysTask implements Runnable {
|
||||
|
||||
private final SignedPreKeyStore signedPreKeyStore;
|
||||
private final PushServiceSocket socket;
|
||||
|
||||
public CleanSignedPreKeysTask(Context context, MasterSecret masterSecret) {
|
||||
this(new TextSecurePreKeyStore(context, masterSecret), PushServiceSocketFactory.create(context));
|
||||
}
|
||||
|
||||
public CleanSignedPreKeysTask(SignedPreKeyStore signedPreKeyStore, PushServiceSocket socket) {
|
||||
this.signedPreKeyStore = signedPreKeyStore;
|
||||
this.socket = socket;
|
||||
}
|
||||
|
||||
public void run() {
|
||||
try {
|
||||
SignedPreKeyEntity currentSignedPreKey = socket.getCurrentSignedPreKey();
|
||||
|
||||
if (currentSignedPreKey == null) return;
|
||||
|
||||
SignedPreKeyRecord currentRecord = signedPreKeyStore.loadSignedPreKey(currentSignedPreKey.getKeyId());
|
||||
List<SignedPreKeyRecord> allRecords = signedPreKeyStore.loadSignedPreKeys();
|
||||
List<SignedPreKeyRecord> oldRecords = removeCurrentRecord(allRecords, currentRecord);
|
||||
SignedPreKeyRecord[] oldRecordsArray = oldRecords.toArray(new SignedPreKeyRecord[0]);
|
||||
|
||||
Arrays.sort(oldRecordsArray, new SignedPreKeySorter());
|
||||
|
||||
Log.w(TAG, "Existing signed prekey record count: " + oldRecordsArray.length);
|
||||
|
||||
if (oldRecordsArray.length > 3) {
|
||||
long oldTimestamp = System.currentTimeMillis() - (14 * 24 * 60 * 60 * 1000);
|
||||
SignedPreKeyRecord[] deletionCandidates = Arrays.copyOf(oldRecordsArray, oldRecordsArray.length - 1);
|
||||
|
||||
for (SignedPreKeyRecord deletionCandidate : deletionCandidates) {
|
||||
Log.w(TAG, "Old signed prekey record timestamp: " + deletionCandidate.getTimestamp());
|
||||
|
||||
if (deletionCandidate.getTimestamp() <= oldTimestamp) {
|
||||
Log.w(TAG, "Remove signed prekey record: " + deletionCandidate.getId());
|
||||
signedPreKeyStore.removeSignedPreKey(deletionCandidate.getId());
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (IOException | InvalidKeyIdException e) {
|
||||
Log.w(TAG, e);
|
||||
}
|
||||
}
|
||||
|
||||
private List<SignedPreKeyRecord> removeCurrentRecord(List<SignedPreKeyRecord> records,
|
||||
SignedPreKeyRecord currentRecord)
|
||||
{
|
||||
List<SignedPreKeyRecord> others = new LinkedList<>();
|
||||
|
||||
for (SignedPreKeyRecord record : records) {
|
||||
if (record.getId() != currentRecord.getId()) {
|
||||
others.add(record);
|
||||
}
|
||||
}
|
||||
|
||||
return others;
|
||||
}
|
||||
}
|
||||
|
||||
private static class RefreshTask implements Runnable {
|
||||
|
||||
private final Context context;
|
||||
private final MasterSecret masterSecret;
|
||||
|
||||
public RefreshTask(Context context, MasterSecret masterSecret) {
|
||||
this.context = context.getApplicationContext();
|
||||
this.masterSecret = masterSecret;
|
||||
}
|
||||
|
||||
public void run() {
|
||||
try {
|
||||
if (!TextSecurePreferences.isPushRegistered(context)) return;
|
||||
|
||||
PushServiceSocket socket = PushServiceSocketFactory.create(context);
|
||||
int availableKeys = socket.getAvailablePreKeys();
|
||||
|
||||
if (availableKeys >= PREKEY_MINIMUM && TextSecurePreferences.isSignedPreKeyRegistered(context)) {
|
||||
Log.w(TAG, "Available keys sufficient: " + availableKeys);
|
||||
return;
|
||||
}
|
||||
|
||||
List<PreKeyRecord> preKeyRecords = PreKeyUtil.generatePreKeys(context, masterSecret);
|
||||
PreKeyRecord lastResortKeyRecord = PreKeyUtil.generateLastResortKey(context, masterSecret);
|
||||
IdentityKeyPair identityKey = IdentityKeyUtil.getIdentityKeyPair(context, masterSecret);
|
||||
SignedPreKeyRecord signedPreKeyRecord = PreKeyUtil.generateSignedPreKey(context, masterSecret, identityKey);
|
||||
|
||||
Log.w(TAG, "Registering new prekeys...");
|
||||
|
||||
socket.registerPreKeys(identityKey.getPublicKey(), lastResortKeyRecord,
|
||||
signedPreKeyRecord, preKeyRecords);
|
||||
|
||||
TextSecurePreferences.setSignedPreKeyRegistered(context, true);
|
||||
PreKeyService.initiateClean(context, masterSecret);
|
||||
} catch (IOException e) {
|
||||
Log.w(TAG, e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static class SignedPreKeySorter implements Comparator<SignedPreKeyRecord> {
|
||||
@Override
|
||||
public int compare(SignedPreKeyRecord lhs, SignedPreKeyRecord rhs) {
|
||||
if (lhs.getTimestamp() < rhs.getTimestamp()) return -1;
|
||||
else if (lhs.getTimestamp() > rhs.getTimestamp()) return 1;
|
||||
else return 0;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -14,17 +14,18 @@ import com.google.android.gms.gcm.GoogleCloudMessaging;
|
||||
|
||||
import org.thoughtcrime.securesms.R;
|
||||
import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
|
||||
import org.thoughtcrime.securesms.push.PushServiceSocketFactory;
|
||||
import org.thoughtcrime.securesms.crypto.MasterSecret;
|
||||
import org.thoughtcrime.securesms.crypto.PreKeyUtil;
|
||||
import org.thoughtcrime.securesms.push.TextSecureCommunicationFactory;
|
||||
import org.thoughtcrime.securesms.util.DirectoryHelper;
|
||||
import org.thoughtcrime.securesms.util.TextSecurePreferences;
|
||||
import org.whispersystems.libaxolotl.IdentityKeyPair;
|
||||
import org.whispersystems.libaxolotl.state.SignedPreKeyRecord;
|
||||
import org.whispersystems.libaxolotl.state.PreKeyRecord;
|
||||
import org.whispersystems.libaxolotl.state.SignedPreKeyRecord;
|
||||
import org.whispersystems.libaxolotl.util.KeyHelper;
|
||||
import org.thoughtcrime.securesms.crypto.MasterSecret;
|
||||
import org.thoughtcrime.securesms.crypto.PreKeyUtil;
|
||||
import org.whispersystems.libaxolotl.util.guava.Optional;
|
||||
import org.whispersystems.textsecure.api.TextSecureAccountManager;
|
||||
import org.whispersystems.textsecure.push.exceptions.ExpectationFailedException;
|
||||
import org.whispersystems.textsecure.push.PushServiceSocket;
|
||||
import org.whispersystems.textsecure.util.Util;
|
||||
|
||||
import java.io.IOException;
|
||||
@@ -153,9 +154,9 @@ public class RegistrationService extends Service {
|
||||
MasterSecret masterSecret = intent.getParcelableExtra("master_secret");
|
||||
|
||||
try {
|
||||
PushServiceSocket socket = PushServiceSocketFactory.create(this, number, password);
|
||||
TextSecureAccountManager accountManager = TextSecureCommunicationFactory.createManager(this, number, password);
|
||||
|
||||
handleCommonRegistration(masterSecret, socket, number);
|
||||
handleCommonRegistration(masterSecret, accountManager, number);
|
||||
|
||||
markAsVerified(number, password, signalingKey);
|
||||
|
||||
@@ -191,14 +192,14 @@ public class RegistrationService extends Service {
|
||||
initializeChallengeListener();
|
||||
|
||||
setState(new RegistrationState(RegistrationState.STATE_CONNECTING, number));
|
||||
PushServiceSocket socket = PushServiceSocketFactory.create(this, number, password);
|
||||
socket.createAccount(false);
|
||||
TextSecureAccountManager accountManager = TextSecureCommunicationFactory.createManager(this, number, password);
|
||||
accountManager.requestSmsVerificationCode();
|
||||
|
||||
setState(new RegistrationState(RegistrationState.STATE_VERIFYING, number));
|
||||
String challenge = waitForChallenge();
|
||||
socket.verifyAccount(challenge, signalingKey, true, registrationId);
|
||||
accountManager.verifyAccount(challenge, signalingKey, true, registrationId);
|
||||
|
||||
handleCommonRegistration(masterSecret, socket, number);
|
||||
handleCommonRegistration(masterSecret, accountManager, number);
|
||||
markAsVerified(number, password, signalingKey);
|
||||
|
||||
setState(new RegistrationState(RegistrationState.STATE_COMPLETE, number));
|
||||
@@ -224,7 +225,7 @@ public class RegistrationService extends Service {
|
||||
}
|
||||
}
|
||||
|
||||
private void handleCommonRegistration(MasterSecret masterSecret, PushServiceSocket socket, String number)
|
||||
private void handleCommonRegistration(MasterSecret masterSecret, TextSecureAccountManager accountManager, String number)
|
||||
throws IOException
|
||||
{
|
||||
setState(new RegistrationState(RegistrationState.STATE_GENERATING_KEYS, number));
|
||||
@@ -232,15 +233,15 @@ public class RegistrationService extends Service {
|
||||
List<PreKeyRecord> records = PreKeyUtil.generatePreKeys(this, masterSecret);
|
||||
PreKeyRecord lastResort = PreKeyUtil.generateLastResortKey(this, masterSecret);
|
||||
SignedPreKeyRecord signedPreKey = PreKeyUtil.generateSignedPreKey(this, masterSecret, identityKey);
|
||||
socket.registerPreKeys(identityKey.getPublicKey(), lastResort, signedPreKey, records);
|
||||
accountManager.setPreKeys(identityKey.getPublicKey(),lastResort, signedPreKey, records);
|
||||
|
||||
setState(new RegistrationState(RegistrationState.STATE_GCM_REGISTERING, number));
|
||||
|
||||
String gcmRegistrationId = GoogleCloudMessaging.getInstance(this).register("312334754206");
|
||||
TextSecurePreferences.setGcmRegistrationId(this, gcmRegistrationId);
|
||||
socket.registerGcmId(gcmRegistrationId);
|
||||
accountManager.setGcmId(Optional.of(gcmRegistrationId));
|
||||
|
||||
DirectoryHelper.refreshDirectory(this, socket, number);
|
||||
DirectoryHelper.refreshDirectory(this, accountManager, number);
|
||||
|
||||
DirectoryRefreshListener.schedule(this);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user