mirror/naiveproxy
1
0
Fork 0
mirror of https://github.com/klzgrad/naiveproxy.git synced 2024-11-28 08:16:09 +03:00
Code Issues Projects Releases Wiki Activity

Fix special characters in password

Browse Source
This commit is contained in:
klzgrad 2020-09-04 22:32:56 +08:00
parent e9ff6f6092
commit 6aa7923585
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/net/tools/naive/naive_proxy_bin.cc
View File

@ -19,6 +19,7 @@
#include "base/macros.h" #include "base/macros.h"
#include "base/rand_util.h" #include "base/rand_util.h"
#include "base/run_loop.h" #include "base/run_loop.h"
#include "base/strings/string16.h"
#include "base/strings/string_number_conversions.h" #include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h" #include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
@ -30,6 +31,7 @@
#include "components/version_info/version_info.h" #include "components/version_info/version_info.h"
#include "net/base/auth.h" #include "net/base/auth.h"
#include "net/base/network_isolation_key.h" #include "net/base/network_isolation_key.h"
#include "net/base/url_util.h"
#include "net/cert/cert_verifier.h" #include "net/cert/cert_verifier.h"
#include "net/cert_net/cert_net_fetcher_url_request.h" #include "net/cert_net/cert_net_fetcher_url_request.h"
#include "net/dns/host_resolver.h" #include "net/dns/host_resolver.h"
@ -98,8 +100,8 @@ struct Params {
int concurrency; int concurrency;
net::HttpRequestHeaders extra_headers; net::HttpRequestHeaders extra_headers;
std::string proxy_url; std::string proxy_url;
std::string proxy_user; base::string16 proxy_user;
std::string proxy_pass; base::string16 proxy_pass;
std::string host_resolver_rules; std::string host_resolver_rules;
net::IPAddress resolver_range; net::IPAddress resolver_range;
size_t resolver_prefix; size_t resolver_prefix;
@ -281,8 +283,7 @@ bool ParseCommandLine(const CommandLine& cmdline, Params* params) {
return false; return false;
} }
params->proxy_url = GetProxyFromURL(url_no_auth); params->proxy_url = GetProxyFromURL(url_no_auth);
params->proxy_user = url.username(); net::GetIdentityFromURL(url, &params->proxy_user, &params->proxy_pass);
params->proxy_pass = url.password();
} }
if (!cmdline.concurrency.empty()) { if (!cmdline.concurrency.empty()) {
@ -437,8 +438,7 @@ std::unique_ptr<URLRequestContext> BuildURLRequestContext(
proxy_url.replace(0, 4, "https"); proxy_url.replace(0, 4, "https");
} }
GURL auth_origin(proxy_url); GURL auth_origin(proxy_url);
AuthCredentials credentials(base::ASCIIToUTF16(params.proxy_user), AuthCredentials credentials(params.proxy_user, params.proxy_pass);
base::ASCIIToUTF16(params.proxy_pass));
auth_cache->Add(auth_origin, HttpAuth::AUTH_PROXY, auth_cache->Add(auth_origin, HttpAuth::AUTH_PROXY,
/*realm=*/{}, HttpAuth::AUTH_SCHEME_BASIC, {}, /*realm=*/{}, HttpAuth::AUTH_SCHEME_BASIC, {},
/*challenge=*/"Basic", credentials, /*path=*/"/"); /*challenge=*/"Basic", credentials, /*path=*/"/");