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

Do not proceed loading ipfs resources if ipfs is disabled #13989

Merged
merged 1 commit into from Jul 2, 2022
Merged

Conversation

cypt4
Copy link
Collaborator

@cypt4 cypt4 commented Jun 28, 2022

Resolves brave/brave-browser#23646

Submitter Checklist:

  • I confirm that no security/privacy review is needed, or that I have requested one
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • 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)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • 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:

@cypt4
Copy link
Collaborator Author

cypt4 commented Jun 29, 2022

/build windows

@cypt4
Copy link
Collaborator Author

cypt4 commented Jun 29, 2022

/build windows
/build macos
/build android
/build windows-x86
/build ios
/build linux

@@ -23,6 +23,10 @@ int OnBeforeURLRequest_IPFSRedirectWork(
return net::OK;
Copy link
Contributor

Choose a reason for hiding this comment

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

double check the incognito/guest/tor profiles

Copy link
Contributor

Choose a reason for hiding this comment

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

also having a test would be nice

@cypt4 cypt4 force-pushed the brave_23646 branch 5 times, most recently from 2ee18c1 to 42e546f Compare June 30, 2022 16:05
@cypt4 cypt4 requested a review from iefremov June 30, 2022 17:43
@cypt4
Copy link
Collaborator Author

cypt4 commented Jul 1, 2022

/build windows

@cypt4
Copy link
Collaborator Author

cypt4 commented Jul 1, 2022

/build windows-x86

@@ -19,10 +19,22 @@ namespace ipfs {
int OnBeforeURLRequest_IPFSRedirectWork(
const brave::ResponseCallback& next_callback,
std::shared_ptr<brave::BraveRequestInfo> ctx) {
if (!ctx->browser_context || !brave::IsRegularProfile(ctx->browser_context))
bool hasIpfsScheme = IsIPFSScheme(ctx->request_url);
Copy link
Contributor

Choose a reason for hiding this comment

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

const bool and has_ipfs_scheme

bool hasIpfsScheme = IsIPFSScheme(ctx->request_url);
if (!ctx->browser_context) {
if (hasIpfsScheme) {
ctx->blocked_by = brave::kOtherBlocked;
Copy link
Contributor

Choose a reason for hiding this comment

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

adding comments is much appreciated

auto* prefs = user_prefs::UserPrefs::Get(ctx->browser_context);
if (IsIpfsResolveMethodDisabled(prefs)) {
bool ipfsDisabled = IsIpfsResolveMethodDisabled(prefs);
Copy link
Contributor

Choose a reason for hiding this comment

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

code style

@iefremov
Copy link
Contributor

iefremov commented Jul 1, 2022

maybe @spylogsster wants to take a look

@cypt4
Copy link
Collaborator Author

cypt4 commented Jul 1, 2022

/build linux

@cypt4 cypt4 requested a review from spylogsster July 1, 2022 13:10
Copy link
Contributor

@spylogsster spylogsster left a comment

Choose a reason for hiding this comment

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

Nice work! LGTM ++

@cypt4 cypt4 merged commit 7ef8cb2 into master Jul 2, 2022
13 of 14 checks passed
@cypt4 cypt4 deleted the brave_23646 branch July 2, 2022 06:18
@github-actions github-actions bot added this to the 1.42.x - Nightly milestone Jul 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/run-network-audit Run network-audit
Projects
None yet
3 participants