Commit Graph

107 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
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
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
336aeb96e5 Merge fixes 2018-01-26 13:45:03 +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
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
24bf6df868 Merge branch 'master' into colljos-merge-release3-dp-master 2018-01-16 09:58:51 +00:00
b1509607cb Updating network-management to use DigitalSignatureWithCert, network map certs and other relevant changes from O/S. 2018-01-15 15:23:07 +00:00
120500646c Minor reverts requested by Shams. 2018-01-15 11:54:24 +00:00
05b8d936b5 Remove duplicate import. 2018-01-13 11:27:21 +00:00
4ea0cc9a3a Remove empty file with incorrect name. 2018-01-13 11:26:17 +00:00
f58c1a9902 Remove redundant empty line. 2018-01-13 11:24:59 +00:00
3e8132b687 Revert to correct spacing. 2018-01-13 11:23:37 +00:00
729aa65e7f Merge from R3 Corda 3.0 Dev Preview release branch to master 2018-01-13 11:00:01 +00:00
4caf6d92ea ENT-1350 unifying the config-file command line argument (#333)
* ENT-1350 unifying the config-file command line argument

* Changing README.md
2018-01-10 16:27:59 +00:00
12546c0a7c [ENT-1281]: Disable database.runMigration by default and enforce database version on startup. (#264)
* [ENT-1281]: set database.runMigration=false by default and add state check at startup

* [ENT-1281]: attempt to fix tests

* [ENT-1281]: attempt to fix tests

* [ENT-1281]: set runMigration=true in the cordformation plugin

* [ENT-1281]: attempt to fix tests

* [ENT-1281]: attempt to fix tests

* [ENT-1281]: attempt to fix tests

* [ENT-1281]: fix formatting

* [ENT-1281]: typo and javadocs

* [ENT-1281]: small refactoring and added test for SchemaMigration

* [ENT-1281]: update documentation to reflect changes

* [ENT-1281]: fix tests after merge

* [ENT-1339]: for h2, allow schemas without migrations to run (#294)

* [ENT-1339]: for h2, allow schemas without migrations to run

* [ENT-1339]: fix various migration issues and change author name

* [ENT-1339]: add naming convention for migrations

* [ENT-1339]: change naming convention to use hyphens

* [ENT-1339]: change mapping of participants to be able to control the table name

* [ENT-1339]: change FK names to <=30 for oracle 11g compatibility

* [ENT-1339]: cmd line argument for migrations made consistent

* [ENT-1339]: revert abstract state superclasses

* Update db integration test setup - new tables.

* Update db integration test setup - new tables.

* [ENT-1339]: remove final from participants to allow table name config

* [ENT-1339]: shortened pk

* [ENT-1339]: revert constructor

* [ENT-1339]: change getMigrationResource api to Nullable

* fix compile error

* [ENT-1281]: fix tests after merge

* [ENT-1281]: fix tests after merge
2018-01-10 11:32:24 +00:00
3c8ebdedae ENT-1355 Rejecting all registration requests, if there is already an entry with the same name (#310) 2018-01-10 10:57:07 +00:00
0c646ff662 [ENT-1339]: for h2, allow schemas without migrations to run (#294) (#305)
* [ENT-1339]: for h2, allow schemas without migrations to run (#294)

* [ENT-1339]: for h2, allow schemas without migrations to run

* [ENT-1339]: fix various migration issues and change author name

* [ENT-1339]: add naming convention for migrations

* [ENT-1339]: change naming convention to use hyphens

* [ENT-1339]: change mapping of participants to be able to control the table name

* [ENT-1339]: change FK names to <=30 for oracle 11g compatibility

* [ENT-1339]: cmd line argument for migrations made consistent

* [ENT-1339]: revert abstract state superclasses

* Update db integration test setup - new tables.

* Update db integration test setup - new tables.

* [ENT-1339]: remove final from participants to allow table name config

* [ENT-1339]: shortened pk

* [ENT-1339]: revert constructor

* [ENT-1339]: change getMigrationResource api to Nullable
2018-01-09 14:44:17 +00:00