From c998968e589aa5efa9f28584d3ae085e66cff40d Mon Sep 17 00:00:00 2001 From: szymonsztuka Date: Wed, 4 Apr 2018 14:35:51 +0100 Subject: [PATCH 1/3] Update RpcExceptionHandlingTest tests introduced by CORDA-1264 (#2916) --- .../net/corda/node/services/rpc/RpcExceptionHandlingTest.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcExceptionHandlingTest.kt b/node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcExceptionHandlingTest.kt index ad3b08daaa..d2f4f8a63b 100644 --- a/node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcExceptionHandlingTest.kt +++ b/node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcExceptionHandlingTest.kt @@ -9,6 +9,8 @@ import net.corda.core.utilities.getOrThrow import net.corda.core.utilities.unwrap import net.corda.node.services.Permissions import net.corda.nodeapi.exceptions.InternalNodeException +import net.corda.testing.core.ALICE_NAME +import net.corda.testing.core.BOB_NAME import net.corda.testing.core.singleIdentity import net.corda.testing.driver.DriverParameters import net.corda.testing.driver.NodeParameters @@ -63,8 +65,8 @@ class RpcExceptionHandlingTest { driver(DriverParameters(startNodesInProcess = true)) { - val nodeA = startNode(NodeParameters(rpcUsers = users)).getOrThrow() - val nodeB = startNode(NodeParameters(rpcUsers = users)).getOrThrow() + val nodeA = startNode(NodeParameters(providedName = ALICE_NAME, rpcUsers = users)).getOrThrow() + val nodeB = startNode(NodeParameters(providedName = BOB_NAME, rpcUsers = users)).getOrThrow() assertThatCode { nodeA.rpc.startFlow(::InitFlow, nodeB.nodeInfo.singleIdentity()).returnValue.getOrThrow() }.isInstanceOfSatisfying(InternalNodeException::class.java) { exception -> From 6572939e6ef26a7d458a34094e516ec09b990582 Mon Sep 17 00:00:00 2001 From: Joel Dudley Date: Wed, 4 Apr 2018 15:45:49 +0100 Subject: [PATCH 2/3] Link to X509Utils. Makes it clear they are only an example. --- docs/source/permissioning.rst | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/docs/source/permissioning.rst b/docs/source/permissioning.rst index 81186269a3..ca4ed2ccb1 100644 --- a/docs/source/permissioning.rst +++ b/docs/source/permissioning.rst @@ -1,4 +1,4 @@ -Network permissioning + Network permissioning ===================== .. contents:: @@ -59,8 +59,8 @@ We can visualise the permissioning structure as follows: Keypair and certificate formats ------------------------------- -You can use any standard key tools or Corda's ``X509Utilities`` (which uses Bouncy Castle) to create the required -public/private keypairs and certificates. The keypairs and certificates should obey the following restrictions: +You can use any standard key tools to create the required public/private keypairs and certificates. The keypairs and +certificates must obey the following restrictions: * The certificates must follow the `X.509 standard `_ @@ -75,6 +75,10 @@ public/private keypairs and certificates. The keypairs and certificates should o * RSA with 3072-bit key size +.. note:: Corda's ``X509Utilities`` show how to generate the required public/private keypairs and certificates using + Bouncy Castle. You can find the ``X509Utilities`` in the `Corda repository `_, under + ``/node-api/src/main/kotlin/net/corda/nodeapi/internal/crypto/X509Utilities.kt``. + Certificate role extension -------------------------- Corda certificates have a custom X.509 v3 extension that specifies the role the certificate relates to. This extension From 22391c21c5fbfe6204339a8f3dbc7d84f64a9628 Mon Sep 17 00:00:00 2001 From: szymonsztuka Date: Wed, 4 Apr 2018 15:59:05 +0100 Subject: [PATCH 3/3] Change log and upgrade notes for Shell changes in CORDA-792. (#2919) --- docs/source/changelog.rst | 3 +++ docs/source/upgrade-notes.rst | 2 ++ 2 files changed, 5 insertions(+) diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst index 109e50a378..2f967ce0ca 100644 --- a/docs/source/changelog.rst +++ b/docs/source/changelog.rst @@ -44,6 +44,9 @@ Unreleased * java.security.cert.X509CRL serialization support added. +* Shell (embedded available only in dev mode or via SSH) connects to the node via RPC instead of using the ``CordaRPCOps`` object directly. + To enable RPC connectivity ensure node’s ``rpcSettings.address`` and ``rpcSettings.adminAddress`` settings are present. + .. _changelog_v3: Version 3.0 diff --git a/docs/source/upgrade-notes.rst b/docs/source/upgrade-notes.rst index be5b870a5d..28d303566a 100644 --- a/docs/source/upgrade-notes.rst +++ b/docs/source/upgrade-notes.rst @@ -54,6 +54,8 @@ UNRELEASED JoinColumn(name = "transaction_id", referencedColumnName = "transaction_id"))) override var participants: MutableSet? = null, +* Shell - to use Shell ensure ``rpcSettings.address`` and ``rpcSettings.adminAddress`` settings are present. + Testing ~~~~~~~