Merge pull request #69 from kstedman9/dcosee_mesos

DCOS Enterprise Mesos Support

Dockerfile

@@ -13,4 +13,4 @@ COPY --from=0 /go/src/github.com/nemosupremo/vault-gatekeeper/dist/gatekeeper /
 WORKDIR /tmp
 WORKDIR /
 ENTRYPOINT ["/gatekeeper"]
-CMD ["server"]
+CMD ["server"]

cmd/gatekeeper/main.go

@@ -4,6 +4,7 @@ import (
 	"runtime"
 
 	// import schedulers before cmd
+	_ "github.com/nemosupremo/vault-gatekeeper/scheduler/dcosee_mesos"
 	_ "github.com/nemosupremo/vault-gatekeeper/scheduler/ecs"
 	_ "github.com/nemosupremo/vault-gatekeeper/scheduler/mesos"
 

cmd/policy.go

@@ -8,11 +8,12 @@ import (
 	"net/url"
 	"os"
 
-	"github.com/franela/goreq"
 	"github.com/nemosupremo/vault-gatekeeper"
 	"github.com/nemosupremo/vault-gatekeeper/policy"
 	"github.com/nemosupremo/vault-gatekeeper/scheduler"
 	"github.com/nemosupremo/vault-gatekeeper/vault"
+
+	"github.com/franela/goreq"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"

cmd/root.go

@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"github.com/nemosupremo/vault-gatekeeper/scheduler"
+
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"

cmd/server.go

@@ -9,6 +9,7 @@ import (
 	"github.com/nemosupremo/vault-gatekeeper"
 	"github.com/nemosupremo/vault-gatekeeper/scheduler"
 	"github.com/nemosupremo/vault-gatekeeper/vault/unsealer"
+
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"

cmd/unseal.go

@@ -3,8 +3,9 @@ package cmd
 import (
 	"net/url"
 
-	"github.com/franela/goreq"
 	"github.com/nemosupremo/vault-gatekeeper/scheduler"
+
+	"github.com/franela/goreq"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"

gatekeeper.go

@@ -14,14 +14,15 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/cenkalti/backoff"
-	"github.com/franela/goreq"
 	gkClient "github.com/nemosupremo/vault-gatekeeper/gatekeeper"
 	"github.com/nemosupremo/vault-gatekeeper/policy"
 	"github.com/nemosupremo/vault-gatekeeper/scheduler"
 	"github.com/nemosupremo/vault-gatekeeper/usagestore"
 	"github.com/nemosupremo/vault-gatekeeper/vault"
 	"github.com/nemosupremo/vault-gatekeeper/vault/unsealer"
+
+	"github.com/cenkalti/backoff"
+	"github.com/franela/goreq"
 	"github.com/segmentio/ksuid"
 	log "github.com/sirupsen/logrus"
 )
@@ -480,6 +481,7 @@ func (g *Gatekeeper) RequestToken(providerKey string, taskId string, requestedRo
 			currentPolicies := g.Policies
 			g.RUnlock()
 
+			log.Debugf("Find Policy:  %s\n", policyKey)
 			if policy, ok := currentPolicies.Get(policyKey); ok && len(policy.Roles) > 0 {
 				if err := g.Store.Acquire(g.Token, providerKey+":"+task.Id(), policy.NumUses, g.config.MaxTaskLife+1*time.Minute); err == nil {
 					roleName := policy.Roles[0]

gatekeeper/gatekeeper.go

@@ -155,9 +155,9 @@ func (c *Client) requestTempToken(taskID string) (string, error) {
 		return "", err
 	}
 
-	if !gkTokResp.OK {
-		return "", errors.New(gkTokResp.Error)
-	}
+	// if !gkTokResp.OK {
+	// 	return "", errors.New(gkTokResp.Error)
+	// }
 
 	return gkTokResp.Token, nil
 }

gatekeeper/types.go

@@ -34,10 +34,10 @@ type gkTokenReq struct {
 }
 
 type gkTokenResp struct {
-	OK     bool   `json:"ok"`
-	Token  string `json:"token"`
-	Status string `json:"status"`
-	Error  string `json:"error"`
+	Unsealed  bool   `json:"unsealed"`
+	Token     string `json:"token"`
+	Ttl       string `json:"ttl"`
+	VaultAddr string `json:"vault_addr"`
 }
 
 type vaultWrappedResponse struct {

gatekeeper_test.go

@@ -6,12 +6,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/franela/goreq"
 	"github.com/nemosupremo/vault-gatekeeper/policy"
 	"github.com/nemosupremo/vault-gatekeeper/scheduler"
 	"github.com/nemosupremo/vault-gatekeeper/scheduler/mock"
 	"github.com/nemosupremo/vault-gatekeeper/vault"
 	"github.com/nemosupremo/vault-gatekeeper/vault/unsealer"
+
+	"github.com/franela/goreq"
 	"github.com/segmentio/ksuid"
 	"github.com/spf13/viper"
 )

policy.go

@@ -4,12 +4,14 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	log "github.com/sirupsen/logrus"
 	"strings"
 
-	"github.com/franela/goreq"
+	log "github.com/sirupsen/logrus"
+
 	"github.com/nemosupremo/vault-gatekeeper/policy"
 	"github.com/nemosupremo/vault-gatekeeper/vault"
+
+	"github.com/franela/goreq"
 )
 
 var policyNotFound = errors.New("No policy saved at configured location.")
@@ -33,21 +35,28 @@ func (g *Gatekeeper) loadPolicies() (*policy.Policies, error) {
 func (g *Gatekeeper) GetPolicyConfig() ([]byte, error) {
 	initialPolicyDir := g.config.PolicyPath
 	policies := make(map[string]policy.Policy)
+	log.Debugf("Policy Dir: %s\n", initialPolicyDir)
 	if policyDirectories, err := g.getNestedPolicyDirs(initialPolicyDir, g.Token); err == nil {
 		for _, dir := range policyDirectories {
+			log.Debugf("Dir: %s\n", dir)
 			if policy, err := getPolicy(dir, g.Token); err == nil {
+				log.Debugf("Policies: %+v\n", policy)
 				for k, v := range policy {
 					policies[k] = v
 				}
 			} else if err == policyNotFound {
+				log.Warnf("%v\n", policyNotFound)
 				continue
 			} else {
 				return nil, err
 			}
 		}
 	} else {
+		log.Errorf("Failed to find direcotries in %s\n", initialPolicyDir)
 		return nil, err
 	}
+
+	log.Debugf("Policies: %+v\n", policies)
 	if len(policies) == 0 {
 		return nil, policyNotFound
 	}
@@ -64,6 +73,7 @@ func (g *Gatekeeper) getNestedPolicyDirs(initialPolicyDir string, authToken stri
 
 	err := g.getDirList(initialPolicyDir, authToken, &nestedPolicyDirs, &subDirs)
 	if err != nil {
+		log.Errorf("Error getting dir list: %v\n", err)
 		return nestedPolicyDirs, err
 	}
 
@@ -84,6 +94,9 @@ func (g *Gatekeeper) getNestedPolicyDirs(initialPolicyDir string, authToken stri
 			}
 		}
 	}
+
+	log.Debugf("Nested Policy Dirs: %+v\n", nestedPolicyDirs)
+
 	return nestedPolicyDirs, err
 }
 
@@ -111,6 +124,7 @@ func (g *Gatekeeper) getDirList(path string, authToken string, nestedPolicies *[
 				Renewable     bool   `json:"renewable"`
 			}
 			if err := r.Body.FromJsonTo(&scrts); err == nil {
+				log.Debugf("Secrets List Data: %+v\n", scrts)
 				for i := range scrts.Data.Keys {
 					//add to sub dir list when "/" suffix
 					if strings.HasSuffix(scrts.Data.Keys[i], "/") {
@@ -121,10 +135,12 @@ func (g *Gatekeeper) getDirList(path string, authToken string, nestedPolicies *[
 				}
 				return nil
 			} else {
+				log.Errorf("Get Dir List: %+v\n", err)
 				return err
 			}
 		case 404:
 			/* A 404 is returned when no sub directories exist below the current directory which is ok. */
+			log.Infof("Get Dir List is empty\n")
 			return nil
 
 		case 403:
@@ -160,6 +176,7 @@ func getPolicy(path string, authToken string) (map[string]policy.Policy, error)
 				} `json:"data"`
 			}
 			if err := r.Body.FromJsonTo(&resp); err == nil {
+				log.Debugf("Response Body: %+v\n", resp)
 				return resp.Data.Data, nil
 			} else {
 				return nil, policyLoadError{fmt.Errorf("There was an error decoding policy from vault. This can occur " +

policy/policy.go

@@ -6,6 +6,8 @@ import (
 	"errors"
 	"strings"
 
+	log "github.com/sirupsen/logrus"
+
 	"github.com/hashicorp/go-immutable-radix"
 )
 
@@ -95,6 +97,8 @@ func (p *Policies) Get(path string) (*Policy, bool) {
 	}
 
 	p.Tree.Root().WalkPath([]byte(path), walkFn)
+
+	log.Debugf("Get Policy:  Found: %t  Ret: %+v\n", foundPolicy, ret)
 	return ret, foundPolicy
 }