Check the logged user instead of $USER #3330
Merged
Conversation
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
Given that `sudo usermod --login "$DOCKER_USER" coder` and `sudo groupmod -n "$DOCKER_USER" coder` modify the container's disk it'll persist across restarts, but environment variables will be reset to whatever state they had at the end of `Dockerfile`. In this case, `$USER` is set to `coder`, so this branch will always be true. By checking with the output of `whoami`, which gets it's information from `/etc/passwd`, we make sure to get the real logged user and not the one defined by $USER. We also move `USER="$DOCKER_USER"` out of the branch, since we always want this to happen at entry-point. If we don't do this assignment, $USER will contain `coder` upon restart.
code-asher
requested changes
May 10, 2021
jsjoeio
added
enhancement
|
Thanks for making your first contribution! 🙂 |
Codecov Report
@@ Coverage Diff @@
## main #3330 +/- ##
=======================================
Coverage 58.95% 58.95%
=======================================
Files 35 35
Lines 1703 1703
Branches 374 374
=======================================
Hits 1004 1004
Misses 561 561
Partials 138 138 Continue to review full report at Codecov.
|
|
You can ignore the trivy-scan failure. We're aware of that and working on a fix. As for the audit vulnerabilities, we're also aware of a postcss CVE that needs to be fixed. Everything else looks good! |
Check `$DOCKER_USER` was defined before copying it to `$USER`.
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.
Given that
sudo usermod --login "$DOCKER_USER" coderandsudo groupmod -n "$DOCKER_USER" codermodify the container's disk it'll persist across restarts, but environment variables will be reset to whatever state they had at the end ofDockerfile. In this case,$USERis set tocoder, so this branch will always be true.By checking with the output of
whoami, which gets it's information from/etc/passwd, we make sure to get the real logged user and not the one defined by $USER.We also move
USER="$DOCKER_USER"out of the branch, since we always want this to happen at entry-point. If we don't do this assignment, $USER will containcoderupon restart.Fixes #2767.