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

net/ftp/ftp_directory_listing_parser_ls_unittest.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/ftp/ftp_directory_listing_parser_unittest.h"
 
 #include "base/format_macros.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "net/ftp/ftp_directory_listing_parser_ls.h"
@@ skipping 73 matching lines @@
   };
   for (size_t i = 0; i < arraysize(good_cases); i++) {
     SCOPED_TRACE(base::StringPrintf("Test[%" PRIuS "]: %s", i,
                                     good_cases[i].input));
 
     net::FtpDirectoryListingParserLs parser(GetMockCurrentTime());
     RunSingleLineTestCase(&parser, good_cases[i]);
   }
 }
 
+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",
     "garbage",
     "-rw-r--r-- ftp ftp",
     "-rw-r--rgb ftp ftp 528 Nov 01 2007 README",
     "-rw-rgbr-- ftp ftp 528 Nov 01 2007 README",
     "qrwwr--r-- ftp ftp 528 Nov 01 2007 README",
     "-rw-r--r-- ftp ftp -528 Nov 01 2007 README",
     "-rw-r--r-- ftp ftp 528 Foo 01 2007 README",
     "-rw-r--r-- 1 ftp ftp",
     "-rw-r--rgb 1 ftp ftp 528 Nov 01 2007 README",
     "-rw-rgbr-- 1 ftp ftp 528 Nov 01 2007 README",
     "qrwwr--r-- 1 ftp ftp 528 Nov 01 2007 README",
     "-rw-r--r-- 1 ftp ftp -528 Nov 01 2007 README",
     "-rw-r--r-- 1 ftp ftp 528 Foo 01 2007 README",
     "drwxrwxrwx   1 owner    group               0 Sep 13  0:3 audio",
 
     "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());
     EXPECT_FALSE(parser.ConsumeLine(UTF8ToUTF16(bad_cases[i]))) << bad_cases[i];
   }
 }
 
 }  // namespace