Commit Graph

1835 Commits

Author SHA1 Message Date
Matthew Nesbit
454f555728 Merged in mnesbit-cor-261-artemis-over-ssl (pull request #247)
Create MessageServiceInternal interface to allow NetworkMapCache to register addresses with the network service.
2016-07-28 13:35:44 +01:00
Matthew Nesbit
09c795e341 Merge remote-tracking branch 'remotes/origin/master' into mnesbit-cor-261-artemis-over-ssl 2016-07-28 13:28:31 +01:00
Clinton Alexander
5410f8b228 Merged in demowebui (pull request #230)
Added an IRS demo web interface
2016-07-28 13:19:32 +01:00
Ross Nicoll
ec726da7d0 Merged in rnicoll-warnings (pull request #246)
Correct warnings
2016-07-28 13:03:55 +01:00
Clinton Alexander
bcbac345e8 Fixed display issue when using double digit months and days. 2016-07-28 11:37:10 +01:00
Matthew Nesbit
7d5ee8ba08 Create MessageServiceInternal interface to allow NetworkMapCache to register addresses with the network service.
Activate WhitelistTrustManager for now to secure the TLS messaging.
2016-07-28 11:25:57 +01:00
Mike Hearn
7e6c1332e7 Regen docsite 2016-07-28 12:20:11 +02:00
Clinton Alexander
f4e8537cf0 Fixed documentation. 2016-07-28 09:26:47 +01:00
Mike Hearn
5167ed7df2 Merged in mike-fix-irs (pull request #244)
Fix how the IRS contract uses fix commands
2016-07-28 10:19:16 +02:00
Clinton Alexander
aebdc86225 Reverted change from previous commit. 2016-07-28 09:17:49 +01:00
Clinton Alexander
188fc29436 Cleaned up build.gradle files. 2016-07-28 09:17:49 +01:00
Clinton Alexander
ffc3c8f421 Added Jacoco code coverage to gradle. 2016-07-28 09:17:49 +01:00
Ross Nicoll
2a0066ae74 Merged in rnicoll-wallet-notify-transaction (pull request #237)
Add wallet service for notifying remote nodes of transactions
2016-07-27 17:45:21 +01:00
Ross Nicoll
d54beca77e Add wallet service for notifying remote nodes of transactions 2016-07-27 17:40:52 +01:00
Ross Nicoll
aaaf6ea4f6 Correct warnings 2016-07-27 17:11:46 +01:00
Matthew Nesbit
510fa34053 Merged in mnesbit-cor-261-artemis-over-ssl (pull request #238)
Add X509 creation and manipulation utilities to core and enable SSL in ArtemisMQ
2016-07-27 15:59:52 +01:00
Matthew Nesbit
5a20b67ce2 Clean up comments 2016-07-27 15:45:32 +01:00
Matthew Nesbit
e3aef96b09 Merge remote-tracking branch 'remotes/origin/master' into mnesbit-cor-261-artemis-over-ssl
# Conflicts:
#	build.gradle
2016-07-27 15:43:01 +01:00
Ross Nicoll
8bdeda63ae Merged in rnicoll-checkpoint-generic (pull request #241)
Rework checkpoint storage to include the FiberRequest
2016-07-27 15:20:40 +01:00
Andrius Dagys
e8c84867cf Merged in andrius-logging (pull request #240)
Enable logging to file
2016-07-27 14:18:24 +01:00
Mike Hearn
1a9cdf992f Fix an issue in the IRS contract where it was expecting two different kinds of fix command simultaneously for apparently no good reason. The unit tests didn't spot that because the unit test wasn't actually verifying the constructed transactions: fix that too.
Uncovered during the tx types refactoring work.
2016-07-27 14:38:21 +02:00
Mike Hearn
62e91000e9 Minor: some minor tweaks to IRSUtils types 2016-07-27 14:37:32 +02:00
Mike Hearn
889b74ca9b Minor: apply some inspector and reformatting cleanups to IRS.kt 2016-07-27 11:17:00 +02:00
Matthew Nesbit
772ce28a81 remove extra space 2016-07-26 15:42:11 +01:00
Matthew Nesbit
9a9df847af Merge remote-tracking branch 'remotes/origin/master' into mnesbit-cor-261-artemis-over-ssl 2016-07-26 15:25:58 +01:00
Matthew Nesbit
fea452d9ac Change to a ConcurrentHashSet whitelist so that we don't hold any locks across the DNS lookup. 2016-07-26 14:40:30 +01:00
Clinton Alexander
73d2346d35 Merged in clint-alltestfix (pull request #235)
All Tests can now be run on Windows as tests are now forked by class.
2016-07-26 12:17:07 +01:00
Clinton Alexander
1c49eb5123 Merged in clint-protocolchange (pull request #243)
Removed reference from progress tracker output to improve output readability.
2016-07-26 12:16:26 +01:00
Clinton Alexander
e81d8b9928 Removed reference from progress tracker output to improve output readability. 2016-07-26 10:43:41 +01:00
Clinton Alexander
250dbaa45d Renamed notional amount to notional. 2016-07-26 10:40:42 +01:00
Matthew Nesbit
4c4484b820 Merge remote-tracking branch 'origin/mnesbit-cor-261-artemis-over-ssl' into mnesbit-cor-261-artemis-over-ssl
# Conflicts:
#	core/src/main/kotlin/com/r3corda/core/crypto/WhitelistTrustManager.kt
2016-07-26 10:36:42 +01:00
Matthew Nesbit
cb8876678e Address comments from code review. Also, make whitelist registration synchronized. 2016-07-26 10:35:59 +01:00
Matthew Nesbit
ed52f2b35d An implementation of a Security Provider that replaces the default TrustManager with one that checks certificate names against a manually controlled white list. This isn't activated anywhere yet, but the network map should register the valid node dns names. 2016-07-26 10:35:58 +01:00
Matthew Nesbit
e5777fd999 Fetch KeyStore passwords from NodeConfiguration 2016-07-26 10:35:57 +01:00
Matthew Nesbit
4c08141ce3 Tidy up based upon comments on PR 2016-07-26 10:35:56 +01:00
Matthew Nesbit
c7bc5ae652 Correct usage of hostName and cannonicalHostName in certificates to ensure the SSL certificates validate on Linux 2016-07-26 10:35:55 +01:00
Matthew Nesbit
00f897d58d Add X509 creation and manipulation utilities to core and enable SSL in ArtemisMQ 2016-07-26 10:35:54 +01:00
Andrius Dagys
f807e157b6 Appended hostname to log filename. Logging date in ISO8601, GMT 2016-07-25 18:07:50 +01:00
Matthew Nesbit
38f4711a80 Merged in mnesbit-sprint-5-tidyup (pull request #229)
Refactor APIServer to use the same whitelist controlled protocol gateway as the scheduler.
2016-07-25 17:58:27 +01:00
Clinton Alexander
d5ca4590d8 Improved styling. 2016-07-25 17:32:33 +01:00
Matthew Nesbit
fd441d5e3e An implementation of a Security Provider that replaces the default TrustManager with one that checks certificate names against a manually controlled white list. This isn't activated anywhere yet, but the network map should register the valid node dns names. 2016-07-25 16:47:28 +01:00
Matthew Nesbit
c08d53d030 Merge remote-tracking branch 'origin/mnesbit-sprint-5-tidyup' into mnesbit-sprint-5-tidyup
# Conflicts:
#	node/src/main/kotlin/com/r3corda/node/internal/APIServerImpl.kt
2016-07-25 16:37:38 +01:00
Matthew Nesbit
0d68523f5c Validate protocol type and args via whitelist ahead of class loading. Also, push this work into another method on the Factory. 2016-07-25 16:35:45 +01:00
Matthew Nesbit
0542f7c509 Refactor APIServer to use the same whitelist controlled protocol gateway as the scheduler. 2016-07-25 13:46:40 +01:00
Clinton Alexander
77245bdc1a Fixed a typo in the docs. 2016-07-25 11:55:23 +01:00
Clinton Alexander
6aabdc49eb Removed rounded borders on top menu 2016-07-25 11:35:37 +01:00
Clinton Alexander
e7f4997b1b Improved styling further on all pages. 2016-07-25 11:32:35 +01:00
Clinton Alexander
df5dcc34f6 Improved homepage theming. 2016-07-25 11:23:43 +01:00
Clinton Alexander
19e3f7f0cb Updated documentation to use the new endpoints. 2016-07-25 10:53:38 +01:00
Clinton Alexander
67defe19cc Small refactor of initWebServer to improve readability. 2016-07-25 10:36:37 +01:00