Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-09 22:00:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

Sanity check NBS message header values to stop the occasional bogus

Browse source 
source-unknown incomming.
This commit is contained in:
Eric House 2015-05-18 07:52:12 -07:00
parent 49dc8e7d10
commit f08c0c8b5e
1 changed files with 40 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSService.java
View file

@ -74,6 +74,7 @@ public class SMSService extends XWService {
private static final int SMS_PROTO_VERSION = 0; private static final int SMS_PROTO_VERSION = 0;
private static final int MAX_LEN_TEXT = 100; private static final int MAX_LEN_TEXT = 100;
private static final int MAX_LEN_BINARY = 100; private static final int MAX_LEN_BINARY = 100;
private static final int MAX_MSG_COUNT = 16; // 1.6K enough? Should be....
private enum SMSAction { _NONE, private enum SMSAction { _NONE,
INVITE, INVITE,
SEND, SEND,
@ -453,35 +454,40 @@ public class SMSService extends XWService {
das.flush(); das.flush();
byte[] data = bas.toByteArray(); byte[] data = bas.toByteArray();
boolean result = false;
byte[][] msgs = breakAndEncode( data ); byte[][] msgs = breakAndEncode( data );
result = sendBuffers( msgs, phone ); boolean result = null != msgs && sendBuffers( msgs, phone );
return result; return result;
} }
private byte[][] breakAndEncode( byte msg[] ) throws java.io.IOException private byte[][] breakAndEncode( byte msg[] ) throws java.io.IOException
{ {
byte[][] result = null;
int count = (msg.length + (MAX_LEN_BINARY-1)) / MAX_LEN_BINARY; int count = (msg.length + (MAX_LEN_BINARY-1)) / MAX_LEN_BINARY;
byte[][] result = new byte[count][]; if ( count < MAX_MSG_COUNT ) {
int msgID = ++s_nSent % 0x000000FF; result = new byte[count][];
int msgID = ++s_nSent % 0x000000FF;
int start = 0; int start = 0;
int end = 0; int end = 0;
for ( int ii = 0; ii < count; ++ii ) { for ( int ii = 0; ii < count; ++ii ) {
int len = msg.length - end; int len = msg.length - end;
if ( len > MAX_LEN_BINARY ) { if ( len > MAX_LEN_BINARY ) {
len = MAX_LEN_BINARY; len = MAX_LEN_BINARY;
}
end += len;
byte[] part = new byte[4 + len];
part[0] = (byte)SMS_PROTO_VERSION;
part[1] = (byte)msgID;
part[2] = (byte)ii;
part[3] = (byte)count;
System.arraycopy( msg, start, part, 4, len );
result[ii] = part;
start = end;
} }
end += len; } else {
byte[] part = new byte[4 + len]; DbgUtils.logf( "breakAndEncode(): msg count %d too large; dropping",
part[0] = (byte)SMS_PROTO_VERSION; count );
part[1] = (byte)msgID;
part[2] = (byte)ii;
part[3] = (byte)count;
System.arraycopy( msg, start, part, 4, len );
result[ii] = part;
start = end;
} }
return result; return result;
} }
@ -549,17 +555,21 @@ public class SMSService extends XWService {
int count = buffer[3]; int count = buffer[3];
byte[] rest = new byte[buffer.length - 4]; byte[] rest = new byte[buffer.length - 4];
System.arraycopy( buffer, 4, rest, 0, rest.length ); System.arraycopy( buffer, 4, rest, 0, rest.length );
tryAssemble( senderPhone, id, index, count, rest ); if ( tryAssemble( senderPhone, id, index, count, rest ) ) {
sendResult( MultiEvent.SMS_RECEIVE_OK );
sendResult( MultiEvent.SMS_RECEIVE_OK ); } else {
DbgUtils.logf( "SMSService: receiveBuffer(): bogus message from"
+ " phone %s", senderPhone );
}
} }
private void tryAssemble( String senderPhone, int id, int index, private boolean tryAssemble( String senderPhone, int id, int index,
int count, byte[] msg ) int count, byte[] msg )
{ {
if ( index == 0 && count == 1 ) { boolean success = true;
if ( index == 0 && count == 1 ) { // most common case
disAssemble( senderPhone, msg ); disAssemble( senderPhone, msg );
} else { } else if ( count > 0 && count < MAX_MSG_COUNT && index < count ) {
// required? Should always be in main thread. // required? Should always be in main thread.
synchronized( s_partialMsgs ) { synchronized( s_partialMsgs ) {
HashMap<Integer, MsgStore> perPhone = HashMap<Integer, MsgStore> perPhone =
@ -579,7 +589,10 @@ public class SMSService extends XWService {
perPhone.remove( id ); perPhone.remove( id );
} }
} }
} else {
success = false;
} }
return success;
} }
private void disAssemble( String senderPhone, byte[] fullMsg ) private void disAssemble( String senderPhone, byte[] fullMsg )