Commit Graph

129 Commits

Author SHA1 Message Date
021b677b7d Renaming DAO for the CSR (#500) 2018-03-02 12:15:46 +00:00
8f05dc2230 Renaming configuration sections for doorman and network map (#472) 2018-03-02 11:41:00 +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
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
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
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
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
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
d7b7dc4925 Merge branch 'master' into merges/february-23-15-30 2018-02-26 09:30:43 +00:00
7828e658ac Revert "Merges - 23rd February 2018 at 15:30 (#479)" (#482)
This reverts commit 2f60ff44a6.
2018-02-26 09:28:56 +00:00
2f60ff44a6 Merges - 23rd February 2018 at 15:30 (#479) 2018-02-23 17:53:15 +00:00
d3dcbfb6c3 Fix path of main class (#478) 2018-02-23 17:05:05 +00:00
3d4e24a364 Patched doorman network parameters with empty list for now, and added a TODO. 2018-02-23 16:01:49 +00:00
f5167e207f Merge remote-tracking branch 'origin/master' into aslemmer-merge-19-Feb 2018-02-23 11:18:16 +00:00
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
6153a336c2 Documenting log level setting when starting doorman 2018-02-20 15:23:04 +00:00
6b2b7b6a3c Merge commit 'fa4b5d16ba6249f85b50851c2f52dc697eebdee6' into aslemmer-merge-19-Feb 2018-02-20 13:26:31 +00:00
66dd6afe2e Merge commit 'd072f6c275a5ff770aa66e37b9492a387d757329' into aslemmer-merge-19-Feb 2018-02-19 16:46:15 +00:00
1d7b0fc499 Merge commit '86fb1ed852c69121f989c9eeea92cfb4c27f9d13' into aslemmer-merge-19-Feb 2018-02-19 16:14:43 +00:00
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
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
73fbff6c4f Adding HSM permissions related tests (#448)
* Adding HSM permission tests

* Addressing review comments
2018-02-06 13:55:32 +00:00
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
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
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
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
970303dc2d fix broken test after merge 2018-01-30 14:23:24 +00:00
1ecf646f7e Oracle 11xe and 12c database compatibility (#206)
* Sql setup scripts for Oracle and datasource configuration.
* CashSelection for Oracle.
* Workaround of forbidden distinct for BLOBs.
* ojdbc8.jar driver dependency from Oracle Maven repository, ojdbc6.jar from lib (it's not in Maven repo).
* allow to use random Port in node names and trim it from schema name, remove schema with port numbers from db setup (to cater for new test, non Oracle specific change) 
* Removed unnecessary code from ConfigUtilities (non Oracle specific change) 
* Removed db integration tests setup for RPCStabilityTest as it doesn't start any nodes
2018-01-29 18:35:58 +00:00
da5d0ab806 Add trace logging to network map service (#410)
* add trace logging on network map incoming request

* address PR issue, added trace logging for get end points
2018-01-29 17:44:43 +00:00
2432b1380e Clean up of network-management to make more use of the existing X509 utilities (#419) 2018-01-29 12:49:58 +00:00
881379b889 Merge branch 'master' into shams-os-merge-250118 2018-01-26 13:45:21 +00:00
336aeb96e5 Merge fixes 2018-01-26 13:45:03 +00:00
5a29e76664 Unifying HSM signing service name (#391) 2018-01-26 09:25:40 +00:00
83ea4611ca Addressing multiple key groups. Removing redundant config parameters for private key passwords (#409) 2018-01-25 16:40:42 +00:00
5f1590d97f Cherry picked commit from the release DEV preview branch. This is the fix for the database config not being honoured by doorman (#408) 2018-01-25 15:41:59 +00:00
5be4df918e Make truststore password configurable during root store generation in doorman (#388)
* Doorman will now ask for truststore password, or can be provided in cmd line arg.

* rebase and changed keystore filename for HSM

* make "network-root-truststore.jks" a const
2018-01-24 16:17:32 +00:00
45b23737c7 Fix broken network management server status endpoint (#397)
* add missing Path annotation and test

* Address PR issue
2018-01-24 14:41:12 +00:00
55385613ac Removing configuration parameter for private key passwords (#395) 2018-01-24 12:12:46 +00:00
cef1f9885c ENT-1282: create standalone db migration tool (#356)
* ENT-1282: add standalone db migration tool that works with both the node and the doorman

* ENT-1282: remove cmd line args during node startup

* ENT-1282: more clear message

* ENT-1282: fix integration test

* ENT-1282: more fixes and cleanup code

* ENT-1282: address PR comments

* ENT-1282: more fixes and refactoring

* ENT-1282: more classloader fixes

* ENT-1282: changes after demo feedback

* ENT-1282: update API

* ENT-1282: update documentation

* ENT-1282: formatting

* ENT-1282: added CONSOLE option for dry-run and logging

* ENT-1282: documentation changes

* ENT-1282: remove getMigrationResource from the public API

* ENT-1282: removed dependency on network-manager, added release-lock

* ENT-1282: Update documentation
2018-01-24 11:55:43 +00:00
789ce5d44a Initial implementation of the certificate generation tool (#148)
* Initial implementation of the certificate generation tool

* Adding trust store persisting

* Addressing review comments

* Adding certificate type to the certificate generation process.

* Addressing review comments

* Fixing typos

* Changing keyOverride to 0 in examples and tests

* Addressing review comments + rebasing

* Adding CRL information to the certificate generation process

* Generation tool refactoring

* Addressing review comments
2018-01-23 11:50:03 +00:00
e1098dee4b Adding public key constraint (#319)
* ENT-1356 Adding public key constraint

* Addressing review comments

* Removing SERIALIZABLE from transaction

* Adding stashed changes

* Removing SERIALIZABLE from node info storage

* Addressing review comments

* Addressing possible certificate inconsitency (design gap) + clearing whole database for new liquibase changeset

* Addressing review comments
2018-01-22 14:10:33 +00:00
cee975c1c1 Reverting schema changes and following the liquibase change tracking … (#385)
* Reverting schema changes and following the liquibase change tracking flow

* Addressing review comments

* Adding other tables cleanup

* Renaming the changeset file
2018-01-22 12:11:31 +00:00
43604ed212 Handle rejected jira issues in doorman (#371)
* handle reject status from jira - WIP

* fix up after rebase

* address PR issue and fix build error after rebase
2018-01-22 10:45:25 +00:00
3094e44115 Dump exception to System.err (#213) 2018-01-19 22:21:43 +00:00
2f8836c8ad Some long overdue cleaning up of some of the doorman code. (#362) 2018-01-18 23:08:02 +00:00
f2f803ecd5 HSM signing of network parameters (#363)
Add HSM signing of network parameters
2018-01-18 12:05:18 +00:00
af21f6065d Fixing missing certificate (#373)
* Fixing missing certificate

* Addressing review comments
2018-01-18 11:15:11 +00:00
299d9bef77 Minor: numbering update. 2018-01-18 11:03:41 +00:00
eb9a51af75 Merge branch 'master' into colljos-merge-release3-dp-master 2018-01-16 14:28:07 +00:00
66b47f0926 Highlight some text. 2018-01-16 10:44:54 +00:00