Commit Graph

7 Commits

Author SHA1 Message Date
Matthew Nesbit
2b55a8f67e Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180411
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/amqp/AMQPBridgeTest.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
#	node/src/main/resources/reference.conf
#	node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
2018-04-11 14:00:56 +01:00
Shams Asari
7296369541 Merge fixes 2018-04-04 14:52:24 +01:00
Matthew Nesbit
e79989cc8f Fixup support for customized certificate configuration
Fix typo
2018-04-03 11:56:10 +01:00
Matthew Nesbit
8ed6c556e4 Add copyright to new bridge files 2018-03-20 10:07:08 +00:00
Matthew Nesbit
6885661b66 Initial cut of SOCKS proxy support
Correct the reconnect logic when SOCKS proxy is in the pipeline

Add integration tests and adjust handling of reconnect

Rename parameter
2018-03-19 11:37:46 +00:00
Shams Asari
a99a910730
Removed duplicate SignedNetworkParameters and SignedNetworkMap type aliases (#562) 2018-03-15 20:55:40 +00:00
Matthew Nesbit
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