keejef
/
session-android
mirror of https://github.com/oxen-io/session-android
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Validate phone numbers when formatting.

Browse Source
pull/1/head
Moxie Marlinspike 12 years ago
parent f7b71e5e28
commit ce5f3c5157
7 changed files with 74 additions and 28 deletions
Show Stats Download Patch File Download Diff File

9
library/src/org/whispersystems/textsecure/directory/Directory.java
Unescape Escape View File

@ -11,6 +11,7 @@ import android.util.Log;
import org.whispersystems.textsecure.push.ContactTokenDetails;
import org.whispersystems.textsecure.util.Base64;
import org.whispersystems.textsecure.util.InvalidNumberException;
import org.whispersystems.textsecure.util.PhoneNumberFormatter;
import org.whispersystems.textsecure.util.Util;
@ -157,8 +158,12 @@ public class Directory {
String rawNumber = cursor.getString(0);
if (rawNumber != null) {
String e164Number = PhoneNumberFormatter.formatNumber(rawNumber, localNumber);
results.add(getToken(e164Number));
try {
String e164Number = PhoneNumberFormatter.formatNumber(rawNumber, localNumber);
results.add(getToken(e164Number));
} catch (InvalidNumberException e) {
Log.w("Directory", "Invalid number: " + rawNumber);
}
}
}

2
library/src/org/whispersystems/textsecure/push/PushDestination.java
Unescape Escape View File

@ -3,6 +3,7 @@ package org.whispersystems.textsecure.push;
import android.content.Context;
import org.whispersystems.textsecure.directory.Directory;
import org.whispersystems.textsecure.util.InvalidNumberException;
import org.whispersystems.textsecure.util.PhoneNumberFormatter;
public class PushDestination {
@ -26,6 +27,7 @@ public class PushDestination {
public static PushDestination create(Context context,
PushServiceSocket.PushCredentials credentials,
String destinationNumber)
throws InvalidNumberException
{
String e164destination = PhoneNumberFormatter.formatNumber(destinationNumber, credentials.getLocalNumber(context));
String relay = Directory.getInstance(context).getRelay(e164destination);

7
library/src/org/whispersystems/textsecure/util/InvalidNumberException.java
Unescape Escape View File

@ -0,0 +1,7 @@
package org.whispersystems.textsecure.util;
public class InvalidNumberException extends Throwable {
public InvalidNumberException(String s) {
super(s);
}
}

16
library/src/org/whispersystems/textsecure/util/PhoneNumberFormatter.java
Unescape Escape View File

@ -21,7 +21,9 @@ public class PhoneNumberFormatter {
return number.matches("^\\+[0-9]{10,}");
}
private static String impreciseFormatNumber(String number, String localNumber) {
private static String impreciseFormatNumber(String number, String localNumber)
throws InvalidNumberException
{
number = number.replaceAll("[^0-9+]", "");
if (number.charAt(0) == '+')
@ -49,9 +51,19 @@ public class PhoneNumberFormatter {
}
}
public static String formatNumber(String number, String localNumber) {
public static String formatNumber(String number, String localNumber)
throws InvalidNumberException
{
if (number.contains("@")) {
throw new InvalidNumberException("Possible attempt to use email address.");
}
number = number.replaceAll("[^0-9+]", "");
if (number.length() == 0) {
throw new InvalidNumberException("No valid characters found.");
}
if (number.charAt(0) == '+')
return number;

4
src/org/thoughtcrime/securesms/transport/PushTransport.java
Unescape Escape View File

@ -48,6 +48,7 @@ import org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent;
import org.whispersystems.textsecure.push.PushServiceSocket;
import org.whispersystems.textsecure.push.RateLimitException;
import org.whispersystems.textsecure.storage.SessionRecordV2;
import org.whispersystems.textsecure.util.InvalidNumberException;
import java.io.IOException;
import java.util.LinkedList;
@ -86,6 +87,9 @@ public class PushTransport extends BaseTransport {
} catch (RateLimitException e) {
Log.w("PushTransport", e);
throw new IOException("Rate limit exceeded.");
} catch (InvalidNumberException e) {
Log.w("PushTransport", e);
throw new IOException("Badly formatted number.");
}
}

59
src/org/thoughtcrime/securesms/transport/UniversalTransport.java
Unescape Escape View File

@ -32,6 +32,7 @@ import org.whispersystems.textsecure.directory.NotInDirectoryException;
import org.whispersystems.textsecure.push.ContactTokenDetails;
import org.whispersystems.textsecure.push.PushDestination;
import org.whispersystems.textsecure.push.PushServiceSocket;
import org.whispersystems.textsecure.util.InvalidNumberException;
import java.io.IOException;
import java.util.LinkedList;
@ -60,19 +61,24 @@ public class UniversalTransport {
return;
}
Recipient recipient = message.getIndividualRecipient();
String number = Util.canonicalizeNumber(context, recipient.getNumber());
if (isPushTransport(number)) {
try {
Log.w("UniversalTransport", "Delivering with GCM...");
pushTransport.deliver(message);
} catch (IOException ioe) {
Log.w("UniversalTransport", ioe);
try {
Recipient recipient = message.getIndividualRecipient();
String number = Util.canonicalizeNumber(context, recipient.getNumber());
if (isPushTransport(number)) {
try {
Log.w("UniversalTransport", "Delivering with GCM...");
pushTransport.deliver(message);
} catch (IOException ioe) {
Log.w("UniversalTransport", ioe);
smsTransport.deliver(message);
}
} else {
Log.w("UniversalTransport", "Delivering with SMS...");
smsTransport.deliver(message);
}
} else {
Log.w("UniversalTransport", "Delivering with SMS...");
} catch (InvalidNumberException e) {
Log.w("UniversalTransport", e);
smsTransport.deliver(message);
}
}
@ -84,24 +90,31 @@ public class UniversalTransport {
return mmsTransport.deliver(mediaMessage);
}
List<PushDestination> destinations = getMediaDestinations(mediaMessage);
if (isPushTransport(destinations)) {
try {
Log.w("UniversalTransport", "Delivering media message with GCM...");
pushTransport.deliver(mediaMessage, destinations, threadId);
return new MmsSendResult("push".getBytes("UTF-8"), 0, true);
} catch (IOException ioe) {
Log.w("UniversalTransport", ioe);
try {
List<PushDestination> destinations = getMediaDestinations(mediaMessage);
if (isPushTransport(destinations)) {
try {
Log.w("UniversalTransport", "Delivering media message with GCM...");
pushTransport.deliver(mediaMessage, destinations, threadId);
return new MmsSendResult("push".getBytes("UTF-8"), 0, true);
} catch (IOException ioe) {
Log.w("UniversalTransport", ioe);
return mmsTransport.deliver(mediaMessage);
}
} else {
Log.w("UniversalTransport", "Delivering media message with MMS...");
return mmsTransport.deliver(mediaMessage);
}
} else {
Log.w("UniversalTransport", "Delivering media message with MMS...");
} catch (InvalidNumberException e) {
Log.w("UniversalTransport", e);
return mmsTransport.deliver(mediaMessage);
}
}
private List<PushDestination> getMediaDestinations(SendReq mediaMessage) {
private List<PushDestination> getMediaDestinations(SendReq mediaMessage)
throws InvalidNumberException
{
TextSecurePushCredentials credentials = TextSecurePushCredentials.getInstance();
LinkedList<PushDestination> destinations = new LinkedList<PushDestination>();

5
src/org/thoughtcrime/securesms/util/Util.java
Unescape Escape View File

@ -27,6 +27,7 @@ import android.os.Build;
import android.provider.Telephony;
import org.thoughtcrime.securesms.mms.MmsRadio;
import org.whispersystems.textsecure.util.InvalidNumberException;
import org.whispersystems.textsecure.util.PhoneNumberFormatter;
import java.io.ByteArrayOutputStream;
@ -122,7 +123,9 @@ public class Util {
}
}
public static String canonicalizeNumber(Context context, String number) {
public static String canonicalizeNumber(Context context, String number)
throws InvalidNumberException
{
String localNumber = TextSecurePreferences.getLocalNumber(context);
return PhoneNumberFormatter.formatNumber(number, localNumber);
}

Write Preview
Loading…
Cancel
Save