Commit Graph

9425 Commits

Author SHA1 Message Date
Dan Newton
044202550d
ENT-6421 Public version of FlowManagerRPCOps (#7006)
A public version of `FlowManagerRPCOps` which does not live in an
internal package has been added. This new interface shares the same name
as the internal one.

Because of the name sharing, the internal version has been
`@Deprecated`.

`FlowManagerRPCOpsImpl` implements both the new and old interfaces. This
 allows for backwards compatibility, allowing old shells or clients to
 call the old interface on newer nodes without breaking.
2022-01-07 16:40:29 +00:00
Viktor Kolomeyko
df5604874b
ENT-6388: Update Crash shell to version 1.7.5 (#7004)
This is a newly built internal version of the library which in particular upgrades `org.apache.mina:mina-core` to version `2.0.22` eliminating NexusIQ vulnerability.
2022-01-06 13:46:58 +00:00
nargas-ritu
e00c7cd693
Merge pull request #7002 from corda/wz/merge-os-43-44-2022-01-04
NOTICK: Merging forward updates from OS 4.3 to OS 4.4 (2022-01-04)
2022-01-06 09:12:10 +00:00
Adel El-Beik
ad0377932e
Merge pull request #7003 from corda/adel/ENT-6494-log4j2.17.1-update
ENT-6494: log4j update to 2.17.1
2022-01-05 17:52:55 +00:00
Adel El-Beik
47bf3c9055 ENT-6494: log4j update to 2.17.1 2022-01-05 15:50:09 +00:00
Adel El-Beik
d3494f8a84 Revert "ENT-6494: Upgrade log4j to 2.17.0 (#6998)"
This reverts commit db0e45146a.

# Conflicts:
#	build.gradle
2022-01-05 15:37:25 +01:00
Waldemar Zurowski
0751bfd835 Revert "Updated classgraph version"
This reverts commit 0d8f5fb965.
2022-01-05 15:35:30 +01:00
Waldemar Zurowski
0d8f5fb965 Updated classgraph version 2022-01-05 15:22:50 +01:00
nargas-ritu
f4a022ddce NOTICK: New branch for Corda OS 4.9 2022-01-04 12:33:03 +00:00
Waldemar Zurowski
525df323a6 Merge branch 'release/os/4.3' into wz/merge-os-43-44-2022-01-04
Conflicts:
	build.gradle
2022-01-04 12:13:57 +01:00
Waldemar Żurowski
9a7308f954
NOTICK: allow to skip executing all tests for a release (#7001)
* backported from emergency releases for log4j updates
* adds a build parameter, which control if tests should be run or not, default is `true`
2022-01-04 11:50:24 +01:00
Walter Oggioni
efaf1549a9
CORDA-4173 Obfuscated zib bombs used for unit tests, so that antivirus software stop complaining about them (#6989) 2021-12-21 14:08:02 +00:00
Adel El-Beik
65bba87741
ENT-6494: Upgraded log4j to 2.17.0 (#6993) 2021-12-21 11:26:52 +00:00
Adel El-Beik
a7d5b46120
ENT-6494: Upgraded log4j to 2.17.0 (#6994) 2021-12-21 11:26:33 +00:00
Adel El-Beik
67da0ffee5
ENT-6494: Upgraded log4j to 2.17.0 (#6995) 2021-12-21 11:26:05 +00:00
Adel El-Beik
0eeaa743d3
ENT-6494: Upgraded log4j to 2.17.0 (#6996) 2021-12-21 11:25:14 +00:00
Adel El-Beik
d2d826c305
ENT-6494: Upgraded log4j to 2.17.0 (#6997) 2021-12-21 11:24:42 +00:00
Adel El-Beik
db0e45146a
ENT-6494: Upgrade log4j to 2.17.0 (#6998) 2021-12-21 11:24:02 +00:00
Waldemar Żurowski
7d5d36c352
Update build.gradle (#6991) 2021-12-17 17:54:59 +01:00
Adel El-Beik
2c01816353
ENT-6494: Upgrade log4j again. (#6990) 2021-12-15 22:21:49 +01:00
Adel El-Beik
094455571f
ENT-6494: Upgrade log4j (#6988) 2021-12-14 12:24:38 +00:00
Viktor Kolomeyko
505ade9c86
ENT-6388: Eliminate usage of Mina's ConcurrentHashSet (#6977)
* ENT-6388: Eliminate usage of Mina's `ConcurrentHashSet`

* ENT-6388: Restrict to `MutableSet<ScheduledStateRef>`
2021-12-02 13:24:11 +00:00
Kyriakos Tharrouniatis
3cbfb0e024
ENT-6355 Empty flow arguments on error transition (#4307)
A user passed in a `FlowLogic` as an argument into another `FlowLogic`
called `subFlow` on it and had it throw an exception.

This all occurred before the first checkpoint, causing the state machine
to try and persist a FAILED checkpoint containing the flow's arguments.
Because the arguments contained a `FlowLogic` that had been started via
`subFlow` it held a reference to `FlowLogic._stateMachine` which cannot
be serialized.

This caused the flow to fail when trying to persist the fact that it
failed.

The flow arguments are now emptied during `ErrorFlowTransition` to
resolve this issue which mimics the behaviour of the first suspend.
Note, this only takes the arguments out of the serialized checkpoint, it
does not affect the flow metadata and therefore a flow's arguments can
still be viewed.

Co-authored-by: Dan Newton <dan.newton@r3.com>
2021-12-01 14:57:30 +00:00
Chris Rankin
e93e7c2846
ENT-6412: Upgrade ClassGraph 4.8.90 -> 4.8.135. (#6973) 2021-11-23 09:43:41 +00:00
Dimos Raptis
18333b4860
Upgrade netty version (#6974) 2021-11-19 14:22:01 +00:00
Chris Rankin
caeafb8201
ENT-6357: Deserialize LedgerTransaction elements for each Contract.verify(). (#6962)
* ENT-6357: Deserialize LedgerTransaction elements for each Contract.verify().

* Lock the LedgerTransaction and NetworkParameters objects down for contract verification.

* Refactor BasicVerifier to be package private instead of public.

* Simplify verifyConstraints() operation.

* Review fixes: replace HashSet with LinkedHashSet, and add signing parties to commands via mapIndexed.

* Ensure tests also run notary nodes "out of process".

* Streamline SerializationContext switching.

* Cache deserialised cryptographic instances during contract verification.

* Invoke Class.forName() instead of ClassLoader.loadClass() to reduce contention on the system classloader's lock.

* Deserialization cache key now pre-computes its hash code.

* Allow AttachmentsClassLoader to be used concurrently.

* Cache all Envelope objects for reuse during contract verification.

* Generate CertPathProxy hash code using conventional algorithm.

* Adjust CustomSerializer.Proxy to allow better access to SerializationContext.
2021-11-10 16:38:40 +00:00
Dimos Raptis
b0889e0201
ENT-6374 - Fix slf4j warning in trader-demo (#6971) 2021-10-18 11:59:51 +01:00
Walter Oggioni
883e794853
ENT-6330 Fixed reading jar entries in memory (#6960)
* ENT-6330 Fixed reading jar entries in memory

This is a trivial fix that is however enough to allow to send zip bombs as attachments without the node crashing, a size limit could be added for increased reliability

* added attachment cumulative size check

* added compression ratio check

* added unit test and moved the code to a standalone verifier object

* removed attachment check from AttachmentClassLoader to minimize performance impact
2021-10-13 09:46:20 +01:00
Christian Sailer
4540e48087
Merge pull request #6970 from corda/nandor-os-4.6-os-4.7-20211011
NAAS-301 Backport fix notary flow retries after ETA message sent (#6965)
2021-10-11 18:06:50 +01:00
Christian Sailer
22f81b161d
Merge pull request #6969 from corda/nandor-os-4.5-os-4.6-20211011
NAAS-300 Forward merge notary ETA fix
2021-10-11 15:57:02 +01:00
nkovacsx
5d26ffcd89 Merge branch 'release/os/4.5' into nandor-os-4.5-os-4.6-20211011 2021-10-11 12:29:53 +01:00
nkovacsx
1dacee8d57
NAAS-295 Fix notary flow retries after ETA message sent (#6965) (#6968) 2021-10-11 12:27:31 +01:00
nkovacsx
9a3ea393a2
NAAS-295 Fix notary flow retries after ETA message sent (#6965) (#6966) 2021-10-08 14:53:24 +01:00
Ramzi El-Yafi
f859d809c7 NAAS-295 Fix notary flow retries after ETA message sent (#6965) 2021-10-07 09:43:53 +01:00
Ramzi El-Yafi
9146228b0f
NAAS-295 Fix notary flow retries after ETA message sent (#6965) 2021-10-04 17:37:22 +01:00
Dimos Raptis
84000e0794
ENT-3644: Upgrade Netty (#6957) 2021-09-15 08:52:14 +01:00
Viktor Kolomeyko
e50f508c2c
ENT-6331: Disable AMQP protocol for Artemis RPC broker (#6956)
Also tidy-up visibility scope of internal constants.
2021-09-14 10:58:02 +01:00
Waldemar Żurowski
943cf0b32f
Merge pull request #6946 from corda/wz/merge-os-47-48-2021-08-06
NOTICK: Merging forward updates from OS 4.7 to OS 4.8
2021-08-06 21:53:18 +02:00
Waldemar Zurowski
d0e8e2d8c2 Merge branch 'release/os/4.7' into wz/merge-os-47-48-2021-08-06 2021-08-06 20:22:40 +02:00
Waldemar Żurowski
18541019e4
Merge pull request #6945 from corda/wz/merge-os-46-47-2021-08-06
NOTICK: Merging forward updates from OS 4.6 to OS 4.7
2021-08-06 20:19:00 +02:00
Waldemar Zurowski
b7560b9793 Merge branch 'release/os/4.6' into wz/merge-os-46-47-2021-08-06 2021-08-06 19:50:58 +02:00
Waldemar Żurowski
9d6614aac9
Merge pull request #6944 from corda/wz/merge-os-45-46-2021-08-06
NOTICK: Merging forward updates from OS 4.5 to OS 4.6
2021-08-06 19:50:15 +02:00
Waldemar Zurowski
5017885b0f Merge branch 'release/os/4.5' into wz/merge-os-45-46-2021-08-06 2021-08-06 19:23:51 +02:00
Waldemar Żurowski
fcd30f554f
Merge pull request #6943 from corda/wz/merge-os-44-45-2021-08-06
NOTICK: Merging forward updates from OS 4.4 to OS 4.5
2021-08-06 19:20:16 +02:00
Waldemar Zurowski
4e4ef3691f Merge branch 'release/os/4.4' into wz/merge-os-44-45-2021-08-06 2021-08-06 17:50:27 +02:00
Waldemar Żurowski
133af149e0
Merge pull request #6942 from corda/wz/merge-os-43-44-2021-08-06
NOTICK: Merging forward updates from OS 4.3 to OS 4.4
2021-08-06 17:45:29 +02:00
Waldemar Zurowski
c1d5038d16 Merge branch 'release/os/4.3' into wz/merge-os-43-44-2021-08-06 2021-08-06 15:43:12 +02:00
Waldemar Żurowski
16fdc289d7
INFRA-1549: added SCIJAVA repo (#6939)
* `com.github.detro:ghostdriver` is gone from repositories configured
  already
* SCI Java public repo has it, and it is configured to resolve
  `com.github.detro` group only
2021-08-05 20:19:16 +02:00
Waldemar Żurowski
70c94adc1d
NOTICK: added newly introduced input (#6940)
see https://github.com/corda/jira-create-issue-action/pull/8
2021-08-05 20:18:41 +02:00
Waldemar Żurowski
bf9d0212d9
Merge pull request #6938 from corda/wz/merge-os-47-48-2021-07-27
NOTICK: Merging forward updates from OS 4.7 to OS 4.8 (2021-07-27)
2021-07-28 10:03:29 +02:00