(via norrietaylor): Require manifest.json to be a regular file in nested bundle verification - #889
Merged
macroscopeapp[bot] merged 1 commit intoJul 22, 2026
Conversation
|
Important Review skippedBot user detected. To trigger a single review, invoke the ⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Free Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
Comment |
macroscopeapp
Bot
merged commit Jul 22, 2026
f8fadfa
into
feat/diag-unit7-guest-fetch
2 checks passed
norrietaylor
added a commit
that referenced
this pull request
Jul 22, 2026
…880) * feat(minimal): guest fetch and degraded-mode fallback for `min bug` Per provider, `min bug` now performs the staged socket probe and — when the probe handshakes — downloads the daemon's own bundle over the DiagBundleTarZst subsystem, nesting it under providers/<name>/guest/. --no-guest skips daemon contact entirely; --guest-timeout-secs bounds each provider's download. Host-side log-prefix skips are deferred until the provider loop settles whether the daemon's logs reached the bundle another way, so the manifest never claims an absence the archive does not back. Squashed rebuild of the original branch onto main after #878 landed there, replacing the merge-heavy history whose #889 squash title also failed commitlint. Refs: #802 Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(minimald): return the served contract from the diag bundle handler PR #895 changed the serve! dispatch so every handler returns Result<(), ConnectionError> for outcome logging; PR #878 merged alongside it with serve_stream_diag_bundle still returning (). The two were each green against a main that lacked the other, and the type mismatch only surfaced on branches built after both landed. Failure still relays the message over the channel's extended-data stream before surfacing as ConnectionError::Internal, mirroring serve_stream_workspace_files. Refs: #878, #895 Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
This PR adds a file type check to the nested bundle verification logic, ensuring that
manifest.jsonmust be a regular file to be considered valid.Changes
Added an
entry.header().entry_type().is_file()check to the manifest detection inverify_nested_bundle. Previously, the code only checked for an entry namedmanifest.json, but this could incorrectly match directories or symlinks with that name.Why
Without this check, a malformed or malicious bundle containing a directory or symlink named
manifest.jsoncould be incorrectly treated as having a valid manifest file. This fix ensures only actual regular files are recognized as valid manifests during nested bundle verification.Note
Macroscope: Fix It For Me
min bug#880.Activity
Currently: Auto-merged f8fadfa
Previously
Note
Require
manifest.jsonto be a regular file inverify_nested_bundleIn guest.rs, the
verify_nested_bundlefunction now checks that a tar entry namedmanifest.jsonis a regular file before counting it as a valid manifest. Previously, symlinks, directories, or other non-file entry types with that name would satisfy the manifest presence check.Macroscope summarized afd34ef.