FTP: fix directory listing parser for ftp://ftp.dd-wrt.com/others/juno6/

net/ftp/ftp_directory_listing_parser_ls_unittest.cc

Index: net/ftp/ftp_directory_listing_parser_ls_unittest.cc
diff --git a/net/ftp/ftp_directory_listing_parser_ls_unittest.cc b/net/ftp/ftp_directory_listing_parser_ls_unittest.cc
index 4b3654456a675e0b524bf184051e7ed478e72b20..3e777ccbef60decf5b6859f1b6139025ddda0bf9 100644
--- a/net/ftp/ftp_directory_listing_parser_ls_unittest.cc
+++ b/net/ftp/ftp_directory_listing_parser_ls_unittest.cc
@@ -91,6 +91,28 @@ TEST_F(FtpDirectoryListingParserLsTest, Good) {
   }
 }
 
+TEST_F(FtpDirectoryListingParserLsTest, Ignored) {
+  const char* ignored_cases[] = {
+    "drwxr-xr-x 2 0 0 4096 Mar 18  2007  ",  // http://crbug.com/60065
+
+    // Tests important for security: verify that after we detect the column
+    // offset we don't try to access invalid memory on malformed input.
+    "drwxr-xr-x 3 ftp ftp 4096 May 15 18:11",
+    "drwxr-xr-x 3 ftp     4096 May 15 18:11",
+    "drwxr-xr-x   folder     0 May 15 18:11",
+  };
+  for (size_t i = 0; i < arraysize(ignored_cases); i++) {
+    SCOPED_TRACE(base::StringPrintf("Test[%" PRIuS "]: %s", i,
+                                    ignored_cases[i]));
+
+    net::FtpDirectoryListingParserLs parser(GetMockCurrentTime());
+    EXPECT_TRUE(parser.ConsumeLine(UTF8ToUTF16(ignored_cases[i])));

[wtc, 2010/10/28 01:05:41]

In the original code, we EXPECT_FALSE here (see line 124 of
the original code).  Why do we EXPECT_TRUE now?  Just curious.

[Paweł Hajdan Jr., 2010/10/28 07:15:34]

When ConsumeLine returns false, it means that the parser doesn't recognize the
listing format. In this case we do recognize the format, but the line is
useless. Note that this test also verifies that the parser does not generate any
listing entries for the input.

Previously, the parser was failing on the input with empty file names, and that
was the root cause of the bug.

I prefer to explicitly ignore lines that we want to ignore rather than all lines
that we don't recognize (that's what Firefox does), because it can lead to
silently "eating" some listing lines. We had a bug earlier (fixed now), that
Chrome was failing to parse the listing with an error (and a link to the raw
listing), while Firefox was silently ignoring and not displaying some lines,
making the problem much harder to detect.

+    EXPECT_FALSE(parser.EntryAvailable());
+    EXPECT_TRUE(parser.OnEndOfInput());
+    EXPECT_FALSE(parser.EntryAvailable());
+  }
+}
+
 TEST_F(FtpDirectoryListingParserLsTest, Bad) {
   const char* bad_cases[] = {
     " foo",
@@ -112,12 +134,6 @@ TEST_F(FtpDirectoryListingParserLsTest, Bad) {
     "d-wx-wx-wt++  4 ftp 989 512 Dec  8 15:54 incoming",
     "d-wx-wx-wt$  4 ftp 989 512 Dec  8 15:54 incoming",
     "-qqqqqqqqq+  2 sys          512 Mar 27  2009 pub",
-
-    // Tests important for security: verify that after we detect the column
-    // offset we don't try to access invalid memory on malformed input.
-    "drwxr-xr-x 3 ftp ftp 4096 May 15 18:11",
-    "drwxr-xr-x 3 ftp     4096 May 15 18:11",
-    "drwxr-xr-x   folder     0 May 15 18:11",
   };
   for (size_t i = 0; i < arraysize(bad_cases); i++) {
     net::FtpDirectoryListingParserLs parser(GetMockCurrentTime());