Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1730)

Side by Side Diff: net/http/http_auth_handler_digest.h

Issue 1383613002: [net/http auth] Cleanup. Method names, and constness. Base URL: https://chromium.googlesource.com/chromium/src.git@mock-auth-handler-generalization
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « net/http/http_auth_handler_basic_unittest.cc ('k') | net/http/http_auth_handler_digest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef NET_HTTP_HTTP_AUTH_HANDLER_DIGEST_H_ 5 #ifndef NET_HTTP_HTTP_AUTH_HANDLER_DIGEST_H_
6 #define NET_HTTP_HTTP_AUTH_HANDLER_DIGEST_H_ 6 #define NET_HTTP_HTTP_AUTH_HANDLER_DIGEST_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 }; 58 };
59 59
60 class NET_EXPORT_PRIVATE Factory : public HttpAuthHandlerFactory { 60 class NET_EXPORT_PRIVATE Factory : public HttpAuthHandlerFactory {
61 public: 61 public:
62 Factory(); 62 Factory();
63 ~Factory() override; 63 ~Factory() override;
64 64
65 // This factory owns the passed in |nonce_generator|. 65 // This factory owns the passed in |nonce_generator|.
66 void set_nonce_generator(const NonceGenerator* nonce_generator); 66 void set_nonce_generator(const NonceGenerator* nonce_generator);
67 67
68 int CreateAuthHandler(HttpAuthChallengeTokenizer* challenge, 68 int CreateAuthHandler(const HttpAuthChallengeTokenizer& challenge,
69 HttpAuth::Target target, 69 HttpAuth::Target target,
70 const GURL& origin, 70 const GURL& origin,
71 CreateReason reason, 71 CreateReason reason,
72 int digest_nonce_count, 72 int digest_nonce_count,
73 const BoundNetLog& net_log, 73 const BoundNetLog& net_log,
74 scoped_ptr<HttpAuthHandler>* handler) override; 74 scoped_ptr<HttpAuthHandler>* handler) override;
75 75
76 private: 76 private:
77 scoped_ptr<const NonceGenerator> nonce_generator_; 77 scoped_ptr<const NonceGenerator> nonce_generator_;
78 }; 78 };
79 79
80 HttpAuth::AuthorizationResult HandleAnotherChallenge( 80 HttpAuth::AuthorizationResult HandleAnotherChallenge(
81 HttpAuthChallengeTokenizer* challenge) override; 81 const HttpAuthChallengeTokenizer& challenge) override;
82 82
83 protected: 83 protected:
84 bool Init(HttpAuthChallengeTokenizer* challenge) override; 84 int Init(const HttpAuthChallengeTokenizer& challenge) override;
85 85
86 int GenerateAuthTokenImpl(const AuthCredentials* credentials, 86 int GenerateAuthTokenImpl(const AuthCredentials* credentials,
87 const HttpRequestInfo* request, 87 const HttpRequestInfo& request,
88 const CompletionCallback& callback, 88 const CompletionCallback& callback,
89 std::string* auth_token) override; 89 std::string* auth_token) override;
90 90
91 private: 91 private:
92 FRIEND_TEST_ALL_PREFIXES(HttpAuthHandlerDigestTest, ParseChallenge); 92 FRIEND_TEST_ALL_PREFIXES(HttpAuthHandlerDigestTest, ParseChallenge);
93 FRIEND_TEST_ALL_PREFIXES(HttpAuthHandlerDigestTest, AssembleCredentials); 93 FRIEND_TEST_ALL_PREFIXES(HttpAuthHandlerDigestTest, AssembleCredentials);
94 FRIEND_TEST_ALL_PREFIXES(HttpNetworkTransactionTest, DigestPreAuthNonceCount); 94 FRIEND_TEST_ALL_PREFIXES(HttpNetworkTransactionTest, DigestPreAuthNonceCount);
95 95
96 // Possible values for the "algorithm" property. 96 // Possible values for the "algorithm" property.
97 enum DigestAlgorithm { 97 enum DigestAlgorithm {
(...skipping 19 matching lines...) Expand all
117 // |nonce_count| indicates how many times the server-specified nonce has 117 // |nonce_count| indicates how many times the server-specified nonce has
118 // been used so far. 118 // been used so far.
119 // |nonce_generator| is used to create a client nonce, and is not owned by 119 // |nonce_generator| is used to create a client nonce, and is not owned by
120 // the handler. The lifetime of the |nonce_generator| must exceed that of this 120 // the handler. The lifetime of the |nonce_generator| must exceed that of this
121 // handler. 121 // handler.
122 HttpAuthHandlerDigest(int nonce_count, const NonceGenerator* nonce_generator); 122 HttpAuthHandlerDigest(int nonce_count, const NonceGenerator* nonce_generator);
123 ~HttpAuthHandlerDigest() override; 123 ~HttpAuthHandlerDigest() override;
124 124
125 // Parse the challenge, saving the results into this instance. 125 // Parse the challenge, saving the results into this instance.
126 // Returns true on success. 126 // Returns true on success.
127 bool ParseChallenge(HttpAuthChallengeTokenizer* challenge); 127 bool ParseChallenge(const HttpAuthChallengeTokenizer& challenge);
128 128
129 // Parse an individual property. Returns true on success. 129 // Parse an individual property. Returns true on success.
130 bool ParseChallengeProperty(const std::string& name, 130 bool ParseChallengeProperty(const std::string& name,
131 const std::string& value); 131 const std::string& value);
132 132
133 // Generates a random string, to be used for client-nonce. 133 // Generates a random string, to be used for client-nonce.
134 static std::string GenerateNonce(); 134 static std::string GenerateNonce();
135 135
136 // Convert enum value back to string. 136 // Convert enum value back to string.
137 static std::string QopToString(QualityOfProtection qop); 137 static std::string QopToString(QualityOfProtection qop);
138 static std::string AlgorithmToString(DigestAlgorithm algorithm); 138 static std::string AlgorithmToString(DigestAlgorithm algorithm);
139 139
140 // Extract the method and path of the request, as needed by 140 // Extract the method and path of the request, as needed by
141 // the 'A2' production. (path may be a hostname for proxy). 141 // the 'A2' production. (path may be a hostname for proxy).
142 void GetRequestMethodAndPath(const HttpRequestInfo* request, 142 void GetRequestMethodAndPath(const HttpRequestInfo& request,
143 std::string* method, 143 std::string* method,
144 std::string* path) const; 144 std::string* path) const;
145 145
146 // Build up the 'response' production. 146 // Build up the 'response' production.
147 std::string AssembleResponseDigest(const std::string& method, 147 std::string AssembleResponseDigest(const std::string& method,
148 const std::string& path, 148 const std::string& path,
149 const AuthCredentials& credentials, 149 const AuthCredentials& credentials,
150 const std::string& cnonce, 150 const std::string& cnonce,
151 const std::string& nc) const; 151 const std::string& nc) const;
152 152
(...skipping 17 matching lines...) Expand all
170 // UTF-8. 170 // UTF-8.
171 std::string original_realm_; 171 std::string original_realm_;
172 172
173 int nonce_count_; 173 int nonce_count_;
174 const NonceGenerator* nonce_generator_; 174 const NonceGenerator* nonce_generator_;
175 }; 175 };
176 176
177 } // namespace net 177 } // namespace net
178 178
179 #endif // NET_HTTP_HTTP_AUTH_HANDLER_DIGEST_H_ 179 #endif // NET_HTTP_HTTP_AUTH_HANDLER_DIGEST_H_
OLDNEW
« no previous file with comments | « net/http/http_auth_handler_basic_unittest.cc ('k') | net/http/http_auth_handler_digest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698