TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-30 09:40:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix URL encoding on single contact query.

Browse Source
This commit is contained in:
Moxie Marlinspike 2015-03-09 12:49:13 -07:00
parent cb4eb3c202
commit 2614bba212
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
java/src/main/java/org/whispersystems/textsecure/api/TextSecureAccountManager.java
View File

@ -16,6 +16,7 @@
*/ */
package org.whispersystems.textsecure.api; package org.whispersystems.textsecure.api;
import com.google.protobuf.ByteString; import com.google.protobuf.ByteString;
import org.whispersystems.libaxolotl.IdentityKey; import org.whispersystems.libaxolotl.IdentityKey;
@ -181,7 +182,7 @@ public class TextSecureAccountManager {
* @throws IOException * @throws IOException
*/ */
public Optional<ContactTokenDetails> getContact(String e164number) throws IOException { public Optional<ContactTokenDetails> getContact(String e164number) throws IOException {
String contactToken = createDirectoryServerToken(e164number); String contactToken = createDirectoryServerToken(e164number, true);
ContactTokenDetails contactTokenDetails = this.pushServiceSocket.getContactTokenDetails(contactToken); ContactTokenDetails contactTokenDetails = this.pushServiceSocket.getContactTokenDetails(contactToken);
if (contactTokenDetails != null) { if (contactTokenDetails != null) {
@ -233,11 +234,14 @@ public class TextSecureAccountManager {
this.pushServiceSocket.sendProvisioningMessage(deviceIdentifier, ciphertext); this.pushServiceSocket.sendProvisioningMessage(deviceIdentifier, ciphertext);
} }
private String createDirectoryServerToken(String e164number) { private String createDirectoryServerToken(String e164number, boolean urlSafe) {
try { try {
MessageDigest digest = MessageDigest.getInstance("SHA1"); MessageDigest digest = MessageDigest.getInstance("SHA1");
byte[] token = Util.trim(digest.digest(e164number.getBytes()), 10); byte[] token = Util.trim(digest.digest(e164number.getBytes()), 10);
return Base64.encodeBytesWithoutPadding(token); String encoded = Base64.encodeBytesWithoutPadding(token);
if (urlSafe) return encoded.replace('+', '-').replace('/', '_');
else return encoded;
} catch (NoSuchAlgorithmException e) { } catch (NoSuchAlgorithmException e) {
throw new AssertionError(e); throw new AssertionError(e);
} }
@ -247,7 +251,7 @@ public class TextSecureAccountManager {
Map<String,String> tokenMap = new HashMap<>(e164numbers.size()); Map<String,String> tokenMap = new HashMap<>(e164numbers.size());
for (String number : e164numbers) { for (String number : e164numbers) {
tokenMap.put(createDirectoryServerToken(number), number); tokenMap.put(createDirectoryServerToken(number, false), number);
} }
return tokenMap; return tokenMap;