ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-12 13:45:48 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
11,957 Commits 96 Branches 407 Tags
Commit Graph

220 Commits

Author SHA1 Message Date
Shams Asari
b2f41d82f9 Merge fixes 2018-05-21 11:25:13 +01:00
Matthew Nesbit
b07d5b3f26
Merge pull request #853 from corda/kat-merge-20180517 
OS -> Ent merge
 2018-05-21 09:48:39 +01:00
Katelyn Baker
c84bb7ebe0 More Fixes to cleanup after GitHub 2018-05-18 17:03:28 +01:00
szymonsztuka
d33f31614c
Test doorman with selected dbs only for ENT-1447 - setup fix. (#854) 2018-05-18 15:20:03 +01:00
Katelyn Baker
3778f029df
Merge branch 'master' into kat-merge-20180517 2018-05-18 14:42:05 +01:00
Michal Kit
71aeb6c339
Improving revocation reason selection (#845) 
* Improving revocation reason selection

* Addressing review comments - round 2
 2018-05-18 14:29:57 +01:00
Michal Kit
da6957e6d1
Fixes for the CRL feature after the first round of testing (#837) 
* Fixes for the CRL feature after the first round of testing

* Addressing review comments

* Synchronising changes with OS

* Addressing review comments - round 2
 2018-05-18 11:17:43 +01:00
Katelyn Baker
d91f063cbe Define Custom NetMan AMQP Scheme 
Removes dependency on node and AMQPServerSerializationscheme
 2018-05-17 21:19:05 +01:00
Katelyn Baker
4a05828e20 OS Merge cleanup 2018-05-17 16:50:17 +01:00
szymonsztuka
18393f27dd
Test doorman with selected dbs only for now (SQL Server and Azure SQL) - for ENT-1447. (#833) 
Test doorman with selected dbs (SQL Server and Azure SQL) only in integration test in database mode since not all databases are supported now.
 2018-05-17 16:27:02 +01:00
Patrick Kuo
478558bd8a
add more information to jira ticket (#812) 2018-05-16 13:14:04 +01:00
Katelyn Baker
361569901a
Merge pull request #824 from corda/kat/doorman-playing 
ENT-1872 - Better cmdline failure msgs for Doorman
 2018-05-15 15:57:45 +01:00
Tudor Malene
a1616767b8 Fix merge 2018-05-14 17:17:48 +01:00
Katarzyna Streich
509a52ad5e
CORDA-866: Implement removal of stale nodes from network (#774) 
* Implement removal of stale nodes from network

Add eventHorizon to NetworkParameters structure. Add republishing of
node info on 1 day intervals - it is treated by network map as heartbeat from node indicating if it's alive or not. Add removal of old node infos on network map signing.

* Add copy method to NetworkParameters data class

Add JvmOverloads annotation to the constructor, because it's data class
exposed in API
 2018-05-11 17:11:56 +01:00
Katelyn Baker
c5591defe3 Test Fixes 2018-05-11 14:44:17 +01:00
Katelyn Baker
df68fa1a5e Review comments 2018-05-11 11:53:24 +01:00
Katelyn Baker
2c40fdf7d4 tidy up 2018-05-10 14:26:42 +01:00
Katelyn Baker
d290fd3d6d ENT-1872 - Better cmdline failure msgs for Doorman 
When the config file specified doesn't exist, a stacktrace is dum
ped to stdout rather than just printing a nice error message. Same
for specifying a stupid mode.

The nice fix would be if the cmdline parseing library exposed the error
states from Converters properly. Alas, what it actually does is catch
the exception you'd like and throws a very generic exception.

So, catch and rethrow with a better error message and don't dump the
stack (i.e. exit rather than rethrow)
 2018-05-10 14:21:18 +01:00
Katarzyna Streich
56c6ec967c
ENT-1803: Allow change of updateDeadline on parameters update (#814) 
* Allow change of updateDeadline on parameters update

ENT-1803. Parameters that where already advertised still need explicit
cancellation.
 2018-05-09 15:01:57 +01:00
Katarzyna Streich
d254bf6d46
ENT-1548: Improve docs for hsm (#805) 
* Improve docs for hsm

Add information on different configs depending on which execution mode
for hsm is run

* Remove default config file argument for hsm, add required to cli flag.
 2018-05-04 15:58:36 +01:00
Michal Kit
c044096260
Merge pull request #801 from corda/mkit-os-ent-merge 
OS -> ENT Merge up to ab80df342ab8a7ede0539daaee9fcecd02f6aeeb
 2018-05-03 12:23:28 +01:00
Katarzyna Streich
2e1cee00f7
ENT-1608: Check that notary identities are registered (#799) 
Check that notary identities are registered

On loading new parameteres check that provieded notary identities were
registered by doorman.
Refactor of NetworkParameters loading code in network-management.
 2018-05-03 11:09:11 +01:00
Michal Kit
e5e98f3540 Merge OS commit 'ab80df342ab8a7ede0539daaee9fcecd02f6aeeb' into enterprise 2018-05-03 10:55:40 +01:00
Patrick Kuo
5ed60ab60d
Bug fix: registration tool doesn't register for service identity if keystore already contains node cert (#756) 
* fix a bug where registration tool will refuse to register for a service identity if the keystore contain NODE_CA key already.
some refactoring
 2018-05-02 09:54:28 +01:00
Katarzyna Streich
f25b0bd1c5
Add more documentation on private networks (#786) 
Add more documentation on private networks
 2018-04-30 16:01:53 +01:00
Michele Sollecito
8ce718f4bf
Merge pull request #785 from corda/merges/april-27-09-38 
Merges: April 27th at 09:38
 2018-04-27 17:26:50 +07:00
sollecitom
70b32636b5 Merge remote-tracking branch 'remotes/open/master' into merges/april-27-09-38 
# Conflicts:
#	docs/source/changelog.rst
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/config/ConfigUtilities.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
 2018-04-27 10:12:15 +01:00
szymonsztuka
df5d45a4a6
Enable integration tests to run doorman against remote database (part of ENT-1447) (#776) 
Change integration tests in remote database mode infrastracture to allow passing parameterised dataSource configuration to doorman. Add doorman tables to SQL clearup scripts.
 2018-04-27 09:57:16 +01:00
Chris Rankin
e135cf062c Merge commit '5f70b6e04954a6dc64a1a56089eeccb2966bb0ae' into chrisr3-os-merge 2018-04-24 18:09:41 +01:00
Patrick Kuo
e618b49a6c
fix a bug which prevent us from starting network map server without doorman. (#760) 2018-04-20 17:45:27 +01:00
Patrick Kuo
57291c435c
ENT-1661 Doorman crashes ungracefully when started with incorrect or … (#747) 
* ENT-1661 Doorman crashes ungracefully when started with incorrect or no program arguments. Should display a meaningful message instead.
 2018-04-19 21:22:04 +01:00
Patrick Kuo
ac99b81ba8
added optional config property for keystore file path (#748) 2018-04-18 17:10:04 +01:00
Patrick Kuo
9cbf7fd7ab
register crypto provider in main when program startsup (#745) 2018-04-18 17:09:45 +01:00
Michal Kit
38a38aa4c4
Fixing Azure deadlock when CSR is persisted (#749) 2018-04-18 11:21:11 +01:00
Patrick Kuo
0e663250ca
add old config annotation to doorman config (#731) 2018-04-17 10:35:28 +01:00
Patrick Kuo
fbdba41b07
ENT-1740 Make registration tool notary only to avoid confusion (#734) 
* ENT-1740 Make registration tool notary only to avoid confusion

* address PR issues
 2018-04-16 14:56:13 +01:00
Patrick Kuo
7f8c36faa0
ENT-1586 Update entire service stack to support private network maps (#691) 
* private network map
 2018-04-13 15:54:53 +01:00
Michal Kit
a320c8d49f
ENT-1456 Adding try-catch to jira ticket processing (#667) 
* Adding try-catch to jira ticket processing

* Addressing review comments

* Addressing review comments

* Refactoring getTransitionId method.

* Addressing review comments

* Refactoring to use requireNotNull

* Refactoring to use more requireNotNull

* Fixing missing map population
 2018-04-13 07:46:16 +01:00
Shams Asari
45d6bca071 Merge branch 'master' into os-merge-f88542f 2018-04-12 15:14:28 +01:00
Shams Asari
a83f3f3abe Removing explicit waits for the default notary in driver tests. 
This issue was fixed in https://github.com/corda/corda/pull/2947.
 2018-04-12 15:13:01 +01:00
Patrick Kuo
eae7d1d3a6
CORDA-1159 Node attempts duplicate CSR if process terminates before receiving Request ID (#723) 
* CORDA-1159 Node attempts duplicate CSR if process terminates before receiving Request ID
 2018-04-12 13:53:17 +01:00
Patrick Kuo
f9ed55b731
ENT-1323 Network map service to check all identities in submitted node info (#499) 
* ENT-1323 Network map service to check all identities in submitted node info

* fixup after rebase

* address PR issues, refactored createValidNodeInfo

* address PR issues
 2018-04-12 13:05:15 +01:00
Shams Asari
c7ad2ca391 Merge fixes 2018-04-11 11:16:31 +01:00
Konstantinos Chalkias
f1ddd2b747 ENT-1756 register providers first thing on doorman boot. 2018-04-10 16:27:01 +01:00
szymonsztuka
6761824ba7
Update database integration tests setup for the test related to ENT-1684 (#703) 2018-04-09 12:36:22 +01:00
Shams Asari
11af3992db
Doorman db entity attributes which are hashes are of type SecureHash where possible. (#695) 
Also made use of InputStream.readObject extension method.
 2018-04-07 17:26:09 +01:00
Katarzyna Streich
00a22c91df ENT-1684: Remove nodes that didn't accept update from network map (#692) 
On flag day all nodes that didn't accept new parameters update will be kicked out of the network map.
 2018-04-07 15:28:57 +01:00
Michal Kit
c4df6b0c85
Fixing CRR signing execution mode (#677) 
* Fixing CRR signing execution mode

* Addressing review comments
 2018-04-06 17:00:47 +01:00
Michal Kit
84398362ab
ENT-1626 Validating cert path on node info submission (#650) 
* Validating cert path on node info submission

* Addressing review comments

* Refactoring user exceptions

* Changing response message.
 2018-04-05 14:21:54 +01:00
Michal Kit
6c2cfc3880
ENT-1732 Preventing non-notaries composite keys being submitted in node info (#676) 
* Preventing non-notaries composite keys being submitted in node info

* Addressing review comments
 2018-04-04 14:33:40 +01:00