Cache login identity for NewFTP transactions.

net/url_request/url_request_ftp_job.cc

 // Copyright (c) 2006-2008 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/url_request/url_request_ftp_job.h"
 
 #include <windows.h>
 #include <wininet.h>
 
 #include "base/message_loop.h"
@@ skipping 120 matching lines @@
   // latest input rather than always trying what they specified
   // in the url (if anything).
   string username, password;
   bool have_auth = false;
   if (server_auth_ && server_auth_->state == net::AUTH_STATE_HAVE_AUTH) {
     // Add auth info to cache
     have_auth = true;
     username = WideToUTF8(server_auth_->username);
     password = WideToUTF8(server_auth_->password);
     request_->context()->ftp_auth_cache()->Add(request_->url().GetOrigin(),
-                                               server_auth_.get());
+                                               server_auth_->username,
+                                               server_auth_->password);
   } else {
     if (request_->url().has_username()) {
       username = request_->url().username();
       password = request_->url().has_password() ? request_->url().password() :
                  "";
       have_auth = true;
     }
   }
 
   int port = request_->url().has_port() ?
@@ skipping 24 matching lines @@
         OnFinishDirectoryTraversal();
         return;
       case ERROR_INTERNET_LOGIN_FAILURE:
         // fall through
       case ERROR_INTERNET_INCORRECT_USER_NAME:
         // fall through
       case ERROR_INTERNET_INCORRECT_PASSWORD: {
         GURL origin = request_->url().GetOrigin();
         if (server_auth_ != NULL &&
             server_auth_->state == net::AUTH_STATE_HAVE_AUTH) {
-          request_->context()->ftp_auth_cache()->Remove(origin);
+          request_->context()->ftp_auth_cache()->Remove(origin,
+                                                        server_auth_->username,
+                                                        server_auth_->password);
         } else {
           server_auth_ = new net::AuthData();
         }
         server_auth_->state = net::AUTH_STATE_NEED_AUTH;
 
-        scoped_refptr<net::AuthData> cached_auth =
+        net::FtpAuthCache::Entry* cached_auth =
             request_->context()->ftp_auth_cache()->Lookup(origin);
 
         if (cached_auth) {
           // Retry using cached auth data.
           SetAuth(cached_auth->username, cached_auth->password);
         } else {
           // The io completed fine, the error was due to invalid auth.
           SetStatus(URLRequestStatus());
 
           // Prompt for a username/password.
@@ skipping 347 matching lines @@
       replacements.SetPathStr(ftp_path);
 
       *location = request_->url().ReplaceComponents(replacements);
       *http_status_code = 301;  // simulate a permanent redirect
       return true;
     }
   }
 
   return false;
 }