Commit Graph

152 Commits

Author SHA1 Message Date
Michele Sollecito
2905989d19
Merge pull request #578 from corda/merges/march-19-14-41
Merges: March 19th at 14:41
2018-03-19 16:34:20 +00:00
sollecitom
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
Shams Asari
24c0588a92
Key store passwords not required in the command line for the private key copying tool. (#577)
If not provided they will be asked for via the command line.
2018-03-19 15:06:23 +00:00
Michal Kit
a26c5c1483
Fixing exception logging for the HSM cert generator (#561) 2018-03-19 08:26:27 +00:00
Shams Asari
060f7cc3cb
Using CordaX500Name in the doorman database entity objects (ENT-1524) (#573)
certificate_signing_request.legal_name is nullable - invalid names from CSRs are not stored in the db.
2018-03-16 18:45:28 +00:00
Michal Kit
6d99f7e5d4
Adding CRL signing (#528)
* Adding CRL signing

* Adding CRL

* Addressing review comments

* Address review comments
2018-03-16 11:48:41 +00:00
Shams Asari
78b2bc7549
network_map table references the network_parameters table (ENT-1524). (#567) 2018-03-16 10:57:30 +00:00
Patrick Kuo
2a898658c2
ENT-1561 - Identity copying tool for distributed notary (#563)
* check in before shelving this task

* keytool in-progress, TODO: Docs and more test

* unit test and doc

* minor typo
2018-03-16 09:42:27 +00:00
Shams Asari
a99a910730
Removed duplicate SignedNetworkParameters and SignedNetworkMap type aliases (#562) 2018-03-15 20:55:40 +00:00
Patrick Kuo
d2b29b42fe
ENT-1592 Add private network id to CSR (#533)
* * add private network id to CSR
* TODO : Doc
* TODO : Signing server and network map end points

* Remove private network attribute from CSR

* revert unnecessary changes

* remove private network identifier from node as we are not shipping this to the node in DP3

* revert unnecessary changes

* address PR issues
2018-03-15 15:20:07 +00:00
Rick Parker
a71ab3f1a1
ENT-1594 Remove usages of Guava cache. Replace with Caffeine. Added whether message is session initiation or not to cache key for de-duplication to account for the 2 P2P consumers. (#557) 2018-03-15 07:58:28 +00:00
Patrick Kuo
a435c23e19
ENT-1557 - Network Map returns 404 not found for current node info advertised in the network map (#511)
* * added is current and timestamp to the node info table
* getNodeInfoHashes returns all "current" node info hashes
* TODO: network map should return 404 if receive old node info request
* TODO: database migration integration test

* fix compilation error

* * removed unnecessary unique constraint

* rebase and tidy up liquid base xml

* address PR issues

* address PR issues

* address PR issues
2018-03-14 11:53:55 +00:00
Michal Kit
341e060424
Adding CSR signature verification (#537) 2018-03-14 09:17:09 +00:00
Shams Asari
34800ab527
Split up the parsing of the command line arguments from the parsing of the config files. (#547)
Also, the "config-file" command line argument for the doorman jar is required - it no longer defaults to network-management.conf
2018-03-14 07:01:53 +00:00
Michal Kit
4f263f806b
Fixing missing configuration (#530)
* Fixing missing configuration

* Addressing review comments
2018-03-13 16:49:02 +00:00
Shams Asari
e22e7acd67
Various cleanups of the network-management code (#545) 2018-03-13 10:58:04 +00:00
Chris Rankin
46a5684762
Delete assertion for modified time as it can never be reliable. (#540) 2018-03-12 10:40:36 +00:00
Patrick Kuo
fb350d9463
* Fix change set ID (#529) 2018-03-09 15:09:46 +00:00
Michal Kit
5f49bfc88a
CRL - persistence layer (#509)
* Addressing review comments

* Certificate Revocation List - persistence layer

* Addressing review comments

* Addressing review comments

* Addressing review comments

* Adding a crl test
2018-03-08 13:28:02 +00:00
Patrick Kuo
feeba03fbf Regenerate liquidBase change log (#518)
* rebase liquidBase change log

* * address PR issues
* Better constraint name
* change Varchar to NVarchar

* Removing liquibase migrations for CRR (#525)

* Removing liquibase migrations for CRR

* Addressing review comments
2018-03-07 16:02:02 +00:00
Michal Kit
6bed95c02b
Certificate Revocation Request - Persistence Layer (#507)
* Certificate Revocation Request - Persistence Layer

* Addressing review comments

* Addressing review comments

* Adding comments to the requestId field
2018-03-07 11:13:34 +00:00
Michele Sollecito
da1afd9c55
Introduced copyright in all source files. (#519) 2018-03-06 17:29:21 +00:00
Katarzyna Streich
e4d2155671
Add version logging to hsm signing service (#502)
Add version logging to hsm signing service
2018-03-06 14:56:05 +00:00
Michal Kit
021b677b7d
Renaming DAO for the CSR (#500) 2018-03-02 12:15:46 +00:00
Michal Kit
8f05dc2230
Renaming configuration sections for doorman and network map (#472) 2018-03-02 11:41:00 +00:00
Michele Sollecito
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
sollecitom
5e5cb1888b Made strict behaviour optional default to true for conf parsing. HSM and Doorman can opt in for this functionality independently. 2018-03-02 09:19:47 +00:00
Michal Kit
2d16647498
Refactoring modifiedBy and status fields for the certificate signing … (#475)
* Refactoring modifiedBy and status fields for the certificate signing request entity

* Fixing migration
2018-03-02 08:50:38 +00:00
sollecitom
38208d9e44 Made strict behaviour optional default to true for conf parsing. HSM and Doorman can opt in for this functionality independently. 2018-03-01 18:08:22 +00:00
Katarzyna Streich
8239c5d29f
Add network-management version info on startup (#497)
* Add network-management version info on startup

Add version info to manifest file and print it out on network-managemnet
startup
2018-03-01 17:09:59 +00:00
Ben Abineri
1e478b5164
Merge pull request #468 from corda/mkit-adding-logging-desc-to-readme
Documenting log level setting when starting doorman
2018-02-28 10:57:03 +00:00
sollecitom
d7b7dc4925 Merge branch 'master' into merges/february-23-15-30 2018-02-26 09:30:43 +00:00
Michele Sollecito
7828e658ac Revert "Merges - 23rd February 2018 at 15:30 (#479)" (#482)
This reverts commit 2f60ff44a6.
2018-02-26 09:28:56 +00:00
Michele Sollecito
2f60ff44a6
Merges - 23rd February 2018 at 15:30 (#479) 2018-02-23 17:53:15 +00:00
Thomas Schroeter
d3dcbfb6c3
Fix path of main class (#478) 2018-02-23 17:05:05 +00:00
sollecitom
3d4e24a364 Patched doorman network parameters with empty list for now, and added a TODO. 2018-02-23 16:01:49 +00:00
Andras Slemmer
f5167e207f Merge remote-tracking branch 'origin/master' into aslemmer-merge-19-Feb 2018-02-23 11:18:16 +00:00
Patrick Kuo
94f73920cc
ENT-1443 Add cert role to CSR and doorman issue cert according to the cert role (#431)
* Doorman and HSM create certificate base on requested cert role specified in the certificate signing request.
2018-02-23 10:57:59 +00:00
Michal Kit
6153a336c2 Documenting log level setting when starting doorman 2018-02-20 15:23:04 +00:00
Andras Slemmer
6b2b7b6a3c Merge commit 'fa4b5d16ba6249f85b50851c2f52dc697eebdee6' into aslemmer-merge-19-Feb 2018-02-20 13:26:31 +00:00
Andras Slemmer
66dd6afe2e Merge commit 'd072f6c275a5ff770aa66e37b9492a387d757329' into aslemmer-merge-19-Feb 2018-02-19 16:46:15 +00:00
Andras Slemmer
1d7b0fc499 Merge commit '86fb1ed852c69121f989c9eeea92cfb4c27f9d13' into aslemmer-merge-19-Feb 2018-02-19 16:14:43 +00:00
Michal Kit
e6e2836119
Implementing dual execution mode of the HSM signing service (#380)
* Implementing dual execution mode for the hsm signing service

* mend

* Addressing review comments

* Extracting processor classes
2018-02-08 16:54:07 +00:00
Michal Kit
8c5f0ac0ca
Making BasicConstraints a critical extension (#420)
Path length will be decided in another ticket - https://r3-cev.atlassian.net/browse/ENT-1508
2018-02-08 14:30:20 +00:00
Michal Kit
73fbff6c4f
Adding HSM permissions related tests (#448)
* Adding HSM permission tests

* Addressing review comments
2018-02-06 13:55:32 +00:00
Michal Kit
3baa15960f
Switching to reading the root certificate from the truststore (#449)
* Switching to reading the root certificate from the truststore

* Addressing review comments
2018-02-05 12:39:57 +00:00
Patrick Kuo
dca8699e7c
set network registration poll interval via http cache control header (#434)
* set network registration poll interval via http cache control header from the server side

* default poll interval to 10 seconds if cache header not found

* address PR issues

* address PR issues
2018-02-01 13:38:25 +00:00
Michal Kit
641cecaf70
Mkit cp ent 1458 fixing hardcoded sign interval (#437)
* Fixing hardcoded sign interval config

* Addressing review comments
2018-02-01 07:37:26 +00:00
Michal Kit
88a6e59906
Mkit cp fix network map serialization issue (#430)
* Fixing serialization issue for the network map signer

* Addressing review comments

* Adding more assertions to the network map test

* Changing assertTrue to assertThat
2018-01-31 14:36:27 +00:00
Patrick Kuo
970303dc2d fix broken test after merge 2018-01-30 14:23:24 +00:00