mirror of
https://github.com/moby/moby.git
synced 2026-01-11 18:51:37 +00:00
5e4e34a966
Migrated using
find . -type f -name "*_test.go" |
xargs gofmt -w \
-r "assert.Check(t, strings.Contains(a, b)) -> assert.Check(t, is.Contains(a, b))"
find . -type f -name "*_test.go" |
xargs gofmt -w \
-r "assert.Assert(t, strings.Contains(a, b)) -> assert.Assert(t, is.Contains(a, b))"
Using a boolean in assert.Assert or assert.Check results in error
messages that don't contain the actual problematic string, and when
running the integration suite on an actual machine (where the source
code parsing doesn't work) this makes it almost impossible to figure out
what the actual error is.
Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
107 lines
3.6 KiB
Go
107 lines
3.6 KiB
Go
package main
|
|
|
|
import (
|
|
"bytes"
|
|
"fmt"
|
|
"os"
|
|
"os/exec"
|
|
"path/filepath"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/docker/docker/integration-cli/cli"
|
|
"github.com/docker/docker/testutil"
|
|
"gotest.tools/v3/assert"
|
|
is "gotest.tools/v3/assert/cmp"
|
|
)
|
|
|
|
func (s *DockerRegistryAuthHtpasswdSuite) TestLogoutWithExternalAuth(c *testing.T) {
|
|
ctx := testutil.GetContext(c)
|
|
s.d.StartWithBusybox(ctx, c)
|
|
|
|
workingDir, err := os.Getwd()
|
|
assert.NilError(c, err)
|
|
absolute, err := filepath.Abs(filepath.Join(workingDir, "fixtures", "auth"))
|
|
assert.NilError(c, err)
|
|
|
|
osPath := os.Getenv("PATH")
|
|
testPath := fmt.Sprintf("%s%c%s", osPath, filepath.ListSeparator, absolute)
|
|
c.Setenv("PATH", testPath)
|
|
|
|
imgRepoName := fmt.Sprintf("%v/dockercli/busybox:authtest", privateRegistryURL)
|
|
|
|
tmp, err := os.MkdirTemp("", "integration-cli-")
|
|
assert.NilError(c, err)
|
|
defer os.RemoveAll(tmp)
|
|
|
|
externalAuthConfig := `{ "credsStore": "shell-test" }`
|
|
|
|
configPath := filepath.Join(tmp, "config.json")
|
|
err = os.WriteFile(configPath, []byte(externalAuthConfig), 0o644)
|
|
assert.NilError(c, err)
|
|
|
|
_, err = s.d.Cmd("--config", tmp, "login", "-u", s.reg.Username(), "-p", s.reg.Password(), privateRegistryURL)
|
|
assert.NilError(c, err)
|
|
|
|
b, err := os.ReadFile(configPath)
|
|
assert.NilError(c, err)
|
|
assert.Assert(c, !strings.Contains(string(b), `"auth":`))
|
|
assert.Assert(c, is.Contains(string(b), privateRegistryURL))
|
|
|
|
_, err = s.d.Cmd("--config", tmp, "tag", "busybox", imgRepoName)
|
|
assert.NilError(c, err)
|
|
_, err = s.d.Cmd("--config", tmp, "push", imgRepoName)
|
|
assert.NilError(c, err)
|
|
_, err = s.d.Cmd("--config", tmp, "logout", privateRegistryURL)
|
|
assert.NilError(c, err)
|
|
|
|
b, err = os.ReadFile(configPath)
|
|
assert.NilError(c, err)
|
|
assert.Assert(c, !strings.Contains(string(b), privateRegistryURL))
|
|
|
|
// check I cannot pull anymore
|
|
out, err := s.d.Cmd("--config", tmp, "pull", imgRepoName)
|
|
assert.ErrorContains(c, err, "", out)
|
|
assert.Assert(c, is.Contains(out, "no basic auth credentials"))
|
|
}
|
|
|
|
// #23100
|
|
func (s *DockerRegistryAuthHtpasswdSuite) TestLogoutWithWrongHostnamesStored(c *testing.T) {
|
|
workingDir, err := os.Getwd()
|
|
assert.NilError(c, err)
|
|
absolute, err := filepath.Abs(filepath.Join(workingDir, "fixtures", "auth"))
|
|
assert.NilError(c, err)
|
|
|
|
osPath := os.Getenv("PATH")
|
|
testPath := fmt.Sprintf("%s%c%s", osPath, filepath.ListSeparator, absolute)
|
|
c.Setenv("PATH", testPath)
|
|
|
|
cmd := exec.Command("docker-credential-shell-test", "store")
|
|
stdin := bytes.NewReader([]byte(fmt.Sprintf(`{"ServerURL": "https://%s", "Username": "%s", "Secret": "%s"}`, privateRegistryURL, s.reg.Username(), s.reg.Password())))
|
|
cmd.Stdin = stdin
|
|
assert.NilError(c, cmd.Run())
|
|
|
|
tmp, err := os.MkdirTemp("", "integration-cli-")
|
|
assert.NilError(c, err)
|
|
|
|
externalAuthConfig := fmt.Sprintf(`{ "auths": {"https://%s": {}}, "credsStore": "shell-test" }`, privateRegistryURL)
|
|
|
|
configPath := filepath.Join(tmp, "config.json")
|
|
err = os.WriteFile(configPath, []byte(externalAuthConfig), 0o644)
|
|
assert.NilError(c, err)
|
|
|
|
cli.DockerCmd(c, "--config", tmp, "login", "-u", s.reg.Username(), "-p", s.reg.Password(), privateRegistryURL)
|
|
|
|
b, err := os.ReadFile(configPath)
|
|
assert.NilError(c, err)
|
|
assert.Assert(c, is.Contains(string(b), fmt.Sprintf(`"https://%s": {}`, privateRegistryURL)))
|
|
assert.Assert(c, is.Contains(string(b), fmt.Sprintf(`"%s": {}`, privateRegistryURL)))
|
|
|
|
cli.DockerCmd(c, "--config", tmp, "logout", privateRegistryURL)
|
|
|
|
b, err = os.ReadFile(configPath)
|
|
assert.NilError(c, err)
|
|
assert.Assert(c, !strings.Contains(string(b), fmt.Sprintf(`"https://%s": {}`, privateRegistryURL)))
|
|
assert.Assert(c, !strings.Contains(string(b), fmt.Sprintf(`"%s": {}`, privateRegistryURL)))
|
|
}
|