d0f5aa670b
Our context package predates the establishment of current best practices regarding context usage and it shows. It encourages bad practices such as using contexts to propagate non-request-scoped values like the application version and using string-typed keys for context values. Move the package internal to remove it from the API surface of distribution/v3@v3.0.0 so we are free to iterate on it without being constrained by compatibility. Signed-off-by: Cory Snider <csnider@mirantis.com>
85 lines
2.5 KiB
Go
85 lines
2.5 KiB
Go
package handlers
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"net/http"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"github.com/distribution/distribution/v3/internal/dcontext"
|
|
)
|
|
|
|
// closeResources closes all the provided resources after running the target
|
|
// handler.
|
|
func closeResources(handler http.Handler, closers ...io.Closer) http.Handler {
|
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
for _, closer := range closers {
|
|
defer closer.Close()
|
|
}
|
|
handler.ServeHTTP(w, r)
|
|
})
|
|
}
|
|
|
|
// copyFullPayload copies the payload of an HTTP request to destWriter. If it
|
|
// receives less content than expected, and the client disconnected during the
|
|
// upload, it avoids sending a 400 error to keep the logs cleaner.
|
|
//
|
|
// The copy will be limited to `limit` bytes, if limit is greater than zero.
|
|
func copyFullPayload(ctx context.Context, responseWriter http.ResponseWriter, r *http.Request, destWriter io.Writer, limit int64, action string) error {
|
|
// Get a channel that tells us if the client disconnects
|
|
clientClosed := r.Context().Done()
|
|
body := r.Body
|
|
if limit > 0 {
|
|
body = http.MaxBytesReader(responseWriter, body, limit)
|
|
}
|
|
|
|
// Read in the data, if any.
|
|
copied, err := io.Copy(destWriter, body)
|
|
if clientClosed != nil && (err != nil || (r.ContentLength > 0 && copied < r.ContentLength)) {
|
|
// Didn't receive as much content as expected. Did the client
|
|
// disconnect during the request? If so, avoid returning a 400
|
|
// error to keep the logs cleaner.
|
|
select {
|
|
case <-clientClosed:
|
|
// Set the response code to "499 Client Closed Request"
|
|
// Even though the connection has already been closed,
|
|
// this causes the logger to pick up a 499 error
|
|
// instead of showing 0 for the HTTP status.
|
|
responseWriter.WriteHeader(499)
|
|
|
|
dcontext.GetLoggerWithFields(ctx, map[interface{}]interface{}{
|
|
"error": err,
|
|
"copied": copied,
|
|
"contentLength": r.ContentLength,
|
|
}, "error", "copied", "contentLength").Error("client disconnected during " + action)
|
|
return errors.New("client disconnected")
|
|
default:
|
|
}
|
|
}
|
|
|
|
if err != nil {
|
|
dcontext.GetLogger(ctx).Errorf("unknown error reading request payload: %v", err)
|
|
return err
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func parseContentRange(cr string) (start int64, end int64, err error) {
|
|
rStart, rEnd, ok := strings.Cut(cr, "-")
|
|
if !ok {
|
|
return -1, -1, fmt.Errorf("invalid content range format, %s", cr)
|
|
}
|
|
start, err = strconv.ParseInt(rStart, 10, 64)
|
|
if err != nil {
|
|
return -1, -1, err
|
|
}
|
|
end, err = strconv.ParseInt(rEnd, 10, 64)
|
|
if err != nil {
|
|
return -1, -1, err
|
|
}
|
|
return start, end, nil
|
|
}
|