Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-11680 Corrected Buffer Size Calculation for Connection Balancing (#7370) 

- Resolved BufferOverflowException in PeerChannel with Bouncy Castle Provider
- Changed prepareForWrite() to use Destination Buffer remaining instead of Application Buffer Size
- Changed encrypt() to Packet Buffer Size instead of Application Buffer Size
This commit is contained in:
exceptionfactory 2023-06-13 10:01:27 -05:00 committed by GitHub
parent 787e0d8261
commit 9c2f15cc18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/client/async/nio/PeerChannel.java
View File

@ -162,12 +162,13 @@ public class PeerChannel implements Closeable {
while (plaintext.hasRemaining()) {
encrypt(plaintext);
final int bytesRemaining = prepared.capacity() - prepared.position();
if (bytesRemaining < destinationBuffer.remaining()) {
final ByteBuffer temp = ByteBuffer.allocate(prepared.capacity() + sslEngine.getSession().getApplicationBufferSize());
final int destinationBufferRemaining = destinationBuffer.remaining();
if (prepared.remaining() < destinationBufferRemaining) {
// Expand Prepared Buffer to hold current bytes plus remaining size of Destination Buffer
final ByteBuffer expanded = ByteBuffer.allocate(prepared.capacity() + destinationBufferRemaining);
prepared.flip();
temp.put(prepared);
prepared = temp;
expanded.put(prepared);
prepared = expanded;
}
prepared.put(destinationBuffer);
@ -289,11 +290,12 @@ public class PeerChannel implements Closeable {
case CLOSED:
throw new IOException("Failed to encrypt data to write to Peer " + peerDescription + " because Peer unexpectedly closed connection");
case BUFFER_OVERFLOW:
// destinationBuffer is not large enough. Need to increase the size.
final ByteBuffer tempBuffer = ByteBuffer.allocate(destinationBuffer.capacity() + sslEngine.getSession().getApplicationBufferSize());
// Expand Destination Buffer using current capacity plus encrypted Packet Buffer Size
final int packetBufferSize = sslEngine.getSession().getPacketBufferSize();
final ByteBuffer expanded = ByteBuffer.allocate(destinationBuffer.capacity() + packetBufferSize);
destinationBuffer.flip();
tempBuffer.put(destinationBuffer);
destinationBuffer = tempBuffer;
expanded.put(destinationBuffer);
destinationBuffer = expanded;
break;
case BUFFER_UNDERFLOW:
// We should never get this result on a call to SSLEngine.wrap(), only on a call to unwrap().