Commit Graph

137 Commits

Author SHA1 Message Date
Patrick Kuo
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
Ross Nicoll
3094e44115 Dump exception to System.err (#213) 2018-01-19 22:21:43 +00:00
Shams Asari
2f8836c8ad
Some long overdue cleaning up of some of the doorman code. (#362) 2018-01-18 23:08:02 +00:00
Katarzyna Streich
f2f803ecd5
HSM signing of network parameters (#363)
Add HSM signing of network parameters
2018-01-18 12:05:18 +00:00
Michal Kit
af21f6065d
Fixing missing certificate (#373)
* Fixing missing certificate

* Addressing review comments
2018-01-18 11:15:11 +00:00
Viktor Kolomeyko
299d9bef77 Minor: numbering update. 2018-01-18 11:03:41 +00:00
josecoll
eb9a51af75 Merge branch 'master' into colljos-merge-release3-dp-master 2018-01-16 14:28:07 +00:00
Przemyslaw Bak
66b47f0926 Highlight some text. 2018-01-16 10:44:54 +00:00
Przemyslaw Bak
7bc2f2a8e6 Set maxMessageSize and maxTransactionSize at the real, useful values 2018-01-16 10:02:53 +00:00
josecoll
24bf6df868 Merge branch 'master' into colljos-merge-release3-dp-master 2018-01-16 09:58:51 +00:00
Shams Asari
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
josecoll
120500646c Minor reverts requested by Shams. 2018-01-15 11:54:24 +00:00
josecoll
05b8d936b5 Remove duplicate import. 2018-01-13 11:27:21 +00:00
josecoll
4ea0cc9a3a Remove empty file with incorrect name. 2018-01-13 11:26:17 +00:00
josecoll
f58c1a9902 Remove redundant empty line. 2018-01-13 11:24:59 +00:00
josecoll
3e8132b687 Revert to correct spacing. 2018-01-13 11:23:37 +00:00
josecoll
729aa65e7f Merge from R3 Corda 3.0 Dev Preview release branch to master 2018-01-13 11:00:01 +00:00
Michal Kit
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
Tudor Malene
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
Michal Kit
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
Tudor Malene
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
Anthony Keenan
a65db712c7
ENT-1226 Check minimum platform version when submitting node info (#300)
* Adding min platform version check when submitting node info

* Return error message to developer

* Fixing integration test

* Added todo to move checks out of data layer

* Added extra logging in nodeinfowebservice and use nodeinfo.verified instead of deserialize

* Tidy up tests

* Cache network parameters

* Add NodeInfoWithSigned class to stop calling to only verify node data once

* Fixing review comments

* Return correct response code if doorman not initialised properly

* Fix merge conflict
2018-01-09 13:31:26 +00:00
Shams Asari
2832eb489b
Replaced DoormanIntegrationTest with NodeRegistrationTest which does a simple end-to-end registration test using the node driver. (#279) 2018-01-08 21:45:39 +00:00
Katarzyna Streich
e92ce3ad37 Add correct value of maxMessageSize
For network-parameters.conf in network management
2018-01-08 12:54:51 +00:00
Shams Asari
52e42ce22f Merge remote-tracking branch 'origin/master' into shams-os-merge-040118 2018-01-05 15:20:19 +00:00
Michal Kit
a83f4fd61b
Changing network parameters to use node info files instead of by hand… (#288)
* Changing network parameters to use node info files instead of by hand specification of notary

* Addressing review comments

* Different names for notaries

* Updating README
2018-01-05 15:10:34 +00:00
Shams Asari
133fd27222 Merge fixes and updated network-management to work with the move away from X509CertificateHolder 2018-01-04 18:30:21 +00:00
Tudor Malene
b8fa95b3d1
[ENT-1145]: change name of foreign keys to a human-readable format of FK__from_table__to_table (#275) 2018-01-03 15:35:31 +00:00
Michal Kit
e9c2090832
Fixing the HSM service config overriding issue (#274)
* Fixing the HSM service config overriding issue

* Addressing review comments
2018-01-03 11:26:45 +00:00
Shams Asari
022daf2190 Merge and test fixes 2018-01-02 16:39:52 +00:00
Shams Asari
19df02541a
Added network-parameter REST endpoint for vending signed network parameters. (#252)
For now this only works with the local signer.
2017-12-22 14:53:36 +00:00
Tudor Malene
83efd33fc7
removed unnecessary "display width" db settings that were failing in postgres (#247) (#251) 2017-12-22 09:55:33 +00:00
Christian Sailer
a2344f15fb
Unicode columns for SqlServer (#248)
* ENT-1291 Switch liquibase changelogs to use nvarchar instead of varchar

* Configure Hibernate to use nationalised strings

* Configure Hibernate to use nationalised strings

* Change schema so that UUIDs are varchars

* Update schema certificate signing request status is not unicode

* Upper case suffix for audit tables

* nvarchar -> varchar for status in the audit table

* Capitalisation

* Capitalisation

* Force hibernate to use unicode columns on SQL server

* Force hibernate to use unicode columns on SQL server

* Schema change to make PostgreSql happy

* SQL files to initialise the perfcluster db for SQL server and PostgreSql

* Code ordering and extra comment
2017-12-21 17:34:21 +00:00
Shams Asari
2a0eefd351
Doorman generates trust store file, containing the root cert, instead of the .pem file (#241) 2017-12-21 13:54:10 +00:00
Christian Sailer
5c5acfac73 Capitatlisation of table/column names in network-management schema (#237)
Capitatlisation of table/column names in network-management schema
2017-12-21 09:41:29 +00:00
szymonsztuka
d9574338bc
Liquibase works for a single db user with multi schema setup (par of ENT-1275) (#233)
* Override Liquibase default schema by one from the node configuration (database.schema) if they are different. This allows database tables be created within a correct schema when no default schema is set at database level.
* Pass in the databaseConfig.schema for network manager (for Liquibase schema migration).
2017-12-20 17:17:17 +00:00
Tudor Malene
c288dcec20
fix hibernate sequence min value (#236) 2017-12-20 16:22:41 +00:00
Shams Asari
97fac8e988 Merge branch 'master' into shams-os-merge-201217 2017-12-20 13:16:30 +00:00
Shams Asari
d48bc41a7c Revert "Shams os merge 191217 (#223)"
This reverts commit 2461421
2017-12-20 13:01:19 +00:00
Ross Nicoll
d31f27571b
Switch from KRYO serialization to AMQP (#229) 2017-12-20 12:59:01 +00:00
Shams Asari
246142173d Shams os merge 191217 (#223)
* CORDA-876 MockNetwork no longer leaks serialization env if init fails (#2272)
* Removed all remaining special treatment of the X500 common name.
* Move unspecifiedCountry to internal. (#2274)
* Merge fixes, which includes fixing the doorman tests and updating the doorman to not set a CN in the CSR responses
2017-12-20 10:32:42 +00:00
Shams Asari
3c64e9feec Merge fixes, which includes fixing the doorman tests and updating the doorman to not set a CN in the CSR responses 2017-12-20 01:03:34 +00:00
Katarzyna Streich
4e80a33dea Fixes after os -> ent merge to networkManagement (#214)
* Quick fixes

* Fix SignedNodeInfo

Introduce network-management schema changes to reflect that NodeInfos
can have multiple signatures.

* Address Shams comments

Store SignedNodeInfo as a blob for network management tool.
2017-12-19 21:36:30 +00:00
Ross Nicoll
3ab1a06db6
Improve run instructions for the HSM doorman (#190)
* Add more detail to HSM doorman outputs
* Remove duplicate display of defaults, add default value where it was only set in text, and show the actual names of the authentication modes.
* Add instructions for getting command line help
* Change error display to use System.err
2017-12-19 12:47:54 +00:00
Andras Slemmer
107fcf82e3 Fixing stuff 2017-12-18 15:39:08 +00:00
josecoll
fc7445f714 Resolve compilation issues related to Network Map changes. 2017-12-18 11:30:32 +00:00
Tudor Malene
f2194fcfd4
Integrate db migration tool - liquibase (#150)
[ENT-996]: integrate Liquibase for data migration
2017-12-16 15:58:12 +00:00
Katarzyna Streich
158993edb1 Fix broken doorman tests after OS -> ENT merge 2017-12-14 13:24:38 +00:00
josecoll
c9bcacd4b4 Remove final dependencies on OS. 2017-12-13 18:39:00 +00:00
josecoll
65ccd2318f
Merge pull request #182 from corda/colljos-os-hc02-merge-121217
OS -> Enterprise merge for HC02
2017-12-13 15:06:40 +00:00
josecoll
4e42fff7d4 Fix broken integration test following rebase from OS master (mostly test utils identity constant redefinitions / renaming) 2017-12-13 12:34:06 +00:00
Ross Nicoll
e309095ad4
Add sanity check that unlimited strength policy is installed (#183)
* Add sanity check that unlimited strength policy is installed
* Add HSM keys to ignore list
2017-12-13 11:21:22 +00:00
josecoll
6507f51659 Merge branch 'master' into colljos-os-hc02-merge-121217 2017-12-13 10:43:01 +00:00
Ross Nicoll
a5ca027d54
Clean up HSM launch (#177)
* Add basedir to HSM configuration
* Add run instructions to the Readme.md
* Correct help messsage display for HSM Doorman
2017-12-13 09:54:34 +00:00
josecoll
c72b33841b Merge branch 'master' into colljos-os-hc02-merge-121217 2017-12-12 17:42:21 +00:00
Ross Nicoll
96d8ec9640
Dynamically add BouncyCastle provider (#185) 2017-12-12 17:07:35 +00:00
josecoll
fe2b76ffd5 Moved "TODO:fix me" comment as per Shams request. 2017-12-12 15:19:02 +00:00
josecoll
2c57165002 Fixed Doorman TEST dependencies and compilation errors following rebase from OS.
Commented out 3 test which require re-coding.
2017-12-12 15:07:58 +00:00
josecoll
7eabee1241 Fixed Doorman dependencies and compilation errors following rebase from OS. 2017-12-12 14:20:59 +00:00
josecoll
cc770e1145 Re-enabled Doorman build and removed hard dependency on specific OS branch. 2017-12-12 11:31:52 +00:00
Patrick Kuo
8af7dc977f
Doorman refactoring and improve UX (#160)
* * change corda dependencies to 3.0-NETWORKMAP_SNAPSHOT
* packages move fix

* address PR issues

* * refactorings
* cleaned up network management server start up code.
* renamed a few classes
* segregate doorman and network map config and startup code.
* make `config-file` optional, default to ./networkManagement.conf

* readme.md and UX changes

* added dependency on rpc for the serilization env

* move init serilization env to main method to avoid interfering with test

* move cert path check to the storage, and remove redundant checks in NodeInfoWebService.

* minor fix

* some refactoring

* fix broken test and added steps to start the network

* address PR issues

* write root cert to pem file

* address PR issues
fix bugs in doorman where it try to transit jira ticket to done multiple times

* address PR issue

* approve request no longer throws exception when approve again, it will simply ignore, test is no longer relevant
2017-12-11 10:06:29 +00:00
Clinton
b1bac9e103
ENT-1216: Various fixes to the doorman publishing that allows doorman (#164)
* Added corda release bucket to allow resolving gradle plugins from teamcity.
* Fixed the classifiers for doorman jar to ensure the correct one is published.
2017-12-08 16:28:28 +00:00
Patrick Kuo
b3ca36132f
Use network map objects from corda instead of stubs (#146)
* * change corda dependencies to 3.0-NETWORKMAP_SNAPSHOT
* packages move fix

* fix up after rebase

* rename test

* address PR issues

* address PR issues

* fix failing test
2017-12-07 13:22:41 +00:00
Alberto Arri
0c667fe9d3
Renable doorman test (#156)
Re-enable doorman tests
2017-12-05 14:40:32 +00:00
Alberto Arri
1a1d5c695c
Add support for TICKET_CREATED to PersistentCertificateRequestStorage (#143) 2017-12-05 14:04:12 +00:00
Alberto Arri
10635dfbfd
Disable failing doorman tests, fix is under way (#155) 2017-12-05 11:35:57 +00:00
Patrick Kuo
60bde88777
upgrade dependencies to latest (#153) 2017-12-04 23:01:50 +00:00
Clinton
bbe8fce686
Doorman and doorman HSM can now be published to artifactory and maven (#151)
Doorman and doorman HSM can now be published to artifactory and maven local.
2017-12-01 23:04:29 +00:00
Patrick Kuo
d81e4809bb
Upgrade Doorman corda dependencies to 3.0-NETWORKMAP-SNAPSHOT (#145)
* * change corda dependencies to 3.0-NETWORKMAP_SNAPSHOT
* packages move fix

* update network map corda dependencies to 3.0-NETWORKMAP-20171201.110332-5

* some refactoring and address PR issues

* remove dependency on corda core and test util

* add back testCompile dependency

* add back testCompile dependency
2017-12-01 16:16:07 +00:00
Clinton
faf6b1d5bd
Added command line flag to set mode (#130)
Added command line flag to set mode and removed it from the config. This is to provide a programmatic interface to doorman configuration for downstream
projects.
2017-12-01 15:13:41 +00:00
Clinton
7b54b82273
Removed trampoline to allow unzipping by most unzip tools. (#149) 2017-12-01 14:46:32 +00:00
mkit
c40e8e4518
Overriding network parameters if they are specified in the deployment… (#136)
* Overriding network parameters if they are specified in the deployment configuration

* Addressing review comments

* Addressing review comments

* Changing the getCurrentNetworkMap return type to be nullable
2017-11-29 16:46:36 +00:00
Alberto Arri
91c9dad6cc
Make doorman print the help if commands are missing from the command line (#139) 2017-11-28 14:20:14 +00:00
mkit
c5e17d90f2
Adding HSM signing service docs (#122)
* Adding HSM signing service docs

* Addressing review comments

* Addressing review comments - round 2

* Addressing review comments - round 3

* Fixing method comment
2017-11-24 11:32:12 +00:00
Clinton
855c22218a
Doorman can now be published to maven local (#125)
* Doorman can now be published to maven local for testing against other projects locally.

* Fixed the classifier for the JAR
2017-11-22 17:50:51 +00:00
Alberto Arri
523b064356
ENT-964 doorman jira downtimes (#120)
* ENT-964 Make doorman resilient to Jira downtimes
2017-11-22 14:54:24 +00:00
Viktor Kolomeyko
6a631ec626
Remove "?" from method name or else Windows build in IntelliJ fails (#116)
Specific error is:
Error:Kotlin: [Internal Error] java.lang.IllegalStateException: java.io.FileNotFoundException: Z:\corda-ent\network-management\out\test\classes\com\r3\corda\networkmanage\doorman\DoormanParametersTest$should throw ShowHelpException when -? is on the command line$1.class (The filename, directory name, or volume label syntax is incorrect)
	at org.jetbrains.kotlin.codegen.CompilationErrorHandler.lambda$static$0(CompilationErrorHandler.java:24)
	at org.jetbrains.kotlin.codegen.PackageCodegenImpl.generate(PackageCodegenImpl.java:74)
	at org.jetbrains.kotlin.codegen.KotlinCodegenFacade.generatePackage(KotlinCodegenFacade.java:100)
	at org.jetbrains.kotlin.codegen.KotlinCodegenFacade.doGenerateFiles(KotlinCodegenFacade.java:78)
	at org.jetbrains.kotlin.codegen.KotlinCodegenFacade.compileCorrectFiles(KotlinCodegenFacade.java:45)
	at org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler.generate(KotlinToJVMBytecodeCompiler.kt:450)
	at org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler.compileModules(KotlinToJVMBytecodeCompiler.kt:152)
	at org.jetbrains.kotlin.cli.jvm.K2JVMCompiler.doExecute(K2JVMCompiler.kt:158)
	at org.jetbrains.kotlin.cli.jvm.K2JVMCompiler.doExecute(K2JVMCompiler.kt:61)
	at org.jetbrains.kotlin.cli.common.CLICompiler.execImpl(CLICompiler.java:107)
	at org.jetbrains.kotlin.cli.common.CLICompiler.execImpl(CLICompiler.java:51)
	at org.jetbrains.kotlin.cli.common.CLITool.exec(CLITool.kt:92)
2017-11-20 15:27:36 +00:00
mkit
c1ae6e9647
Removing NodeInfo signing process - this task is moved to node itself (#112)
* Removing NodeInfo signing process - this task is moved to node itself

* Addressing review comments

* Introducing HSM simulator polling

* Addressing review comments
2017-11-20 12:52:30 +00:00
Alberto Arri
233f1fb8e2
Move all the configuration for running doorman in its configuration f… (#104)
* Move all the configuration for running doorman in its configuration files
2017-11-15 13:04:16 +00:00
mkit
fffcdb47da
Introducing the InputReader interface (#102)
* Introducing the InputReader interface

* Addressing review comments

* Addressing review comments
2017-11-15 08:36:24 +00:00
Alberto Arri
c56ea4088f
fix enterprise build (#108)
fix enterprise build
2017-11-14 17:27:03 +00:00
mkit
40cf4ad191
Small clean-up (#98)
* Small clean-up

* Unifying enum casing

* Adding TODOs
2017-11-14 09:44:48 +00:00
mkit
1ec40ee983
Network Map signing (#87)
* Network Map signing

* Fixing failing tests

* Fixing integration tests

* Addressing review comments

* Addressing review comments

* Rebasing to the new network parameters + network map ownership redesign

* Addressing review comments

* Addressing review comments

* Splitting the PR

* Reverting enum uppercasing

* Fixing the NetworkMapEntity comment

* Addressing review comments - round 3

* Fixing docs and adding some TODOS

* Removing nullification of the common name
2017-11-14 08:29:07 +00:00
Alberto Arri
523a6db0b9
ENT-990 Make doorman read an initial set of Network parameters from d… (#96)
ENT-990 Make doorman read an initial set of Network parameters from disk at start-up time
2017-11-13 15:40:44 +00:00
mkit
4c7dc58135
Adding HSM simulator to integration tests (#92)
* Adding HSM simulator to integration tests

* Addressing review comments

* Adjusting implementation to the agreed TC setup

* Addressing review comments

* Addressing review comments - round 2
2017-11-13 11:50:24 +00:00
alberto.arri@r3.com
bc2fd3948f Fix the description of --mode flag in doorman 2017-11-09 10:14:22 +00:00
mkit
dfb226fbbb Merging signing service and doorman (#72)
* Merging signing service and doorman

* Addressing review comments

* Removing redundant package name space from method call

* Adding description field to gradle
2017-10-20 17:19:50 +01:00