mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
98caf09f0f
Previously, ioutils imported the crypty/sha256 package, because it was used by the HashData() utility. As a side-effect of that import, the sha256 algorithm was registered through its `init()` function. Now that the HashData() utility is removed, the import is no longer needed in this package, but some parts of our code depended on the side-effect, and without this, it fail to recognise the algorithms, unless something else happens to import crypto/sha256 / crypto/sha512, which made our tests fail: ``` === Failed === FAIL: reference TestLoad (0.00s) store_test.go:53: failed to parse reference: unsupported digest algorithm === FAIL: reference TestSave (0.00s) store_test.go:82: failed to parse reference: unsupported digest algorithm === FAIL: reference TestAddDeleteGet (0.00s) store_test.go:174: could not parse reference: unsupported digest algorithm === FAIL: reference TestInvalidTags (0.00s) store_test.go:355: assertion failed: error is not nil: unsupported digest algorithm ``` While it would be better to do the import in the actual locations where it's expected, there may be code-paths we overlook, so instead adding the import here temporarily. Until the PR in go-digest has been merged and released. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
151 lines
3.4 KiB
Go
151 lines
3.4 KiB
Go
package ioutils // import "github.com/docker/docker/pkg/ioutils"
|
|
|
|
import (
|
|
"context"
|
|
"io"
|
|
|
|
// make sure crypto.SHA256, crypto.sha512 and crypto.SHA384 are registered
|
|
// TODO remove once https://github.com/opencontainers/go-digest/pull/64 is merged.
|
|
_ "crypto/sha256"
|
|
_ "crypto/sha512"
|
|
)
|
|
|
|
// ReadCloserWrapper wraps an io.Reader, and implements an io.ReadCloser
|
|
// It calls the given callback function when closed. It should be constructed
|
|
// with NewReadCloserWrapper
|
|
type ReadCloserWrapper struct {
|
|
io.Reader
|
|
closer func() error
|
|
}
|
|
|
|
// Close calls back the passed closer function
|
|
func (r *ReadCloserWrapper) Close() error {
|
|
return r.closer()
|
|
}
|
|
|
|
// NewReadCloserWrapper returns a new io.ReadCloser.
|
|
func NewReadCloserWrapper(r io.Reader, closer func() error) io.ReadCloser {
|
|
return &ReadCloserWrapper{
|
|
Reader: r,
|
|
closer: closer,
|
|
}
|
|
}
|
|
|
|
type readerErrWrapper struct {
|
|
reader io.Reader
|
|
closer func()
|
|
}
|
|
|
|
func (r *readerErrWrapper) Read(p []byte) (int, error) {
|
|
n, err := r.reader.Read(p)
|
|
if err != nil {
|
|
r.closer()
|
|
}
|
|
return n, err
|
|
}
|
|
|
|
// NewReaderErrWrapper returns a new io.Reader.
|
|
func NewReaderErrWrapper(r io.Reader, closer func()) io.Reader {
|
|
return &readerErrWrapper{
|
|
reader: r,
|
|
closer: closer,
|
|
}
|
|
}
|
|
|
|
// OnEOFReader wraps an io.ReadCloser and a function
|
|
// the function will run at the end of file or close the file.
|
|
type OnEOFReader struct {
|
|
Rc io.ReadCloser
|
|
Fn func()
|
|
}
|
|
|
|
func (r *OnEOFReader) Read(p []byte) (n int, err error) {
|
|
n, err = r.Rc.Read(p)
|
|
if err == io.EOF {
|
|
r.runFunc()
|
|
}
|
|
return
|
|
}
|
|
|
|
// Close closes the file and run the function.
|
|
func (r *OnEOFReader) Close() error {
|
|
err := r.Rc.Close()
|
|
r.runFunc()
|
|
return err
|
|
}
|
|
|
|
func (r *OnEOFReader) runFunc() {
|
|
if fn := r.Fn; fn != nil {
|
|
fn()
|
|
r.Fn = nil
|
|
}
|
|
}
|
|
|
|
// cancelReadCloser wraps an io.ReadCloser with a context for cancelling read
|
|
// operations.
|
|
type cancelReadCloser struct {
|
|
cancel func()
|
|
pR *io.PipeReader // Stream to read from
|
|
pW *io.PipeWriter
|
|
}
|
|
|
|
// NewCancelReadCloser creates a wrapper that closes the ReadCloser when the
|
|
// context is cancelled. The returned io.ReadCloser must be closed when it is
|
|
// no longer needed.
|
|
func NewCancelReadCloser(ctx context.Context, in io.ReadCloser) io.ReadCloser {
|
|
pR, pW := io.Pipe()
|
|
|
|
// Create a context used to signal when the pipe is closed
|
|
doneCtx, cancel := context.WithCancel(context.Background())
|
|
|
|
p := &cancelReadCloser{
|
|
cancel: cancel,
|
|
pR: pR,
|
|
pW: pW,
|
|
}
|
|
|
|
go func() {
|
|
_, err := io.Copy(pW, in)
|
|
select {
|
|
case <-ctx.Done():
|
|
// If the context was closed, p.closeWithError
|
|
// was already called. Calling it again would
|
|
// change the error that Read returns.
|
|
default:
|
|
p.closeWithError(err)
|
|
}
|
|
in.Close()
|
|
}()
|
|
go func() {
|
|
for {
|
|
select {
|
|
case <-ctx.Done():
|
|
p.closeWithError(ctx.Err())
|
|
case <-doneCtx.Done():
|
|
return
|
|
}
|
|
}
|
|
}()
|
|
|
|
return p
|
|
}
|
|
|
|
// Read wraps the Read method of the pipe that provides data from the wrapped
|
|
// ReadCloser.
|
|
func (p *cancelReadCloser) Read(buf []byte) (n int, err error) {
|
|
return p.pR.Read(buf)
|
|
}
|
|
|
|
// closeWithError closes the wrapper and its underlying reader. It will
|
|
// cause future calls to Read to return err.
|
|
func (p *cancelReadCloser) closeWithError(err error) {
|
|
p.pW.CloseWithError(err)
|
|
p.cancel()
|
|
}
|
|
|
|
// Close closes the wrapper its underlying reader. It will cause
|
|
// future calls to Read to return io.EOF.
|
|
func (p *cancelReadCloser) Close() error {
|
|
p.closeWithError(io.EOF)
|
|
return nil
|
|
}
|