mirror of
				https://github.com/moby/moby.git
				synced 2022-11-09 12:21:53 -05:00 
			
		
		
		
	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 <yong.tang.github@outlook.com>
This commit is contained in:
		
							parent
							
								
									8a0d2d8e57
								
							
						
					
					
						commit
						93973196f4
					
				
					 2 changed files with 26 additions and 0 deletions
				
			
		
							
								
								
									
										23
									
								
								integration-cli/docker_api_auth_test.go
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										23
									
								
								integration-cli/docker_api_auth_test.go
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -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)))
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
	}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue