| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 #include "googleurl/src/gurl.h" | 5 #include "googleurl/src/gurl.h" |
| 6 #include "net/base/net_errors.h" | 6 #include "net/base/net_errors.h" |
| 7 #include "net/proxy/proxy_service.h" | 7 #include "net/proxy/proxy_service.h" |
| 8 #include "testing/gtest/include/gtest/gtest.h" | 8 #include "testing/gtest/include/gtest/gtest.h" |
| 9 | 9 |
| 10 namespace { | 10 namespace { |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 std::vector<std::string> proxies; | 55 std::vector<std::string> proxies; |
| 56 proxies.push_back("www.first.com:80"); | 56 proxies.push_back("www.first.com:80"); |
| 57 proxies.push_back("www.second.com:80"); | 57 proxies.push_back("www.second.com:80"); |
| 58 proxy_list.SetVector(proxies); | 58 proxy_list.SetVector(proxies); |
| 59 | 59 |
| 60 EXPECT_EQ(std::string("PROXY www.first.com:80;PROXY www.second.com:80"), | 60 EXPECT_EQ(std::string("PROXY www.first.com:80;PROXY www.second.com:80"), |
| 61 proxy_list.GetAnnotatedList()); | 61 proxy_list.GetAnnotatedList()); |
| 62 } | 62 } |
| 63 | 63 |
| 64 TEST(ProxyServiceTest, Direct) { | 64 TEST(ProxyServiceTest, Direct) { |
| 65 net::ProxyService service(new MockProxyResolver); | 65 scoped_refptr<net::ProxyService> service = |
| 66 new net::ProxyService(new MockProxyResolver); |
| 66 | 67 |
| 67 GURL url("http://www.google.com/"); | 68 GURL url("http://www.google.com/"); |
| 68 | 69 |
| 69 net::ProxyInfo info; | 70 net::ProxyInfo info; |
| 70 int rv = service.ResolveProxy(url, &info, NULL, NULL); | 71 int rv = service->ResolveProxy(url, &info, NULL, NULL); |
| 71 EXPECT_EQ(rv, net::OK); | 72 EXPECT_EQ(rv, net::OK); |
| 72 EXPECT_TRUE(info.is_direct()); | 73 EXPECT_TRUE(info.is_direct()); |
| 73 } | 74 } |
| 74 | 75 |
| 75 TEST(ProxyServiceTest, PAC) { | 76 TEST(ProxyServiceTest, PAC) { |
| 76 MockProxyResolver* resolver = new MockProxyResolver; | 77 MockProxyResolver* resolver = new MockProxyResolver; |
| 77 resolver->config.pac_url = GURL("http://foopy/proxy.pac"); | 78 resolver->config.pac_url = GURL("http://foopy/proxy.pac"); |
| 78 resolver->info.UseNamedProxy("foopy"); | 79 resolver->info.UseNamedProxy("foopy"); |
| 79 resolver->info_predicate_query_host = "www.google.com"; | 80 resolver->info_predicate_query_host = "www.google.com"; |
| 80 | 81 |
| 81 net::ProxyService service(resolver); | 82 scoped_refptr<net::ProxyService> service = new net::ProxyService(resolver); |
| 82 | 83 |
| 83 GURL url("http://www.google.com/"); | 84 GURL url("http://www.google.com/"); |
| 84 | 85 |
| 85 net::ProxyInfo info; | 86 net::ProxyInfo info; |
| 86 int rv = service.ResolveProxy(url, &info, NULL, NULL); | 87 int rv = service->ResolveProxy(url, &info, NULL, NULL); |
| 87 EXPECT_EQ(rv, net::OK); | 88 EXPECT_EQ(rv, net::OK); |
| 88 EXPECT_FALSE(info.is_direct()); | 89 EXPECT_FALSE(info.is_direct()); |
| 89 EXPECT_EQ(info.proxy_server(), "foopy"); | 90 EXPECT_EQ(info.proxy_server(), "foopy"); |
| 90 } | 91 } |
| 91 | 92 |
| 92 TEST(ProxyServiceTest, PAC_FailoverToDirect) { | 93 TEST(ProxyServiceTest, PAC_FailoverToDirect) { |
| 93 MockProxyResolver* resolver = new MockProxyResolver; | 94 MockProxyResolver* resolver = new MockProxyResolver; |
| 94 resolver->config.pac_url = GURL("http://foopy/proxy.pac"); | 95 resolver->config.pac_url = GURL("http://foopy/proxy.pac"); |
| 95 resolver->info.UseNamedProxy("foopy:8080"); | 96 resolver->info.UseNamedProxy("foopy:8080"); |
| 96 resolver->info_predicate_query_host = "www.google.com"; | 97 resolver->info_predicate_query_host = "www.google.com"; |
| 97 | 98 |
| 98 net::ProxyService service(resolver); | 99 scoped_refptr<net::ProxyService> service = new net::ProxyService(resolver); |
| 99 | 100 |
| 100 GURL url("http://www.google.com/"); | 101 GURL url("http://www.google.com/"); |
| 101 | 102 |
| 102 net::ProxyInfo info; | 103 net::ProxyInfo info; |
| 103 int rv = service.ResolveProxy(url, &info, NULL, NULL); | 104 int rv = service->ResolveProxy(url, &info, NULL, NULL); |
| 104 EXPECT_EQ(rv, net::OK); | 105 EXPECT_EQ(rv, net::OK); |
| 105 EXPECT_FALSE(info.is_direct()); | 106 EXPECT_FALSE(info.is_direct()); |
| 106 EXPECT_EQ(info.proxy_server(), "foopy:8080"); | 107 EXPECT_EQ(info.proxy_server(), "foopy:8080"); |
| 107 | 108 |
| 108 // Now, imagine that connecting to foopy:8080 fails. | 109 // Now, imagine that connecting to foopy:8080 fails. |
| 109 rv = service.ReconsiderProxyAfterError(url, &info, NULL, NULL); | 110 rv = service->ReconsiderProxyAfterError(url, &info, NULL, NULL); |
| 110 EXPECT_EQ(rv, net::OK); | 111 EXPECT_EQ(rv, net::OK); |
| 111 EXPECT_TRUE(info.is_direct()); | 112 EXPECT_TRUE(info.is_direct()); |
| 112 } | 113 } |
| 113 | 114 |
| 114 TEST(ProxyServiceTest, PAC_FailsToDownload) { | 115 TEST(ProxyServiceTest, PAC_FailsToDownload) { |
| 115 // Test what happens when we fail to download the PAC URL. | 116 // Test what happens when we fail to download the PAC URL. |
| 116 | 117 |
| 117 MockProxyResolver* resolver = new MockProxyResolver; | 118 MockProxyResolver* resolver = new MockProxyResolver; |
| 118 resolver->config.pac_url = GURL("http://foopy/proxy.pac"); | 119 resolver->config.pac_url = GURL("http://foopy/proxy.pac"); |
| 119 resolver->info.UseNamedProxy("foopy:8080"); | 120 resolver->info.UseNamedProxy("foopy:8080"); |
| 120 resolver->info_predicate_query_host = "www.google.com"; | 121 resolver->info_predicate_query_host = "www.google.com"; |
| 121 resolver->fail_get_proxy_for_url = true; | 122 resolver->fail_get_proxy_for_url = true; |
| 122 | 123 |
| 123 net::ProxyService service(resolver); | 124 scoped_refptr<net::ProxyService> service = new net::ProxyService(resolver); |
| 124 | 125 |
| 125 GURL url("http://www.google.com/"); | 126 GURL url("http://www.google.com/"); |
| 126 net::ProxyInfo info; | 127 net::ProxyInfo info; |
| 127 int rv = service.ResolveProxy(url, &info, NULL, NULL); | 128 int rv = service->ResolveProxy(url, &info, NULL, NULL); |
| 128 EXPECT_EQ(rv, net::OK); | 129 EXPECT_EQ(rv, net::OK); |
| 129 EXPECT_TRUE(info.is_direct()); | 130 EXPECT_TRUE(info.is_direct()); |
| 130 | 131 |
| 131 rv = service.ResolveProxy(url, &info, NULL, NULL); | 132 rv = service->ResolveProxy(url, &info, NULL, NULL); |
| 132 EXPECT_EQ(rv, net::OK); | 133 EXPECT_EQ(rv, net::OK); |
| 133 EXPECT_TRUE(info.is_direct()); | 134 EXPECT_TRUE(info.is_direct()); |
| 134 | 135 |
| 135 resolver->fail_get_proxy_for_url = false; | 136 resolver->fail_get_proxy_for_url = false; |
| 136 resolver->info.UseNamedProxy("foopy_valid:8080"); | 137 resolver->info.UseNamedProxy("foopy_valid:8080"); |
| 137 | 138 |
| 138 // But, if that fails, then we should give the proxy config another shot | 139 // But, if that fails, then we should give the proxy config another shot |
| 139 // since we have never tried it with this URL before. | 140 // since we have never tried it with this URL before. |
| 140 rv = service.ReconsiderProxyAfterError(url, &info, NULL, NULL); | 141 rv = service->ReconsiderProxyAfterError(url, &info, NULL, NULL); |
| 141 EXPECT_EQ(rv, net::OK); | 142 EXPECT_EQ(rv, net::OK); |
| 142 EXPECT_FALSE(info.is_direct()); | 143 EXPECT_FALSE(info.is_direct()); |
| 143 EXPECT_EQ(info.proxy_server(), "foopy_valid:8080"); | 144 EXPECT_EQ(info.proxy_server(), "foopy_valid:8080"); |
| 144 } | 145 } |
| 145 | 146 |
| 146 TEST(ProxyServiceTest, ProxyFallback) { | 147 TEST(ProxyServiceTest, ProxyFallback) { |
| 147 // Test what happens when we specify multiple proxy servers and some of them | 148 // Test what happens when we specify multiple proxy servers and some of them |
| 148 // are bad. | 149 // are bad. |
| 149 | 150 |
| 150 MockProxyResolver* resolver = new MockProxyResolver; | 151 MockProxyResolver* resolver = new MockProxyResolver; |
| 151 resolver->config.pac_url = GURL("http://foopy/proxy.pac"); | 152 resolver->config.pac_url = GURL("http://foopy/proxy.pac"); |
| 152 resolver->info.UseNamedProxy("foopy1:8080;foopy2:9090"); | 153 resolver->info.UseNamedProxy("foopy1:8080;foopy2:9090"); |
| 153 resolver->info_predicate_query_host = "www.google.com"; | 154 resolver->info_predicate_query_host = "www.google.com"; |
| 154 resolver->fail_get_proxy_for_url = false; | 155 resolver->fail_get_proxy_for_url = false; |
| 155 | 156 |
| 156 net::ProxyService service(resolver); | 157 scoped_refptr<net::ProxyService> service = new net::ProxyService(resolver); |
| 157 | 158 |
| 158 GURL url("http://www.google.com/"); | 159 GURL url("http://www.google.com/"); |
| 159 | 160 |
| 160 // Get the proxy information. | 161 // Get the proxy information. |
| 161 net::ProxyInfo info; | 162 net::ProxyInfo info; |
| 162 int rv = service.ResolveProxy(url, &info, NULL, NULL); | 163 int rv = service->ResolveProxy(url, &info, NULL, NULL); |
| 163 EXPECT_EQ(rv, net::OK); | 164 EXPECT_EQ(rv, net::OK); |
| 164 EXPECT_FALSE(info.is_direct()); | 165 EXPECT_FALSE(info.is_direct()); |
| 165 | 166 |
| 166 // The first item is valid. | 167 // The first item is valid. |
| 167 EXPECT_EQ(info.proxy_server(), "foopy1:8080"); | 168 EXPECT_EQ(info.proxy_server(), "foopy1:8080"); |
| 168 | 169 |
| 169 // Fake an error on the proxy. | 170 // Fake an error on the proxy. |
| 170 rv = service.ReconsiderProxyAfterError(url, &info, NULL, NULL); | 171 rv = service->ReconsiderProxyAfterError(url, &info, NULL, NULL); |
| 171 EXPECT_EQ(rv, net::OK); | 172 EXPECT_EQ(rv, net::OK); |
| 172 | 173 |
| 173 // The second proxy should be specified. | 174 // The second proxy should be specified. |
| 174 EXPECT_EQ(info.proxy_server(), "foopy2:9090"); | 175 EXPECT_EQ(info.proxy_server(), "foopy2:9090"); |
| 175 | 176 |
| 176 // Create a new resolver that returns 3 proxies. The second one is already | 177 // Create a new resolver that returns 3 proxies. The second one is already |
| 177 // known to be bad. | 178 // known to be bad. |
| 178 resolver->config.pac_url = GURL("http://foopy/proxy.pac"); | 179 resolver->config.pac_url = GURL("http://foopy/proxy.pac"); |
| 179 resolver->info.UseNamedProxy("foopy3:7070;foopy1:8080;foopy2:9090"); | 180 resolver->info.UseNamedProxy("foopy3:7070;foopy1:8080;foopy2:9090"); |
| 180 resolver->info_predicate_query_host = "www.google.com"; | 181 resolver->info_predicate_query_host = "www.google.com"; |
| 181 resolver->fail_get_proxy_for_url = false; | 182 resolver->fail_get_proxy_for_url = false; |
| 182 | 183 |
| 183 rv = service.ResolveProxy(url, &info, NULL, NULL); | 184 rv = service->ResolveProxy(url, &info, NULL, NULL); |
| 184 EXPECT_EQ(rv, net::OK); | 185 EXPECT_EQ(rv, net::OK); |
| 185 EXPECT_FALSE(info.is_direct()); | 186 EXPECT_FALSE(info.is_direct()); |
| 186 EXPECT_EQ(info.proxy_server(), "foopy3:7070"); | 187 EXPECT_EQ(info.proxy_server(), "foopy3:7070"); |
| 187 | 188 |
| 188 // We fake another error. It should now try the third one. | 189 // We fake another error. It should now try the third one. |
| 189 rv = service.ReconsiderProxyAfterError(url, &info, NULL, NULL); | 190 rv = service->ReconsiderProxyAfterError(url, &info, NULL, NULL); |
| 190 EXPECT_EQ(rv, net::OK); | 191 EXPECT_EQ(rv, net::OK); |
| 191 EXPECT_EQ(info.proxy_server(), "foopy2:9090"); | 192 EXPECT_EQ(info.proxy_server(), "foopy2:9090"); |
| 192 | 193 |
| 193 // Fake another error, the last proxy is gone, the list should now be empty. | 194 // Fake another error, the last proxy is gone, the list should now be empty. |
| 194 rv = service.ReconsiderProxyAfterError(url, &info, NULL, NULL); | 195 rv = service->ReconsiderProxyAfterError(url, &info, NULL, NULL); |
| 195 EXPECT_EQ(rv, net::OK); // We try direct. | 196 EXPECT_EQ(rv, net::OK); // We try direct. |
| 196 EXPECT_TRUE(info.is_direct()); | 197 EXPECT_TRUE(info.is_direct()); |
| 197 | 198 |
| 198 // If it fails again, we don't have anything else to try. | 199 // If it fails again, we don't have anything else to try. |
| 199 rv = service.ReconsiderProxyAfterError(url, &info, NULL, NULL); | 200 rv = service->ReconsiderProxyAfterError(url, &info, NULL, NULL); |
| 200 EXPECT_EQ(rv, net::ERR_FAILED); // We try direct. | 201 EXPECT_EQ(rv, net::ERR_FAILED); // We try direct. |
| 201 | 202 |
| 202 // TODO(nsylvain): Test that the proxy can be retried after the delay. | 203 // TODO(nsylvain): Test that the proxy can be retried after the delay. |
| 203 } | 204 } |
| 204 | 205 |
| 205 TEST(ProxyServiceTest, ProxyFallback_NewSettings) { | 206 TEST(ProxyServiceTest, ProxyFallback_NewSettings) { |
| 206 // Test proxy failover when new settings are available. | 207 // Test proxy failover when new settings are available. |
| 207 | 208 |
| 208 MockProxyResolver* resolver = new MockProxyResolver; | 209 MockProxyResolver* resolver = new MockProxyResolver; |
| 209 resolver->config.pac_url = GURL("http://foopy/proxy.pac"); | 210 resolver->config.pac_url = GURL("http://foopy/proxy.pac"); |
| 210 resolver->info.UseNamedProxy("foopy1:8080;foopy2:9090"); | 211 resolver->info.UseNamedProxy("foopy1:8080;foopy2:9090"); |
| 211 resolver->info_predicate_query_host = "www.google.com"; | 212 resolver->info_predicate_query_host = "www.google.com"; |
| 212 resolver->fail_get_proxy_for_url = false; | 213 resolver->fail_get_proxy_for_url = false; |
| 213 | 214 |
| 214 net::ProxyService service(resolver); | 215 scoped_refptr<net::ProxyService> service = new net::ProxyService(resolver); |
| 215 | 216 |
| 216 GURL url("http://www.google.com/"); | 217 GURL url("http://www.google.com/"); |
| 217 | 218 |
| 218 // Get the proxy information. | 219 // Get the proxy information. |
| 219 net::ProxyInfo info; | 220 net::ProxyInfo info; |
| 220 int rv = service.ResolveProxy(url, &info, NULL, NULL); | 221 int rv = service->ResolveProxy(url, &info, NULL, NULL); |
| 221 EXPECT_EQ(rv, net::OK); | 222 EXPECT_EQ(rv, net::OK); |
| 222 EXPECT_FALSE(info.is_direct()); | 223 EXPECT_FALSE(info.is_direct()); |
| 223 | 224 |
| 224 // The first item is valid. | 225 // The first item is valid. |
| 225 EXPECT_EQ(info.proxy_server(), "foopy1:8080"); | 226 EXPECT_EQ(info.proxy_server(), "foopy1:8080"); |
| 226 | 227 |
| 227 // Fake an error on the proxy, and also a new configuration on the proxy. | 228 // Fake an error on the proxy, and also a new configuration on the proxy. |
| 228 resolver->config = net::ProxyConfig(); | 229 resolver->config = net::ProxyConfig(); |
| 229 resolver->config.pac_url = GURL("http://foopy-new/proxy.pac"); | 230 resolver->config.pac_url = GURL("http://foopy-new/proxy.pac"); |
| 230 | 231 |
| 231 rv = service.ReconsiderProxyAfterError(url, &info, NULL, NULL); | 232 rv = service->ReconsiderProxyAfterError(url, &info, NULL, NULL); |
| 232 EXPECT_EQ(rv, net::OK); | 233 EXPECT_EQ(rv, net::OK); |
| 233 | 234 |
| 234 // The first proxy is still there since the configuration changed. | 235 // The first proxy is still there since the configuration changed. |
| 235 EXPECT_EQ(info.proxy_server(), "foopy1:8080"); | 236 EXPECT_EQ(info.proxy_server(), "foopy1:8080"); |
| 236 | 237 |
| 237 // We fake another error. It should now ignore the first one. | 238 // We fake another error. It should now ignore the first one. |
| 238 rv = service.ReconsiderProxyAfterError(url, &info, NULL, NULL); | 239 rv = service->ReconsiderProxyAfterError(url, &info, NULL, NULL); |
| 239 EXPECT_EQ(rv, net::OK); | 240 EXPECT_EQ(rv, net::OK); |
| 240 EXPECT_EQ(info.proxy_server(), "foopy2:9090"); | 241 EXPECT_EQ(info.proxy_server(), "foopy2:9090"); |
| 241 | 242 |
| 242 // We simulate a new configuration. | 243 // We simulate a new configuration. |
| 243 resolver->config = net::ProxyConfig(); | 244 resolver->config = net::ProxyConfig(); |
| 244 resolver->config.pac_url = GURL("http://foopy-new2/proxy.pac"); | 245 resolver->config.pac_url = GURL("http://foopy-new2/proxy.pac"); |
| 245 | 246 |
| 246 // We fake anothe error. It should go back to the first proxy. | 247 // We fake anothe error. It should go back to the first proxy. |
| 247 rv = service.ReconsiderProxyAfterError(url, &info, NULL, NULL); | 248 rv = service->ReconsiderProxyAfterError(url, &info, NULL, NULL); |
| 248 EXPECT_EQ(rv, net::OK); | 249 EXPECT_EQ(rv, net::OK); |
| 249 EXPECT_EQ(info.proxy_server(), "foopy1:8080"); | 250 EXPECT_EQ(info.proxy_server(), "foopy1:8080"); |
| 250 } | 251 } |
| 251 | 252 |
| 252 TEST(ProxyServiceTest, ProxyFallback_BadConfig) { | 253 TEST(ProxyServiceTest, ProxyFallback_BadConfig) { |
| 253 // Test proxy failover when the configuration is bad. | 254 // Test proxy failover when the configuration is bad. |
| 254 | 255 |
| 255 MockProxyResolver* resolver = new MockProxyResolver; | 256 MockProxyResolver* resolver = new MockProxyResolver; |
| 256 resolver->config.pac_url = GURL("http://foopy/proxy.pac"); | 257 resolver->config.pac_url = GURL("http://foopy/proxy.pac"); |
| 257 resolver->info.UseNamedProxy("foopy1:8080;foopy2:9090"); | 258 resolver->info.UseNamedProxy("foopy1:8080;foopy2:9090"); |
| 258 resolver->info_predicate_query_host = "www.google.com"; | 259 resolver->info_predicate_query_host = "www.google.com"; |
| 259 resolver->fail_get_proxy_for_url = false; | 260 resolver->fail_get_proxy_for_url = false; |
| 260 | 261 |
| 261 net::ProxyService service(resolver); | 262 scoped_refptr<net::ProxyService> service = new net::ProxyService(resolver); |
| 262 | 263 |
| 263 GURL url("http://www.google.com/"); | 264 GURL url("http://www.google.com/"); |
| 264 | 265 |
| 265 // Get the proxy information. | 266 // Get the proxy information. |
| 266 net::ProxyInfo info; | 267 net::ProxyInfo info; |
| 267 int rv = service.ResolveProxy(url, &info, NULL, NULL); | 268 int rv = service->ResolveProxy(url, &info, NULL, NULL); |
| 268 EXPECT_EQ(rv, net::OK); | 269 EXPECT_EQ(rv, net::OK); |
| 269 EXPECT_FALSE(info.is_direct()); | 270 EXPECT_FALSE(info.is_direct()); |
| 270 | 271 |
| 271 // The first item is valid. | 272 // The first item is valid. |
| 272 EXPECT_EQ(info.proxy_server(), "foopy1:8080"); | 273 EXPECT_EQ(info.proxy_server(), "foopy1:8080"); |
| 273 | 274 |
| 274 // Fake a proxy error. | 275 // Fake a proxy error. |
| 275 rv = service.ReconsiderProxyAfterError(url, &info, NULL, NULL); | 276 rv = service->ReconsiderProxyAfterError(url, &info, NULL, NULL); |
| 276 EXPECT_EQ(rv, net::OK); | 277 EXPECT_EQ(rv, net::OK); |
| 277 | 278 |
| 278 // The first proxy is ignored, and the second one is selected. | 279 // The first proxy is ignored, and the second one is selected. |
| 279 EXPECT_FALSE(info.is_direct()); | 280 EXPECT_FALSE(info.is_direct()); |
| 280 EXPECT_EQ(info.proxy_server(), "foopy2:9090"); | 281 EXPECT_EQ(info.proxy_server(), "foopy2:9090"); |
| 281 | 282 |
| 282 // Fake a PAC failure. | 283 // Fake a PAC failure. |
| 283 net::ProxyInfo info2; | 284 net::ProxyInfo info2; |
| 284 resolver->fail_get_proxy_for_url = true; | 285 resolver->fail_get_proxy_for_url = true; |
| 285 rv = service.ResolveProxy(url, &info2, NULL, NULL); | 286 rv = service->ResolveProxy(url, &info2, NULL, NULL); |
| 286 EXPECT_EQ(rv, net::OK); | 287 EXPECT_EQ(rv, net::OK); |
| 287 | 288 |
| 288 // No proxy servers are returned. It's a direct connection. | 289 // No proxy servers are returned. It's a direct connection. |
| 289 EXPECT_TRUE(info2.is_direct()); | 290 EXPECT_TRUE(info2.is_direct()); |
| 290 | 291 |
| 291 // The PAC is now fixed and will return a proxy server. | 292 // The PAC is now fixed and will return a proxy server. |
| 292 // It should also clear the list of bad proxies. | 293 // It should also clear the list of bad proxies. |
| 293 resolver->fail_get_proxy_for_url = false; | 294 resolver->fail_get_proxy_for_url = false; |
| 294 | 295 |
| 295 // Try to resolve, it will still return "direct" because we have no reason | 296 // Try to resolve, it will still return "direct" because we have no reason |
| 296 // to check the config since everything works. | 297 // to check the config since everything works. |
| 297 net::ProxyInfo info3; | 298 net::ProxyInfo info3; |
| 298 rv = service.ResolveProxy(url, &info3, NULL, NULL); | 299 rv = service->ResolveProxy(url, &info3, NULL, NULL); |
| 299 EXPECT_EQ(rv, net::OK); | 300 EXPECT_EQ(rv, net::OK); |
| 300 EXPECT_TRUE(info3.is_direct()); | 301 EXPECT_TRUE(info3.is_direct()); |
| 301 | 302 |
| 302 // But if the direct connection fails, we check if the ProxyInfo tried to | 303 // But if the direct connection fails, we check if the ProxyInfo tried to |
| 303 // resolve the proxy before, and if not (like in this case), we give the | 304 // resolve the proxy before, and if not (like in this case), we give the |
| 304 // PAC another try. | 305 // PAC another try. |
| 305 rv = service.ReconsiderProxyAfterError(url, &info3, NULL, NULL); | 306 rv = service->ReconsiderProxyAfterError(url, &info3, NULL, NULL); |
| 306 EXPECT_EQ(rv, net::OK); | 307 EXPECT_EQ(rv, net::OK); |
| 307 | 308 |
| 308 // The first proxy is still there since the list of bad proxies got cleared. | 309 // The first proxy is still there since the list of bad proxies got cleared. |
| 309 EXPECT_FALSE(info3.is_direct()); | 310 EXPECT_FALSE(info3.is_direct()); |
| 310 EXPECT_EQ(info3.proxy_server(), "foopy1:8080"); | 311 EXPECT_EQ(info3.proxy_server(), "foopy1:8080"); |
| 311 } | 312 } |
| 312 | 313 |
| 313 TEST(ProxyServiceTest, ProxyBypassList) { | 314 TEST(ProxyServiceTest, ProxyBypassList) { |
| 314 // Test what happens when a proxy bypass list is specified. | 315 // Test what happens when a proxy bypass list is specified. |
| 315 | 316 |
| 316 net::ProxyConfig config; | 317 net::ProxyConfig config; |
| 317 config.proxy_server = "foopy1:8080;foopy2:9090"; | 318 config.proxy_server = "foopy1:8080;foopy2:9090"; |
| 318 config.auto_detect = false; | 319 config.auto_detect = false; |
| 319 config.proxy_bypass_local_names = true; | 320 config.proxy_bypass_local_names = true; |
| 320 | 321 |
| 321 net::ProxyService service(new MockProxyResolver(config)); | 322 scoped_refptr<net::ProxyService> service = |
| 323 new net::ProxyService(new MockProxyResolver(config)); |
| 322 GURL url("http://www.google.com/"); | 324 GURL url("http://www.google.com/"); |
| 323 // Get the proxy information. | 325 // Get the proxy information. |
| 324 net::ProxyInfo info; | 326 net::ProxyInfo info; |
| 325 int rv = service.ResolveProxy(url, &info, NULL, NULL); | 327 int rv = service->ResolveProxy(url, &info, NULL, NULL); |
| 326 EXPECT_EQ(rv, net::OK); | 328 EXPECT_EQ(rv, net::OK); |
| 327 EXPECT_FALSE(info.is_direct()); | 329 EXPECT_FALSE(info.is_direct()); |
| 328 | 330 |
| 329 net::ProxyService service1(new MockProxyResolver(config)); | 331 scoped_refptr<net::ProxyService> service1 = |
| 332 new net::ProxyService(new MockProxyResolver(config)); |
| 330 GURL test_url1("local"); | 333 GURL test_url1("local"); |
| 331 net::ProxyInfo info1; | 334 net::ProxyInfo info1; |
| 332 rv = service1.ResolveProxy(test_url1, &info1, NULL, NULL); | 335 rv = service1->ResolveProxy(test_url1, &info1, NULL, NULL); |
| 333 EXPECT_EQ(rv, net::OK); | 336 EXPECT_EQ(rv, net::OK); |
| 334 EXPECT_TRUE(info1.is_direct()); | 337 EXPECT_TRUE(info1.is_direct()); |
| 335 | 338 |
| 336 config.proxy_bypass.clear(); | 339 config.proxy_bypass.clear(); |
| 337 config.proxy_bypass.push_back("*.org"); | 340 config.proxy_bypass.push_back("*.org"); |
| 338 config.proxy_bypass_local_names = true; | 341 config.proxy_bypass_local_names = true; |
| 339 MockProxyResolver* resolver = new MockProxyResolver(config); | 342 MockProxyResolver* resolver = new MockProxyResolver(config); |
| 340 net::ProxyService service2(resolver); | 343 scoped_refptr<net::ProxyService> service2 = new net::ProxyService(resolver); |
| 341 GURL test_url2("http://www.webkit.org"); | 344 GURL test_url2("http://www.webkit.org"); |
| 342 net::ProxyInfo info2; | 345 net::ProxyInfo info2; |
| 343 rv = service2.ResolveProxy(test_url2, &info2, NULL, NULL); | 346 rv = service2->ResolveProxy(test_url2, &info2, NULL, NULL); |
| 344 EXPECT_EQ(rv, net::OK); | 347 EXPECT_EQ(rv, net::OK); |
| 345 EXPECT_TRUE(info2.is_direct()); | 348 EXPECT_TRUE(info2.is_direct()); |
| 346 | 349 |
| 347 config.proxy_bypass.clear(); | 350 config.proxy_bypass.clear(); |
| 348 config.proxy_bypass.push_back("*.org"); | 351 config.proxy_bypass.push_back("*.org"); |
| 349 config.proxy_bypass.push_back("7*"); | 352 config.proxy_bypass.push_back("7*"); |
| 350 config.proxy_bypass_local_names = true; | 353 config.proxy_bypass_local_names = true; |
| 351 resolver = new MockProxyResolver(config); | 354 resolver = new MockProxyResolver(config); |
| 352 net::ProxyService service3(resolver); | 355 scoped_refptr<net::ProxyService> service3 = new net::ProxyService(resolver); |
| 353 GURL test_url3("http://74.125.19.147"); | 356 GURL test_url3("http://74.125.19.147"); |
| 354 net::ProxyInfo info3; | 357 net::ProxyInfo info3; |
| 355 rv = service3.ResolveProxy(test_url3, &info3, NULL, NULL); | 358 rv = service3->ResolveProxy(test_url3, &info3, NULL, NULL); |
| 356 EXPECT_EQ(rv, net::OK); | 359 EXPECT_EQ(rv, net::OK); |
| 357 EXPECT_TRUE(info3.is_direct()); | 360 EXPECT_TRUE(info3.is_direct()); |
| 358 | 361 |
| 359 config.proxy_bypass.clear(); | 362 config.proxy_bypass.clear(); |
| 360 config.proxy_bypass.push_back("*.org"); | 363 config.proxy_bypass.push_back("*.org"); |
| 361 config.proxy_bypass_local_names = true; | 364 config.proxy_bypass_local_names = true; |
| 362 resolver = new MockProxyResolver(config); | 365 resolver = new MockProxyResolver(config); |
| 363 net::ProxyService service4(resolver); | 366 scoped_refptr<net::ProxyService> service4 = new net::ProxyService(resolver); |
| 364 GURL test_url4("http://www.msn.com"); | 367 GURL test_url4("http://www.msn.com"); |
| 365 net::ProxyInfo info4; | 368 net::ProxyInfo info4; |
| 366 rv = service4.ResolveProxy(test_url4, &info4, NULL, NULL); | 369 rv = service4->ResolveProxy(test_url4, &info4, NULL, NULL); |
| 367 EXPECT_EQ(rv, net::OK); | 370 EXPECT_EQ(rv, net::OK); |
| 368 EXPECT_FALSE(info4.is_direct()); | 371 EXPECT_FALSE(info4.is_direct()); |
| 369 | 372 |
| 370 config.proxy_bypass.clear(); | 373 config.proxy_bypass.clear(); |
| 371 config.proxy_bypass.push_back("*.MSN.COM"); | 374 config.proxy_bypass.push_back("*.MSN.COM"); |
| 372 config.proxy_bypass_local_names = true; | 375 config.proxy_bypass_local_names = true; |
| 373 resolver = new MockProxyResolver(config); | 376 resolver = new MockProxyResolver(config); |
| 374 net::ProxyService service5(resolver); | 377 scoped_refptr<net::ProxyService> service5 = new net::ProxyService(resolver); |
| 375 GURL test_url5("http://www.msnbc.msn.com"); | 378 GURL test_url5("http://www.msnbc.msn.com"); |
| 376 net::ProxyInfo info5; | 379 net::ProxyInfo info5; |
| 377 rv = service5.ResolveProxy(test_url5, &info5, NULL, NULL); | 380 rv = service5->ResolveProxy(test_url5, &info5, NULL, NULL); |
| 378 EXPECT_EQ(rv, net::OK); | 381 EXPECT_EQ(rv, net::OK); |
| 379 EXPECT_TRUE(info5.is_direct()); | 382 EXPECT_TRUE(info5.is_direct()); |
| 380 | 383 |
| 381 config.proxy_bypass.clear(); | 384 config.proxy_bypass.clear(); |
| 382 config.proxy_bypass.push_back("*.msn.com"); | 385 config.proxy_bypass.push_back("*.msn.com"); |
| 383 config.proxy_bypass_local_names = true; | 386 config.proxy_bypass_local_names = true; |
| 384 resolver = new MockProxyResolver(config); | 387 resolver = new MockProxyResolver(config); |
| 385 net::ProxyService service6(resolver); | 388 scoped_refptr<net::ProxyService> service6 = new net::ProxyService(resolver); |
| 386 GURL test_url6("HTTP://WWW.MSNBC.MSN.COM"); | 389 GURL test_url6("HTTP://WWW.MSNBC.MSN.COM"); |
| 387 net::ProxyInfo info6; | 390 net::ProxyInfo info6; |
| 388 rv = service6.ResolveProxy(test_url6, &info6, NULL, NULL); | 391 rv = service6->ResolveProxy(test_url6, &info6, NULL, NULL); |
| 389 EXPECT_EQ(rv, net::OK); | 392 EXPECT_EQ(rv, net::OK); |
| 390 EXPECT_TRUE(info6.is_direct()); | 393 EXPECT_TRUE(info6.is_direct()); |
| 391 } | 394 } |
| 392 | 395 |
| 393 TEST(ProxyServiceTest, PerProtocolProxyTests) { | 396 TEST(ProxyServiceTest, PerProtocolProxyTests) { |
| 394 net::ProxyConfig config; | 397 net::ProxyConfig config; |
| 395 config.proxy_server = "http=foopy1:8080;https=foopy2:8080"; | 398 config.proxy_server = "http=foopy1:8080;https=foopy2:8080"; |
| 396 config.auto_detect = false; | 399 config.auto_detect = false; |
| 397 | 400 |
| 398 net::ProxyService service1(new MockProxyResolver(config)); | 401 scoped_refptr<net::ProxyService> service1 = |
| 402 new net::ProxyService(new MockProxyResolver(config)); |
| 399 GURL test_url1("http://www.msn.com"); | 403 GURL test_url1("http://www.msn.com"); |
| 400 net::ProxyInfo info1; | 404 net::ProxyInfo info1; |
| 401 int rv = service1.ResolveProxy(test_url1, &info1, NULL, NULL); | 405 int rv = service1->ResolveProxy(test_url1, &info1, NULL, NULL); |
| 402 EXPECT_EQ(rv, net::OK); | 406 EXPECT_EQ(rv, net::OK); |
| 403 EXPECT_FALSE(info1.is_direct()); | 407 EXPECT_FALSE(info1.is_direct()); |
| 404 EXPECT_TRUE(info1.proxy_server() == "foopy1:8080"); | 408 EXPECT_TRUE(info1.proxy_server() == "foopy1:8080"); |
| 405 | 409 |
| 406 net::ProxyService service2(new MockProxyResolver(config)); | 410 scoped_refptr<net::ProxyService> service2 = |
| 411 new net::ProxyService(new MockProxyResolver(config)); |
| 407 GURL test_url2("ftp://ftp.google.com"); | 412 GURL test_url2("ftp://ftp.google.com"); |
| 408 net::ProxyInfo info2; | 413 net::ProxyInfo info2; |
| 409 rv = service2.ResolveProxy(test_url2, &info2, NULL, NULL); | 414 rv = service2->ResolveProxy(test_url2, &info2, NULL, NULL); |
| 410 EXPECT_EQ(rv, net::OK); | 415 EXPECT_EQ(rv, net::OK); |
| 411 EXPECT_TRUE(info2.is_direct()); | 416 EXPECT_TRUE(info2.is_direct()); |
| 412 EXPECT_TRUE(info2.proxy_server() == ""); | 417 EXPECT_TRUE(info2.proxy_server() == ""); |
| 413 | 418 |
| 414 net::ProxyService service3(new MockProxyResolver(config)); | 419 scoped_refptr<net::ProxyService> service3 = |
| 420 new net::ProxyService(new MockProxyResolver(config)); |
| 415 GURL test_url3("https://webbranch.techcu.com"); | 421 GURL test_url3("https://webbranch.techcu.com"); |
| 416 net::ProxyInfo info3; | 422 net::ProxyInfo info3; |
| 417 rv = service3.ResolveProxy(test_url3, &info3, NULL, NULL); | 423 rv = service3->ResolveProxy(test_url3, &info3, NULL, NULL); |
| 418 EXPECT_EQ(rv, net::OK); | 424 EXPECT_EQ(rv, net::OK); |
| 419 EXPECT_FALSE(info3.is_direct()); | 425 EXPECT_FALSE(info3.is_direct()); |
| 420 EXPECT_TRUE(info3.proxy_server() == "foopy2:8080"); | 426 EXPECT_TRUE(info3.proxy_server() == "foopy2:8080"); |
| 421 | 427 |
| 422 MockProxyResolver* resolver = new MockProxyResolver(config); | 428 MockProxyResolver* resolver = new MockProxyResolver(config); |
| 423 resolver->config.proxy_server = "foopy1:8080"; | 429 resolver->config.proxy_server = "foopy1:8080"; |
| 424 net::ProxyService service4(resolver); | 430 scoped_refptr<net::ProxyService> service4 = |
| 431 new net::ProxyService(resolver); |
| 425 GURL test_url4("www.microsoft.com"); | 432 GURL test_url4("www.microsoft.com"); |
| 426 net::ProxyInfo info4; | 433 net::ProxyInfo info4; |
| 427 rv = service4.ResolveProxy(test_url4, &info4, NULL, NULL); | 434 rv = service4->ResolveProxy(test_url4, &info4, NULL, NULL); |
| 428 EXPECT_EQ(rv, net::OK); | 435 EXPECT_EQ(rv, net::OK); |
| 429 EXPECT_FALSE(info4.is_direct()); | 436 EXPECT_FALSE(info4.is_direct()); |
| 430 EXPECT_TRUE(info4.proxy_server() == "foopy1:8080"); | 437 EXPECT_TRUE(info4.proxy_server() == "foopy1:8080"); |
| 431 } | 438 } |
| 432 | 439 |
| OLD | NEW |