Commit Graph

8778 Commits

Author SHA1 Message Date
Phil Estes
309c9c25ba
Merge pull request #3706 from mrueg/enable-autocmpl
ctr: Enable shell autocompletion
2019-10-03 09:15:51 -04:00
Phil Estes
a83ae30016
Merge pull request #3681 from crosbymichael/bump-cgroups
Update cri and cgroup packages
2019-10-01 11:38:23 -04:00
Michael Crosby
8ff5827e98 Update cri and cgroup packages
This change includes a cri master bump and a cgroup bump for windows support
with cgroup stats and reusing the cgroup metric types.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-10-01 10:19:56 -04:00
Phil Estes
1009023783
Merge pull request #3705 from dmcgowan/limit-travis-release
Limit travis release script to a single build
2019-10-01 08:24:48 -04:00
Manuel Rüger
b5fa55b0c2 ctr: Enable shell autocompletion
Signed-off-by: Manuel Rüger <manuel@rueg.eu>
2019-10-01 09:43:21 +02:00
Derek McGowan
45ce735676
Limit travis release script to a single build
Prevent Travis from building and pushing up multiple times

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-09-30 14:35:56 -07:00
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
Lantao Liu
0ebf032aac
Merge pull request #1306 from Random-Liu/extend-permission-denied-retry
[WCOW] Extend permission denied retry to 3min.
2019-09-27 10:21:36 -07:00
Lantao Liu
180e86ab39 Extend permission denied retry to 3min.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-26 22:39:00 -07: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
Lantao Liu
1629277497
Merge pull request #1300 from Random-Liu/hostname-test
Add hostname CRI validation and unit test.
2019-09-25 20:09:13 -07:00
Lantao Liu
358d672160 Add hostname CRI validation and unit test.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-25 16:11:27 -07: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
Lantao Liu
7fba77f238
Merge pull request #1298 from Random-Liu/set-sandbox-cpu-shares
Set default sandbox container cpu shares on windows.
2019-09-25 11:05:43 -07:00
Mike Brown
a1e4f99a32
Merge pull request #1296 from Random-Liu/fix-ssh-disconnect
Set keepalive for ssh in windows test.
2019-09-25 10:02:59 -05: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
Lantao Liu
2eba67a7ee
Merge pull request #1287 from crosbymichael/cgroups
Use type alias from containerd for cgroup metric types
2019-09-24 17:34:49 -07: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
Lantao Liu
f3ef10e9a2 Set default sandbox container cpu shares on windows.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-24 17:03:11 -07:00
Lantao Liu
4a0b0a883f Set keepalive for ssh in windows test.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-24 16:57:31 -07:00
Lantao Liu
36f393dc6d
Merge pull request #1292 from Random-Liu/better-kube-up
Document simpler kube-up.sh
2019-09-24 13:17:17 -07:00
Lantao Liu
44e1f8ded5
Merge pull request #1294 from jterry75/fix_windows_hostname_upstream
Forward SandboxConfig.Hostname to Workload container activation
2019-09-24 11:40:51 -07:00
Justin Terry (VM)
ed7873ef1e Forward SandboxConfig.Hostname to Workload container activation
1. For Windows the Hostname property is not inherited from the sandbox and must
be passed for the Workload container activations as well.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2019-09-24 10:21:17 -07:00
Mike Brown
4f203aa8ba
Merge pull request #1293 from Random-Liu/update-hcsshim
Update hcsshim to c088f411aaf3585d8dffc9deb4289ffa32854497.
2019-09-24 10:07:56 -05: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
Lantao Liu
e8a788d786 Update hcsshim to c088f411aaf3585d8dffc9deb4289ffa32854497.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-24 00:11:58 -07:00
Lantao Liu
bad68a8270
Merge pull request #1284 from liyanhui1228/win_portforward
Add windows port forward support
2019-09-23 22:17:08 -07: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
Mike Brown
0a6d9f188b
Merge pull request #1291 from Random-Liu/fix-indent-cni
Fix indent in cni.template.
2019-09-23 19:52:31 -05:00