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

CORDA-4110 startFlowDynamicWithClientId permissions (#6857)

Browse Source
This commit is contained in:
Dan Newton 2021-02-05 16:05:55 +00:00 committed by GitHub
parent b421f0daa0
commit 4e437ace2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
node/src/integration-test/kotlin/net/corda/node/flows/FlowWithClientIdTest.kt
View File

@ -61,6 +61,38 @@ class FlowWithClientIdTest {
} }
} }
@Test(timeout = 300_000)
fun `start flow with client id permissions`() {
val user = User("TonyStark", "I AM IRONMAN", setOf("StartFlow.net.corda.node.flows.FlowWithClientIdTest\$ResultFlow"))
driver(DriverParameters(startNodesInProcess = true, cordappsForAllNodes = emptySet())) {
val nodeA = startNode(rpcUsers = listOf(user)).getOrThrow()
nodeA.rpc.startFlowWithClientId(UUID.randomUUID().toString(), ::ResultFlow, 5).returnValue.getOrThrow(20.seconds)
nodeA.rpc.startFlowDynamicWithClientId(
UUID.randomUUID().toString(),
ResultFlow::class.java,
5
).returnValue.getOrThrow(20.seconds)
}
}
@Test(timeout = 300_000)
fun `start flow with client id without permissions`() {
val user = User("TonyStark", "I AM IRONMAN", setOf())
driver(DriverParameters(startNodesInProcess = true, cordappsForAllNodes = emptySet())) {
val nodeA = startNode(rpcUsers = listOf(user)).getOrThrow()
assertFailsWith<PermissionException> {
nodeA.rpc.startFlowWithClientId(UUID.randomUUID().toString(), ::ResultFlow, 5).returnValue.getOrThrow(20.seconds)
}
assertFailsWith<PermissionException> {
nodeA.rpc.startFlowDynamicWithClientId(
UUID.randomUUID().toString(),
ResultFlow::class.java,
5
).returnValue.getOrThrow(20.seconds)
}
}
}
@Test(timeout = 300_000) @Test(timeout = 300_000)
fun `remove client id`() { fun `remove client id`() {
val clientId = UUID.randomUUID().toString() val clientId = UUID.randomUUID().toString()

11
node/src/main/kotlin/net/corda/node/internal/rpc/proxies/AuthenticatedRpcOpsProxy.kt
View File

@ -5,6 +5,7 @@ import net.corda.core.flows.FlowLogic
import net.corda.core.internal.messaging.InternalCordaRPCOps import net.corda.core.internal.messaging.InternalCordaRPCOps
import net.corda.core.messaging.CordaRPCOps import net.corda.core.messaging.CordaRPCOps
import net.corda.core.internal.utilities.InvocationHandlerTemplate import net.corda.core.internal.utilities.InvocationHandlerTemplate
import net.corda.core.messaging.FlowHandleWithClientId
import net.corda.node.services.rpc.RpcAuthContext import net.corda.node.services.rpc.RpcAuthContext
import net.corda.node.services.rpc.rpcContext import net.corda.node.services.rpc.rpcContext
import java.lang.reflect.Method import java.lang.reflect.Method
@ -32,6 +33,16 @@ internal class AuthenticatedRpcOpsProxy(private val delegate: InternalCordaRPCOp
delegate.startTrackedFlowDynamic(logicType, *args) delegate.startTrackedFlowDynamic(logicType, *args)
} }
// Need overriding to pass additional `listOf(logicType)` argument for polymorphic `startFlow` permissions.
@Suppress("SpreadOperator")
override fun <T> startFlowDynamicWithClientId(
clientId: String,
logicType: Class<out FlowLogic<T>>,
vararg args: Any?
): FlowHandleWithClientId<T> = guard("startFlowDynamic", listOf(logicType), ::rpcContext) {
delegate.startFlowDynamicWithClientId(clientId, logicType, *args)
}
private companion object { private companion object {
private fun proxy(delegate: InternalCordaRPCOps, context: () -> RpcAuthContext): InternalCordaRPCOps { private fun proxy(delegate: InternalCordaRPCOps, context: () -> RpcAuthContext): InternalCordaRPCOps {
val handler = PermissionsEnforcingInvocationHandler(delegate, context) val handler = PermissionsEnforcingInvocationHandler(delegate, context)