InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27267 from ezrasilvera/plugin_fix

Browse Source 
Call the AuthZRes function also when the daemon  returns error
This commit is contained in:
Sebastiaan van Stijn
2016-10-18 21:53:43 -07:00
committed by GitHub
parent 3b0660da30 5a8ff40254
commit 194f04bbbe
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/authorization/middleware.go
View File

@@ -64,15 +64,21 @@ func (m *Middleware) WrapHandler(handler func(ctx context.Context, w http.Respon
rw := NewResponseModifier(w)
if err := handler(ctx, rw, r, vars); err != nil {
logrus.Errorf("Handler for %s %s returned error: %s", r.Method, r.RequestURI, err)
return err
var errD error
if errD = handler(ctx, rw, r, vars); errD != nil {
logrus.Errorf("Handler for %s %s returned error: %s", r.Method, r.RequestURI, errD)
}
if err := authCtx.AuthZResponse(rw, r); err != nil {
if err := authCtx.AuthZResponse(rw, r); errD == nil && err != nil {
logrus.Errorf("AuthZResponse for %s %s returned error: %s", r.Method, r.RequestURI, err)
return err
}
if errD != nil {
return errD
}
return nil
}
}