climb frame tree to determine top level eTLD+1 when generating farble seed #5877
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
pilgrim-brave
suggested changes
Jun 17, 2020
| return ""; | ||
| } | ||
|
|
||
| return top_sec_ctx->GetSecurityOrigin()->RegistrableDomain().Utf8(); |
There was a problem hiding this comment.
RegistrableDomain is not what we want. See examples in https://url.spec.whatwg.org/#host-registrable-domain
bridiver
reviewed
Jun 17, 2020
| // are disconnect, remote or local to the top level frame. | ||
| // | ||
| // If the top level frame is not discoverable, an empty string is returned. | ||
| std::string topETLDPlusOneForDoc(const Document& doc) { |
There was a problem hiding this comment.
this method name should be capitalized
bridiver
reviewed
Jun 17, 2020
| } | ||
|
|
||
| const std::string host = top_sec_ctx->GetSecurityOrigin()->Host().Utf8(); | ||
| return net::registry_controlled_domains::GetDomainAndRegistry( |
There was a problem hiding this comment.
we should be using network_utils::GetDomainAndRegistry in blink
There was a problem hiding this comment.
okie, moved to network_utils::GetDomainAndRegistry
bridiver
reviewed
Jun 17, 2020
| // frame that the given document is in. This includes frames that | ||
| // are disconnect, remote or local to the top level frame. | ||
| // | ||
| // If the top level frame is not discoverable, an empty string is returned. |
There was a problem hiding this comment.
We don't know all the cases, but I updated the comment to include an example
bridiver
reviewed
Jun 17, 2020
| // This can happen in cases including frames that are not connected | ||
| // to the document, or iframes that are accessed while they're moving | ||
| // between processes (e.g., a frame's url is being changed to | ||
| // be LocalFrame to a RemoveFrame, or vise versa). |
bridiver
reviewed
Jun 17, 2020
| std::string TopETLDPlusOneForDoc(const Document& doc) { | ||
| const auto* top_loc_frame = doc.GetFrameOfMasterDocument(); | ||
| if (top_loc_frame == nullptr) { | ||
| LOG(ERROR) << "Unable to farble frame bc can't find top local frame: " |
There was a problem hiding this comment.
should we have a DCHECK here to see if it's still happening with this change or do we still expect it to be null in some cases?
pes10k
force-pushed
the
change-farbling-origin-lookup
branch
from
e8c429c to
b093351
Compare
pilgrim-brave
approved these changes
Jun 17, 2020
bridiver
approved these changes
Jun 17, 2020
pes10k
force-pushed
the
change-farbling-origin-lookup
branch
from
b093351 to
63d585b
Compare
bsclifton
pushed a commit
that referenced
this pull request
Jun 18, 2020
climb frame tree to determine top level eTLD+1 when generating farble seed
4 tasks
bsclifton
pushed a commit
that referenced
this pull request
Jun 18, 2020
climb frame tree to determine top level eTLD+1 when generating farble seed
4 tasks
This was referenced Jun 18, 2020
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.
This PR tries to solve a problem where we were using garbage memory sometimes when generating the farble seed, by trying to climb the frame tree. I hope i got it right…
Should fix brave/brave-browser#10260