From 93973196f4b4dafae5b94eb541a3b752ea48f66e Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Fri, 22 Apr 2016 20:00:47 -0700 Subject: [PATCH] Add default `serveraddress` value in remote API `/auth` This fix tries to address the issue in #22244 where the remote API `/auth` will not set the default value of `serveraddress` if not provided. This behavior happens after only in 1.11.0 and is a regression as in 1.10.3 `serveraddress` will be assigned with `IndexServer` if no value is provided. The default value `IndexServer` is assigned to `serveraddress` if no value provided in this fix. An integration test `TestAuthApi` has been added to cover this change This fix fixes #22244. Signed-off-by: Yong Tang --- integration-cli/docker_api_auth_test.go | 23 +++++++++++++++++++++++ registry/service.go | 3 +++ 2 files changed, 26 insertions(+) create mode 100644 integration-cli/docker_api_auth_test.go diff --git a/integration-cli/docker_api_auth_test.go b/integration-cli/docker_api_auth_test.go new file mode 100644 index 0000000000..63e78ab520 --- /dev/null +++ b/integration-cli/docker_api_auth_test.go @@ -0,0 +1,23 @@ +package main + +import ( + "net/http" + + "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/engine-api/types" + "github.com/go-check/check" +) + +// Test case for #22244 +func (s *DockerSuite) TestAuthApi(c *check.C) { + config := types.AuthConfig{ + Username: "no-user", + Password: "no-password", + } + + expected := "Get https://registry-1.docker.io/v2/: unauthorized: incorrect username or password\n" + status, body, err := sockRequest("POST", "/auth", config) + c.Assert(err, check.IsNil) + c.Assert(status, check.Equals, http.StatusUnauthorized) + c.Assert(string(body), checker.Contains, expected, check.Commentf("Expected: %v, got: %v", expected, string(body))) +} diff --git a/registry/service.go b/registry/service.go index c27f9b1c93..3006e8ab84 100644 --- a/registry/service.go +++ b/registry/service.go @@ -37,6 +37,9 @@ func (s *Service) ServiceConfig() *registrytypes.ServiceConfig { // It can be used to verify the validity of a client's credentials. func (s *Service) Auth(authConfig *types.AuthConfig, userAgent string) (status, token string, err error) { serverAddress := authConfig.ServerAddress + if serverAddress == "" { + serverAddress = IndexServer + } if !strings.HasPrefix(serverAddress, "https://") && !strings.HasPrefix(serverAddress, "http://") { serverAddress = "https://" + serverAddress }