772ce28a81
remove extra space
2016-07-26 15:42:11 +01:00
9a9df847af
Merge remote-tracking branch 'remotes/origin/master' into mnesbit-cor-261-artemis-over-ssl
2016-07-26 15:25:58 +01:00
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
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
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
e81d8b9928
Removed reference from progress tracker output to improve output readability.
2016-07-26 10:43:41 +01:00
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
cb8876678e
Address comments from code review. Also, make whitelist registration synchronized.
2016-07-26 10:35:59 +01:00
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
e5777fd999
Fetch KeyStore passwords from NodeConfiguration
2016-07-26 10:35:57 +01:00
4c08141ce3
Tidy up based upon comments on PR
2016-07-26 10:35:56 +01:00
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
00f897d58d
Add X509 creation and manipulation utilities to core and enable SSL in ArtemisMQ
2016-07-26 10:35:54 +01:00
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
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
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
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
0542f7c509
Refactor APIServer to use the same whitelist controlled protocol gateway as the scheduler.
2016-07-25 13:46:40 +01:00
83c89c3ec8
Fetch KeyStore passwords from NodeConfiguration
2016-07-22 18:07:27 +01:00
b042fac905
Tidy up based upon comments on PR
2016-07-22 18:07:26 +01:00
196fe57147
Correct usage of hostName and cannonicalHostName in certificates to ensure the SSL certificates validate on Linux
2016-07-22 18:07:25 +01:00
129eeca7de
Add X509 creation and manipulation utilities to core and enable SSL in ArtemisMQ
2016-07-22 18:07:24 +01:00
119813a36d
Minor: document the SMM.changes observable.
2016-07-22 15:50:21 +02:00
9375cd21c1
All Tests can now be run on Windows as tests are now forked by class.
2016-07-20 14:27:24 +01:00
2c139ae40c
Merged in rnicoll-state-machine-id (pull request #234 )
...
Add Fiber ID to state machine change events
2016-07-20 13:23:02 +01:00
f866c4689e
Merged in rnicoll-cash-generate-exit (pull request #233 )
...
Add Cash.generateExit() function
2016-07-20 13:21:29 +01:00
f25e19ed5e
Add Cash.generateExit() function
2016-07-20 13:20:43 +01:00
f72d8ed9fb
Add Fiber ID to state machine change events
...
Where state machine change events are to be serialized for relay to external systems, serializing the entire
protocol is excessive. Instead being able to identify changes based on the ID of the fiber is a lot simpler
for these use-cases.
2016-07-19 14:58:54 +01:00
ab7ddaa264
Merged in rnicoll-in-memory-networking (pull request #232 )
...
Correct processing of unhandled messages
2016-07-19 14:20:29 +01:00
c92d51a0b6
Correct processing of unhandled messages
...
Unhandled messages in the in memory messaging network can disrupt runNetwork(), as they
result in getNextQueue() returning null, irrespective of whether there is further work
which could be done. This modifies the flow to loop through the remaining transfers on
the queue before giving up, rather than stopping after the first.
2016-07-19 14:19:57 +01:00
c442cd01a7
Merged in andrius-cleanup-tweaks (pull request #208 )
...
Remove the "verify correct notary has signed" check from TwoParty protocols
2016-07-18 10:40:25 +01:00
1715941dce
Regen docsite
2016-07-14 10:55:35 +02:00
1ec1642080
Merged in rnicoll-clauses-commercial-paper (pull request #227 )
...
Rebuild commercial paper contracts using clauses
2016-07-13 17:04:30 +01:00
c32af56b41
Rebuild commercial paper contracts using clauses
2016-07-13 16:55:18 +01:00
0ab4d90bf1
Merged in rnicoll-clauses-irs2 (pull request #222 )
...
Rebuild IRS contract using clauses
2016-07-13 16:29:10 +01:00
e03dd19979
Rebuild IRS contract using clauses
2016-07-13 16:15:01 +01:00
49b58d8a43
Split IRS verification into individual functions
2016-07-13 13:19:51 +01:00
3257640e7f
Merged in rnicoll-clauses-assets (pull request #220 )
...
Rebuild asset contracts using clauses
2016-07-13 13:09:14 +01:00
cba3aab96e
Rebuild asset contracts using clauses
2016-07-13 13:08:23 +01:00
ea051d57be
Move clauses into main
2016-07-13 11:48:51 +01:00
d022b0be7b
Refactor APIServer to use the same whitelist controlled protocol gateway as the scheduler.
2016-07-13 11:44:13 +01:00
95a9f4d10b
Merged in mnesbit-sprint-5-tidyup (pull request #226 )
...
Mnesbit sprint 5 tidyup
2016-07-13 11:36:37 +01:00
bc26e08189
Merge branch 'mnesbit-sprint-5-tidyup' of https://bitbucket.org/R3-CEV/r3prototyping into mnesbit-sprint-5-tidyup
2016-07-13 11:32:10 +01:00
d07db80461
Repair broken RateFixDemo code and script
2016-07-13 11:28:54 +01:00
9d18234383
Consistently use an sl4j logger with timestamp, rather than console println within the node. Note that the current protocol events published via the ProgressTracker are sent to the console without a timestamp.
2016-07-13 11:28:52 +01:00
ead19c619a
Merged in mike-cp-issuance-fix (pull request #224 )
...
Disentangle the concept of CP issuer vs underlying redeemable asset issuer in the CP contract.
2016-07-13 11:13:23 +02:00
229b0ce0bc
Merged in rnicoll-cleanup (pull request #228 )
...
Cleanup
2016-07-13 09:56:52 +01:00
15bc48b49b
Minor: Add note about refactoring TwoPartyTradeProtocol
2016-07-12 18:42:36 +01:00
254592dc54
Move protocols into correct package
2016-07-12 18:42:00 +01:00
27241fb10a
Rebuild documentation
2016-07-12 17:52:52 +01:00
