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

Avoid crashing importer utility process if Muon bookmarks data is malformed #1082

Merged
merged 1 commit into from
Dec 16, 2018

Conversation

garrettr
Copy link
Contributor

@garrettr garrettr commented Dec 13, 2018

Resolves brave/brave-browser#2517.

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:

  1. Download this example of a corrupted session-store-1.
  2. Start Muon with a fresh profile (backup your old profile, if necessary)
  3. Close Muon
  4. Copy the corrupted session-store-1 into Muon's user data directory
  5. Open Muon again; create a new window with some random tabs in it. This is one way to make sure the importer process got through to the last step, which is importing open windows and tabs.
  6. Close Muon
  7. Open Brave Core.
  8. Import bookmarks and settings.... Choose "Brave (old)" in the drop-down menu and make sure all of the importer data type checkboxes are checked.
  9. Click Import.

Import should succeed and all data types should be imported (did the window you had open in Muon get opened in Brave Core?).

You should still have all of your bookmarks except for the ones that were intentionally corrupted. The importer should skip importing those without causing the importer utility process to crash.

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

@garrettr garrettr merged commit 233876e into master Dec 16, 2018
@garrettr garrettr deleted the issue/2517 branch December 16, 2018 06:12
@kjozwiak
Copy link
Member

@garrettr uplift request to 0.58.x approved after deliberating with @rebron 👍 Please add/remove all needed labels and ensure that the associated issues are moved into the correct milestone.

Before requesting uplift approval for beta, please make sure that the PR has already been merged into master/nightly and dev.

garrettr added a commit that referenced this pull request Dec 17, 2018
Avoid crashing importer utility process if Muon bookmarks data is malformed
garrettr added a commit that referenced this pull request Dec 17, 2018
Avoid crashing importer utility process if Muon bookmarks data is malformed
garrettr added a commit that referenced this pull request Dec 17, 2018
Avoid crashing importer utility process if Muon bookmarks data is malformed
@garrettr
Copy link
Contributor Author

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Rest of Muon import fails after bookmarks import fails
4 participants