Merge pull request #4963 from corda/colljos-backport-secfix-serializer

(BACKPORT) ENT-3121 restrict custom serializers
This commit is contained in:
josecoll
2019-03-29 16:51:44 +00:00
committed by GitHub
14 changed files with 159 additions and 32 deletions

View File

@ -0,0 +1,96 @@
package net.corda.serialization.internal.amqp
import net.corda.core.CordaException
import net.corda.core.serialization.CordaSerializable
import net.corda.core.serialization.SerializationContext
import net.corda.finance.contracts.asset.Cash
import org.apache.qpid.proton.amqp.Symbol
import org.apache.qpid.proton.codec.Data
import org.junit.Test
import java.lang.reflect.Type
import kotlin.test.assertFailsWith
import kotlin.test.assertSame
class CustomSerializerRegistryTests {
private val descriptorBasedRegistry = DefaultDescriptorBasedSerializerRegistry()
private val unit = CachingCustomSerializerRegistry(descriptorBasedRegistry)
class TestCustomSerializer(descriptorString: String, private val serializerFor: (Class<*>) -> Boolean): CustomSerializer<Any>() {
override fun isSerializerFor(clazz: Class<*>): Boolean = serializerFor(clazz)
override val descriptor: Descriptor get() = throw UnsupportedOperationException()
override val schemaForDocumentation: Schema get() = throw UnsupportedOperationException()
override fun writeDescribedObject(obj: Any, data: Data, type: Type, output: SerializationOutput, context: SerializationContext) {
throw UnsupportedOperationException()
}
override val type: Type get() = Any::class.java
override val typeDescriptor: Symbol = Symbol.valueOf(descriptorString)
override fun writeClassInfo(output: SerializationOutput) {
throw UnsupportedOperationException()
}
override fun readObject(obj: Any, schemas: SerializationSchemas, input: DeserializationInput, context: SerializationContext): Any {
throw UnsupportedOperationException()
}
}
@Test
fun `a custom serializer cannot register to serialize a type already annotated with CordaSerializable`() {
val serializerForEverything = TestCustomSerializer("a") { true }
unit.register(serializerForEverything)
@CordaSerializable
class AnnotatedWithCordaSerializable
class NotAnnotatedWithCordaSerializable
assertSame(
serializerForEverything,
unit.find(NotAnnotatedWithCordaSerializable::class.java))
assertFailsWith<IllegalCustomSerializerException> {
unit.find(AnnotatedWithCordaSerializable::class.java)
}
}
@Test
fun `exception types can have custom serializers`() {
@CordaSerializable
class MyCustomException : CordaException("Custom exception annotated with @CordaSerializable")
val customExceptionSerializer = TestCustomSerializer("a") { type -> type == MyCustomException::class.java }
unit.register(customExceptionSerializer)
assertSame(
customExceptionSerializer,
unit.find(MyCustomException::class.java))
}
@Test
fun `two custom serializers cannot register to serialize the same type`() {
val weSerializeCash = TestCustomSerializer("a") { type -> type == Cash::class.java }
val weMaliciouslySerializeCash = TestCustomSerializer("b") { type -> type == Cash::class.java }
unit.run {
register(weSerializeCash)
register(weMaliciouslySerializeCash)
}
assertFailsWith<DuplicateCustomSerializerException> {
unit.find(Cash::class.java)
}
}
@Test
fun `primitive types cannot have custom serializers`() {
unit.register(TestCustomSerializer("a") { type -> type == Float::class.java })
assertFailsWith<IllegalCustomSerializerException> {
unit.find(Float::class.java)
}
}
private fun CustomSerializerRegistry.find(clazz: Class<*>): AMQPSerializer<Any> = findCustomSerializer(clazz, clazz)!!
}