ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-19 13:08:04 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
1,190 Commits 91 Branches 405 Tags 354 MiB
5167ed7df2
Commit Graph

1190 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Ross Nicoll
2f04d876ae Move FiberRequest out to a top level class 
Move FiberRequest out to a top level class, both because it is expanding as functionality is added,
and to enable alternative state machine implementations to share it.
 2016-07-24 09:30:16 +01:00
Matthew Nesbit
83c89c3ec8 Fetch KeyStore passwords from NodeConfiguration 2016-07-22 18:07:27 +01:00
Matthew Nesbit
b042fac905 Tidy up based upon comments on PR 2016-07-22 18:07:26 +01:00
Matthew Nesbit
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
Matthew Nesbit
129eeca7de Add X509 creation and manipulation utilities to core and enable SSL in ArtemisMQ 2016-07-22 18:07:24 +01:00
Andrius Dagys
e7ff5b8f6f Typo fix 2016-07-22 17:31:03 +01:00
Ross Nicoll
31ee8ab60b Rework checkpoint storage to include the FiberRequest 
Rework checkpoint storage to include the FiberRequest, so that different requests can be supported.
 2016-07-22 16:40:15 +01:00
Andrius Dagys
2142bd1d8a Added Log4j bindings for SLF4J. Test log output is redirected to the console, and demo output is now additionally stored in a rolling log file. 2016-07-22 16:15:00 +01:00
Mike Hearn
119813a36d Minor: document the SMM.changes observable. 2016-07-22 15:50:21 +02:00
Clinton Alexander
9375cd21c1 All Tests can now be run on Windows as tests are now forked by class. 2016-07-20 14:27:24 +01:00
Ross Nicoll
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
Ross Nicoll
f866c4689e Merged in rnicoll-cash-generate-exit (pull request #233) 
Add Cash.generateExit() function
 2016-07-20 13:21:29 +01:00
Ross Nicoll
f25e19ed5e Add Cash.generateExit() function 2016-07-20 13:20:43 +01:00
Ross Nicoll
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
Ross Nicoll
ab7ddaa264 Merged in rnicoll-in-memory-networking (pull request #232) 
Correct processing of unhandled messages
 2016-07-19 14:20:29 +01:00
Ross Nicoll
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
Andrius Dagys
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
Mike Hearn
1715941dce Regen docsite 2016-07-14 10:55:35 +02:00
Ross Nicoll
1ec1642080 Merged in rnicoll-clauses-commercial-paper (pull request #227) 
Rebuild commercial paper contracts using clauses
 2016-07-13 17:04:30 +01:00
Ross Nicoll
c32af56b41 Rebuild commercial paper contracts using clauses 2016-07-13 16:55:18 +01:00