From 70bd425917f634bd9fafe82ac55e5d6612387d76 Mon Sep 17 00:00:00 2001 From: Inf1mum Date: Sat, 7 Nov 2026 01:42:50 +0300 Subject: [PATCH] Fix NET-200: treat Unix block and character devices as UNKNOWN_TYPE UnixFTPEntryParser mapped 'b' (block device) and 'c' (character device) listing entries to FTPFile.FILE_TYPE, so FTPFile#isFile() reported devices as regular files. They now map to FTPFile.UNKNOWN_TYPE, as agreed on the JIRA issue; the hard-link count is still not parsed for devices. A dedicated regression test covers block and character device entries. Signed-off-by: Inf1mum --- src/changes/changes.xml | 1 + .../net/ftp/parser/UnixFTPEntryParser.java | 3 ++- .../ftp/parser/UnixFTPEntryParserTest.java | 24 ++++++++++++++++++- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 611cd0b87..63476090a 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -71,6 +71,7 @@ The type attribute can be add,update,fix,remove. [Javadoc] Improve UnixFTPEntryParser when filename with leading space when listing contains a year instead of time (IBM i example) (#405). Force Gregorian calendar in FTP listing timestamp parsers (##406). TFTPRequestPacket now throws TFTPPacketException instead of ArrayIndexOutOfBoundsException (#407). + UnixFTPEntryParser now treats block and character devices as FTPFile.UNKNOWN_TYPE instead of FTPFile.FILE_TYPE. Add and use FTPFile.setUserPermission(int, boolean). diff --git a/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java b/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java index a6badea69..4d96be0dd 100644 --- a/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java +++ b/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java @@ -227,7 +227,8 @@ public FTPFile parseFTPEntry(final String entry) { case 'b': case 'c': isDevice = true; - type = FTPFile.FILE_TYPE; // TODO change this if DEVICE_TYPE implemented + // NET-200: block and character devices are not regular files. + type = FTPFile.UNKNOWN_TYPE; break; case 'f': case '-': diff --git a/src/test/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java b/src/test/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java index f91aad5d6..dcc62f0d0 100644 --- a/src/test/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java +++ b/src/test/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java @@ -109,7 +109,9 @@ protected void doAdditionalGoodTests(final String test, final FTPFile f) { case 'b': case 'c': assertEquals(0, f.getHardLinkCount()); - // falls through$ TODO this needs to be fixed if a device type is introduced + // NET-200: block and character devices are not regular files. + assertEquals(FTPFile.UNKNOWN_TYPE, type, "Type of " + test); + break; case 'f': case '-': assertEquals(FTPFile.FILE_TYPE, type, "Type of " + test); @@ -228,6 +230,26 @@ void testNET294() { assertEquals("bloplab 7 cd1.img", f.getName()); } + // https://issues.apache.org/jira/browse/NET-200 + @Test + void testNET200BlockAndCharacterDevicesAreNotFiles() { + final String[] deviceEntries = { + // block device + "brw-rw---- 1 root disk 8, 0 Jan 22 2001 sda", + // character device + "crw-rw-rw- 1 root root 1, 3 Jan 22 2001 null"}; + for (final String entry : deviceEntries) { + final FTPFile f = getParser().parseFTPEntry(entry); + assertNotNull(f, "Failed to parse " + entry); + assertEquals(FTPFile.UNKNOWN_TYPE, f.getType(), "Type of " + entry); + assertFalse(f.isFile(), "Device must not be a regular file: " + entry); + assertFalse(f.isDirectory(), "Device must not be a directory: " + entry); + assertTrue(f.isUnknown(), "Device must be of unknown type: " + entry); + assertEquals(0, f.getHardLinkCount(), "Hard link count of " + entry); + assertNotNull(f.getTimestamp(), "Expected to find a timestamp for " + entry); + } + } + @Test void testNoSpacesBeforeFileSize() { final FTPFile f = getParser().parseFTPEntry("drwxr-x---+1464 chrism chrism 41472 Feb 25 13:17 20090225");