vbatts/registry
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

auth.AccessController interface now uses distribution/context

Browse source 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
This commit is contained in:
Stephen J Day 2015-07-23 19:48:47 -07:00
parent a0fdfb9d4d
commit d31f9fd5b1
4 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
registry/auth/auth.go
View file

@ -34,7 +34,7 @@ import (
"fmt" "fmt"
"net/http" "net/http"
"golang.org/x/net/context" "github.com/docker/distribution/context"
) )
// UserInfo carries information about // UserInfo carries information about

7
registry/auth/htpasswd/access.go
View file

@ -11,9 +11,8 @@ import (
"net/http" "net/http"
"os" "os"
ctxu "github.com/docker/distribution/context" "github.com/docker/distribution/context"
"github.com/docker/distribution/registry/auth" "github.com/docker/distribution/registry/auth"
"golang.org/x/net/context"
) )
var ( var (
@ -57,7 +56,7 @@ func newAccessController(options map[string]interface{}) (auth.AccessController,
} }
func (ac *accessController) Authorized(ctx context.Context, accessRecords ...auth.Access) (context.Context, error) { func (ac *accessController) Authorized(ctx context.Context, accessRecords ...auth.Access) (context.Context, error) {
req, err := ctxu.GetRequest(ctx) req, err := context.GetRequest(ctx)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -71,7 +70,7 @@ func (ac *accessController) Authorized(ctx context.Context, accessRecords ...aut
} }
if err := ac.htpasswd.authenticateUser(username, password); err != nil { if err := ac.htpasswd.authenticateUser(username, password); err != nil {
ctxu.GetLogger(ctx).Errorf("error authenticating user %q: %v", username, err) context.GetLogger(ctx).Errorf("error authenticating user %q: %v", username, err)
return nil, &challenge{ return nil, &challenge{
realm: ac.realm, realm: ac.realm,
err: ErrAuthenticationFailure, err: ErrAuthenticationFailure,

5
registry/auth/silly/access.go
View file

@ -12,9 +12,8 @@ import (
"net/http" "net/http"
"strings" "strings"
ctxu "github.com/docker/distribution/context" "github.com/docker/distribution/context"
"github.com/docker/distribution/registry/auth" "github.com/docker/distribution/registry/auth"
"golang.org/x/net/context"
) )
// accessController provides a simple implementation of auth.AccessController // accessController provides a simple implementation of auth.AccessController
@ -44,7 +43,7 @@ func newAccessController(options map[string]interface{}) (auth.AccessController,
// Authorized simply checks for the existence of the authorization header, // Authorized simply checks for the existence of the authorization header,
// responding with a bearer challenge if it doesn't exist. // responding with a bearer challenge if it doesn't exist.
func (ac *accessController) Authorized(ctx context.Context, accessRecords ...auth.Access) (context.Context, error) { func (ac *accessController) Authorized(ctx context.Context, accessRecords ...auth.Access) (context.Context, error) {
req, err := ctxu.GetRequest(ctx) req, err := context.GetRequest(ctx)
if err != nil { if err != nil {
return nil, err return nil, err
} }

5
registry/auth/token/accesscontroller.go
View file

@ -11,10 +11,9 @@ import (
"os" "os"
"strings" "strings"
ctxu "github.com/docker/distribution/context" "github.com/docker/distribution/context"
"github.com/docker/distribution/registry/auth" "github.com/docker/distribution/registry/auth"
"github.com/docker/libtrust" "github.com/docker/libtrust"
"golang.org/x/net/context"
) )
// accessSet maps a typed, named resource to // accessSet maps a typed, named resource to
@ -220,7 +219,7 @@ func (ac *accessController) Authorized(ctx context.Context, accessItems ...auth.
accessSet: newAccessSet(accessItems...), accessSet: newAccessSet(accessItems...),
} }
req, err := ctxu.GetRequest(ctx) req, err := context.GetRequest(ctx)
if err != nil { if err != nil {
return nil, err return nil, err
} }