[27.x backport] cli-plugins: Fix searching inaccessible directories#5652
Merged
thaJeztah merged 2 commits intodocker:27.xfrom Nov 29, 2024
Merged
[27.x backport] cli-plugins: Fix searching inaccessible directories#5652thaJeztah merged 2 commits intodocker:27.xfrom
thaJeztah merged 2 commits intodocker:27.xfrom
Conversation
Fix a case where one inaccessible plugin search path stops the whole search and prevents latter paths from being scanned. Remove a preliminary `Stat` call that verifies whether path is an actual directory and is accessible. It's unneeded and doesn't actually check whether the directory can be listed or not. `os.ReadDir` will fail in such case anyway, so just attempt to do that and ignore any encountered error, instead of erroring out the whole plugin candidate listing. Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com> (cherry picked from commit 6de3d71) Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
The returned error is always nil now, so just remove it. Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com> (cherry picked from commit fcd94fe) Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## 27.x #5652 +/- ##
==========================================
+ Coverage 58.54% 58.57% +0.03%
==========================================
Files 346 346
Lines 29335 29323 -12
==========================================
+ Hits 17173 17175 +2
+ Misses 11184 11174 -10
+ Partials 978 974 -4 |
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
3 participants
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.
backport: cli-plugins: Fix searching inaccessible directories #5651
fixes: Permission issue on /usr/local/libexec prevents using plugins from /usr/libexec #5643
Fix a case where one inaccessible plugin search path stops the whole search and prevents latter paths from being scanned.
Remove a preliminary
Statcall that verifies whether path is an actual directory and is accessible.It's unneeded and doesn't actually check whether the directory can be listed or not.
os.ReadDirwill fail in such case anyway, so just attempt to do that and ignore any encountered error, instead of erroring out the whole plugin candidate listing.- What I did
- How I did it
- How to verify it
TestListPluginCandidatesInaccesibleDir
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)