commit
b3ecf67fa7
8 changed files with 8 additions and 8 deletions
|
@ -46,7 +46,7 @@ func (htpasswd *htpasswd) authenticateUser(username string, password string) err
|
||||||
|
|
||||||
// parseHTPasswd parses the contents of htpasswd. This will read all the
|
// parseHTPasswd parses the contents of htpasswd. This will read all the
|
||||||
// entries in the file, whether or not they are needed. An error is returned
|
// entries in the file, whether or not they are needed. An error is returned
|
||||||
// if an syntax errors are encountered or if the reader fails.
|
// if a syntax errors are encountered or if the reader fails.
|
||||||
func parseHTPasswd(rd io.Reader) (map[string][]byte, error) {
|
func parseHTPasswd(rd io.Reader) (map[string][]byte, error) {
|
||||||
entries := map[string][]byte{}
|
entries := map[string][]byte{}
|
||||||
scanner := bufio.NewScanner(rd)
|
scanner := bufio.NewScanner(rd)
|
||||||
|
|
|
@ -11,7 +11,7 @@ import (
|
||||||
"github.com/docker/distribution/registry/api/errcode"
|
"github.com/docker/distribution/registry/api/errcode"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ErrNoErrorsInBody is returned when a HTTP response body parses to an empty
|
// ErrNoErrorsInBody is returned when an HTTP response body parses to an empty
|
||||||
// errcode.Errors slice.
|
// errcode.Errors slice.
|
||||||
var ErrNoErrorsInBody = errors.New("no error details found in HTTP response body")
|
var ErrNoErrorsInBody = errors.New("no error details found in HTTP response body")
|
||||||
|
|
||||||
|
|
|
@ -926,7 +926,7 @@ func testManifestAPISchema1(t *testing.T, env *testEnv, imageName reference.Name
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO(stevvooe): Add a test case where we take a mostly valid registry,
|
// TODO(stevvooe): Add a test case where we take a mostly valid registry,
|
||||||
// tamper with the content and ensure that we get a unverified manifest
|
// tamper with the content and ensure that we get an unverified manifest
|
||||||
// error.
|
// error.
|
||||||
|
|
||||||
// Push 2 random layers
|
// Push 2 random layers
|
||||||
|
|
|
@ -20,7 +20,7 @@ func closeResources(handler http.Handler, closers ...io.Closer) http.Handler {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// copyFullPayload copies the payload of a HTTP request to destWriter. If it
|
// copyFullPayload copies the payload of an HTTP request to destWriter. If it
|
||||||
// receives less content than expected, and the client disconnected during the
|
// receives less content than expected, and the client disconnected during the
|
||||||
// upload, it avoids sending a 400 error to keep the logs cleaner.
|
// upload, it avoids sending a 400 error to keep the logs cleaner.
|
||||||
func copyFullPayload(responseWriter http.ResponseWriter, r *http.Request, destWriter io.Writer, context ctxu.Context, action string, errSlice *errcode.Errors) error {
|
func copyFullPayload(responseWriter http.ResponseWriter, r *http.Request, destWriter io.Writer, context ctxu.Context, action string, errSlice *errcode.Errors) error {
|
||||||
|
|
|
@ -267,7 +267,7 @@ func logLevel(level configuration.Loglevel) log.Level {
|
||||||
return l
|
return l
|
||||||
}
|
}
|
||||||
|
|
||||||
// panicHandler add a HTTP handler to web app. The handler recover the happening
|
// panicHandler add an HTTP handler to web app. The handler recover the happening
|
||||||
// panic. logrus.Panic transmits panic message to pre-config log hooks, which is
|
// panic. logrus.Panic transmits panic message to pre-config log hooks, which is
|
||||||
// defined in config.yml.
|
// defined in config.yml.
|
||||||
func panicHandler(handler http.Handler) http.Handler {
|
func panicHandler(handler http.Handler) http.Handler {
|
||||||
|
|
|
@ -18,7 +18,7 @@ import (
|
||||||
storagemiddleware "github.com/docker/distribution/registry/storage/driver/middleware"
|
storagemiddleware "github.com/docker/distribution/registry/storage/driver/middleware"
|
||||||
)
|
)
|
||||||
|
|
||||||
// cloudFrontStorageMiddleware provides an simple implementation of layerHandler that
|
// cloudFrontStorageMiddleware provides a simple implementation of layerHandler that
|
||||||
// constructs temporary signed CloudFront URLs from the storagedriver layer URL,
|
// constructs temporary signed CloudFront URLs from the storagedriver layer URL,
|
||||||
// then issues HTTP Temporary Redirects to this CloudFront content URL.
|
// then issues HTTP Temporary Redirects to this CloudFront content URL.
|
||||||
type cloudFrontStorageMiddleware struct {
|
type cloudFrontStorageMiddleware struct {
|
||||||
|
|
|
@ -183,7 +183,7 @@ func TestFileReaderNonExistentFile(t *testing.T) {
|
||||||
// conditions that can arise when reading a layer.
|
// conditions that can arise when reading a layer.
|
||||||
func TestFileReaderErrors(t *testing.T) {
|
func TestFileReaderErrors(t *testing.T) {
|
||||||
// TODO(stevvooe): We need to cover error return types, driven by the
|
// TODO(stevvooe): We need to cover error return types, driven by the
|
||||||
// errors returned via the HTTP API. For now, here is a incomplete list:
|
// errors returned via the HTTP API. For now, here is an incomplete list:
|
||||||
//
|
//
|
||||||
// 1. Layer Not Found: returned when layer is not found or access is
|
// 1. Layer Not Found: returned when layer is not found or access is
|
||||||
// denied.
|
// denied.
|
||||||
|
|
|
@ -35,7 +35,7 @@ type linkedBlobStore struct {
|
||||||
// control the repository blob link set to which the blob store
|
// control the repository blob link set to which the blob store
|
||||||
// dispatches. This is required because manifest and layer blobs have not
|
// dispatches. This is required because manifest and layer blobs have not
|
||||||
// yet been fully merged. At some point, this functionality should be
|
// yet been fully merged. At some point, this functionality should be
|
||||||
// removed an the blob links folder should be merged. The first entry is
|
// removed the blob links folder should be merged. The first entry is
|
||||||
// treated as the "canonical" link location and will be used for writes.
|
// treated as the "canonical" link location and will be used for writes.
|
||||||
linkPathFns []linkPathFunc
|
linkPathFns []linkPathFunc
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue