ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-05-28 13:14:24 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
10,841 Commits 108 Branches 407 Tags
Commit Graph

10841 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ryan Fowler
42255b6bd6 Merge fixup 2025-03-17 10:39:45 +00:00
Ryan Fowler
cee8df1bd0 Merge fixup 2025-03-14 13:57:05 +00:00
Ryan Fowler
363876a958 Merge fixup 2025-03-14 11:47:02 +00:00
Ryan Fowler
c9803985e7 Revert "Merge fixup" 
This reverts commit c1b718202cb70a9e670cfd66661832dd0e68fc78.
 2025-03-14 11:29:33 +00:00
Ryan Fowler
c1b718202c Merge fixup 2025-03-14 10:28:00 +00:00
Rick Parker
91da445d99 ENT-12843: Merge the P2P and RPC built in brokers (#5231) 
* Initial look at restricting artemis user based on connection port

* Consolidate RPC and RPCAdmin broker types

* First pass at consolidating into single P2P and RPC broker.  Passes at least one integration test (NodeRPCTests)

* Detekt fixes

* Fix dependencies of BridgeSmokeTest

* Close RPC security manager on shared broker close

* Fix return type from authenticate method to be nullable

* Fix AuthDBTests by stopping caching of RPC users failed logins and now correct permission exception is returned by RPC when user is revoked

* Fix port binding error reporting

* Fix null user to be treated as RPC user, and changed expectation of missing queue to be a permissions failure

* Fix MQSecurityAsRPCTest to have correct expectations

* Fix detekt

* Fix RPCSecurityManagerTest for change in exception thrown

* Added new tests for RPC user deletion and password change

* New RPC test for user password change (old password fails) and reduced caching time of authentication and authorisation, from 1 hour to 10 seconds, of P2P connections now they don't check expensive CRLs.

* Confine max message size checking to P2P port only

* Upgrade to Artemis 2.37.0

* Remove issuance tests as involves no P2P

* Remove issuance tests as involves no P2P

* Upgrade Artemis MQ and Proton-J

* Appease detekt to remove magic numbers

* Fix qpid jms to be a version that is compatible with our code.  No correlation with qpid version.

* Fix deprecated methods

* Revert "Appease detekt to remove magic numbers"

This reverts commit ae7942013ff3ca0f82c71d71177f8037cfeb2d66.

* Revert "Remove issuance tests as involves no P2P"

This reverts commit c5dda17bd8182ecb83dd61bfa9ff658cff114f92.

* Revert "Remove issuance tests as involves no P2P"

This reverts commit 9166541608d12952aa19e8f0c5d0cea2320da9c2.

* Add a constant for qpid version

---------

Co-authored-by: Ryan Fowler <ryan.fowler@r3.com>
 2025-03-14 09:57:15 +00:00
Adel El-Beik
4dd3857592
Merge pull request #7903 from corda/merge-release/os/4.12-release/os/4.13-2025-03-05-1 
ENT-12508: Merging forward updates from release/os/4.12 to release/os/4.13 - 2025-03-05
 2025-03-12 10:44:18 +00:00
r3-build
3a2b3ae5a7 Merging forward updates from release/os/4.12 to release/os/4.13 - 2025-03-05 2025-03-05 17:00:08 +00:00
Chris Cochrane
fe770cdc0d
ENT-12508 - Upgraded Log4j (#7896)
Some checks failed
Sync assigned jira issues / sync_assigned (push) Has been cancelled
Details
Sync closed jira issues / sync_closed (push) Has been cancelled
Details 
* Upgraded Log4j; removed superfluous code

* Removed unused imports
 2025-03-03 15:43:00 +00:00
Shams Asari
df8f4fa3e9
ENT-12709: Replace uses of assert with correct assertion methods (#7902) 
The Kotlin `assert` is only active if the `-ea` JVM flag is specified,
which it isn't. Replaced all uses with the correct assertj assertion.
 2025-02-25 14:09:58 +00:00
Adel El-Beik
781aaba649
ENT-12568: Added a test to check system property is defined in external verifier. (#7898) 2025-01-22 18:00:25 +00:00
Adel El-Beik
7b6df5cc14
ENT-12568: Add ability to pass system properties to external verifier. (#7897) 
* ENT-12568: Add ability to pess system properties to external verifier.
 2025-01-15 16:56:32 +00:00
Chris Cochrane
1c40e969f7
ENT-12507 - Revert Log4j (#7895) 
* Rollback log4j

* Revert Log4j further
 2024-12-13 09:32:00 +00:00
Chris Cochrane
40ce095398
ENT-12507 - Upgrade log4j (#7894) 
* Upgrade log4j

* Added deprecation suppressions
 2024-12-11 13:02:01 +00:00
Adel El-Beik
563001e0ac
Merge pull request #7889 from corda/merge-release/os/4.11-release/os/4.12-2024-12-06-478 
ENT-12039: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-12-06
 2024-12-06 17:08:17 +00:00
Adel El-Beik
d195984584
Merge pull request #7893 from corda/cc/dev/os/4.12/security_vulnerabilities 
ENT-12327,ENT-12328,ENT-12428 - Dependency updates
 2024-12-06 17:01:00 +00:00
Chris Cochrane
d1110e726e
Merge branch 'release/os/4.12' into merge-release/os/4.11-release/os/4.12-2024-12-06-478 2024-12-06 09:55:00 +00:00
Adel El-Beik
b9c6651780
Merge pull request #7886 from corda/merge-release/os/4.11-release/os/4.12-2024-11-28-469 
ENT-12385: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-11-28
 2024-12-05 12:05:45 +00:00
chriscochrane
3d611247c8
Dependency updates 2024-12-04 16:08:18 +00:00
Adel El-Beik
c6fc18356e Merge branch 'merge-release/os/4.11-release/os/4.12-2024-11-28-469' of github.com:corda/corda into merge-release/os/4.11-release/os/4.12-2024-11-28-469 2024-12-04 15:21:20 +00:00
Adel El-Beik
b4f0499465 ENT-12385: Fixed merge artifact. 2024-12-04 15:20:42 +00:00
Adel El-Beik
523bd6533d
Merge pull request #7888 from corda/cc/dev/os/4.11/security_vulns 
ENT-12039 - Security vulnerabilities
 2024-12-04 15:18:43 +00:00
Adel El-Beik
0322b8c6ce
ENT-12491: Commands were being deserialized in captured serialisation… (#7887) 
* ENT-12491: Commands were being deserialized in captured serialisation context which did not include the serialisation context with attachments class loader. Now make the deserialisation lazy.

* ENT-12491: Disable carpenter in the external verifier.
 2024-12-02 21:48:50 +00:00
Chris Cochrane
7caafd626f
Merge branch 'release/os/4.12' into merge-release/os/4.11-release/os/4.12-2024-11-28-469 2024-12-02 20:35:23 +00:00
chriscochrane
b736ea03ea
ENT-12039 upgrade jackson again 2024-12-02 20:27:19 +00:00
Adel El-Beik
8ebf4ad835
Merge pull request #7884 from corda/merge-release/os/4.11-release/os/4.12-2024-11-27-467 
ENT-12433: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-11-27
 2024-11-28 16:24:28 +00:00
Adel El-Beik
ed0a696562
Merge pull request #7885 from corda/merge-release/os/4.10-release/os/4.11-2024-11-27-425 
ENT-12385: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-11-27
 2024-11-28 16:23:59 +00:00
Chris Cochrane
61aa4de348
Merge branch 'release/os/4.12' into merge-release/os/4.11-release/os/4.12-2024-11-27-467 2024-11-27 11:22:57 +00:00
r3-build
9b51bd3f81 Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-11-27 2024-11-27 10:51:08 +00:00
Adel El-Beik
7895bbff92
Merge pull request #7883 from corda/merge-release/os/4.9-release/os/4.10-2024-11-25-422 
ENT-12385: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-11-25
 2024-11-27 10:49:45 +00:00
Adel El-Beik
761a3ab049
Merge pull request #7882 from corda/merge-release/os/4.10-release/os/4.11-2024-11-25-422 
ENT-12433: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-11-25
 2024-11-27 10:49:11 +00:00
chriscochrane
fc7ad4281d
Fwd-merge jackson version reversion 2024-11-25 16:52:22 +00:00
Chris Cochrane
2ed9753f87
Merge branch 'release/os/4.10' into merge-release/os/4.9-release/os/4.10-2024-11-25-422 2024-11-25 16:49:21 +00:00
Adel El-Beik
1b72f3c10f
Merge pull request #7880 from corda/cc/dev/os/4.9/ent-12385/revert_jackson_version 
ENT-12385 - Reverted Jackson version
 2024-11-25 16:16:55 +00:00
r3-build
c3bf65cf7d Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-11-25 2024-11-25 13:38:09 +00:00
Adel El-Beik
cbb1f10871
Merge pull request #7879 from corda/merge-release/os/4.9-release/os/4.10-2024-11-20-416 
ENT-12433: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-11-20
 2024-11-25 13:35:52 +00:00
Adel El-Beik
5b9d61224f
Merge pull request #7881 from corda/jzadroga/ent-12442/update-bc-dependencies 
ENT-12442: Add bcutil dependency for Bouncy Castle
 2024-11-25 11:58:45 +00:00
jakub.zadroga
83a7f28c67 Add bcutil dependency for BC 2024-11-21 18:41:24 +07:00
chriscochrane
3d26a5a07e
ENT-12385: reverted Jackson version 2024-11-21 11:31:08 +00:00
r3-build
640f119d67 Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-11-20 2024-11-20 21:18:38 +00:00
Adel El-Beik
3623e45653
Merge pull request #7878 from corda/cc/dev/os/4.9/ent-12433/bc_package_list 
ENT-12433 - Bouncy Castle docs generation
 2024-11-20 21:17:43 +00:00
chriscochrane
33757a2a29
Updated BC package list URL 2024-11-14 11:20:21 +00:00
Adel El-Beik
ba977d8a5a
Merge pull request #7877 from corda/merge-release/os/4.11-release/os/4.12-2024-11-09-448 
ENT-12373: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-11-09
 2024-11-10 20:32:05 +00:00
Adel El-Beik
35b04b0502 ENT-12373: Fixed merge typo. 2024-11-10 17:06:38 +00:00
Adel El-Beik
5846cda6bb ENT-12373: Removed extra line from merge. 2024-11-10 17:04:25 +00:00
Adel El-Beik
301dc7469b Merge branch 'release/os/4.12' into merge-release/os/4.11-release/os/4.12-2024-11-09-448 2024-11-10 17:02:33 +00:00
Adel El-Beik
11a398a5af
Merge pull request #7875 from corda/merge-release/os/4.11-release/os/4.12-2024-11-07-445 
ENT-12373: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-11-07
 2024-11-08 19:42:39 +00:00
Adel El-Beik
194d50071b Merge branch 'release/os/4.12' into merge-release/os/4.11-release/os/4.12-2024-11-07-445 2024-11-08 11:06:08 +00:00
Adel El-Beik
dc4d888a30
Merge pull request #7876 from corda/merge-release/os/4.10-release/os/4.11-2024-11-08-404 
ENT-12373: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-11-08
 2024-11-08 08:49:23 +00:00
r3-build
8335dcc931 Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-11-08 2024-11-08 03:33:27 +00:00