From 608308996c0106cc4bd3b3f9bd9cf90a63e805cb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Aug 2022 09:18:43 +0000 Subject: [PATCH 1/2] Bump github.com/hashicorp/yamux from 0.1.0 to 0.1.1 Bumps [github.com/hashicorp/yamux](https://github.com/hashicorp/yamux) from 0.1.0 to 0.1.1. - [Release notes](https://github.com/hashicorp/yamux/releases) - [Commits](https://github.com/hashicorp/yamux/compare/v0.1.0...v0.1.1) --- updated-dependencies: - dependency-name: github.com/hashicorp/yamux dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 61f93210d..860495c01 100644 --- a/go.mod +++ b/go.mod @@ -29,7 +29,7 @@ require ( github.com/hashicorp/golang-lru v0.5.4 github.com/hashicorp/hcl v1.0.0 github.com/hashicorp/vault/sdk v0.5.3 - github.com/hashicorp/yamux v0.1.0 + github.com/hashicorp/yamux v0.1.1 github.com/kelseyhightower/envconfig v1.4.0 github.com/letsencrypt/boulder v0.0.0-20220723181115-27de4befb95e github.com/mitchellh/copystructure v1.2.0 diff --git a/go.sum b/go.sum index b11df3d7c..d0702356e 100644 --- a/go.sum +++ b/go.sum @@ -1177,8 +1177,8 @@ github.com/hashicorp/vault/api v1.7.2 h1:kawHE7s/4xwrdKbkmwQi0wYaIeUhk5ueek7ljue github.com/hashicorp/vault/api v1.7.2/go.mod h1:xbfA+1AvxFseDzxxdWaL0uO99n1+tndus4GCrtouy0M= github.com/hashicorp/vault/sdk v0.5.3 h1:PWY8sq/9pRrK9vUIy75qCH2Jd8oeENAgkaa/qbhzFrs= github.com/hashicorp/vault/sdk v0.5.3/go.mod h1:DoGraE9kKGNcVgPmTuX357Fm6WAx1Okvde8Vp3dPDoU= -github.com/hashicorp/yamux v0.1.0 h1:DzDIF6Sd7GD2sX0kDFpHAsJMY4L+OfTvtuaQsOYXxzk= -github.com/hashicorp/yamux v0.1.0/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ= +github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE= +github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ= github.com/honeycombio/beeline-go v1.1.1 h1:sU8r4ae34uEL3/CguSl8Mr+Asz9DL1nfH9Wwk85Pc7U= github.com/honeycombio/libhoney-go v1.15.2 h1:5NGcjOxZZma13dmzNcl3OtGbF1hECA0XHJNHEb2t2ck= github.com/howeyc/gopass v0.0.0-20190910152052-7cb4b85ec19c/go.mod h1:lADxMC39cJJqL93Duh1xhAs4I2Zs8mKS89XWXFGp9cs= From 7b5e50686b8794691fe23a748f7b66d4d8702d9f Mon Sep 17 00:00:00 2001 From: cpanato Date: Tue, 23 Aug 2022 12:32:00 +0200 Subject: [PATCH 2/2] update codegen Signed-off-by: cpanato --- .../VENDOR-LICENSE/github.com/hashicorp/yamux/stream.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/third_party/VENDOR-LICENSE/github.com/hashicorp/yamux/stream.go b/third_party/VENDOR-LICENSE/github.com/hashicorp/yamux/stream.go index d197d28e5..23d08fcc8 100644 --- a/third_party/VENDOR-LICENSE/github.com/hashicorp/yamux/stream.go +++ b/third_party/VENDOR-LICENSE/github.com/hashicorp/yamux/stream.go @@ -128,6 +128,9 @@ START: // Send a window update potentially err = s.sendWindowUpdate() + if err == ErrSessionShutdown { + err = nil + } return n, err WAIT: @@ -488,14 +491,15 @@ func (s *Stream) readData(hdr header, flags uint16, conn io.Reader) error { // This way we can read in the whole packet without further allocations. s.recvBuf = bytes.NewBuffer(make([]byte, 0, length)) } - if _, err := io.Copy(s.recvBuf, conn); err != nil { + copiedLength, err := io.Copy(s.recvBuf, conn) + if err != nil { s.session.logger.Printf("[ERR] yamux: Failed to read stream data: %v", err) s.recvLock.Unlock() return err } // Decrement the receive window - s.recvWindow -= length + s.recvWindow -= uint32(copiedLength) s.recvLock.Unlock() // Unblock any readers