snapdtool: check for binary existence in InternalToolPath() #13227
Conversation
This file contains 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
The current version of `InternalToolPath()` does not actually checks in all cases if the binary is actually there. Historically this was not a problem but with recent snapd releases we have the internal tool `apparmor_parser` that is only available in the `snapd` snap but not in the `core` snap. This means that on systems that have the snapd deb and only core `InternalToolPath` may return `/snap/core/123/usr/lib/snapd/apparmor_parser` even if this tool in not available inside the core snap. This commit fixes this by checking if the actual executable is available.
Codecov Report
❗ Your organization needs to install the Codecov GitHub app to enable full functionality. @@ Coverage Diff @@
## master #13227 +/- ##
=======================================
Coverage 78.81% 78.81%
=======================================
Files 1014 1014
Lines 126399 126401 +2
=======================================
+ Hits 99621 99623 +2
Misses 20539 20539
Partials 6239 6239
Flags with carried forward coverage won't be shown. Click here to find out more.
... and 3 files with indirect coverage changes 📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
ernestl
changed the title
pedronis
changed the title
fredldotme
pushed a commit
to fredldotme/snapd
that referenced
this pull request
Mar 2, 2024
…l#13227) * snapdtool: check for binary existance in InternalToolPath() The current version of `InternalToolPath()` does not actually checks in all cases if the binary is actually there. Historically this was not a problem but with recent snapd releases we have the internal tool `apparmor_parser` that is only available in the `snapd` snap but not in the `core` snap. This means that on systems that have the snapd deb and only core `InternalToolPath` may return `/snap/core/123/usr/lib/snapd/apparmor_parser` even if this tool in not available inside the core snap. This commit fixes this by checking if the actual executable is available. * snapdtool: add test for non-executable internal tool path * snapdtool: simplify InternalToolPath() (thanks to Samuele)
fredldotme
pushed a commit
to fredldotme/snapd
that referenced
this pull request
Jun 4, 2024
…l#13227) * snapdtool: check for binary existance in InternalToolPath() The current version of `InternalToolPath()` does not actually checks in all cases if the binary is actually there. Historically this was not a problem but with recent snapd releases we have the internal tool `apparmor_parser` that is only available in the `snapd` snap but not in the `core` snap. This means that on systems that have the snapd deb and only core `InternalToolPath` may return `/snap/core/123/usr/lib/snapd/apparmor_parser` even if this tool in not available inside the core snap. This commit fixes this by checking if the actual executable is available. * snapdtool: add test for non-executable internal tool path * snapdtool: simplify InternalToolPath() (thanks to Samuele)
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.
The current version of
InternalToolPath()does not actually checks in all cases if the binary is actually there. Historically this was not a problem but with recent snapd releases we have the internal toolapparmor_parserthat is only available in thesnapdsnap but not in thecoresnap. This means that on systems that have the snapd deb and only coreInternalToolPathmay return/snap/core/123/usr/lib/snapd/apparmor_parsereven if this tool in not available inside the core snap.This commit fixes this by checking if the actual executable is available.