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

Merged in mnesbit-sprint-5-tidyup (pull request #229)

Browse Source 
Refactor APIServer to use the same whitelist controlled protocol gateway as the scheduler.
This commit is contained in:
Matthew Nesbit
2016-07-25 17:58:27 +01:00
parent 119813a36d c08d53d030
commit 38f4711a80
2 changed files with 19 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/main/kotlin/com/r3corda/core/protocols/ProtocolLogicRef.kt
View File

@ -49,6 +49,22 @@ class ProtocolLogicRefFactory(private val protocolWhitelist: Map<String, Set<Str
require(protocolWhitelist[className]!!.contains(argClassName)) { "Args to ${className} must have types on the args whitelist: $argClassName" } require(protocolWhitelist[className]!!.contains(argClassName)) { "Args to ${className} must have types on the args whitelist: $argClassName" }
} }
/**
* Create a [ProtocolLogicRef] for the Kotlin primary constructor of a named [ProtocolLogic]
*/
fun createKotlin(protocolLogicClassName: String, args: Map<String,Any?>, attachments: List<SecureHash> = emptyList()): ProtocolLogicRef {
val context = AppContext(attachments)
validateProtocolClassName(protocolLogicClassName, context)
for(arg in args.values.filterNotNull()) {
validateArgClassName(protocolLogicClassName, arg.javaClass.name, context)
}
val clazz = Class.forName(protocolLogicClassName)
require(ProtocolLogic::class.java.isAssignableFrom(clazz)) { "$protocolLogicClassName is not a ProtocolLogic" }
@Suppress("UNCHECKED_CAST")
val logic = clazz as Class<ProtocolLogic<ProtocolLogic<*>>>
return createKotlin(logic, args)
}
/** /**
* Create a [ProtocolLogicRef] for the Kotlin primary constructor or Java constructor and the given args. * Create a [ProtocolLogicRef] for the Kotlin primary constructor or Java constructor and the given args.
*/ */

39
node/src/main/kotlin/com/r3corda/node/internal/APIServerImpl.kt
View File

@ -5,14 +5,10 @@ import com.r3corda.core.contracts.*
import com.r3corda.core.crypto.DigitalSignature import com.r3corda.core.crypto.DigitalSignature
import com.r3corda.core.crypto.SecureHash import com.r3corda.core.crypto.SecureHash
import com.r3corda.core.node.services.linearHeadsOfType import com.r3corda.core.node.services.linearHeadsOfType
import com.r3corda.core.protocols.ProtocolLogic
import com.r3corda.core.serialization.SerializedBytes import com.r3corda.core.serialization.SerializedBytes
import com.r3corda.node.api.* import com.r3corda.node.api.*
import java.time.LocalDateTime import java.time.LocalDateTime
import java.util.*
import javax.ws.rs.core.Response import javax.ws.rs.core.Response
import kotlin.reflect.KParameter
import kotlin.reflect.jvm.javaType
class APIServerImpl(val node: AbstractNode) : APIServer { class APIServerImpl(val node: AbstractNode) : APIServer {
@ -70,38 +66,9 @@ class APIServerImpl(val node: AbstractNode) : APIServer {
private fun invokeProtocolAsync(type: ProtocolRef, args: Map<String, Any?>): ListenableFuture<out Any?> { private fun invokeProtocolAsync(type: ProtocolRef, args: Map<String, Any?>): ListenableFuture<out Any?> {
if (type is ProtocolClassRef) { if (type is ProtocolClassRef) {
val clazz = Class.forName(type.className) val protocolLogicRef = node.services.protocolLogicRefFactory.createKotlin(type.className, args)
if (ProtocolLogic::class.java.isAssignableFrom(clazz)) { val protocolInstance = node.services.protocolLogicRefFactory.toProtocolLogic(protocolLogicRef)
// TODO for security, check annotated as exposed on API? Or have PublicProtocolLogic... etc return node.services.startProtocol(type.className, protocolInstance)
nextConstructor@ for (constructor in clazz.kotlin.constructors) {
val params = HashMap<KParameter, Any?>()
for (parameter in constructor.parameters) {
if (parameter.isOptional && !args.containsKey(parameter.name)) {
// OK to be missing
} else if (args.containsKey(parameter.name)) {
val value = args[parameter.name]
if (value is Any) {
// TODO consider supporting more complex test here to support coercing numeric/Kotlin types
if (!(parameter.type.javaType as Class<*>).isAssignableFrom(value.javaClass)) {
// Not null and not assignable
break@nextConstructor
}
} else if (!parameter.type.isMarkedNullable) {
// Null and not nullable
break@nextConstructor
}
params[parameter] = value
} else {
break@nextConstructor
}
}
// If we get here then we matched every parameter
val protocol = constructor.callBy(params) as ProtocolLogic<*>
val future = node.smm.add("api-call", protocol)
return future
}
}
throw UnsupportedOperationException("Could not find matching protocol and constructor for: $type $args")
} else { } else {
throw UnsupportedOperationException("Unsupported ProtocolRef type: $type") throw UnsupportedOperationException("Unsupported ProtocolRef type: $type")
} }