FTP: make the code handling server messages in directory listings more general.

net/ftp/ftp_directory_listing_parser_ls.cc

 // Copyright (c) 2011 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_ls.h"
 
 #include <vector>
 
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
@@ skipping 33 matching lines @@
   // separate this column from the next column (number of links), resulting
   // in additional characters at the end. Also, sometimes there is a "+"
   // sign at the end indicating the file has ACLs set.
 
   // In fact, we don't even expect three "rwx" triplets of permission
   // listing, as some FTP servers like Hylafax only send two.
   return (LooksLikeUnixPermission(text.substr(1, 3)) &&
           LooksLikeUnixPermission(text.substr(4, 3)));
 }
 
-bool LooksLikePermissionDeniedError(const string16& text) {
-  // Try to recognize a three-part colon-separated error message:
-  //
-  //   1. ftpd server name
-  //   2. directory name (often just ".")
-  //   3. message text (usually "Permission denied")
-  std::vector<string16> parts;
-  base::SplitString(CollapseWhitespace(text, false), ':', &parts);
-
-  if (parts.size() != 3)
-    return false;
-
-  return parts[2].find(ASCIIToUTF16("Permission denied")) != string16::npos;
-}
-
 // Returns the column index of the end of the date listing and detected
 // last modification time.
 bool DetectColumnOffsetAndModificationTime(const std::vector<string16>& columns,
                                            const base::Time& current_time,
                                            size_t* offset,
                                            base::Time* modification_time) {
   // The column offset can be arbitrarily large if some fields
   // like owner or group name contain spaces. Try offsets from left to right
   // and use the first one that matches a date listing.
   //
@@ skipping 73 matching lines @@
       continue;
     }
 
     FtpDirectoryListingEntry entry;
 
     size_t column_offset;
     if (!DetectColumnOffsetAndModificationTime(columns,
                                                current_time,
                                                &column_offset,
                                                &entry.last_modified)) {
-      // If we can't recognize a normal listing line, maybe it's an error?
-      // In that case, just ignore the error, but still recognize the data
-      // as valid listing.
-      if (LooksLikePermissionDeniedError(lines[i]))
+      // Some servers send a message in one of the first few lines.
+      // All those messages have in common is the string ".:",
+      // where "." means the current directory, and ":" separates it
+      // from the rest of the message, which may be empty.
+      if (lines[i].find(ASCIIToUTF16(".:")) != string16::npos)
         continue;
 
       return false;
     }
 
     if (!LooksLikeUnixPermissionsListing(columns[0]))
       return false;
     if (columns[0][0] == 'l') {
       entry.type = FtpDirectoryListingEntry::SYMLINK;
     } else if (columns[0][0] == 'd') {
@@ skipping 42 matching lines @@
         entry.name = entry.name.substr(0, pos);
     }
 
     entries->push_back(entry);
   }
 
   return true;
 }
 
 }  // namespace net