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

Ipfs shields #7692

Merged
merged 9 commits into from
Jan 31, 2021
Merged

Ipfs shields #7692

merged 9 commits into from
Jan 31, 2021

Conversation

bbondy
Copy link
Member

@bbondy bbondy commented Jan 25, 2021

Resolves brave/brave-browser#13741
Resolves brave/brave-browser#13742

Reviewing per commit is easiest.

Brave extension sees IPFS URIs as ipfs://. Instead if we let it see URIs as what they resolve to, it makes everything work correctly. Furthermore, after the brave extension issue is fixed, adblock was still not working because the tab URL was always blank. This sets it to the initiator URI which is actually available.

Submitter Checklist:

  • There is a ticket for my issue.
  • Used Github auto-closing keywords in the commit message.
  • Wrote a good PR/commit description
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally: npm run test -- brave_browser_tests, npm run test -- brave_unit_tests, npm run lint, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed).
  • Requested a security/privacy review as needed.

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

@bbondy bbondy requested a review from yrliou January 25, 2021 18:12
@bbondy bbondy requested a review from iefremov as a code owner January 25, 2021 18:12
@bbondy bbondy self-assigned this Jan 25, 2021
Copy link
Member

@yrliou yrliou left a comment

Choose a reason for hiding this comment

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

Overall looks good, just a nit.

browser/extensions/api/ipfs_api.cc Outdated Show resolved Hide resolved
Copy link
Member

@yrliou yrliou 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 bbondy added this to the 1.21.x - Nightly milestone Jan 31, 2021
@bbondy bbondy merged commit 1aa51cb into master Jan 31, 2021
@bbondy bbondy deleted the ipfs-shields branch January 31, 2021 00:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants