ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-19 03:06:36 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixed bug in Kryo.useClassLoader

Browse Source 
Renamed to AttachmentsClassLoader + autoformat
Added unit test to validate exception being throw when deserializing WireTransaction without contract jar in attachments.
This commit is contained in:
sofusmortensen 2016-04-05 00:25:58 +02:00
parent 88a7406ec9
commit bba0a4a55d
3 changed files with 63 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/main/kotlin/core/node/ClassLoader.kt → core/src/main/kotlin/core/node/AttachmentsClassLoader.kt
View File

@ -6,8 +6,6 @@ import java.io.File
import java.io.FileOutputStream
import java.net.URL
import java.net.URLClassLoader
import java.security.AccessControlContext
import java.security.ProtectionDomain
import java.util.*
import java.util.jar.JarEntry
@ -16,10 +14,8 @@ class OverlappingAttachments : Exception()
/**
* A custom ClassLoader for creating contracts distributed as attachments and for contracts to
* access attachments.
*
*
*/
class ClassLoader private constructor(val tmpFiles: List<File> )
class AttachmentsClassLoader private constructor(val tmpFiles: List<File>)
: URLClassLoader(tmpFiles.map { URL("file", "", it.toString()) }.toTypedArray()), Closeable {
override fun close() {
@ -35,19 +31,20 @@ class ClassLoader private constructor(val tmpFiles: List<File> )
}
companion object {
fun create(streams: List<Attachment>) : ClassLoader {
fun create(streams: List<Attachment>): AttachmentsClassLoader {
validate(streams)
var tmpFiles = streams.map {
var filename = File.createTempFile("jar", "")
it.open().use {
str -> FileOutputStream(filename).use { str.copyTo(it) }
str ->
FileOutputStream(filename).use { str.copyTo(it) }
}
filename
}
return ClassLoader(tmpFiles)
return AttachmentsClassLoader(tmpFiles)
}
private fun validate(streams: List<Attachment>) {

10
core/src/main/kotlin/core/serialization/Kryo.kt
View File

@ -180,15 +180,13 @@ class ImmutableClassSerializer<T : Any>(val klass: KClass<T>) : Serializer<T>()
}
inline fun <T> Kryo.useClassLoader(cl: ClassLoader, body: () -> T) : T {
val tmp = this.classLoader
val tmp = this.classLoader ?: ClassLoader.getSystemClassLoader()
this.classLoader = cl
try {
return body()
}
finally {
if (tmp != null) {
this.classLoader
}
this.classLoader = tmp
}
}
@ -233,9 +231,9 @@ fun createKryo(k: Kryo = core.serialization.Kryo2()): Kryo {
val attachmentStorage = (kryo as? core.serialization.Kryo2)?.attachmentStorage
// .filterNotNull in order for TwoPartyTradeProtocolTests.checkDependenciesOfSaleAssetAreResolved test to run
val classLoader = core.node.ClassLoader.create( attachments.map { attachmentStorage?.openAttachment(it) }.filterNotNull() )
val classLoader = core.node.AttachmentsClassLoader.create( attachments.map { attachmentStorage?.openAttachment(it) }.filterNotNull() )
return kryo.useClassLoader(classLoader) {
kryo.useClassLoader(classLoader) {
var outputs = kryo.readClassAndObject(input) as List<ContractState>
var commands = kryo.readClassAndObject(input) as List<Command>

62
src/test/kotlin/core/node/ClassLoaderTests.kt
View File

@ -1,10 +1,13 @@
package core.node
import com.esotericsoftware.kryo.KryoException
import contracts.DUMMY_PROGRAM_ID
import contracts.DummyContract
import core.*
import core.crypto.SecureHash
import core.serialization.*
import core.serialization.createKryo
import core.serialization.deserialize
import core.serialization.serialize
import core.testutils.MEGA_CORP
import org.apache.commons.io.IOUtils
import org.junit.Test
@ -71,7 +74,7 @@ class ClassLoaderTests {
assertFailsWith( OverlappingAttachments::class ) {
var cl = ClassLoader.create(arrayOf(att0, att1, att2).map { storage.openAttachment(it)!! })
AttachmentsClassLoader.create(arrayOf(att0, att1, att2).map { storage.openAttachment(it)!! })
}
}
@ -85,7 +88,7 @@ class ClassLoaderTests {
var att1 = storage.importAttachment( ByteArrayInputStream(fakeAttachment("file1.txt", "some data")) )
var att2 = storage.importAttachment( ByteArrayInputStream(fakeAttachment("file2.txt", "some other data")) )
ClassLoader.create( arrayOf( att0, att1, att2 ).map { storage.openAttachment(it)!! } ).use {
AttachmentsClassLoader.create(arrayOf(att0, att1, att2).map { storage.openAttachment(it)!! }).use {
var txt = IOUtils.toString(it.getResourceAsStream("file1.txt"))
assertEquals( "some data", txt )
}
@ -99,7 +102,7 @@ class ClassLoaderTests {
var att1 = storage.importAttachment( ByteArrayInputStream(fakeAttachment("file1.txt", "some data")) )
var att2 = storage.importAttachment( ByteArrayInputStream(fakeAttachment("file2.txt", "some other data")) )
ClassLoader.create( arrayOf( att0, att1, att2 ).map { storage.openAttachment(it)!! } ).use {
AttachmentsClassLoader.create(arrayOf(att0, att1, att2).map { storage.openAttachment(it)!! }).use {
var contractClass = Class.forName("contracts.isolated.AnotherDummyContract", true, it)
var contract = contractClass.newInstance() as Contract
@ -149,7 +152,7 @@ class ClassLoaderTests {
var att1 = storage.importAttachment( ByteArrayInputStream(fakeAttachment("file1.txt", "some data")) )
var att2 = storage.importAttachment( ByteArrayInputStream(fakeAttachment("file2.txt", "some other data")) )
val clsLoader = ClassLoader.create( arrayOf( att0, att1, att2 ).map { storage.openAttachment(it)!! } )
val clsLoader = AttachmentsClassLoader.create(arrayOf(att0, att1, att2).map { storage.openAttachment(it)!! })
val kryo = createKryo()
kryo.classLoader = clsLoader
@ -166,6 +169,8 @@ class ClassLoaderTests {
fun `testing Kryo with ClassLoader (without top level class name)`() {
val data = Data( createContract2Cash() )
assertNotNull(data.contract)
val bytes = data.serialize()
var storage = MockAttachmentStorage()
@ -174,7 +179,7 @@ class ClassLoaderTests {
var att1 = storage.importAttachment( ByteArrayInputStream(fakeAttachment("file1.txt", "some data")) )
var att2 = storage.importAttachment( ByteArrayInputStream(fakeAttachment("file2.txt", "some other data")) )
val clsLoader = ClassLoader.create( arrayOf( att0, att1, att2 ).map { storage.openAttachment(it)!! } )
val clsLoader = AttachmentsClassLoader.create(arrayOf(att0, att1, att2).map { storage.openAttachment(it)!! })
val kryo = createKryo()
kryo.classLoader = clsLoader
@ -210,8 +215,9 @@ class ClassLoaderTests {
var storage = MockAttachmentStorage()
var kryo = createKryo() as core.serialization.Kryo2
// todo - think about better way to push attachmentStorage down to serializer
var kryo = THREAD_LOCAL_KRYO.get() as core.serialization.Kryo2
kryo.attachmentStorage = storage
var attachmentRef = storage.importAttachment( FileInputStream(ISOLATED_CONTRACTS_JAR_PATH) )
@ -220,13 +226,51 @@ class ClassLoaderTests {
val wireTransaction = tx.toWireTransaction()
val bytes = wireTransaction.serialize()
val bytes = wireTransaction.serialize(kryo)
val copiedWireTransaction = bytes.deserialize()
kryo = createKryo() as core.serialization.Kryo2
// use empty attachmentStorage
kryo.attachmentStorage = storage
val copiedWireTransaction = bytes.deserialize(kryo)
assertEquals(1, copiedWireTransaction.outputs.size)
var contract2 = copiedWireTransaction.outputs[0].contract as DummyContractBackdoor
assertEquals(42, contract2.inspectState( copiedWireTransaction.outputs[0] ))
}
@Test
fun `test deserialize of WireTransaction where contract cannot be found`() {
var child = URLClassLoader(arrayOf(URL("file", "", ISOLATED_CONTRACTS_JAR_PATH)))
var contractClass = Class.forName("contracts.isolated.AnotherDummyContract", true, child)
var contract = contractClass.newInstance() as DummyContractBackdoor
val tx = contract.generateInitial(MEGA_CORP.ref(0), 42)
var storage = MockAttachmentStorage()
var kryo = createKryo() as core.serialization.Kryo2
// todo - think about better way to push attachmentStorage down to serializer
kryo.attachmentStorage = storage
var attachmentRef = storage.importAttachment(FileInputStream(ISOLATED_CONTRACTS_JAR_PATH))
tx.addAttachment(storage.openAttachment(attachmentRef)!!)
val wireTransaction = tx.toWireTransaction()
val bytes = wireTransaction.serialize(kryo)
kryo = createKryo() as core.serialization.Kryo2
// use empty attachmentStorage
kryo.attachmentStorage = MockAttachmentStorage()
assertFailsWith(KryoException::class) {
bytes.deserialize(kryo)
}
}
}