Commit Graph

10459 Commits

Author SHA1 Message Date
szymonsztuka
f701bc1b9a Merge commit 'ad23bb875482b7b8e17c64fb37342d0d6a5ce94d' into feature/test-merge-szymon
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/services/BFTNotaryServiceTests.kt
2018-01-02 11:54:29 +00:00
bpaunescu
e3638f99e4
Merge pull request #259 from corda/bogdan-fix-ENT-1322
ENT-1322: format new date object to work with SQLServer comparison be…
2018-01-02 10:53:34 +00:00
bpaunescu
a320c8a116 moved init of simpleDateFormat 2018-01-02 09:55:03 +00:00
Tommy Lillehagen
b68c776e8c
ENT-1248 - Update ASCII logo (#265) 2018-01-02 09:32:12 +00:00
Tudor Malene
a8aad8ed55
add slf4j support to liquibase (#268) 2017-12-29 13:39:47 +00:00
szymonsztuka
a3295abf50
Fix CordaRPCJavaClientTest.java in database integration test mode (#256)
* Invoke setUp from base integration class in CordaRPCJavaClientTest
* Align CordaRPCJavaClientTest with Kotlin version of the test
2017-12-28 10:22:06 +00:00
bpaunescu
6d2608d693 ENT-1322: format new date object to work with SQLServer comparison between timestamp and datetime 2017-12-22 21:16:27 +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
Chris Rankin
c545a58c1d
Remote Attestation Phase 2 (#235)
* Initial host server skeleton.
* Create IASProxy project, and skeleton for attestation host.
* Fix up tests
* Extend attestation host skeleton, and make test ports configurable.
* Enhance MockIAS to make pseManifestStatus optional.
* Make IASProxy endpoints asynchronous.
* Add sub-modules for challenger and for common code.
* Create integration test for host's provisioning endpoint.
* Flesh out attestation challenger WAR.
* Package refactoring, to be more Java9 friendly.
* Refactor more messages into attestation-common.
* Remove our private key from the repository.
* Declare an empty PSE Manifest to be invalid.
* Fix basic integration test issues for challenger and host.
* Integrate keystore scripts into the build properly.
* Name keystore targets explicitly for Gradle.
* Allow HTTP conversation between Challenger, Host and ISV using session ID.
* Add MockHost for challenger's integration tests.
* Reconcile HTTP port numbers between Phase1 and Phase2 components.
* Remove elements that can be inherited from root project.
* Add placeholder README.
* Add convenient extension functions to ObjectMapper.
* Extend integration test coverage for challenger/host/isv.
* Catch IOException from HttpClient for challenger.
* Integrate host sub-module with remote-attestation project.
* Begin integrating host/enclave code from Phase I.
* Rename challenger's HTTP endpoint.
* Generate keystore for challenger "on the fly".
* Add native JNI code for accessing the SGX enclave.
* Point Gradle to the correct enclave object.
* Fixes for generating a Quote for this enclave.
* Return the IAS report to the challenger for verification.
* Begin populating the challenger's AttestationResponse message.
* Enable the challenger to pass encrypted secrets into the enclave.
* Align challenger, host and isv ports.
* Refactor challenger as a fat-jar application.
* AttestationResponse is not shared, so refactor into challenger.
* Move HttpClientContext objects into HttpClient blocks.
* Remove unused Message2 and Message3 objects.
* Add realistic dummy value for reportID from IAS.
* Small tidy-up on attestation host.
* First set of review comments.
* Add missing exception message.
* Update location of environment file.
* Use empty mock revocation lists by default.
* Improve logging and add "happy path" test for provisioning secrets.
* Update Gradle files so that we can run attestation-host from IntelliJ.
* The platformInfo field from IAS can be null, so allow this.
Also protect other JNI pointer parameters from NPE.
* Allow Gradle to build hardware enclave.
2017-12-22 14:42:42 +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
szymonsztuka
269a4ba79d
Refactor BFTNotaryServicetest and MySQLNotaryServiceTest to allow running database integration tests. (#211)
* BFTNotaryServiceTests.kt - instantiate MockServices before each test, not at the class level - to allow database integration test clean database before each test.
* MySQLNotaryServiceTests.kt - use H2 datasource for the notary in database integration tests (and as it was before during standard integration tests)
* Revert Enterprise way of makeTestDataSourceProperties MockNode.kt.
* Minor attempt to refactor Enterprise only parts of reading database config and make it less error prone during OS->Enterprise merge.
2017-12-21 13:24:13 +00:00
josecoll
4b42600f6a
Update master release build label to reflect snapshot. (#209) 2017-12-21 11:58:48 +00:00
szymonsztuka
ad23bb8754
BFTNotaryServiceTests - instantiate MockServices before each test, not at the class level. (#2281)
* change to align with enterprise repo
2017-12-21 09:50:21 +00:00
Anthony Keenan
cb703476a0
CORDA-880 Make contractsdsl java interop functions behave same as inline functions (#2275)
* Make java interop functions same as inline functions and add tests

* Fixing docs

* Move unspecifiedCountry to internal. (#2274)

* Review changes

* Call java interop functions from inline functions

* Use correct test assertion
2017-12-21 09:42:09 +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
Michele Sollecito
0711ad34e3
[ENT-850]: RPC function to kill a flow (#215)
* Tentative API and implementation.

* Tests completed. API update needed.

* Updated api-current.txt. Some previous changes hadn't been reflected and now they are.

* Improved the tests.

* Some code review changes.

* Merge branch 'master' into features/ENT-850

# Conflicts:
#	.ci/api-current.txt

* Code review changes.

* Code review changes.
2017-12-20 19:16:54 +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
Ben Abineri
a8398164ed
Merge pull request #228 from corda/feature/vkolomeyko/explorer-docs
R3NET-546: IOU/Business Network reference implementation documentation for Node Explorer.
2017-12-20 15:02:17 +00:00
Viktor Kolomeyko
388ef19008 R3NET-546: Changes following review from @josecoll. 2017-12-20 13:57:51 +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
Viktor Kolomeyko
c2b10a1882 Business Network design document (#204)
* Design doc (unfinished).

* Design doc, requirements completed.

* Design doc, more content and the diagram.

* Design doc, more content.

* Design doc, minor changes.

* Changes following review from @davidleeuk

* Changes following review from @gendal

* Changes following review from @shamsasari
2017-12-20 12:07:42 +00:00
Viktor Kolomeyko
c0e997c1dd
Wave 3 of Business Network changes. (#193)
* R3NET-546: Re-arrange independent flows into separate packages. Functionally this is a NOP change.

* R3NET-546: Start BNO as a separate Corda node and improve GUI experience for IOU.

* R3NET-546: Move all the membership checks to the Business Network Owner node side, creating "InitiatedBy" flows as necessary.

* R3NET-546: Make MembershipViolationException AMQP serializable.

* R3NET-546: Improve GUI error reporting in case of membership violation.

* R3NET-546: Code changes following review by: @shamsasari

* R3NET-546: Code changes following review by: @shamsasari

* R3NET-546: Added a dedicated InvalidMembershipListNameException.
2017-12-20 12:01:32 +00:00
Viktor Kolomeyko
cc043d0aec R3NET-546: Changes following review from @josecoll. 2017-12-20 11:58:52 +00:00
Viktor Kolomeyko
f09de7aac3 R3NET-546: IOU/Business Network reference implementation documentation for Node Explorer. 2017-12-20 11:25:23 +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
Katarzyna Streich
8d48083ddf Fix startErrorFlowSimulation (#222) 2017-12-20 10:02:03 +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
Shams Asari
de9565b96a Merge remote-tracking branch 'open/master' into shams-os-merge-191217
# Conflicts:
#	core/src/main/kotlin/net/corda/core/node/services/NotaryService.kt
#	node/src/integration-test/kotlin/net/corda/node/services/BFTNotaryServiceTests.kt
#	node/src/integration-test/kotlin/net/corda/node/services/RaftNotaryServiceTests.kt
#	node/src/integration-test/kotlin/net/corda/services/messaging/P2PMessagingTest.kt
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
2017-12-19 23:44:07 +00:00
Andrzej Cichocki
762d7b7275
Merge pull request #217 from corda/andr3ej-ross-merge
Merge 22af527 from OS
2017-12-19 23:24:50 +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
Andrzej Cichocki
9447c51a7b
Merge pull request #221 from corda/rnicoll/andr3ej-ross-merge
Remove change address usage from CashTests
2017-12-19 20:58:25 +00:00
Tommy Lillehagen
c171237556
ENT-1248 - Node banner: R3 Corda (#219) 2017-12-19 19:33:00 +00:00
Tommy Lillehagen
0e8c7b0b87
ENT-1012 - Make sure bashrc is properly set for container (#218) 2017-12-19 19:22:09 +00:00
Ross Nicoll
4958d26048 Remove change address usage from CashTests 2017-12-19 18:43:18 +00:00
Andrzej Cichocki
a652c8b19f
Merge commit '22af527b7943c0c4376af582de6505893817111a' into andr3ej-ross-merge
# Conflicts:
#	docs/source/changelog.rst
2017-12-19 17:07:17 +00:00
Tudor Malene
dd59b06c62
Fix null migration resource (#210)
throw exception when migration not set for MappedSchema
2017-12-19 14:06:55 +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
Andrzej Cichocki
313d21f068
Move unspecifiedCountry to internal. (#2274) 2017-12-19 12:09:31 +00:00
Tommy Lillehagen
fbcdc23434
ENT-1012 - Make SGX builds IntelliJ-friendly (#208)
* ENT-1012 - Use non-privileged user

* ENT-1012 - Build and run containerised tests from IntelliJ

* ENT-1012 - Remove trusty source in container

* ENT-1012 - Make debug target toggleable

* ENT-1012 - Inform when ready to attach debugger

* ENT-1012 - Update reference to user home folder
2017-12-19 10:19:35 +00:00
Shams Asari
e1e715ee81 Removed all remaining special treatment of the X500 common name.
With network parameters the CN is no longer needed to identify notaries. This frees it up to be used in the node's name alongside the other attributes.

Also, the identity generation logic has been simplified, removing the need to have magic string values for storing distributed identities in the keystore. Now there are just two alias prefixes: "identity" as it was previously, and "distributed-notary".
2017-12-18 21:39:11 +00:00
josecoll
0aa56f55b8
Merge pull request #205 from corda/colljos-os-merge-rc01
OS -> ENT merge for Enterprise Developer Preview RC01
2017-12-18 17:45:35 +00:00
Andrzej Cichocki
f7445a5e6a
CORDA-876 MockNetwork no longer leaks serialization env if init fails (#2272) 2017-12-18 17:09:24 +00:00
josecoll
f55e565a3d Re-instate previous commit fix removed by exfalso. 2017-12-18 17:01:05 +00:00
josecoll
cfd67f4e55 Merge branch 'colljos-os-merge-rc01' of https://github.com/corda/enterprise into colljos-os-merge-rc01 2017-12-18 16:58:32 +00:00
Ross Nicoll
22af527b79
CORDA-869: Clean up error reporting in node config/registration (#2268) 2017-12-18 16:54:49 +00:00