nutomic/ensichat
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed crash when receiving message with invalid length.

Browse source
This commit is contained in:
Felix Ableitner 2016-02-11 13:51:15 +01:00
parent 02a506608f
commit ba3ce67a06
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/src/main/scala/com/nutomic/ensichat/core/Message.scala
View file

@ -19,13 +19,13 @@ object Message {
}
}
class ParseMessageException(detailMessage: String) extends RuntimeException(detailMessage) {
}
val Charset = "UTF-8"
class ReadMessageException(throwable: Throwable)
extends RuntimeException(throwable)
class ReadMessageException(message: String, throwable: Throwable)
extends RuntimeException(message, throwable) {
def this(message: String) = this(message, null)
def this(throwable: Throwable) = this(null, throwable)
}
/**
* Reads the entire message (header, crypto and body) into an object.

7
core/src/main/scala/com/nutomic/ensichat/core/header/MessageHeader.scala
View file

@ -3,7 +3,7 @@ package com.nutomic.ensichat.core.header
import java.nio.ByteBuffer
import com.nutomic.ensichat.core.Address
import com.nutomic.ensichat.core.Message.ParseMessageException
import com.nutomic.ensichat.core.Message.ReadMessageException
import com.nutomic.ensichat.core.util.BufferUtils
object MessageHeader {
@ -15,17 +15,20 @@ object MessageHeader {
*
* @return The header and the message length in bytes.
*/
@throws(classOf[ReadMessageException])
def read(bytes: Array[Byte]): (MessageHeader, Int) = {
val b = ByteBuffer.wrap(bytes, 0, MessageHeader.Length)
val version = BufferUtils.getUnsignedByte(b)
if (version != AbstractHeader.Version)
throw new ParseMessageException("Failed to parse message with unsupported version " + version)
throw new ReadMessageException("Failed to parse message with unsupported version " + version)
val protocolType = BufferUtils.getUnsignedByte(b)
val hopLimit = BufferUtils.getUnsignedByte(b)
val hopCount = BufferUtils.getUnsignedByte(b)
val length = BufferUtils.getUnsignedInt(b)
if (length < Length)
throw new ReadMessageException("Received message with invalid length " + length)
val origin = new Address(BufferUtils.getByteArray(b, Address.Length))
val target = new Address(BufferUtils.getByteArray(b, Address.Length))