Fix CVE-2026-61487, CVE-2026-59878 (5.16.x) - #268
Merged
epearson-tt merged 2 commits intoAug 27, 2026
Merged
Conversation
… (apache#2172) Add a negative size check for AMQP NIO transports. This also adds a similar check to OpenWire. For OpenWire the same IllegalArgumentException is thrown but this improves the error message in the NIO transport. (cherry picked from commit 6e9dd5b) (cherry picked from commit cb03c48)
…ionBroker (apache#2219) (apache#2221) For temporary destinations we need to iterate over the list of composite destinations and compute the union using the same strategy as DefaultAuthorizationMap. Backport adaptation for the 5.16.x-TT.x branch: this branch builds at source/target 1.8, but the upstream tests use language and library features newer than Java 8. The test code has been rewritten with Java 8 equivalents, leaving the assertions and the code under test unchanged: * AuthorizationBrokerTest: Set.of(...) (Java 9) is replaced by a local setOf(Object...) helper returning new HashSet<>(Arrays.asList(items)), with a java.util.HashSet import added. Set equality is by size plus containsAll, so HashSet compares identically to the immutable set the upstream test built. The helper returns Set<Object> to match the Set<Object> parameter of AuthorizationEntry's setAdminACLs/setReadACLs/setWriteACLs. * AuthorizationBrokerTest and SimpleSecurityBrokerSystemTest: the no-argument Optional.orElseThrow() (Java 10) is replaced by Optional.get(). Both throw NoSuchElementException when empty, so behaviour is unchanged. * AuthorizationBrokerTest and SimpleSecurityBrokerSystemTest: local variables declared with var (Java 10) are given their explicit types, SimpleAuthorizationMap and TempDestinationAuthorizationEntry. No main/ source is adapted: the fix itself is Java 8 clean, and the only new library calls in the CVE-2026-59878 companion commit, Integer.toUnsignedLong and Integer.compareUnsigned, are Java 8 APIs. (cherry picked from commit 91e35e0) (cherry picked from commit 106d181)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes the following CVEs: