ssh: make channel.close idempotent
channel.close closes the internal Go channels (msg, incomingRequests); calling it twice panics with "close of closed channel". Both current callers run on the mux loop and are serialized, so the panic is not reachable today. Harden close by guarding it with sync.Once, so that the connection does not become fragile to any future bug that reaches close twice. Change-Id: I5d8d948367538ea5561724033c4ee4daa668e221 Reviewed-on: https://go-review.googlesource.com/c/crypto/+/797060 LUCI-TryBot-Result: golang-scoped@luci-project-accounts.iam.gserviceaccount.com <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Filippo Valsorda <filippo@golang.org> Reviewed-by: David Chase <drchase@google.com> Reviewed-by: Junyang Shao <shaojunyang@google.com>
This commit is contained in:
@@ -1213,6 +1213,18 @@ func TestChannelUnexpectedResponsesDiscarded(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestChannelCloseIdempotent(t *testing.T) {
|
||||
a, b := memPipe()
|
||||
defer a.Close()
|
||||
defer b.Close()
|
||||
|
||||
m := newMux(a)
|
||||
ch := m.newChannel("session", channelOutbound, nil)
|
||||
|
||||
ch.close()
|
||||
ch.close() // must be a no-op, not a panic
|
||||
}
|
||||
|
||||
func TestChannelConcurrentRequests(t *testing.T) {
|
||||
writer, reader, mux := channelPair(t)
|
||||
defer writer.Close()
|
||||
|
||||
Reference in New Issue
Block a user