Commit Graph

5531 Commits

Author SHA1 Message Date
Phil Estes
7f9530d95b
Merge pull request #3703 from yuxiaobo96/containerd-my
fix-up :typo
2019-09-30 08:52:01 -04:00
yuxiaobo
0cb7e4d5fd Perfect documentations
Signed-off-by: yuxiaobo <yuxiaobogo@163.com>
2019-09-30 09:29:04 +08:00
Wei Fu
36cf5b690d
Merge pull request #3689 from dmcgowan/release-1.3.0
Update release docs for 1.3.0
2019-09-27 09:04:35 +08:00
Derek McGowan
b172b7f9d7
Update release docs for 1.3.0
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-09-26 17:00:26 -07:00
Derek McGowan
a668365eca
Merge pull request #3696 from dmcgowan/fix-all-media-types
Fix all media types in Accept header to match RFC
2019-09-26 16:27:33 -07:00
Derek McGowan
524f81d06d
Merge pull request #3695 from Random-Liu/update-cri-release-1.3
Update cri to 5d49e7e51b43e36a6b9c4386257c7d08c602237f.
2019-09-26 15:22:18 -07:00
Derek McGowan
394db03f15
Fix all media types in Accept header to match RFC
Fixes the media type to align with Accept HTTP header
RFC which specifies glob syntax */*

See https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-09-26 14:48:42 -07:00
Lantao Liu
90735a5d13 Update cri to 5d49e7e51b43e36a6b9c4386257c7d08c602237f.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-26 14:31:00 -07:00
Michael Crosby
6624f622b2
Merge pull request #3692 from Random-Liu/cri-dependency-version
Get CRI dependency versions from containerd vendor.conf.
2019-09-26 16:56:14 -04:00
Lantao Liu
1b1b862eb3 Get CRI dependency versions from containerd vendor.conf.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-26 12:52:36 -07:00
Phil Estes
277ab9ed6e
Merge pull request #3686 from thaJeztah/bump_golang_1.12.10
AppVeyor: bump golang 1.12.10 (CVE-2019-16276)
2019-09-26 13:24:34 -04:00
Sebastiaan van Stijn
35d3bae1e1
AppVeyor: bump golang 1.12.10 (CVE-2019-16276)
full diff: https://github.com/golang/go/compare/go1.12.9...go1.12.10

```
Hi gophers,

We have just released Go 1.13.1 and Go 1.12.10 to address a recently reported security issue. We recommend that all affected users update to one of these releases (if you're not sure which, choose Go 1.13.1).

net/http (through net/textproto) used to accept and normalize invalid HTTP/1.1 headers with a space before the colon, in violation of RFC 7230. If a Go server is used behind an uncommon reverse proxy that accepts and forwards but doesn't normalize such invalid headers, the reverse proxy and the server can interpret the headers differently. This can lead to filter bypasses or request smuggling, the latter if requests from separate clients are multiplexed onto the same upstream connection by the proxy. Such invalid headers are now rejected by Go servers, and passed without normalization to Go client applications.

The issue is CVE-2019-16276 and Go issue golang.org/issue/34540.

Thanks to Andrew Stucki, Adam Scarr (99designs.com), and Jan Masarik (masarik.sh) for discovering and reporting this issue.

Downloads are available at https://golang.org/dl for all supported platforms.

Alla prossima,
Filippo on behalf of the Go team
```

From the patch: 6e6f4aaf70

```
net/textproto: don't normalize headers with spaces before the colon

RFC 7230 is clear about headers with a space before the colon, like

X-Answer : 42

being invalid, but we've been accepting and normalizing them for compatibility
purposes since CL 5690059 in 2012.

On the client side, this is harmless and indeed most browsers behave the same
to this day. On the server side, this becomes a security issue when the
behavior doesn't match that of a reverse proxy sitting in front of the server.

For example, if a WAF accepts them without normalizing them, it might be
possible to bypass its filters, because the Go server would interpret the
header differently. Worse, if the reverse proxy coalesces requests onto a
single HTTP/1.1 connection to a Go server, the understanding of the request
boundaries can get out of sync between them, allowing an attacker to tack an
arbitrary method and path onto a request by other clients, including
authentication headers unknown to the attacker.

This was recently presented at multiple security conferences:
https://portswigger.net/blog/http-desync-attacks-request-smuggling-reborn

net/http servers already reject header keys with invalid characters.
Simply stop normalizing extra spaces in net/textproto, let it return them
unchanged like it does for other invalid headers, and let net/http enforce
RFC 7230, which is HTTP specific. This loses us normalization on the client
side, but there's no right answer on the client side anyway, and hiding the
issue sounds worse than letting the application decide.
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-09-26 18:54:56 +02:00
Phil Estes
2a467650e2
Merge pull request #3684 from crosbymichael/bump-runc-cve
Bump runc for CVE-2019-16884
2019-09-26 11:36:43 -04:00
Michael Crosby
95dbbdc8c1 Bump runc for CVE-2019-16884
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-09-26 10:09:42 -04:00
Michael Crosby
4509efc303
Merge pull request #3683 from yuxiaobo96/containerd-update3
fix-up typo
2019-09-26 09:42:33 -04:00
yuxiaobo
62c2eea78d fix-up typo
Signed-off-by: yuxiaobo <yuxiaobogo@163.com>
2019-09-26 13:02:03 +08:00
Derek McGowan
1c42610d98
Merge pull request #3680 from crosbymichael/btrfs-flake
Sync and stat btrfs loopback in tests
2019-09-25 13:47:31 -07:00
Michael Crosby
c5821baa41 Sync and stat btrfs loopback in tests
Fixes #3676

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-09-25 15:40:16 -04:00
Phil Estes
da66333271
Merge pull request #3677 from dmcgowan/gc-fix-notes
Add release note for gc fix
2019-09-25 08:29:36 -04:00
Phil Estes
c10e6a1029
Merge pull request #3679 from yuxiaobo96/containerd-update2
Perfect documentation
2019-09-25 08:28:49 -04:00
Phil Estes
4cd5de74bd
Merge pull request #3678 from yuxiaobo96/containerd-update
Word spelling correction
2019-09-25 08:27:24 -04:00
yuxiaobo
5ea9363624 Perfect documentation
Signed-off-by: yuxiaobo <yuxiaobogo@163.com>
2019-09-25 16:59:31 +08:00
yuxiaobo
a0ae24b984 Word spelling correction
Signed-off-by: yuxiaobo <yuxiaobogo@163.com>
2019-09-25 16:49:54 +08:00
Derek McGowan
85eac2550f
Add release note for gc fix
Adds note for garbage collection fix related to removal
of leases, containers, and images.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-09-24 17:05:06 -07:00
Michael Crosby
aba201344e
Merge pull request #3675 from Random-Liu/update-cri-release-1.3
Update cri to 4ea022f82a55c449bf15bfc62ac8b0de968d81be.
2019-09-24 11:06:18 -04:00
Phil Estes
9c10bf89ba
Merge pull request #3668 from dmcgowan/fix-metadata-dirty
Update metadata interfaces for containers and leases
2019-09-24 09:38:27 -04:00
Wei Fu
94c497984f
Merge pull request #3673 from seemethere/mkdir_man
gen-manpages: Create man directory if it does not exist
2019-09-24 10:58:15 +08:00
Lantao Liu
cbbb6a2297 Update release note.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-23 18:04:17 -07:00
Lantao Liu
fc31fa176d Update cri to 4ea022f82a55c449bf15bfc62ac8b0de968d81be.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-23 17:51:26 -07:00
Derek McGowan
51f8807d02
Merge pull request #3672 from crosbymichael/kill-errors
Check for more kill error types
2019-09-23 16:15:16 -07:00
Derek McGowan
0b224ac7d6
Update metadata interfaces for containers and leases
Add more thorough dirty checking across all types which
may be deleted and hold references.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-09-23 15:27:39 -07:00
Eli Uriegas
2a636f8c34
gen-manpages: Create man directory if it does not exist
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2019-09-23 20:31:26 +00:00
Michael Crosby
0a21292225 Check for more kill error types
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-09-23 15:36:34 -04:00
Phil Estes
1af133f6c5
Merge pull request #3669 from crosbymichael/crun
Don't search for state.json path in tests
2019-09-23 13:18:56 -04:00
Michael Crosby
dd51228094 Don't search for state.json path
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-09-20 14:35:58 -04:00
Wei Fu
ed16170c4c
Merge pull request #3666 from crosbymichael/metrics
Add metrics type alias
2019-09-20 14:19:56 +08:00
Derek McGowan
a0dafd9309
Merge pull request #3649 from dmcgowan/generic-layer-support
Generic layer support
2019-09-19 17:43:03 -07:00
Derek McGowan
6f31417d49
Generalize media types
Avoid directly handling media types with "+" attributes,
instead handling the base and passing through the full
media type to the appropriate stream processor or decompression.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-09-19 16:09:19 -07:00
Michael Crosby
f3148d0b98 Add metrics type alias
This will help to decouple the import in CRI from the cgroups package
directly by importing the type alias in containerd repo.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-09-19 14:13:56 -04:00
Wei Fu
d4802a64f9
Merge pull request #3665 from estesp/golangcideadline
Move golangci-lint deadline to config file
2019-09-19 21:51:05 +08:00
Phil Estes
57b51b9481
Move golangci-lint deadline to config file
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2019-09-19 09:10:56 -04:00
Michael Crosby
6fafc8a724
Merge pull request #3662 from cpuguy83/set_custom_scopes_for_authorizer
Add function to set custom auth scope in context
2019-09-18 15:10:51 -04:00
Michael Crosby
a65aa5fe0e
Merge pull request #3661 from cpuguy83/custom_keys_for_fetch_hander
Get media type key from context
2019-09-18 14:55:07 -04:00
Brian Goff
e84a84a5a9 Add function to set custom auth scope in context
Currently auth.docker.io uses a custom auth scope for (docker) plugins
`repository(plugin):<repo>:<perms>`.
This makes it impossible to use containerd distribution tooling to fetch
plugins without also supplying a totally custom authorizer.

This changes allows clients to set the correct scope on the context.
It's a little bit nasty but "works".

I'm also a bit suspect of some a couple of these unexported context
functrions. Before the primary one used `contextWithRepositoryScope`
overwrites any scope value and there is another one that appends the
scope value.
With this change they both append...

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-09-18 11:29:16 -07:00
Brian Goff
bca374aa1b Get media type key from context
Adds a method for setting a custom media type key prefix used by the
fetch handler.
This allows both overwriting a built-in prefix (for reasons?) as well as
supplying a custom media type.

I added this because I was getting an error on `FetchHandler` when
pulling docker plugin images which have their own media type.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-09-18 11:26:50 -07:00
Michael Crosby
324a94790d
Merge pull request #3659 from katiewasnothere/shimreconnectupstream
fail on file not found for shim reconnect on containerd restart
2019-09-18 12:50:08 -04:00
Phil Estes
a7e67ff9aa
Merge pull request #3655 from crosbymichael/shmsize
Add Opt for modifying shm size
2019-09-18 11:54:46 -04:00
Michael Crosby
e4dc2f662b
Merge pull request #3660 from fuweid/me-golint
Makefile: increase deadline to 2m for golangci-lint
2019-09-18 10:35:20 -04:00
Michael Crosby
20d3fae3db Add Opt for modifying shm size
Closes #3654

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-09-18 10:20:36 -04:00
Phil Estes
c3452abae4
Merge pull request #3656 from crosbymichael/stress
Fix density spec generation
2019-09-18 09:19:20 -04:00