From 7d66ae02a6dda555d2b59c395556c3e33e66e066 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 27 May 2023 13:09:22 +0200 Subject: [PATCH] osxkeychain: use designated domains in tests (RFC2606) Update domains used in tests to used domains that are designated for this purpose as described in [RFC2606, section 3][1] [1]: https://www.rfc-editor.org/rfc/rfc2606.html#section-3 Signed-off-by: Sebastiaan van Stijn --- osxkeychain/osxkeychain_test.go | 56 ++++++++++++++++----------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/osxkeychain/osxkeychain_test.go b/osxkeychain/osxkeychain_test.go index 447c145..c82c649 100644 --- a/osxkeychain/osxkeychain_test.go +++ b/osxkeychain/osxkeychain_test.go @@ -11,12 +11,12 @@ import ( func TestOSXKeychainHelper(t *testing.T) { creds := &credentials.Credentials{ - ServerURL: "https://foobar.docker.io:2376/v1", + ServerURL: "https://foobar.example.com:2376/v1", Username: "foobar", Secret: "foobarbaz", } creds1 := &credentials.Credentials{ - ServerURL: "https://foobar.docker.io:2376/v2", + ServerURL: "https://foobar.example.com:2376/v2", Username: "foobarbaz", Secret: "foobar", } @@ -68,18 +68,18 @@ func TestOSXKeychainHelperRetrieveAliases(t *testing.T) { }{ { doc: "stored with port, retrieved without", - storeURL: "https://foobar.docker.io:2376", - readURL: "https://foobar.docker.io", + storeURL: "https://foobar.example.com:2376", + readURL: "https://foobar.example.com", }, { doc: "stored as https, retrieved without scheme", - storeURL: "https://foobar.docker.io:2376", - readURL: "foobar.docker.io", + storeURL: "https://foobar.example.com:2376", + readURL: "foobar.example.com", }, { doc: "stored with path, retrieved without", - storeURL: "https://foobar.docker.io:1234/one/two", - readURL: "https://foobar.docker.io:1234", + storeURL: "https://foobar.example.com:1234/one/two", + readURL: "https://foobar.example.com:1234", }, } @@ -126,35 +126,35 @@ func TestOSXKeychainHelperRetrieveStrict(t *testing.T) { }{ { doc: "stored as https, retrieved using http", - storeURL: "https://foobar.docker.io:2376", - readURL: "http://foobar.docker.io:2376", + storeURL: "https://foobar.example.com:2376", + readURL: "http://foobar.example.com:2376", }, { doc: "stored as http, retrieved using https", - storeURL: "http://foobar.docker.io:2376", - readURL: "https://foobar.docker.io:2376", + storeURL: "http://foobar.example.com:2376", + readURL: "https://foobar.example.com:2376", }, { // stored as http, retrieved without a scheme specified (hence, using the default https://) doc: "stored as http, retrieved without scheme", - storeURL: "http://foobar.docker.io", - readURL: "foobar.docker.io:5678", + storeURL: "http://foobar.example.com", + readURL: "foobar.example.com:5678", }, { doc: "non-matching ports", - storeURL: "https://foobar.docker.io:1234", - readURL: "https://foobar.docker.io:5678", + storeURL: "https://foobar.example.com:1234", + readURL: "https://foobar.example.com:5678", }, // TODO: is this desired behavior? The other way round does work // { // doc: "non-matching ports (stored without port)", - // storeURL: "https://foobar.docker.io", - // readURL: "https://foobar.docker.io:5678", + // storeURL: "https://foobar.example.com", + // readURL: "https://foobar.example.com:5678", // }, { doc: "non-matching paths", - storeURL: "https://foobar.docker.io:1234/one/two", - readURL: "https://foobar.docker.io:1234/five/six", + storeURL: "https://foobar.example.com:1234/one/two", + readURL: "https://foobar.example.com:1234/five/six", }, } @@ -197,14 +197,14 @@ func TestOSXKeychainHelperStoreRetrieve(t *testing.T) { tests := []struct { url string }{ - {url: "foobar.docker.io"}, - {url: "foobar.docker.io:2376"}, - {url: "//foobar.docker.io:2376"}, - {url: "https://foobar.docker.io:2376"}, - {url: "http://foobar.docker.io:2376"}, - {url: "https://foobar.docker.io:2376/some/path"}, - {url: "https://foobar.docker.io:2376/some/other/path"}, - {url: "https://foobar.docker.io:2376/some/other/path?foo=bar"}, + {url: "foobar.example.com"}, + {url: "foobar.example.com:2376"}, + {url: "//foobar.example.com:2376"}, + {url: "https://foobar.example.com:2376"}, + {url: "http://foobar.example.com:2376"}, + {url: "https://foobar.example.com:2376/some/path"}, + {url: "https://foobar.example.com:2376/some/other/path"}, + {url: "https://foobar.example.com:2376/some/other/path?foo=bar"}, } helper := Osxkeychain{}