Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PDF checks for blocking should use proper tab origin #958

Closed
wants to merge 1 commit into from

Conversation

bbondy
Copy link
Member

@bbondy bbondy commented Nov 27, 2018

Fix brave/brave-browser#1033

Submitter Checklist:

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Verified that these changes build without errors on
    • Windows
    • macOS
    • Linux
  • Verified that these changes pass automated tests (npm test brave_unit_tests && npm test brave_browser_tests) on
    • Windows
    • macOS
    • Linux
  • Ran git rebase master (if needed).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.
  • Request a security/privacy review as needed.
  • Add appropriate QA labels (QA/Yes or QA/No) to include the closed issue in milestone

Test Plan:

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source


GURL GetURLOrPDFURL(const GURL& url) {
if (url.SchemeIs("chrome-extension") &&
url.host() == pdfjs_extension_id) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[minor] it would be helpful to set chrome-extension://<pdfjs_extension_id>/ as a constant pdfjs_extension_prefix in extension_constants since it is repeated a lot in this PR and will also be needed in the PR to hide the pdfjs prefix.

then this check can be replaced with if (url.GetOrigin() == pdfjs_extension_prefix)

@@ -23,7 +24,7 @@ void BraveRequestInfo::FillCTXFromRequest(const net::URLRequest* request,
std::shared_ptr<brave::BraveRequestInfo> ctx) {
ctx->request_identifier = request->identifier();
ctx->request_url = request->url();
ctx->tab_origin = request->site_for_cookies().GetOrigin();
ctx->tab_origin = brave::GetURLOrPDFURL(request->site_for_cookies()).GetOrigin();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is ctx->tab_origin used for anything security-related? if so it probably shouldn't be set to the pdfjs pseudo-origin.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no only our internal filtering, but I'll update this to scope it to only adblock+TP or just exclude TP.

Copy link
Contributor

@emerick emerick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@bbondy
Copy link
Member Author

bbondy commented Nov 27, 2018

I'm going to change to different approach.

@bbondy bbondy closed this Nov 27, 2018
@kjozwiak kjozwiak deleted the pdf-blocking branch November 28, 2018 06:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Some PDFs don't open
3 participants