mirror of
https://github.com/genuinetools/reg.git
synced 2024-05-10 08:38:32 -04:00
65b2c0329d
Rather than returning an error that requires pattern-matching from `parseChallenge` when the challenge header requires basic authentication, return a distinguished error value. This makes checking for this error a bit easier. This commit also updates the check in `r.Headers` to use the new error value and adds a couple of regression tests.
94 lines
2.2 KiB
Go
94 lines
2.2 KiB
Go
package registry
|
|
|
|
import (
|
|
"strings"
|
|
"testing"
|
|
)
|
|
|
|
type authServiceMock struct {
|
|
service string
|
|
realm string
|
|
scope []string
|
|
}
|
|
|
|
type challengeTestCase struct {
|
|
header string
|
|
errorString string
|
|
value authServiceMock
|
|
}
|
|
|
|
func (asm authServiceMock) equalTo(v *authService) bool {
|
|
if asm.service != v.Service {
|
|
return false
|
|
}
|
|
for i, v := range v.Scope {
|
|
if v != asm.scope[i] {
|
|
return false
|
|
}
|
|
}
|
|
|
|
return asm.realm == v.Realm.String()
|
|
}
|
|
|
|
func TestParseChallenge(t *testing.T) {
|
|
challengeHeaderCases := []challengeTestCase{
|
|
{
|
|
header: `Bearer realm="https://foobar.com/api/v1/token",service=foobar.com,scope=""`,
|
|
value: authServiceMock{
|
|
service: "foobar.com",
|
|
realm: "https://foobar.com/api/v1/token",
|
|
},
|
|
},
|
|
{
|
|
header: `Bearer realm="https://r.j3ss.co/auth",service="Docker registry",scope="repository:chrome:pull"`,
|
|
value: authServiceMock{
|
|
service: "Docker registry",
|
|
realm: "https://r.j3ss.co/auth",
|
|
scope: []string{"repository:chrome:pull"},
|
|
},
|
|
},
|
|
{
|
|
header: `Basic realm="https://r.j3ss.co/auth",service="Docker registry"`,
|
|
errorString: "basic auth required",
|
|
},
|
|
{
|
|
header: `Basic realm="Registry Realm",service="Docker registry"`,
|
|
errorString: "basic auth required",
|
|
},
|
|
}
|
|
|
|
for _, tc := range challengeHeaderCases {
|
|
val, err := parseChallenge(tc.header)
|
|
if err != nil && !strings.Contains(err.Error(), tc.errorString) {
|
|
t.Fatalf("expected error to contain %v, got %s", tc.errorString, err)
|
|
}
|
|
if err == nil && !tc.value.equalTo(val) {
|
|
t.Fatalf("got %v, expected %v", val, tc.value)
|
|
}
|
|
|
|
}
|
|
}
|
|
|
|
func TestParseChallengePush(t *testing.T) {
|
|
challengeHeaderCases := []challengeTestCase{
|
|
{
|
|
header: `Bearer realm="https://foo.com/v2/token",service="foo.com",scope="repository:pdr/tls:pull,push"`,
|
|
value: authServiceMock{
|
|
realm: "https://foo.com/v2/token",
|
|
service: "foo.com",
|
|
scope: []string{"repository:pdr/tls:pull,push"},
|
|
},
|
|
},
|
|
}
|
|
for _, tc := range challengeHeaderCases {
|
|
val, err := parseChallenge(tc.header)
|
|
if err != nil && !strings.Contains(err.Error(), tc.errorString) {
|
|
t.Fatalf("expected error to contain %v, got %s", tc.errorString, err)
|
|
}
|
|
if !tc.value.equalTo(val) {
|
|
t.Fatalf("got %v, expected %v", val, tc.value)
|
|
}
|
|
|
|
}
|
|
}
|