ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-05-31 14:40:52 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

CORDA-540: Perform schema verification (#1672)

Browse Source
This commit is contained in:
Viktor Kolomeyko 2017-10-03 11:47:53 +01:00 committed by GitHub
parent 24b773eec1
commit c87e1045eb
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/DeserializationInput.kt
View File

@ -60,7 +60,7 @@ class DeserializationInput(internal val serializerFactory: SerializerFactory) {
deserializeAndReturnEnvelope(bytes, T::class.java) deserializeAndReturnEnvelope(bytes, T::class.java)
@Throws(NotSerializableException::class) @Throws(NotSerializableException::class)
private fun getEnvelope(bytes: ByteSequence): Envelope { internal fun getEnvelope(bytes: ByteSequence): Envelope {
// Check that the lead bytes match expected header // Check that the lead bytes match expected header
val headerSize = AmqpHeaderV1_0.size val headerSize = AmqpHeaderV1_0.size
if (bytes.take(headerSize) != AmqpHeaderV1_0) { if (bytes.take(headerSize) != AmqpHeaderV1_0) {

24
node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/ListsSerializationTest.kt
View File

@ -4,8 +4,12 @@ import com.esotericsoftware.kryo.Kryo
import com.esotericsoftware.kryo.util.DefaultClassResolver import com.esotericsoftware.kryo.util.DefaultClassResolver
import net.corda.core.serialization.* import net.corda.core.serialization.*
import net.corda.node.services.statemachine.SessionData import net.corda.node.services.statemachine.SessionData
import net.corda.nodeapi.internal.serialization.amqp.DeserializationInput
import net.corda.nodeapi.internal.serialization.amqp.Envelope
import net.corda.nodeapi.internal.serialization.amqp.SerializerFactory
import net.corda.testing.TestDependencyInjectionBase import net.corda.testing.TestDependencyInjectionBase
import net.corda.testing.amqpSpecific import net.corda.testing.amqpSpecific
import net.corda.testing.kryoSpecific
import org.assertj.core.api.Assertions import org.assertj.core.api.Assertions
import org.junit.Assert.* import org.junit.Assert.*
import org.junit.Test import org.junit.Test
@ -17,6 +21,13 @@ import java.util.*
class ListsSerializationTest : TestDependencyInjectionBase() { class ListsSerializationTest : TestDependencyInjectionBase() {
private companion object { private companion object {
val javaEmptyListClass = Collections.emptyList<Any>().javaClass val javaEmptyListClass = Collections.emptyList<Any>().javaClass
fun<T : Any> verifyEnvelope(serBytes: SerializedBytes<T>, envVerBody: (Envelope) -> Unit) =
amqpSpecific<ListsSerializationTest>("AMQP specific envelope verification") {
val context = SerializationFactory.defaultFactory.defaultContext
val envelope = DeserializationInput(SerializerFactory(context.whitelist, context.deserializationClassLoader)).getEnvelope(serBytes)
envVerBody(envelope)
}
} }
@Test @Test
@ -43,7 +54,7 @@ class ListsSerializationTest : TestDependencyInjectionBase() {
} }
@Test @Test
fun `check empty list serialises as Java emptyList`() { fun `check empty list serialises as Java emptyList`() = kryoSpecific<ListsSerializationTest>("Kryo specific test"){
val nameID = 0 val nameID = 0
val serializedForm = emptyList<Int>().serialize() val serializedForm = emptyList<Int>().serialize()
val output = ByteArrayOutputStream().apply { val output = ByteArrayOutputStream().apply {
@ -83,14 +94,19 @@ class ListsSerializationTest : TestDependencyInjectionBase() {
payload.add(Child(1)) payload.add(Child(1))
payload.add(Child(2)) payload.add(Child(2))
val container = CovariantContainer(payload) val container = CovariantContainer(payload)
assertEqualAfterRoundTripSerialization(container)
}
fun verifyEnvelopeBody(envelope: Envelope) {
envelope.schema.types.single { typeNotation -> typeNotation.name == java.util.List::class.java.name + "<?>" }
}
assertEqualAfterRoundTripSerialization(container, {bytes -> verifyEnvelope(bytes, ::verifyEnvelopeBody)})
}
} }
internal inline fun<reified T : Any> assertEqualAfterRoundTripSerialization(obj: T) { internal inline fun<reified T : Any> assertEqualAfterRoundTripSerialization(obj: T, noinline streamValidation: ((SerializedBytes<T>) -> Unit)? = null) {
val serializedForm: SerializedBytes<T> = obj.serialize() val serializedForm: SerializedBytes<T> = obj.serialize()
streamValidation?.invoke(serializedForm)
val deserializedInstance = serializedForm.deserialize() val deserializedInstance = serializedForm.deserialize()
assertEquals(obj, deserializedInstance) assertEquals(obj, deserializedInstance)