[cherry-pick] Avoid dangling symlinks in git-init #3485
Merged
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
When the following conditions are met: 1. the feature flag disable-home-env-overwrite is "true" 2. the container user is root 3. no git / ssh secret is attached to a taskrun service account 4. user is running new-ish version of catalog git-clone task with git-init v0.15.2+ git-init will error out in the git-clone task because we create a circular symlink from /root/.ssh to itself and then try to look up /root/.ssh/known_hosts. This commit adds a check to avoid this from happening: If the user's $HOME/.ssh directory doesn't exist or if they aren't able to access it for any reason, then we don't try to create a symlink to it at all since we can trust that the user is incapable of utilizing the credential. This commit also expands an existing check to see if the $HOME/.ssh directory is the same as the user's home directory + '.ssh'. This was originally only checked if the user was nonroot, but now this is also checked if the user is root too. (cherry picked from commit 1160686) Signed-off-by: Vincent Demeester <vdemeest@redhat.com>
tekton-robot
added
release-note
|
The following is the coverage report on the affected files.
|
ghost
approved these changes
Nov 2, 2020
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: sbwsg The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/lgtm |
tekton-robot
added
the
approved
|
/retest |
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.
When the following conditions are met:
git-init will error out in the git-clone task because we create a circular symlink
from /root/.ssh to itself and then try to look up /root/.ssh/known_hosts.
This commit adds a check to avoid this from happening:
If the user's $HOME/.ssh directory doesn't exist or if they aren't able to access it
for any reason, then we don't try to create a symlink to it at all since we can trust that
the user is incapable of utilizing the credential.
This commit also expands an existing check to see if the $HOME/.ssh directory is
the same as the user's home directory + '.ssh'. This was originally only checked if
the user was nonroot, but now this is also checked if the user is root too.
(cherry picked from commit 1160686)
Signed-off-by: Vincent Demeester vdemeest@redhat.com
/kind bug
/cc @sbwsg @bobcatfish @afrittoli
Changes
Submitter Checklist
These are the criteria that every PR should meet, please check them off as you
review them:
See the contribution guide for more details.
Double check this list of stuff that's easy to miss:
cmddir, please updatethe release Task to build and release this image.
Reviewer Notes
If API changes are included, additive changes must be approved by at least two OWNERS and backwards incompatible changes must be approved by more than 50% of the OWNERS, and they must first be added in a backwards compatible way.
Release Notes