snap/pack: ensure layout paths presence for snaps using bare or core26 and later - #16893
Merged
bboozzoo merged 4 commits intoMay 6, 2026
Merged
Conversation
github-actions
Bot
added
the
Run only one system
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #16893 +/- ##
==========================================
+ Coverage 79.06% 79.10% +0.04%
==========================================
Files 1368 1375 +7
Lines 190680 191204 +524
Branches 2465 2465
==========================================
+ Hits 150758 151259 +501
- Misses 30835 30842 +7
- Partials 9087 9103 +16
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
|
Wed May 6 10:08:17 UTC 2026 Failures:Preparing:
Executing:
Restoring:
Skipped tests from snapd-testing-skipIf you wish to have any of the below tests run in your PR, in your PR description, add 'unskip:' followed by a copy-and-pasted list (without variants) of the below tests you wish to run (unskip plus test list must be valid yaml)
|
zyga
approved these changes
Apr 10, 2026
| layout := info.Layout[layoutPath] | ||
|
|
||
| // Determine the source path. Only check bind and bind-file; | ||
| // symlink targets and tmpfs layouts are not validated. |
Contributor
There was a problem hiding this comment.
Let's add a TODO for this but keep it as-is.
bboozzoo
commented
Apr 16, 2026
bboozzoo
commented
Apr 16, 2026
bboozzoo
force-pushed
the
bboozzoo/core26-layout-presence-checks
branch
from
April 27, 2026 14:06
5ee50f8 to
0919a7f
Compare
bboozzoo
changed the title
bboozzoo
force-pushed
the
bboozzoo/core26-layout-presence-checks
branch
from
April 28, 2026 06:30
0919a7f to
eaa2cfe
Compare
Contributor
There was a problem hiding this comment.
Pull request overview
Extends snap/pack skeleton validation to ensure layout-related paths under $SNAP (bind/bind-file sources and tmpfs targets) actually exist in the snap source tree when packing snaps that should carry those paths (bare / core26+).
Changes:
- Add layout path presence validation for
$SNAP-scoped layout bind/bind-file sources and$SNAPtmpfs mountpoints. - Refactor base gating into a shared helper used to decide when strict validation applies.
- Add unit tests covering valid/invalid layout-path scenarios and skipping for older bases.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
snap/pack/pack.go |
Adds validateLayoutPaths and gates strict validation via needsStrictLayoutOrContentValidation. |
snap/pack/pack_test.go |
Adds test matrix for layout source/tmpfs path presence and old-base skip behavior. |
bboozzoo
marked this pull request as ready for review
April 28, 2026 08:02
github-actions
Bot
removed
the
Run only one system
pedronis
reviewed
Apr 29, 2026
| } | ||
| // Only $SNAP paths (or paths with no variable prefix) can be checked at | ||
| // pack time; $SNAP_DATA and $SNAP_COMMON are read-write runtime | ||
| // directories and mount points can be created as needed. |
Contributor
There was a problem hiding this comment.
why is this comment going away?
Contributor
Author
There was a problem hiding this comment.
hm, I may have dropped a bit too much during rebase. Let me restore it
Comment on lines
+155
to
+161
| relPath := strings.TrimPrefix(layoutPath, "$SNAP") | ||
| relPath = strings.TrimPrefix(relPath, "/") | ||
| if relPath == "" { | ||
| continue | ||
| } | ||
| fi, err := container.Lstat(relPath) | ||
| if err != nil || !fi.IsDir() { |
Contributor
There was a problem hiding this comment.
the other functions has also code like? maybe a small helper?
bboozzoo
commented
Apr 29, 2026
| if layout.Bind != "" && (err != nil || !fi.IsDir()) { | ||
| return fmt.Errorf("layout %q source %q must exist and be a directory, ensure it is present in the snap or created before packing", layoutPath, source) | ||
| } | ||
| if layout.BindFile != "" && (err != nil || fi.IsDir()) { |
Contributor
Author
There was a problem hiding this comment.
hm spotted a small issue here, this should be Mode().IsRegular()
…6 and later Ensure that layout paths - sources and tmpfs targets, located under $SNAP are actually found inside the snap directory tree. This is an extension of validation introduced for content interface targets, and follows the exact same rules - i.e. snaps using bare or core26+ bases are expected to carry relevant paths. Related: SNAPDENG-36626 Signed-off-by: Maciej Borzecki <maciej.borzecki@canonical.com>
…r core26 and later
…r core26 and later
…r core26 and later
bboozzoo
force-pushed
the
bboozzoo/core26-layout-presence-checks
branch
from
April 29, 2026 14:23
61783fc to
8426d83
Compare
bboozzoo
added
the
Auto rerun spread
pedronis
reviewed
Apr 30, 2026
| continue | ||
| } | ||
| relPath := strings.TrimPrefix(layoutPath, "$SNAP") | ||
| relPath = strings.TrimPrefix(relPath, "/") |
Contributor
There was a problem hiding this comment.
maybe: we could make a trimSnapPrefix(p) helper that also consider SNAP_DATA and SNAP_COMMON and returns "" in those cases too?
Contributor
There was a problem hiding this comment.
to be clear if we do the helper that might not be the best name
Contributor
Author
There was a problem hiding this comment.
I'll open a followup PR
pedronis
approved these changes
Apr 30, 2026
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
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.
Ensure that layout paths - sources and tmpfs targets, located under
$SNAP are actually found inside the snap directory tree.
This is an extension of validation introduced for content interface
targets, and follows the exact same rules - i.e. snaps using bare or
core26+ bases are expected to carry relevant paths.
Related: SNAPDENG-36626
Based on #16828
Thanks for helping us make a better snapd!
Have you signed the license agreement and read the contribution guide?