Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@OmarBasem
OmarBasem committed Mar 28, 2021
1 parent 046a4d8 commit 604ef46
Show file tree
Hide file tree
Showing 24 changed files with 501 additions and 402 deletions.
69 changes: 27 additions & 42 deletions android/app/src/main/java/com/stiiick/stickprotocol/main/StickProtocol.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@
import com.stiiick.stickprotocol.keychain.Keychain;
import com.stiiick.stickprotocol.recipient.LiveRecipientCache;
import com.stiiick.stickprotocol.store.MySenderKeyStore;
import com.stiiick.stickprotocol.store.MySignalProtocolStore;
import com.stiiick.stickprotocol.store.MyProtocolStore;
import com.stiiick.stickprotocol.util.Base64;
import com.stiiick.stickprotocol.util.IdentityKeyUtil;
import com.stiiick.stickprotocol.util.Log;
import com.stiiick.stickprotocol.util.PreKeyUtil;
import com.stiiick.stickprotocol.util.Preferences;
import com.stiiick.stickprotocol.util.Util;
Expand Down Expand Up @@ -139,7 +138,7 @@ public JSONObject refreshIdentityKey(int days) throws Exception {
long identityKeyAge = TimeUnit.MINUTES.toMillis(1) / 2;
long activeDuration = System.currentTimeMillis() - Preferences.getActiveIdentityKeyTimestamp(context);
if (activeDuration > identityKeyAge) {
SignalProtocolStore store = new MySignalProtocolStore(context);
SignalProtocolStore store = new MyProtocolStore(context);
IdentityKeyUtil.generateIdentityKeys(context);
IdentityKeyPair identityKey = store.getIdentityKeyPair();

Expand Down Expand Up @@ -167,13 +166,15 @@ public void resetDatabase() {
public void reInit(JSONObject bundle, String password, String userId, String oneTimeId, ProgressEvent progressEvent) {
// ** Regenerate previous keys ** //
try {
PreferenceManager.getDefaultSharedPreferences(context).edit().putString("oneTimeId", oneTimeId).apply();
PreferenceManager.getDefaultSharedPreferences(context).edit().putString("userId", userId).apply();
// Store password in BlockStore/KeyStore
HashMap<String, String> serviceMap = new HashMap();
serviceMap.put("service", context.getPackageName());
keychain.setGenericPassword(userId, userId, password, serviceMap);


SignalProtocolStore store = new MySignalProtocolStore(context);
SignalProtocolStore store = new MyProtocolStore(context);
Preferences.setLocalRegistrationId(context, bundle.getInt("localId"));
JSONArray preKeys = (JSONArray) bundle.get("preKeys");
JSONArray senderKeys = (JSONArray) bundle.get("senderKeys");
Expand Down Expand Up @@ -268,37 +269,37 @@ public void reInit(JSONObject bundle, String password, String userId, String one
progressEvent.execute(event);
}
}
PreferenceManager.getDefaultSharedPreferences(context).edit().putString("oneTimeId", oneTimeId).apply();
PreferenceManager.getDefaultSharedPreferences(context).edit().putString("userId", userId).apply();
} catch (Exception e) {
e.printStackTrace();
}
// *** //
}

public void reinitSenderKey(JSONObject senderKey, SignalProtocolAddress signalProtocolAddress, String userId) throws IOException, InvalidKeyException, NoSessionException, JSONException {
SenderKeyName senderKeyName = new SenderKeyName(senderKey.getString("stickId"), signalProtocolAddress);
SenderKeyStore senderKeyStore = new MySenderKeyStore(context);
SenderKeyRecord senderKeyRecord = senderKeyStore.loadSenderKey(senderKeyName);
ECPublicKey senderPubKey = Curve.decodePoint(Base64.decode(senderKey.getString("public")), 0);
int identityKeyId = senderKey.getInt("identityKeyId");
public String decryptStickyKey(String senderId, String cipher, int identityKeyId) {
int activeIdentityKeyId = Preferences.getActiveIdentityKeyId(context);
// Swap identity key if needed
if (Preferences.getActiveIdentityKeyId(context) != identityKeyId) {
if (activeIdentityKeyId != identityKeyId) {
IdentityKeyRecord identityKeyRecord = DatabaseFactory.getIdentityKeyDatabase(context).getIdentityKey(identityKeyId);
IdentityKeyUtil.save(context, "pref_identity_public", Base64.encodeBytes(identityKeyRecord.getKeyPair().getPublicKey().serialize()));
IdentityKeyUtil.save(context, "pref_identity_private", Base64.encodeBytes(identityKeyRecord.getKeyPair().getPrivateKey().serialize()));
}

String cipher = decryptTextPairwise(userId, 1, true, senderKey.getString("cipher"));

String key = decryptTextPairwise(senderId, 1, true, cipher);
// Reverse identity key back if was swapped
if (Preferences.getActiveIdentityKeyId(context) != identityKeyId) {
if (activeIdentityKeyId != identityKeyId) {
IdentityKeyRecord identityKeyRecord = DatabaseFactory.getIdentityKeyDatabase(context).getIdentityKey(Preferences.getActiveIdentityKeyId(context));
IdentityKeyUtil.save(context, "pref_identity_public", Base64.encodeBytes(identityKeyRecord.getKeyPair().getPublicKey().serialize()));
IdentityKeyUtil.save(context, "pref_identity_private", Base64.encodeBytes(identityKeyRecord.getKeyPair().getPrivateKey().serialize()));
}
return key;
}

ECPrivateKey senderPrivKey = Curve.decodePrivatePoint(Base64.decode(cipher));
public void reinitSenderKey(JSONObject senderKey, SignalProtocolAddress signalProtocolAddress, String userId) throws IOException, InvalidKeyException, NoSessionException, JSONException {
SenderKeyName senderKeyName = new SenderKeyName(senderKey.getString("stickId"), signalProtocolAddress);
SenderKeyStore senderKeyStore = new MySenderKeyStore(context);
SenderKeyRecord senderKeyRecord = senderKeyStore.loadSenderKey(senderKeyName);
ECPublicKey senderPubKey = Curve.decodePoint(Base64.decode(senderKey.getString("public")), 0);
String privateKey = decryptStickyKey(userId, senderKey.getString("cipher"), senderKey.getInt("identityKeyId"));
ECPrivateKey senderPrivKey = Curve.decodePrivatePoint(Base64.decode(privateKey));
ECKeyPair signedSenderKey = new ECKeyPair(senderPubKey, senderPrivKey);
senderKeyRecord.setSenderKeyState(
senderKey.getInt("id"),
Expand Down Expand Up @@ -400,7 +401,7 @@ public JSONObject initialize(String userId, String password, ProgressEvent progr
.getHash();
String passwordHash = Base64.encodeBytes(passwordHashBytes);

SignalProtocolStore store = new MySignalProtocolStore(context);
SignalProtocolStore store = new MyProtocolStore(context);
IdentityKeyUtil.generateIdentityKeys(context);
IdentityKeyPair identityKey = store.getIdentityKeyPair();
SignedPreKeyRecord signedPreKey = PreKeyUtil.generateSignedPreKey(context, identityKey, true);
Expand Down Expand Up @@ -479,14 +480,14 @@ public JSONObject initialize(String userId, String password, ProgressEvent progr
}

public boolean isInitialized() {
SignalProtocolStore store = new MySignalProtocolStore(context);
SignalProtocolStore store = new MyProtocolStore(context);
int localId = store.getLocalRegistrationId();
return localId != 0;
}

public void initPairwiseSession(JSONObject bundle) {
try {
SignalProtocolStore store = new MySignalProtocolStore(context);
SignalProtocolStore store = new MyProtocolStore(context);
SignalProtocolAddress signalProtocolAddress = new SignalProtocolAddress(bundle.getString("userId"), bundle.getInt("deviceId"));
SessionBuilder sessionBuilder = new SessionBuilder(store, signalProtocolAddress);
ECPublicKey preKey = Curve.decodePoint(Base64.decode(bundle.getString("preKey")), 0);
Expand All @@ -511,14 +512,14 @@ public void initPairwiseSession(JSONObject bundle) {
}

public boolean pairwiseSessionExists(String oneTimeId) {
SignalProtocolStore store = new MySignalProtocolStore(context);
SignalProtocolStore store = new MyProtocolStore(context);
SignalProtocolAddress signalProtocolAddress = new SignalProtocolAddress(oneTimeId, 0);
return store.containsSession(signalProtocolAddress);
}

public String encryptTextPairwise(String userId, int deviceId, String text) {
try {
SignalProtocolStore store = new MySignalProtocolStore(context);
SignalProtocolStore store = new MyProtocolStore(context);
SignalProtocolAddress signalProtocolAddress = new SignalProtocolAddress(userId, deviceId);
SessionCipher sessionCipher = new SessionCipher(store, signalProtocolAddress);
CiphertextMessage cipher = sessionCipher.encrypt(text.getBytes(StandardCharsets.UTF_8));
Expand Down Expand Up @@ -620,23 +621,7 @@ public void initSession(String senderId, String stickId, String cipherSenderKey,
SignalProtocolAddress signalProtocolAddress = new SignalProtocolAddress(senderId, isSticky ? 1 : 0);
SenderKeyName senderKeyName = new SenderKeyName(stickId, signalProtocolAddress);
GroupSessionBuilder groupSessionBuilder = new GroupSessionBuilder(senderKeyStore);

// Swap identity key if needed
if (identityKeyId != -1 && Preferences.getActiveIdentityKeyId(context) != identityKeyId) {
IdentityKeyRecord identityKeyRecord = DatabaseFactory.getIdentityKeyDatabase(context).getIdentityKey(identityKeyId);
IdentityKeyUtil.save(context, "pref_identity_public", Base64.encodeBytes(identityKeyRecord.getKeyPair().getPublicKey().serialize()));
IdentityKeyUtil.save(context, "pref_identity_private", Base64.encodeBytes(identityKeyRecord.getKeyPair().getPrivateKey().serialize()));
}

String senderKey = decryptTextPairwise(senderId, isSticky ? 1 : 0, true, cipherSenderKey);

// Reverse identity key back if was swapped
if (identityKeyId != -1 && Preferences.getActiveIdentityKeyId(context) != identityKeyId) {
IdentityKeyRecord identityKeyRecord = DatabaseFactory.getIdentityKeyDatabase(context).getIdentityKey(Preferences.getActiveIdentityKeyId(context));
IdentityKeyUtil.save(context, "pref_identity_public", Base64.encodeBytes(identityKeyRecord.getKeyPair().getPublicKey().serialize()));
IdentityKeyUtil.save(context, "pref_identity_private", Base64.encodeBytes(identityKeyRecord.getKeyPair().getPrivateKey().serialize()));
}

String senderKey = decryptStickyKey(senderId, cipherSenderKey, identityKeyId);
if (senderKey != null) {
SenderKeyDistributionMessage senderKeyDistributionMessage = new SenderKeyDistributionMessage(Base64.decode(senderKey));
groupSessionBuilder.process(senderKeyName, senderKeyDistributionMessage);
Expand Down Expand Up @@ -679,7 +664,7 @@ public void deleteSession(String stickId, String senderId) {

public String decryptTextPairwise(String senderId, int deviceId, boolean isStickyKey, String cipher) {
try {
SignalProtocolStore store = new MySignalProtocolStore(context);
SignalProtocolStore store = new MyProtocolStore(context);
SignalProtocolAddress signalProtocolAddress = new SignalProtocolAddress(senderId, deviceId);
SessionCipher sessionCipher = new SessionCipher(store, signalProtocolAddress);
byte[] bytes;
Expand All @@ -693,7 +678,7 @@ public String decryptTextPairwise(String senderId, int deviceId, boolean isStick
return new String(bytes, StandardCharsets.UTF_8);
} catch (InvalidMessageException | DuplicateMessageException | LegacyMessageException | UntrustedIdentityException | InvalidVersionException | InvalidKeyIdException | InvalidKeyException | NoSessionException | IOException e) {
e.printStackTrace();
SignalProtocolStore store = new MySignalProtocolStore(context);
SignalProtocolStore store = new MyProtocolStore(context);
SignalProtocolAddress signalProtocolAddress = new SignalProtocolAddress(senderId, deviceId);
SessionCipher sessionCipher = new SessionCipher(store, signalProtocolAddress);
byte[] bytes = null;
Expand Down
4 changes: 2 additions & 2 deletions ...protocol/store/MySignalProtocolStore.java → .../stickprotocol/store/MyProtocolStore.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@

import java.util.List;

public class MySignalProtocolStore implements SignalProtocolStore {
public class MyProtocolStore implements SignalProtocolStore {

private final PreKeyStore preKeyStore;
private final SignedPreKeyStore signedPreKeyStore;
private final IdentityKeyStore identityKeyStore;
private final SessionStore sessionStore;

public MySignalProtocolStore(Context context) {
public MyProtocolStore(Context context) {
this.preKeyStore = new MyPreKeyStore(context);
this.signedPreKeyStore = new MyPreKeyStore(context);
this.identityKeyStore = new MyIdentityKeyStore(context);
Expand Down
2 changes: 1 addition & 1 deletion ios/StickProtocol/StickProtocol.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Pod::Spec.new do |spec|


spec.name = "StickProtocol"
spec.version = "1.1.46"
spec.version = "1.1.50"
spec.summary = "Customized Signal Protocol C Library for the Stick Protocol"
spec.swift_version = "5.0"

Expand Down
Loading

0 comments on commit 604ef46

Please sign in to comment.