a97abbc8c0
Merge remote-tracking branch 'open/master' into os-merge-1b37cef
2018-04-05 17:23:03 +01:00
1b37cef822
Minor: use of ByteArray.inputStream() and introduced PublicKey.hash ( #2931 )
2018-04-05 17:18:27 +01:00
c8b58a601f
Adding CRL support in the generated certificates. ( #2932 )
2018-04-05 16:39:41 +01:00
53a0aae489
Introduced a few helper methods around InputStream.readBytes ( #2928 )
2018-04-05 14:27:42 +01:00
375b4638ba
Merge remote-tracking branch 'remotes/open/master' into feature/vkolomeyko/ent-master-merge
...
# Conflicts:
# node/src/integration-test/kotlin/net/corda/node/modes/draining/FlowsDrainingModeContentionTest.kt
# node/src/integration-test/kotlin/net/corda/node/persistence/NodeStatePersistenceTests.kt
2018-04-05 13:12:13 +01:00
71fa61020e
Adding a unit test for SignedNodeInfo verification ( #2925 )
2018-04-05 11:25:41 +01:00
6283462548
Merge remote-tracking branch 'open/master' into shams-os-merge-0af42bd
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
2018-04-04 14:18:24 +01:00
0af42bda44
Fix a bug in the AMQP protocol wrapper code which gives incorrect reply address information on received packets. ( #2914 )
2018-04-04 11:23:09 +01:00
fbafe36643
Merge commit '2f1b8ff23e5a0400f72ff603da10b849604c6b04' into aslemmer-merge-2f1b8ff23e5a0400f72ff603da10b849604c6b04
2018-04-03 17:10:33 +01:00
2f1b8ff23e
Fixing SignedNodeInfoe security issue ( #2908 )
2018-04-03 15:49:06 +01:00
625d0447aa
ENT-992: Introducing the CRR submission tool ( #633 )
...
* Introducing the CRR submission tool
* Addressing review comments
* Addressing review comments - round 2 - Redesign of the tool.
* Fixing messages
2018-04-03 08:33:22 +01:00
89ecfb96c5
Merge remote-tracking branch 'remotes/open/master' into merges/march-29-13-11
2018-03-29 13:12:00 +01:00
0d1d7daedc
[CORDA-1264]: Ensure correct serialisation and masking for throwables raised by a node and propagated through RPC. ( #2892 )
2018-03-29 13:01:41 +01:00
71baccf167
Merge remote-tracking branch 'open/master' into os-merge-d2b7f8b
2018-03-28 17:06:15 +01:00
768dd32417
ENT-1663 - Inclusion of the cert path and root cert in the exception message when cert path validation fails. ( #2890 )
...
Also, added check to node startup that --initial-registration cannot occur in devMode
2018-03-28 15:18:50 +01:00
bc3605e8da
Merge remote-tracking branch 'open/master' into kat-merge-28-03-18
2018-03-28 09:47:49 +01:00
6c9a39ae44
DOCS: Serialization roundtrip removes mutability explanation ( #2888 )
2018-03-28 09:40:21 +01:00
1f2d9454ee
Merge remote-tracking branch 'open/master' into kat-merge-27-03-18
2018-03-27 10:22:42 +01:00
e43b12c203
CORDA-1236 - Don't let Carpenter exceptions escape the serializer ( #2852 )
...
* CORDA-1236 - Don't let Carpenter exceptions escape the serializer
* Review comments
* Merge branch 'kat/bug/master/nestedCArpenterException' of https://github.com/corda/corda into kat/bug/master/nestedCArpenterException
2018-03-27 10:11:39 +01:00
0f99efa768
CORDA-1213 - Explicitly disallow serialization of non static nested classes ( #2824 )
...
* CORDA-1213 - Explicitly disallow serialization of non static nested classes
WIP
* Review comments
2018-03-27 10:06:46 +01:00
91cdcc6752
CORDA-1258 - Only register custom serializers once ( #2862 )
...
* CORDA-1258 - Only register custom serializers once
* Review comments
* Fix test
2018-03-26 19:09:03 +01:00
7dbceaadcb
Merge remote-tracking branch 'open/master'
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/services/events/NodeSchedulerService.kt
# node/src/test/kotlin/net/corda/node/services/events/NodeSchedulerServiceTest.kt
2018-03-26 15:46:26 +01:00
c3031b182b
ENT-1665 - Update fast-classpath-scanner version to 2.12.3 (was 2.0.21) ( #2877 )
...
Problem manifests now that the classpath scanner is used by the
serialisation framework in factory initialization to locate pluggable
serializers. The actual thrown error is
java.lang.RuntimeException: Unknown constant pool tag
Given this is a known issue and a fixed bug it makes sense to move the
version forward. Unfortunately at this time we cannot move beyond
2.12.3 as 2.12.4 and later versions (up to the latest 2.18.1) exhibit
some other error that needs investigating. Thus, move to the latest
version that is stable for our current set of use cases.
More information on the nature of the problem exhibited by moving beyond
2.12.3 can be found on the linked Jira (ENT-1665) as well as details on
reproducing the issue moving forward to 2.12.3 fixes.
2018-03-26 14:24:43 +01:00
c9caaf8be4
Adding sockets ( #570 )
...
* Adding sockets
* Addressing review comments
* Adding review comments
* Addressing review comments
2018-03-23 07:43:13 +00:00
620ba1e8a2
Integration test for network parameter updates and improved logging ( #2863 )
2018-03-22 14:08:07 +00:00
ff4bbaf63f
ENT-1524 & ENT-1358: Cleaned up doorman db schema ( #565 )
...
* Renamed tables and constraints to have name < 30 characters
* Using AttributeConverters were possible for custom types
* NodeInfoEntity has relationship to accepted NetworkParametersEntity, not the hash
* Improved logging in the node
2018-03-22 06:39:02 +00:00
aaa9e8c83f
Merge remote-tracking branch 'open/master' into bogdan-merge-20-03-18
...
# Conflicts:
# docs/source/changelog.rst
2018-03-20 16:54:56 +00:00
ac9cb59a6e
Fix RPC flaky test ( #2849 )
...
* fix rpc reconnect flaky test; remove obsolete rpcproxy log message
* rpc client proxy: replace lock with atomic variable
* rpc client proxy: removed volatile property
* RPCStabilityTests: used eventually() method to test async response
* RPCStabilityTests: remove unused import
2018-03-20 16:23:29 +00:00
144632818c
Adding the X509CRL custom serializer. ( #2844 )
...
CORDA-1233
* Adding the X509CRL custom serializer.
* Addressing review comments
2018-03-20 15:42:25 +00:00
a80be413e0
Merge remote-tracking branch 'open/master' into corda/tudor-os-merge-1
2018-03-20 10:20:17 +00:00
1a1cd94161
ENT-1564 - add additional uploader check to the HashConstraint ( #2845 )
2018-03-20 10:17:44 +00:00
9fff66257b
Merge pull request #569 from corda/mnesbit-socks-proxy-support
...
ENT-1614: Add SOCKS proxy capability to the AMQP Bridges
2018-03-20 09:06:06 +00:00
8a561cddbf
Merge remote-tracking branch 'remotes/open/master' into merges/march-19-14-41
...
# Conflicts:
# client/rpc/src/test/kotlin/net/corda/client/rpc/RPCPerformanceTests.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
# node/src/integration-test/kotlin/net/corda/node/modes/draining/P2PFlowsDrainingModeTest.kt
# node/src/main/java/CordaCaplet.java
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
2018-03-19 15:17:49 +00:00
8591ae2dc9
CordApps back in node classpath ( #2843 ) [CORDA-1232]
2018-03-19 14:34:02 +00:00
327d7d8acf
Added sign helper method to CertificateAndKeyPair for producing SignedDataWithCert objects ( #2841 )
2018-03-19 12:47:23 +00:00
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
6d99f7e5d4
Adding CRL signing ( #528 )
...
* Adding CRL signing
* Adding CRL
* Addressing review comments
* Address review comments
2018-03-16 11:48:41 +00:00
78b2bc7549
network_map table references the network_parameters table (ENT-1524). ( #567 )
2018-03-16 10:57:30 +00:00
0d1e9694ae
Merge remote-tracking branch 'open/master' into andrius-merge-1503
2018-03-15 15:07:55 +00:00
15e4449b38
Adding BigInteger serialization support ( #2804 )
...
* Adding BigInteger serialization support
* Addressing review comments
2018-03-15 10:11:01 +00:00
27e45bc865
Adding public key verification to the X509Utilities.createCertificateSigningRequest ( #2784 )
2018-03-15 08:42:36 +00:00
0a0c8538c4
Merge from Corda/OS
2018-03-14 17:24:47 +00:00
2cff495553
Remove CordApps JARs from node classpath [CORDA-1135] ( #2691 )
2018-03-14 16:42:23 +00:00
1cf1e2d6f0
Merge pull request #553 from corda/bogdan-merge-14
...
Bogdan OS-ENT merge 14-03-18
2018-03-14 16:36:54 +00:00
a24a2105b1
CORDA-1217 Replace Guava caches with Caffeine ( #2818 )
2018-03-14 16:07:31 +00:00
0b12c5f602
Merge remote-tracking branch 'open/master' into bogdan-merge-14
2018-03-14 15:01:27 +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
341e060424
Adding CSR signature verification ( #537 )
2018-03-14 09:17:09 +00:00
1a6f7bc2c0
Whitelisting CRLReason class ( #2803 )
2018-03-14 08:05:00 +00:00
9afcbb16a2
Unwrapping InvocationTargetException during config parsing ( #2811 )
2018-03-14 07:04:25 +00:00
