-
Notifications
You must be signed in to change notification settings - Fork 774
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[release-1.11-rhel] fix potential CVE in tarfile w/ symlink #2574
Merged
TomSweeneyRedHat
merged 3 commits into
containers:release-1.11-rhel
from
nalind:cve-10696-1.11
Sep 1, 2020
Merged
[release-1.11-rhel] fix potential CVE in tarfile w/ symlink #2574
TomSweeneyRedHat
merged 3 commits into
containers:release-1.11-rhel
from
nalind:cve-10696-1.11
Sep 1, 2020
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
Stealing @nalind 's workaround to avoid refetching content after a file read failure. Under the right circumstances that could be a symlink to a file meant to overwrite a good file with bad data. Testing: ``` goodstuff [1] 14901 127.0.0.1 - - [24/Mar/2020 20:15:50] "GET / HTTP/1.1" 200 - 127.0.0.1 - - [24/Mar/2020 20:15:50] "GET / HTTP/1.1" 200 - no FROM statement found goodstuff ``` Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
LGTM |
LGTM |
Don't try to use an htpasswd binary in the registry:2 image, which dropped it. Instead, install htpasswd on the host and run it there. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
nalind
force-pushed
the
cve-10696-1.11
branch
4 times, most recently
from
August 31, 2020 19:29
0347c5a
to
f6f5862
Compare
Update which VM images we use for running tests to match what we're using for later releases. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
In 1.11 the image-based tests in Cirrus are just checking that compilation succeeded, and I think they're passing now. Unit and integration tests are only being run in Travis. |
bors r+ (If this branch supports bors.) If not then just commit. |
bors bot
added a commit
that referenced
this pull request
Aug 31, 2020
2574: [release-1.11-rhel] fix potential CVE in tarfile w/ symlink r=rhatdan a=nalind #### What type of PR is this? /kind bug #### What this PR does / why we need it: This cherry-picks the fix from #2245 to fix CVE-2020-10696. #### How to verify it #### Which issue(s) this PR fixes: CVE-2020=10696 #### Special notes for your reviewer: #### Does this PR introduce a user-facing change? ``` None ``` Co-authored-by: TomSweeneyRedHat <tsweeney@redhat.com> Co-authored-by: Nalin Dahyabhai <nalin@redhat.com>
Timed out. |
bors retry |
bors bot
added a commit
that referenced
this pull request
Aug 31, 2020
2574: [release-1.11-rhel] fix potential CVE in tarfile w/ symlink r=rhatdan a=nalind #### What type of PR is this? /kind bug #### What this PR does / why we need it: This cherry-picks the fix from #2245 to fix CVE-2020-10696. #### How to verify it #### Which issue(s) this PR fixes: CVE-2020=10696 #### Special notes for your reviewer: #### Does this PR introduce a user-facing change? ``` None ``` Co-authored-by: TomSweeneyRedHat <tsweeney@redhat.com> Co-authored-by: Nalin Dahyabhai <nalin@redhat.com>
Build failed: |
Per @rhatdan I'm going to save the planet and commit this. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
What type of PR is this?
/kind bug
What this PR does / why we need it:
This cherry-picks the fix from #2245 to fix CVE-2020-10696.
How to verify it
Which issue(s) this PR fixes:
CVE-2020=10696
Special notes for your reviewer:
Does this PR introduce a user-facing change?