Unescape username/passwords obtained from URLs before using them for HTTP aut...

net/http/http_network_transaction.h

 // Copyright (c) 2006-2009 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.
 
 #ifndef NET_HTTP_HTTP_NETWORK_TRANSACTION_H_
 #define NET_HTTP_HTTP_NETWORK_TRANSACTION_H_
 
 #include <string>
 
 #include "base/ref_counted.h"
@@ skipping 44 matching lines @@
         HaveAuth(pending_auth_target_);
   }
 
   virtual int Read(IOBuffer* buf, int buf_len, CompletionCallback* callback);
   virtual const HttpResponseInfo* GetResponseInfo() const;
   virtual LoadState GetLoadState() const;
   virtual uint64 GetUploadProgress() const;
 
  private:
   FRIEND_TEST(HttpNetworkTransactionTest, ResetStateForRestart);
+  FRIEND_TEST(HttpNetworkTransactionTest, GetIdentifyFromUrl);
+  FRIEND_TEST(HttpNetworkTransactionTest, GetIdentifyFromUrl_UTF8);
 
   // This version of IOBuffer lets us use a string as the real storage and
   // "move" the data pointer inside the string before using it to do actual IO.
   class RequestHeaders : public net::IOBuffer {
    public:
     RequestHeaders() : net::IOBuffer() {}
     ~RequestHeaders() { data_ = NULL; }
 
     void SetDataOffset(size_t offset) {
       data_ = const_cast<char*>(headers_.data()) + offset;
@@ skipping 177 matching lines @@
   // Invalidates any auth cache entries after authentication has failed.
   // The identity that was rejected is auth_identity_[target].
   void InvalidateRejectedAuthFromCache(HttpAuth::Target target);
 
   // Sets auth_identity_[target] to the next identity that the transaction
   // should try. It chooses candidates by searching the auth cache
   // and the URL for a username:password. Returns true if an identity
   // was found.
   bool SelectNextAuthIdentityToTry(HttpAuth::Target target);
 
+  // Extract the unescaped username/password from |url|, saving the results
+  // into |*username| and |*password|.
+  static void GetIdentifyFromUrl(const GURL& url,

[wtc, 2009/08/13 21:37:36]

Consider moving this method to net_util.h, so that we don't
need to add new FRIEND_TESTs.

Nit: Use "URL" in the function's name.

+                                 std::wstring* username,
+                                 std::wstring* password);
+
   // Searches the auth cache for an entry that encompasses the request's path.
   // If such an entry is found, updates auth_identity_[target] and
   // auth_handler_[target] with the cache entry's data and returns true.
   bool SelectPreemptiveAuth(HttpAuth::Target target);
 
   bool HaveAuth(HttpAuth::Target target) const {
     return auth_handler_[target].get() && !auth_identity_[target].invalid;
   }
 
   // Get the {scheme, host, port} for the authentication target
@@ skipping 127 matching lines @@
   // The time that we request the ClientSocketPool for a connected socket.
   base::TimeTicks transport_socket_request_time_;
 
   // The next state in the state machine.
   State next_state_;
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_NETWORK_TRANSACTION_H_