From 1d508fb792ced1e58fdc74ffc80f2b4a068bc695 Mon Sep 17 00:00:00 2001
From: Brad Rydzewski <brad.rydzewski@gmail.com>
Date: Tue, 3 May 2016 23:36:23 -0700
Subject: [PATCH] fix drone agent issue

---
 client/client_impl.go              | 2 +-
 drone/agent/agent.go               | 6 ++++++
 drone/agent/exec.go                | 2 ++
 router/middleware/agent.go         | 2 +-
 router/middleware/session/agent.go | 2 ++
 5 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/client/client_impl.go b/client/client_impl.go
index c1fecaa8e..24dfdc6f6 100644
--- a/client/client_impl.go
+++ b/client/client_impl.go
@@ -245,7 +245,7 @@ func (c *client) open(rawurl, method string, in, out interface{}) (io.ReadCloser
 	if resp.StatusCode > http.StatusPartialContent {
 		defer resp.Body.Close()
 		out, _ := ioutil.ReadAll(resp.Body)
-		return nil, fmt.Errorf(string(out))
+		return nil, fmt.Errorf("client error %d: %s", resp.StatusCode, string(out))
 	}
 	return resp.Body, nil
 }
diff --git a/drone/agent/agent.go b/drone/agent/agent.go
index 5bf306621..143ead3eb 100644
--- a/drone/agent/agent.go
+++ b/drone/agent/agent.go
@@ -52,6 +52,12 @@ var AgentCmd = cli.Command{
 			Usage:  "docker architecture system",
 			Value:  "amd64",
 		},
+		cli.StringFlag{
+			EnvVar: "DOCKER_STORAGE_DRIVER",
+			Name:   "docker-storage-driver",
+			Usage:  "docker storage driver",
+			Value:  "overlay",
+		},
 		cli.StringFlag{
 			EnvVar: "DRONE_SERVER",
 			Name:   "drone-server",
diff --git a/drone/agent/exec.go b/drone/agent/exec.go
index 43af6f74e..87983ce25 100644
--- a/drone/agent/exec.go
+++ b/drone/agent/exec.go
@@ -17,6 +17,7 @@ import (
 	"github.com/drone/drone/engine/runner/docker"
 	"github.com/drone/drone/model"
 	"github.com/drone/drone/queue"
+	"github.com/drone/drone/version"
 	"github.com/drone/drone/yaml/expander"
 
 	"github.com/samalba/dockerclient"
@@ -255,6 +256,7 @@ func toEnv(w *queue.Work) map[string]string {
 		"DRONE_YAML_SIGNED":          fmt.Sprintf("%v", w.Signed),
 		"DRONE_BRANCH":               w.Build.Branch,
 		"DRONE_COMMIT":               w.Build.Commit,
+		"DRONE_VERSION":              version.Version,
 	}
 
 	if w.Build.Event == model.EventTag {
diff --git a/router/middleware/agent.go b/router/middleware/agent.go
index f3d884a72..a1526e865 100644
--- a/router/middleware/agent.go
+++ b/router/middleware/agent.go
@@ -18,7 +18,7 @@ func Agents(cli *cli.Context) gin.HandlerFunc {
 		logrus.Fatalf("failed to generate token from DRONE_AGENT_SECRET")
 	}
 
-	t := token.New(secret, "")
+	t := token.New(token.AgentToken, secret)
 	s, err := t.Sign(secret)
 	if err != nil {
 		logrus.Fatalf("failed to generate token from DRONE_AGENT_SECRET. %s", err)
diff --git a/router/middleware/session/agent.go b/router/middleware/session/agent.go
index bb0183e3c..d1a31c66c 100644
--- a/router/middleware/session/agent.go
+++ b/router/middleware/session/agent.go
@@ -18,8 +18,10 @@ func AuthorizeAgent(c *gin.Context) {
 	})
 	if err != nil {
 		c.String(500, "invalid or empty token. %s", err)
+		c.Abort()
 	} else if parsed.Kind != token.AgentToken {
 		c.String(403, "invalid token. please use an agent token")
+		c.Abort()
 	} else {
 		c.Next()
 	}