Fixes serialization of ProxyServer for mojo. #11028
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
darkdh
approved these changes
Nov 11, 2021
|
@darkdh, added a few unit tests. PTAL. Thanks |
goodov
reviewed
Nov 12, 2021
| } | ||
|
|
||
| std::string result = | ||
| scheme_prefix + GetProxyServerAuthString(proxy_server) + proxy_uri; |
| } | ||
|
|
||
| std::string result = | ||
| scheme_prefix + GetProxyServerAuthString(proxy_server) + proxy_pac; |
| #include "testing/gtest/include/gtest/gtest.h" | ||
|
|
||
| namespace net { | ||
| namespace { |
There was a problem hiding this comment.
tests shouldn't be in anonymous namespace. They will work, but we shouldn't encourage this. One of the reasons - you cannot friend such test fixture.
| @@ -72,14 +61,15 @@ std::string ProxyServerToProxyUri(const ProxyServer& proxy_server) { | |||
| } | |||
| auth_string += '@'; | |||
There was a problem hiding this comment.
all of this can be improved with base::StrAppend.
Previuosly, serialization of ProxyServer's HostPortPair used its ToString method which we overrode, but now ProxyServerToPacResultElement explicitly constructs the string by getting host() and port() members and calling ConstructHostPortString. We need to override this behavior to insert auth info. Fixes brave/brave-browser#19371 Chromium change: https://source.chromium.org/chromium/chromium/src/+/5dbd4599a981da1fac5dc5211772fe843a06a9b0 commit 5dbd4599a981da1fac5dc5211772fe843a06a9b0 Author: Eric Orth <[email protected]> Date: Fri Sep 24 21:21:24 2021 +0000 Stop dealing with HostPortPair in proxy_string_util.(cc/h) String->ProxyServer now done using ProxyServer::FromSchemeHostAndPort, and ProxyServer->String now done using ProxyServer::GetHost() and ProxyServer::GetPort(). With less ProxyServer-external dealing with HostPortPair, will aide the future-CL transition to not storing HostPortPair for all proxies. Also has the effect that construction-from-string now results in canonicalization of the ProxyServer hostname. Slight impact on tests that were parsing stuff with now-recognized-as-invalid hostnames (especially the v8 tracing tests that were hacking information into wildly invalid hostnames), but don't expect any real-world impact because these are clearly invalid names that shouldn't ever be able to resolve to real servers. Also moved the hostname:port parsing directly into proxy_string_util.cc (from url_util::ParseHostAndPort()) to avoid silliness like stripping IPv6 brackets just for them to be added back for canonicalization. Bug: 1243398
mkarolin
force-pushed
the
maxk-fix-tor-reset-connection
branch
from
c198485 to
4339800
Compare
|
Merging as this is blocking the upcoming release. @goodov, please let me know if any additional fixes are needed and I'll do a followup. Thanks. |
mkarolin
added a commit
that referenced
this pull request
Nov 13, 2021
Fixes serialization of ProxyServer for mojo.
mkarolin
added a commit
that referenced
this pull request
Nov 13, 2021
Fixes serialization of ProxyServer for mojo.
This was referenced Nov 13, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previuosly, serialization of ProxyServer's HostPortPair used
its ToString method which we overrode, but now
ProxyServerToPacResultElement explicitly constructs the string
by getting host() and port() members and calling
ConstructHostPortString. We need to override this behavior to insert
auth info.
Fixes brave/brave-browser#19371
Chromium change:
https://source.chromium.org/chromium/chromium/src/+/5dbd4599a981da1fac5dc5211772fe843a06a9b0
commit 5dbd4599a981da1fac5dc5211772fe843a06a9b0
Author: Eric Orth [email protected]
Date: Fri Sep 24 21:21:24 2021 +0000
Submitter Checklist:
QA/YesorQA/No;release-notes/includeorrelease-notes/exclude;OS/...) to the associated issuenpm run test -- brave_browser_tests,npm run test -- brave_unit_tests,npm run lint,npm run gn_check,npm run tslintgit rebase master(if needed)Reviewer Checklist:
gnAfter-merge Checklist:
changes has landed on
Test Plan: