cd37f761ab
Merge pull request #476 from corda/mnesbit-external-bridge
...
ENT-1549: Initial Creation of Bridge/Float Process
2018-03-14 14:14:34 +00:00
d592fb5c49
Create basic bridge module and capsule build
...
Basic pieces of bridge, still very rough
Work in progress
Fixes after rebase
Primitive float tunnel implementation
Put explanatory comments on the interfaces. Add support for different SSL KeyStores for the different connections to/from the bridge and float.
Add a couple more comments
Cleanup
Fix some issues
Use a new custom header to relay the login identity from bridges. (Will add more security to this shortly)
Make key protection logic a bit clearer in the comments
Create some basic test and integrationTests
Add a couple of tests of the BridgeAMQPListenerService
Add some basic tests
Correct comment
Fixup after rebase
Fixup after rebase
Fixup after rebase
Explicit parameter types to work on build box.
Address PR comments
Address some of Mike's PR comments.
Re-enable test on enterprise.
Don't sweep up node default config
Remove obsolete config entry
Correct merge mistake
Configurable whitelist headers on bridge
Don't access primary artemis session from different threads used by inbound packet pathway.
Fix unit test
2018-03-14 11:08:09 +00:00
f7151e96d3
Merge commit '932d632716c55fef0bda7c6519677a46b66f05c2' into andr3ej-provider-setup-ent
...
# Conflicts:
# core/src/main/kotlin/net/corda/core/crypto/CryptoUtils.kt
# node/src/main/kotlin/net/corda/node/Corda.kt
2018-03-14 10:50:41 +00:00
932d632716
ENT-1439 Refactor Provider setup ( #2780 )
...
* Initialise crypto nice and early
* More OO way of requiring correct name for BouncyCastlePQCProvider
2018-03-13 17:22:38 +00:00
6b80072b18
ENT-1439 Use thread-local MessageDigest. ( #541 )
2018-03-13 10:20:22 +00:00
dba52b1676
Merge remote-tracking branch 'open/master' into ags_2018-03-12
2018-03-12 11:25:46 +00:00
9a0a0e9880
Merge pull request #2758 from corda/merge/CORDA-1155
...
CORDA-1155 - Jolokia logging via slf4j (#2753 )
2018-03-12 11:19:05 +00:00
d9ab693752
make two exceptions that held me up recently more helpful ( #2778 )
2018-03-12 09:35:40 +00:00
2fbb34ba38
CORDA-1171: Update MySQL uniqueness provider to throw the correct exception
2018-03-09 16:22:36 +00:00
98ba212e00
Merge remote-tracking branch 'open/master' into andrius-merge-03-09
2018-03-09 16:09:59 +00:00
2d31247da2
CORDA-1171: When a double-spend occurs, do not send the consuming transaction id and requesting party back to the client - this might lead to privacy leak. Only the transaction id hash is now returned.
2018-03-09 16:00:52 +00:00
a3bf4577f3
CORDA-696 - Ensure deterministic transaction id calculation for contra… ( #2676 )
...
The problem with the previous implementation is that the transaction would be deserialized with the schema specified
in the serialized form, but the calculation of the id would involve re-serializing properties using a local serialization context
which might produce a different result.
2018-03-09 14:39:31 +00:00
a8753a692e
Merge pull request #535 from corda/aslemmer-ENT-1589
...
ENT-1589
2018-03-09 12:02:36 +00:00
4e16c2a06a
Switch checkpoints on for retryable sends, add back confirmationWindowSize setting
2018-03-09 10:18:39 +00:00
b86071c5c5
ENT-1566 Fixes for db integration tests + ENT-1575 db migrations for db attachment changes ( #521 )
...
ENT-1575 Add db migrations for db attachment changes,
ENT-1566 Fixes for db integration tests -following changes in CORDA-926 (obligatory node properties), upgrade db schema setup in draining mode/RPC tests, set runMigration=true in properties files for db tests, add new tables for deletion in SQL setup scrips
Updated db integration tests description in testing.rst
2018-03-09 09:52:44 +00:00
ca54ed611c
addressing review remarks
2018-03-08 09:06:12 +00:00
3733e7d715
Merge remote-tracking branch 'remotes/open/master' into merges/CORDA-792
...
# Conflicts:
# .idea/compiler.xml
# build.gradle
# node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcSslTest.kt
# node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
# node/src/main/kotlin/net/corda/node/shell/CordaAuthenticationPlugin.kt
# node/src/main/kotlin/net/corda/node/shell/CordaSSHAuthInfo.kt
# node/src/main/kotlin/net/corda/node/shell/RPCOpsWithContext.kt
# node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
# settings.gradle
# testing/test-common/src/main/kotlin/net/corda/testing/common/internal/UnsafeCertificatesFactory.kt
# tools/shell/src/integration-test/kotlin/net/corda/tools/shell/SSHServerTest.kt
# tools/shell/src/main/java/net/corda/tools/shell/FlowShellCommand.java
# tools/shell/src/main/java/net/corda/tools/shell/RunShellCommand.java
# tools/shell/src/main/java/net/corda/tools/shell/StartShellCommand.java
# tools/shell/src/main/kotlin/net/corda/tools/shell/FlowWatchPrintingSubscriber.kt
# tools/shell/src/main/kotlin/net/corda/tools/shell/InteractiveShell.kt
# tools/shell/src/main/kotlin/net/corda/tools/shell/InteractiveShellCommand.kt
# tools/shell/src/main/kotlin/net/corda/tools/shell/utlities/ANSIProgressRenderer.kt
# tools/shell/src/main/resources/net/corda/tools/shell/base/login.groovy
# tools/shell/src/test/kotlin/net/corda/tools/shell/CustomTypeJsonParsingTests.kt
# tools/shell/src/test/kotlin/net/corda/tools/shell/InteractiveShellTest.kt
2018-03-07 16:49:00 +00:00
ed3ba537f3
Restoring Jolokia in webserver, to be able to redirect logger via Slf4j
2018-03-07 14:35:15 +00:00
0d5f033aae
[CORDA-1085] Alter column names to be consistent with R3.Corda. ( #2606 )
...
Alter column names to be consistent with R3.Corda - related to CORDA-990.
2018-03-07 13:28:49 +00:00
803ce15b32
Corda-1155 - Jolokia logging via slf4j ( #2753 )
...
* Jolokia logging through slf4j
* review remarks
2018-03-07 13:23:00 +00:00
b6831eed6a
Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180307
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/services/messaging/Messaging.kt
# node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt
# node/src/main/kotlin/net/corda/node/services/statemachine/StateMachineManagerImpl.kt
2018-03-07 11:37:46 +00:00
2653da9f12
Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180307
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/services/messaging/Messaging.kt
# node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt
# node/src/main/kotlin/net/corda/node/services/statemachine/StateMachineManagerImpl.kt
2018-03-07 11:02:32 +00:00
72074c76c7
[CORDA-792] Standalone Shell ( #2663 )
...
- Existing embedded Shell connects via RPC including checking RPC user credentials (before was a direct use of CordaRPCOps): in dev mode when console terminal is enabled, node created `shell` user.
- New Standalone Shell app with the same functionalities as Shell: connects to a node via RPC Client, can use SSL and run SSH server.
2018-03-07 09:57:32 +00:00
8fe94bca2d
ENT-1575 Shorten table name ( #2750 )
2018-03-07 09:55:41 +00:00
519644ce0d
CORDA-1170: Define and whitelist the Artemis/AMQP application headers that are accepted by Corda ( #2728 )
...
* Whitelist headers copied across bridges
* Address PR comments
2018-03-07 08:56:58 +00:00
2a5ef62eed
Merge pull request #520 from corda/merges/march-6-16-56
...
Merge: 06/03/2018 at 16:56
2018-03-06 18:58:48 +00:00
da1afd9c55
Introduced copyright in all source files. ( #519 )
2018-03-06 17:29:21 +00:00
906dae11ad
Merge remote-tracking branch 'remotes/open/master' into merges/march-6-16-56
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
2018-03-06 16:59:13 +00:00
f483763249
Fixed unrecognized property jarDirs in node configuration. ( #2748 )
2018-03-06 16:54:01 +00:00
ad4bed779d
Merge pull request #515 from corda/merge/tudor_network_bootstrap
...
Merge/tudor network bootstrap
2018-03-06 15:15:00 +00:00
00c171cd61
CORDA-973 Turn on compression for checkpoints and tx storage ( #490 )
2018-03-06 15:01:30 +00:00
4121f70da3
CORDA-1175 Docs numbering issue and counterparty consistency. ( #2744 )
2018-03-06 14:22:38 +00:00
98a4fe1ce3
Merge remote-tracking branch 'open/master' into merge/tudor_network_bootstrap
...
# Conflicts:
# node/src/integration-test/kotlin/net/corda/node/amqp/AMQPBridgeTest.kt
2018-03-06 11:37:30 +00:00
81f4bbcaf3
Fix flaky bridge test and an associated deadlock during rollback in the BridgeManager code. ( #2739 )
2018-03-06 10:49:29 +00:00
6479d7d8ff
[CORDA-1156]: Output of run networkMapFeed and run networkMapSnapshot not consistent in shell (fixed) ( #2733 )
2018-03-06 10:15:17 +00:00
596edcc2ae
Merge commit '29ccd4d' into os-merge-050318
2018-03-05 23:21:35 +00:00
84ff1c875a
CORDA-1006: Undoing the wiring of maxMessageSize as it's not correctly implemented and updating the docs to clarify its status. ( #2501 ) ( #2729 )
...
The network parameter was just fed into Artemis' minLargeMessageSize property which isn't the same thing.
(cherry picked from commit 49f75da
2018-03-05 17:26:08 +00:00
04610b8545
Merge remote-tracking branch 'public/master' into chrisr3-merge-os
...
O/S merge up to ef703c50
2018-03-05 12:27:49 +00:00
4a73a80b39
CORDA-1160: Only read node-info files if their last modified time has changed. ( #2717 )
2018-03-05 11:10:38 +00:00
e19f9a3841
CORDA-1122 Tweak Artemis for performance ( #496 )
...
* ENT-1434 - tweak Artemis for P2P to auto commit and send asynchronously.
* ENT-1434 - tweak Artemis for P2P to auto commit and send asynchronously.
* Fix test compilation
2018-03-05 10:47:45 +00:00
7c459f3c99
Merge pull request #445 from corda/aslemmer-fix-added-sm-event
...
Only emit SM Add events when the flow signals that it started
2018-03-05 10:45:10 +00:00
abc281056f
Merge remote-tracking branch 'open/master' into mike-merge-80c00b920b
2018-03-02 15:17:32 +01:00
80c00b920b
Fix another non-serializable exception, add docs, fix a possible security issue. ( #2707 )
...
* Fix another non-serializable exception, add docs, fix a possible security issue.
* Update API definition to reflect methods added to make more exceptions serializable
2018-03-02 15:10:54 +01:00
a59083ceb2
Merge remote-tracking branch 'open/master' into os-merge-020318
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/internal/Node.kt
2018-03-02 10:42:03 +00:00
29215035e1
Merge pull request #498 from corda/merges/march-1-15-20
...
merges/CORDA-926_march-1-15_20
2018-03-02 10:17:12 +00:00
f9bfebe4a8
[CORDA-1136] Update startup message of P2P address and port ( #2698 )
2018-03-02 08:50:31 +00:00
8616f24523
CORDA-1048: Making it simpler to move an existing local deployment of nodes to across different machines. ( #2672 )
...
This was achieved by having the hash in the node-info file to be just of the node's X.500 name. This also solves existing duplicate node-info file issues that we've been having.
Also updated the docsite.
2018-03-01 21:24:10 +00:00
26a11bccc9
CORDA-1004 Use FastThreadLocalThread in multi-thread SMM. ( #492 )
2018-03-01 17:35:41 +00:00
c38dccacca
Changed system and environmental variables to only be parsed as config if they're prefixed with "corda." e.g., to override "p2pPort" would now take a "corda.p2pPort" from system or environmental variables.
2018-03-01 16:37:15 +00:00
36cd34bff5
Merge remote-tracking branch 'remotes/open/master' into merges/march-1-15-20
...
# Conflicts:
# docs/source/corda-configuration-file.rst
# docs/source/release-notes.rst
# node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
# tools/demobench/src/test/kotlin/net/corda/demobench/model/NodeConfigTest.kt
# tools/explorer/README.md
# tools/explorer/src/main/kotlin/net/corda/explorer/ExplorerSimulation.kt
2018-03-01 15:36:40 +00:00
