kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Revert "Update authz plugin list on failure."

Browse source 
This reverts commit fae904af02.

Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
This commit is contained in:
Riyaz Faizullabhoy 2016-11-02 14:29:40 -07:00
parent f54339dfea
commit a64fc8eea3
3 changed files with 3 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

14
pkg/authorization/authz.go
View file

@ -52,8 +52,6 @@ type Ctx struct {
}
// AuthZRequest authorized the request to the docker daemon using authZ plugins
// Side effect: If the authz plugin is invalid, then update ctx.plugins, so that
// the caller(middleware) can update its list and stop retrying with invalid plugins.
func (ctx *Ctx) AuthZRequest(w http.ResponseWriter, r *http.Request) error {
var body []byte
if sendBody(ctx.requestURI, r.Header) && r.ContentLength > 0 && r.ContentLength < maxBodySize {
@ -85,14 +83,11 @@ func (ctx *Ctx) AuthZRequest(w http.ResponseWriter, r *http.Request) error {
}
}
for i, plugin := range ctx.plugins {
for _, plugin := range ctx.plugins {
logrus.Debugf("AuthZ request using plugin %s", plugin.Name())
authRes, err := plugin.AuthZRequest(ctx.authReq)
if err != nil {
if err == ErrInvalidPlugin {
ctx.plugins = append(ctx.plugins[:i], ctx.plugins[i+1:]...)
}
return fmt.Errorf("plugin %s failed with error: %s", plugin.Name(), err)
}
@ -105,8 +100,6 @@ func (ctx *Ctx) AuthZRequest(w http.ResponseWriter, r *http.Request) error {
}
// AuthZResponse authorized and manipulates the response from docker daemon using authZ plugins
// Side effect: If the authz plugin is invalid, then update ctx.plugins, so that
// the caller(middleware) can update its list and stop retrying with invalid plugins.
func (ctx *Ctx) AuthZResponse(rm ResponseModifier, r *http.Request) error {
ctx.authReq.ResponseStatusCode = rm.StatusCode()
ctx.authReq.ResponseHeaders = headers(rm.Header())
@ -115,14 +108,11 @@ func (ctx *Ctx) AuthZResponse(rm ResponseModifier, r *http.Request) error {
ctx.authReq.ResponseBody = rm.RawBody()
}
for i, plugin := range ctx.plugins {
for _, plugin := range ctx.plugins {
logrus.Debugf("AuthZ response using plugin %s", plugin.Name())
authRes, err := plugin.AuthZResponse(ctx.authReq)
if err != nil {
if err == ErrInvalidPlugin {
ctx.plugins = append(ctx.plugins[:i], ctx.plugins[i+1:]...)
}
return fmt.Errorf("plugin %s failed with error: %s", plugin.Name(), err)
}

11
pkg/authorization/middleware.go
View file

@ -2,7 +2,6 @@ package authorization
import (
"net/http"
"strings"
"sync"
"github.com/Sirupsen/logrus"
@ -60,11 +59,6 @@ func (m *Middleware) WrapHandler(handler func(ctx context.Context, w http.Respon
if err := authCtx.AuthZRequest(w, r); err != nil {
logrus.Errorf("AuthZRequest for %s %s returned error: %s", r.Method, r.RequestURI, err)
if strings.Contains(err.Error(), ErrInvalidPlugin.Error()) {
m.mu.Lock()
m.plugins = authCtx.plugins
m.mu.Unlock()
}
return err
}
@ -78,11 +72,6 @@ func (m *Middleware) WrapHandler(handler func(ctx context.Context, w http.Respon
if err := authCtx.AuthZResponse(rw, r); errD == nil && err != nil {
logrus.Errorf("AuthZResponse for %s %s returned error: %s", r.Method, r.RequestURI, err)
if strings.Contains(err.Error(), ErrInvalidPlugin.Error()) {
m.mu.Lock()
m.plugins = authCtx.plugins
m.mu.Unlock()
}
return err
}

10
pkg/authorization/plugin.go
View file

@ -1,20 +1,12 @@
package authorization
import (
"errors"
"sync"
"github.com/docker/docker/pkg/plugingetter"
"github.com/docker/docker/pkg/plugins"
)
var (
// ErrInvalidPlugin indicates that the plugin cannot be used. This is
// because the plugin was not found or does not implement necessary
// functionality
ErrInvalidPlugin = errors.New("invalid plugin")
)
// Plugin allows third party plugins to authorize requests and responses
// in the context of docker API
type Plugin interface {
@ -110,7 +102,7 @@ func (a *authorizationPlugin) initPlugin() error {
plugin, e = plugins.Get(a.name, AuthZApiImplements)
}
if e != nil {
err = ErrInvalidPlugin
err = e
return
}
a.plugin = plugin.Client()