Skip to content
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

Conversation

nalind
Copy link
Member

@nalind nalind commented Aug 28, 2020

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

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>
@TomSweeneyRedHat
Copy link
Member

LGTM

@rhatdan
Copy link
Member

rhatdan commented Aug 29, 2020

LGTM
Tests seem broken, because of old images.

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 nalind force-pushed the cve-10696-1.11 branch 4 times, most recently from 0347c5a to f6f5862 Compare August 31, 2020 19:29
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>
@nalind
Copy link
Member Author

nalind commented Aug 31, 2020

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.

@rhatdan
Copy link
Member

rhatdan commented Aug 31, 2020

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>
@bors
Copy link
Contributor

bors bot commented Aug 31, 2020

Timed out.

@TomSweeneyRedHat
Copy link
Member

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>
@bors
Copy link
Contributor

bors bot commented Sep 1, 2020

Build failed:

@TomSweeneyRedHat
Copy link
Member

Per @rhatdan I'm going to save the planet and commit this.

@TomSweeneyRedHat TomSweeneyRedHat merged commit f0d9b46 into containers:release-1.11-rhel Sep 1, 2020
@nalind nalind deleted the cve-10696-1.11 branch September 1, 2020 13:28
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 30, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants