TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-25 17:27:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve pdu generation in SmsListenerTest

Browse Source 
one Android 2.3.3 device was throwing NPEs while parsing the precompiled
pdu test vectors so I modified SmsListenerTest to generate them on the fly
using Android's own PDU related classes. All tests now pass on 2.3.3,
4.2.2, 4.4.4, 5.1.

Closes #3048

// FREEBIE
This commit is contained in:
Rhodey Orbits 2015-04-23 12:32:43 -07:00 committed by Moxie Marlinspike
parent 26c4d746d2
commit 3fe676a3dd
1 changed files with 59 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
androidTest/java/org/thoughtcrime/securesms/service/SmsListenerTest.java
View File

@ -23,12 +23,17 @@ import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.os.Bundle; import android.os.Bundle;
import android.provider.Telephony; import android.provider.Telephony;
import android.telephony.PhoneNumberUtils;
import android.util.Log; import android.util.Log;
import org.mockito.ArgumentCaptor; import org.mockito.ArgumentCaptor;
import org.spongycastle.util.encoders.Hex;
import org.thoughtcrime.securesms.TextSecureTestCase; import org.thoughtcrime.securesms.TextSecureTestCase;
import java.io.ByteArrayOutputStream;
import java.lang.reflect.Method;
import java.util.Calendar;
import java.util.GregorianCalendar;
import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.anyString;
@ -40,21 +45,12 @@ import static org.mockito.Mockito.when;
public class SmsListenerTest extends TextSecureTestCase { public class SmsListenerTest extends TextSecureTestCase {
/* private static final String CHALLENGE_SMS_3_3 = "Your TextSecure verification code: 337-337";
http://rednaxela.net/pdu.php private static final String CHALLENGE_SMS_3_4 = "Your TextSecure verification code: 337-1337";
'Your TextSecure verification code: 337-337' private static final String CHALLENGE_SMS_4_3 = "Your TextSecure verification code: 1337-337";
'Your TextSecure verification code: 337-1337' private static final String CHALLENGE_SMS_4_4 = "Your TextSecure verification code: 1337-1337";
'Your TextSecure verification code: 1337-337' private static final String CHALLENGE_SMS_4_4_PREPEND = "XXXYour TextSecure verification code: 1337-1337";
'Your TextSecure verification code: 1337-1337' private static final String CHALLENGE_SMS_4_4_APPEND = "Your TextSecure verification code: 1337-1337XXX";
'XXXYour TextSecure verification code: 1337-1337'
'Your TextSecure verification code: 1337-1337XXX'
*/
private static final String CHALLENGE_SMS_3_3 = "07914400000000F001000B811000000000F000002AD9775D0EA296F1F469795C979741F6B23C6D4E8FC3F4F4DB0D1ABFC9651D6836BBB566B31B";
private static final String CHALLENGE_SMS_3_4 = "07914400000000F001000B811000000000F000002BD9775D0EA296F1F469795C979741F6B23C6D4E8FC3F4F4DB0D1ABFC9651D6836BBB562B3D90D";
private static final String CHALLENGE_SMS_4_3 = "07914400000000F001000B811000000000F000002BD9775D0EA296F1F469795C979741F6B23C6D4E8FC3F4F4DB0D1ABFC9651D28369BDD5AB3D90D";
private static final String CHALLENGE_SMS_4_4 = "07914400000000F001000B811000000000F000002CD9775D0EA296F1F469795C979741F6B23C6D4E8FC3F4F4DB0D1ABFC9651D28369BDD5AB1D9EC06";
private static final String CHALLENGE_SMS_4_4_PREPEND = "07914400000000F001000B811000000000F000002F582C36FBAECB41D4329E3E2D8FEBF232C85E96A7CDE971989E7EBB41E337B9AC03C566B35B2B369BDD00";
private static final String CHALLENGE_SMS_4_4_APPEND = "07914400000000F001000B811000000000F000002FD9775D0EA296F1F469795C979741F6B23C6D4E8FC3F4F4DB0D1ABFC9651D28369BDD5AB1D9EC86C56201";
private static final String[] CHALLENGE_SMS = { private static final String[] CHALLENGE_SMS = {
CHALLENGE_SMS_3_3, CHALLENGE_SMS_3_4, CHALLENGE_SMS_4_3, CHALLENGE_SMS_3_3, CHALLENGE_SMS_3_4, CHALLENGE_SMS_4_3,
CHALLENGE_SMS_4_4, CHALLENGE_SMS_4_4_PREPEND, CHALLENGE_SMS_4_4_APPEND CHALLENGE_SMS_4_4, CHALLENGE_SMS_4_4_PREPEND, CHALLENGE_SMS_4_4_APPEND
@ -69,12 +65,57 @@ public class SmsListenerTest extends TextSecureTestCase {
CHALLENGE_4_4, CHALLENGE_4_4, CHALLENGE_4_4, CHALLENGE_4_4, CHALLENGE_4_4, CHALLENGE_4_4,
}; };
/*
credit :D
http://stackoverflow.com/a/12338541
*/
private static byte[] buildSmsPdu(String sender, String body) throws Exception{
byte[] scBytes = PhoneNumberUtils.networkPortionToCalledPartyBCD("0000000000");
byte[] senderBytes = PhoneNumberUtils.networkPortionToCalledPartyBCD(sender);
int lsmcs = scBytes.length;
byte[] dateBytes = new byte[7];
Calendar calendar = new GregorianCalendar();
dateBytes[0] = reverseByte((byte) (calendar.get(Calendar.YEAR)));
dateBytes[1] = reverseByte((byte) (calendar.get(Calendar.MONTH) + 1));
dateBytes[2] = reverseByte((byte) (calendar.get(Calendar.DAY_OF_MONTH)));
dateBytes[3] = reverseByte((byte) (calendar.get(Calendar.HOUR_OF_DAY)));
dateBytes[4] = reverseByte((byte) (calendar.get(Calendar.MINUTE)));
dateBytes[5] = reverseByte((byte) (calendar.get(Calendar.SECOND)));
dateBytes[6] = reverseByte((byte) ((calendar.get(Calendar.ZONE_OFFSET) + calendar.get(Calendar.DST_OFFSET)) / (60 * 1000 * 15)));
ByteArrayOutputStream bo = new ByteArrayOutputStream();
bo.write(lsmcs);
bo.write(scBytes);
bo.write(0x04);
bo.write((byte) sender.length());
bo.write(senderBytes);
bo.write(0x00);
bo.write(0x00);
bo.write(dateBytes);
String sReflectedClassName = "com.android.internal.telephony.GsmAlphabet";
Class cReflectedNFCExtras = Class.forName(sReflectedClassName);
Method stringToGsm7BitPacked = cReflectedNFCExtras.getMethod("stringToGsm7BitPacked", new Class[] { String.class });
stringToGsm7BitPacked.setAccessible(true);
byte[] bodybytes = (byte[]) stringToGsm7BitPacked.invoke(null, body);
bo.write(bodybytes);
return bo.toByteArray();
}
private static byte reverseByte(byte b) {
return (byte) ((b & 0xF0) >> 4 | (b & 0x0F) << 4);
}
@SuppressLint("NewApi") @SuppressLint("NewApi")
private Intent buildSmsReceivedIntent(String encodedPdu) throws Exception { private Intent buildSmsReceivedIntent(String smsBody) throws Exception {
final Intent smsIntent = mock(Intent.class); final Intent smsIntent = mock(Intent.class);
final Bundle smsExtras = new Bundle(); final Bundle smsExtras = new Bundle();
final byte[] smsPdu = buildSmsPdu("15555555555", smsBody);
smsExtras.putSerializable("pdus", new Object[]{Hex.decode(encodedPdu)}); smsExtras.putSerializable("pdus", new Object[]{smsPdu});
when(smsIntent.getAction()).thenReturn(Telephony.Sms.Intents.SMS_RECEIVED_ACTION); when(smsIntent.getAction()).thenReturn(Telephony.Sms.Intents.SMS_RECEIVED_ACTION);
when(smsIntent.getExtras()).thenReturn(smsExtras); when(smsIntent.getExtras()).thenReturn(smsExtras);