From b6f9b706eef71d05ad53099c689a99c345321acc Mon Sep 17 00:00:00 2001 From: simpleqt <2015900818@qq.com> Date: Mon, 16 Nov 2026 00:58:50 +0800 Subject: [PATCH] Fix TFTP request packets truncated by bufferedSend TFTPRequestPacket.newDatagram(DatagramPacket, byte[]) computed the datagram length without the encoded option extensions, so a request parsed with options and forwarded through TFTP.bufferedSend() lost its options. Count the option extensions once and write their trailing NUL terminator explicitly. Assisted-By: DeepSeek Harness (deepseek-v41-flash) --- .../commons/net/tftp/TFTPRequestPacket.java | 22 ++++++++++++++----- .../net/tftp/TFTPRequestPacketTest.java | 16 ++++++++++++++ 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/apache/commons/net/tftp/TFTPRequestPacket.java b/src/main/java/org/apache/commons/net/tftp/TFTPRequestPacket.java index f3dec654d..1093ca69d 100644 --- a/src/main/java/org/apache/commons/net/tftp/TFTPRequestPacket.java +++ b/src/main/java/org/apache/commons/net/tftp/TFTPRequestPacket.java @@ -179,6 +179,19 @@ public final Map getOptions() { return options; } + /** + * Gets the encoded length of the options extensions. + * + * @return The encoded length of the options extensions. + */ + private int getOptionsLength() { + int optionsLength = 0; + for (final Map.Entry entry : options.entrySet()) { + optionsLength += entry.getKey().length() + 1 + entry.getValue().length() + 1; + } + return optionsLength; + } + private void handleOptions(final byte[] data, final int fileLength, final int modeLength) { int index = fileLength + modeLength + 2; for (final Map.Entry entry : options.entrySet()) { @@ -193,6 +206,7 @@ private void handleOptions(final byte[] data, final int fileLength, final int mo System.arraycopy(value.getBytes(StandardCharsets.US_ASCII), 0, data, index, value.length()); index += value.length(); } + data[index] = 0; } private boolean isChar(final byte[] data, int index) { @@ -210,10 +224,7 @@ private boolean isChar(final byte[] data, int index) { public final DatagramPacket newDatagram() { final int fileLength = fileName.length(); final int modeLength = modeBytes[mode].length; - int optionsLength = 0; - for (final Map.Entry entry : options.entrySet()) { - optionsLength += entry.getKey().length() + 1 + entry.getValue().length() + 1; - } + final int optionsLength = getOptionsLength(); final byte[] data = new byte[fileLength + modeLength + 3 + optionsLength]; data[0] = 0; data[1] = (byte) type; @@ -238,6 +249,7 @@ public final DatagramPacket newDatagram() { final DatagramPacket newDatagram(final DatagramPacket datagram, final byte[] data) { final int fileLength = fileName.length(); final int modeLength = modeBytes[mode].length; + final int optionsLength = getOptionsLength(); data[0] = 0; data[1] = (byte) type; System.arraycopy(fileName.getBytes(Charset.defaultCharset()), 0, data, 2, fileLength); @@ -247,7 +259,7 @@ final DatagramPacket newDatagram(final DatagramPacket datagram, final byte[] dat datagram.setAddress(address); datagram.setPort(port); datagram.setData(data); - datagram.setLength(fileLength + modeLength + 3); + datagram.setLength(fileLength + modeLength + 3 + optionsLength); return datagram; } } diff --git a/src/test/java/org/apache/commons/net/tftp/TFTPRequestPacketTest.java b/src/test/java/org/apache/commons/net/tftp/TFTPRequestPacketTest.java index 153286429..d19d3f47c 100644 --- a/src/test/java/org/apache/commons/net/tftp/TFTPRequestPacketTest.java +++ b/src/test/java/org/apache/commons/net/tftp/TFTPRequestPacketTest.java @@ -27,6 +27,7 @@ import java.net.InetAddress; import java.net.UnknownHostException; import java.nio.charset.StandardCharsets; +import java.util.Arrays; import java.util.Map; import org.junit.jupiter.api.Test; @@ -69,6 +70,21 @@ void testGetOptions() throws UnknownHostException, TFTPPacketException { assertEquals("1024", options.get("blksize")); } + @Test + void testNewDatagramBufferIncludesOptions() throws TFTPPacketException, UnknownHostException { + final DatagramPacket datagramPacket = getDatagramPacket(); + final TFTPReadRequestPacket requestPacket = new TFTPReadRequestPacket(datagramPacket); + final byte[] buffer = new byte[datagramPacket.getLength()]; + // Simulate a reused send buffer that is not zero-initialized anymore, as in TFTP.bufferedSend(). + Arrays.fill(buffer, (byte) 'X'); + final DatagramPacket reused = new DatagramPacket(buffer, buffer.length, InetAddress.getLocalHost(), 0); + + requestPacket.newDatagram(reused, buffer); + + assertEquals(datagramPacket.getLength(), reused.getLength()); + assertArrayEquals(datagramPacket.getData(), buffer); + } + @Test void testNewDatagram() throws TFTPPacketException, UnknownHostException { final DatagramPacket datagramPacket = getDatagramPacket();