vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #23425 from runcom/authz-race

Browse source 
pkg: authorization: lock when lazy loading
This commit is contained in:
Vincent Demeester 2016-06-13 23:20:37 +02:00 committed by GitHub
commit 789aee497c
3 changed files with 44 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
authorization/authz_unix_test.go
View file

@ -6,6 +6,7 @@
package authorization
import (
"bytes"
"encoding/json"
"io/ioutil"
"net"
@ -14,17 +15,17 @@ import (
"os"
"path"
"reflect"
"testing"
"bytes"
"strings"
"testing"
"github.com/docker/docker/pkg/plugins"
"github.com/docker/go-connections/tlsconfig"
"github.com/gorilla/mux"
)
const pluginAddress = "authzplugin.sock"
const (
pluginAddress = "authz-test-plugin.sock"
)
func TestAuthZRequestPluginError(t *testing.T) {
server := authZPluginTestServer{t: t}
@ -36,7 +37,7 @@ func TestAuthZRequestPluginError(t *testing.T) {
request := Request{
User: "user",
RequestBody: []byte("sample body"),
RequestURI: "www.authz.com",
RequestURI: "www.authz.com/auth",
RequestMethod: "GET",
RequestHeaders: map[string]string{"header": "value"},
}
@ -50,10 +51,10 @@ func TestAuthZRequestPluginError(t *testing.T) {
}
if !reflect.DeepEqual(server.replayResponse, *actualResponse) {
t.Fatalf("Response must be equal")
t.Fatal("Response must be equal")
}
if !reflect.DeepEqual(request, server.recordedRequest) {
t.Fatalf("Requests must be equal")
t.Fatal("Requests must be equal")
}
}
@ -67,7 +68,7 @@ func TestAuthZRequestPlugin(t *testing.T) {
request := Request{
User: "user",
RequestBody: []byte("sample body"),
RequestURI: "www.authz.com",
RequestURI: "www.authz.com/auth",
RequestMethod: "GET",
RequestHeaders: map[string]string{"header": "value"},
}
@ -82,10 +83,10 @@ func TestAuthZRequestPlugin(t *testing.T) {
}
if !reflect.DeepEqual(server.replayResponse, *actualResponse) {
t.Fatalf("Response must be equal")
t.Fatal("Response must be equal")
}
if !reflect.DeepEqual(request, server.recordedRequest) {
t.Fatalf("Requests must be equal")
t.Fatal("Requests must be equal")
}
}
@ -98,6 +99,7 @@ func TestAuthZResponsePlugin(t *testing.T) {
request := Request{
User: "user",
RequestURI: "someting.com/auth",
RequestBody: []byte("sample body"),
}
server.replayResponse = Response{
@ -111,10 +113,10 @@ func TestAuthZResponsePlugin(t *testing.T) {
}
if !reflect.DeepEqual(server.replayResponse, *actualResponse) {
t.Fatalf("Response must be equal")
t.Fatal("Response must be equal")
}
if !reflect.DeepEqual(request, server.recordedRequest) {
t.Fatalf("Requests must be equal")
t.Fatal("Requests must be equal")
}
}
@ -158,7 +160,7 @@ func TestDrainBody(t *testing.T) {
t.Fatalf("Body must be copied, actual length: '%d'", len(body))
}
if closer == nil {
t.Fatalf("Closer must not be nil")
t.Fatal("Closer must not be nil")
}
modified, err := ioutil.ReadAll(closer)
if err != nil {
@ -229,8 +231,10 @@ type authZPluginTestServer struct {
// start starts the test server that implements the plugin
func (t *authZPluginTestServer) start() {
r := mux.NewRouter()
os.Remove(pluginAddress)
l, _ := net.ListenUnix("unix", &net.UnixAddr{Name: pluginAddress, Net: "unix"})
l, err := net.Listen("unix", pluginAddress)
if err != nil {
t.t.Fatal(err)
}
t.listener = l
r.HandleFunc("/Plugin.Activate", t.activate)
r.HandleFunc("/"+AuthZApiRequest, t.auth)
@ -257,14 +261,23 @@ func (t *authZPluginTestServer) stop() {
// auth is a used to record/replay the authentication api messages
func (t *authZPluginTestServer) auth(w http.ResponseWriter, r *http.Request) {
t.recordedRequest = Request{}
body, _ := ioutil.ReadAll(r.Body)
body, err := ioutil.ReadAll(r.Body)
if err != nil {
t.t.Fatal(err)
}
r.Body.Close()
json.Unmarshal(body, &t.recordedRequest)
b, _ := json.Marshal(t.replayResponse)
b, err := json.Marshal(t.replayResponse)
if err != nil {
t.t.Fatal(err)
}
w.Write(b)
}
func (t *authZPluginTestServer) activate(w http.ResponseWriter, r *http.Request) {
b, _ := json.Marshal(plugins.Manifest{Implements: []string{AuthZApiImplements}})
b, err := json.Marshal(plugins.Manifest{Implements: []string{AuthZApiImplements}})
if err != nil {
t.t.Fatal(err)
}
w.Write(b)
}

20
authorization/plugin.go
View file

@ -1,6 +1,10 @@
package authorization
import "github.com/docker/docker/pkg/plugins"
import (
"sync"
"github.com/docker/docker/pkg/plugins"
)
// Plugin allows third party plugins to authorize requests and responses
// in the context of docker API
@ -33,6 +37,7 @@ func NewPlugins(names []string) []Plugin {
type authorizationPlugin struct {
plugin *plugins.Plugin
name string
once sync.Once
}
func newAuthorizationPlugin(name string) Plugin {
@ -72,12 +77,11 @@ func (a *authorizationPlugin) AuthZResponse(authReq *Request) (*Response, error)
// initPlugin initializes the authorization plugin if needed
func (a *authorizationPlugin) initPlugin() error {
// Lazy loading of plugins
if a.plugin == nil {
var err error
a.plugin, err = plugins.Get(a.name, AuthZApiImplements)
if err != nil {
return err
var err error
a.once.Do(func() {
if a.plugin == nil {
a.plugin, err = plugins.Get(a.name, AuthZApiImplements)
}
}
return nil
})
return err
}

2
plugins/client.go
View file

@ -130,7 +130,7 @@ func (c *Client) callWithRetry(serviceMethod string, data io.Reader, retry bool)
return nil, err
}
retries++
logrus.Warnf("Unable to connect to plugin: %s:%s, retrying in %v", req.URL.Host, req.URL.Path, timeOff)
logrus.Warnf("Unable to connect to plugin: %s%s: %v, retrying in %v", req.URL.Host, req.URL.Path, err, timeOff)
time.Sleep(timeOff)
continue
}