Skip to content

Fix bootloader and fido issues.#297

Merged
lihuanhuan merged 2 commits intoOneKeyHQ:mainfrom
lihuanhuan:pro_main
Apr 18, 2025
Merged

Fix bootloader and fido issues.#297
lihuanhuan merged 2 commits intoOneKeyHQ:mainfrom
lihuanhuan:pro_main

Conversation

@lihuanhuan
Copy link
Copy Markdown
Contributor

@lihuanhuan lihuanhuan commented Apr 18, 2025

Summary by CodeRabbit

  • Bug Fixes
    • Improved USB initialization to prevent repeated attempts.
    • Enhanced display handling after firmware install cancellation for clearer user feedback.
    • Stricter filtering of SPI input data to prevent processing of invalid or unexpected messages.
  • New Features
    • Added background task to handle FIDO buffer when WebAuthn is disabled.
  • Refactor
    • Adjusted firmware verification logic for more accurate checks on multi-part firmware updates.
  • Style
    • Minor display elements were hidden during certain confirmation screens.

@lihuanhuan lihuanhuan requested a review from a team as a code owner April 18, 2025 05:19
@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Apr 18, 2025

Walkthrough

This update introduces conditional logic and stricter validation in several core components. Display calls were commented out in the bootloader UI. USB initialization now runs only once per session. The firmware update flow clears the display and updates the status bar after user cancellation. Firmware image verification for the second part is now conditional on code length. SPI slave polling now validates headers before processing. An asynchronous buffer flush is scheduled if WebAuthn is disabled in the session manager.

Changes

File(s) Change Summary
core/embed/bootloader/bootui.c Commented out display calls in the install confirmation UI function.
core/embed/bootloader/main.c Added a static flag to ensure USB initialization runs only once.
core/embed/emmc_wrapper/emmc_commands.c Added display clear and status bar update after firmware install cancellation.
core/embed/trezorhal/image.c Made P2 firmware verification conditional on code length; removed unconditional image content check.
core/embed/trezorhal/spi_legacy.c Added header validation before SPI data processing; stricter input filtering and conditional FIFO flush.
core/src/session.py Added async buffer flush function; schedules it if WebAuthn is disabled.

Tip

⚡💬 Agentic Chat (Pro Plan, General Availability)
  • We're introducing multi-step agentic chat in review comments and issue comments, within and outside of PR's. This feature enhances review and issue discussions with the CodeRabbit agentic chat by enabling advanced interactions, including the ability to create pull requests directly from comments and add commits to existing pull requests.
✨ Finishing Touches
  • 📝 Generate Docstrings

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Copy Markdown

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between de7d8fc and b990dd1.

📒 Files selected for processing (6)
  • core/embed/bootloader/bootui.c (1 hunks)
  • core/embed/bootloader/main.c (1 hunks)
  • core/embed/emmc_wrapper/emmc_commands.c (1 hunks)
  • core/embed/trezorhal/image.c (1 hunks)
  • core/embed/trezorhal/spi_legacy.c (2 hunks)
  • core/src/session.py (1 hunks)
🧰 Additional context used
🧬 Code Graph Analysis (1)
core/embed/emmc_wrapper/emmc_commands.c (4)
core/embed/extmod/modtrezorui/display.c (1)
  • display_clear (169-171)
core/embed/extmod/modtrezorui/display.h (1)
  • display_clear (97-97)
core/embed/bootloader/bootui.c (1)
  • ui_statusbar_update (586-654)
core/embed/bootloader/bootui.h (1)
  • ui_statusbar_update (83-83)
⏰ Context from checks skipped due to timeout of 90000ms (3)
  • GitHub Check: Style check
  • GitHub Check: Defs check
  • GitHub Check: Gen check
🔇 Additional comments (7)
core/embed/emmc_wrapper/emmc_commands.c (1)

1268-1269: UI cleanup added after cancellation.

Clear display and update status bar before returning from cancelled installation.

core/embed/bootloader/main.c (1)

217-221: Prevent multiple USB initializations.

Added flag prevents redundant USB setup calls.

core/src/session.py (2)

21-26: New async function added to handle SPI FIDO events.

Continuous buffer flushing when waiting for specific IO events.


32-33: Schedule buffer flushing when WebAuthn disabled.

Ensures SPI FIDO buffer gets flushed even when WebAuthn interface isn't active.

core/embed/trezorhal/spi_legacy.c (2)

333-337: Added early validation for SPI headers.

This checks header validity before processing and drops invalid data.


362-367: Added BOOT_ONLY mode filtering.

Flushes unexpected data during boot mode operation.

core/embed/trezorhal/image.c (1)

754-793: Added conditional P2 firmware verification.

Only checks P2 when firmware exceeds internal size. Cleans memory on failure.

@lihuanhuan lihuanhuan merged commit 6e0b3a3 into OneKeyHQ:main Apr 18, 2025
9 checks passed
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.

3 participants