2014-08-11 21:01:45 +00:00
|
|
|
package consul
|
|
|
|
|
|
|
|
import (
|
|
|
|
"errors"
|
|
|
|
"fmt"
|
|
|
|
"os"
|
Creates new "prepared-query" ACL type and new token capture behavior.
Prior to this change, prepared queries had the following behavior for
ACLs, which will need to change to support templates:
1. A management token, or a token with read access to the service being
queried needed to be provided in order to create a prepared query.
2. The token used to create the prepared query was stored with the query
in the state store and used to execute the query.
3. A management token, or the token used to create the query needed to be
supplied to perform and CRUD operations on an existing prepared query.
This was pretty subtle and complicated behavior, and won't work for
templates since the service name is computed at execution time. To solve
this, we introduce a new "prepared-query" ACL type, where the prefix
applies to the query name for static prepared query types and to the
prefix for template prepared query types.
With this change, the new behavior is:
1. A management token, or a token with "prepared-query" write access to
the query name or (soon) the given template prefix is required to do
any CRUD operations on a prepared query, or to list prepared queries
(the list is filtered by this ACL).
2. You will no longer need a management token to list prepared queries,
but you will only be able to see prepared queries that you have access
to (you get an empty list instead of permission denied).
3. When listing or getting a query, because it was easy to capture
management tokens given the past behavior, this will always blank out
the "Token" field (replacing the contents as <hidden>) for all tokens
unless a management token is supplied. Going forward, we should
discourage people from binding tokens for execution unless strictly
necessary.
4. No token will be captured by default when a prepared query is created.
If the user wishes to supply an execution token then can pass it in via
the "Token" field in the prepared query definition. Otherwise, this
field will default to empty.
5. At execution time, we will use the captured token if it exists with the
prepared query definition, otherwise we will use the token that's passed
in with the request, just like we do for other RPCs (or you can use the
agent's configured token for DNS).
6. Prepared queries with no name (accessible only by ID) will not require
ACLs to create or modify (execution time will depend on the service ACL
configuration). Our argument here is that these are designed to be
ephemeral and the IDs are as good as an ACL. Management tokens will be
able to list all of these.
These changes enable templates, but also enable delegation of authority to
manage the prepared query namespace.
2016-02-23 08:12:58 +00:00
|
|
|
"reflect"
|
2014-08-11 21:01:45 +00:00
|
|
|
"testing"
|
|
|
|
|
2014-08-11 21:18:51 +00:00
|
|
|
"github.com/hashicorp/consul/acl"
|
2014-08-11 21:01:45 +00:00
|
|
|
"github.com/hashicorp/consul/consul/structs"
|
|
|
|
"github.com/hashicorp/consul/testutil"
|
|
|
|
)
|
|
|
|
|
|
|
|
func TestACL_Disabled(t *testing.T) {
|
|
|
|
dir1, s1 := testServer(t)
|
|
|
|
defer os.RemoveAll(dir1)
|
|
|
|
defer s1.Shutdown()
|
|
|
|
client := rpcClient(t, s1)
|
|
|
|
defer client.Close()
|
|
|
|
|
2015-10-13 23:43:52 +00:00
|
|
|
testutil.WaitForLeader(t, s1.RPC, "dc1")
|
2014-08-11 21:01:45 +00:00
|
|
|
|
|
|
|
acl, err := s1.resolveToken("does not exist")
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
if acl != nil {
|
|
|
|
t.Fatalf("got acl")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-08-12 17:58:02 +00:00
|
|
|
func TestACL_ResolveRootACL(t *testing.T) {
|
|
|
|
dir1, s1 := testServerWithConfig(t, func(c *Config) {
|
|
|
|
c.ACLDatacenter = "dc1" // Enable ACLs!
|
|
|
|
})
|
|
|
|
defer os.RemoveAll(dir1)
|
|
|
|
defer s1.Shutdown()
|
|
|
|
|
|
|
|
acl, err := s1.resolveToken("allow")
|
|
|
|
if err == nil || err.Error() != rootDenied {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
if acl != nil {
|
|
|
|
t.Fatalf("bad: %v", acl)
|
|
|
|
}
|
|
|
|
|
|
|
|
acl, err = s1.resolveToken("deny")
|
|
|
|
if err == nil || err.Error() != rootDenied {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
if acl != nil {
|
|
|
|
t.Fatalf("bad: %v", acl)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-08-11 21:01:45 +00:00
|
|
|
func TestACL_Authority_NotFound(t *testing.T) {
|
|
|
|
dir1, s1 := testServerWithConfig(t, func(c *Config) {
|
|
|
|
c.ACLDatacenter = "dc1" // Enable ACLs!
|
|
|
|
})
|
|
|
|
defer os.RemoveAll(dir1)
|
|
|
|
defer s1.Shutdown()
|
|
|
|
client := rpcClient(t, s1)
|
|
|
|
defer client.Close()
|
|
|
|
|
2015-10-13 23:43:52 +00:00
|
|
|
testutil.WaitForLeader(t, s1.RPC, "dc1")
|
2014-08-11 21:01:45 +00:00
|
|
|
|
|
|
|
acl, err := s1.resolveToken("does not exist")
|
|
|
|
if err == nil || err.Error() != aclNotFound {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
if acl != nil {
|
|
|
|
t.Fatalf("got acl")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestACL_Authority_Found(t *testing.T) {
|
|
|
|
dir1, s1 := testServerWithConfig(t, func(c *Config) {
|
|
|
|
c.ACLDatacenter = "dc1" // Enable ACLs!
|
2014-08-12 22:32:44 +00:00
|
|
|
c.ACLMasterToken = "root"
|
2014-08-11 21:01:45 +00:00
|
|
|
})
|
|
|
|
defer os.RemoveAll(dir1)
|
|
|
|
defer s1.Shutdown()
|
|
|
|
client := rpcClient(t, s1)
|
|
|
|
defer client.Close()
|
|
|
|
|
2015-10-13 23:43:52 +00:00
|
|
|
testutil.WaitForLeader(t, s1.RPC, "dc1")
|
2014-08-11 21:01:45 +00:00
|
|
|
|
|
|
|
// Create a new token
|
|
|
|
arg := structs.ACLRequest{
|
|
|
|
Datacenter: "dc1",
|
|
|
|
Op: structs.ACLSet,
|
|
|
|
ACL: structs.ACL{
|
|
|
|
Name: "User token",
|
|
|
|
Type: structs.ACLTypeClient,
|
|
|
|
Rules: testACLPolicy,
|
|
|
|
},
|
2014-08-12 22:32:44 +00:00
|
|
|
WriteRequest: structs.WriteRequest{Token: "root"},
|
2014-08-11 21:01:45 +00:00
|
|
|
}
|
|
|
|
var id string
|
2015-10-13 23:43:52 +00:00
|
|
|
if err := s1.RPC("ACL.Apply", &arg, &id); err != nil {
|
2014-08-11 21:01:45 +00:00
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Resolve the token
|
|
|
|
acl, err := s1.resolveToken(id)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
if acl == nil {
|
|
|
|
t.Fatalf("missing acl")
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check the policy
|
|
|
|
if acl.KeyRead("bar") {
|
|
|
|
t.Fatalf("unexpected read")
|
|
|
|
}
|
|
|
|
if !acl.KeyRead("foo/test") {
|
|
|
|
t.Fatalf("unexpected failed read")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-08-11 21:54:18 +00:00
|
|
|
func TestACL_Authority_Anonymous_Found(t *testing.T) {
|
|
|
|
dir1, s1 := testServerWithConfig(t, func(c *Config) {
|
|
|
|
c.ACLDatacenter = "dc1" // Enable ACLs!
|
|
|
|
})
|
|
|
|
defer os.RemoveAll(dir1)
|
|
|
|
defer s1.Shutdown()
|
|
|
|
client := rpcClient(t, s1)
|
|
|
|
defer client.Close()
|
|
|
|
|
2015-10-13 23:43:52 +00:00
|
|
|
testutil.WaitForLeader(t, s1.RPC, "dc1")
|
2014-08-11 21:54:18 +00:00
|
|
|
|
|
|
|
// Resolve the token
|
|
|
|
acl, err := s1.resolveToken("")
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
if acl == nil {
|
|
|
|
t.Fatalf("missing acl")
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check the policy, should allow all
|
|
|
|
if !acl.KeyRead("foo/test") {
|
|
|
|
t.Fatalf("unexpected failed read")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestACL_Authority_Master_Found(t *testing.T) {
|
|
|
|
dir1, s1 := testServerWithConfig(t, func(c *Config) {
|
|
|
|
c.ACLDatacenter = "dc1" // Enable ACLs!
|
|
|
|
c.ACLMasterToken = "foobar"
|
|
|
|
})
|
|
|
|
defer os.RemoveAll(dir1)
|
|
|
|
defer s1.Shutdown()
|
|
|
|
client := rpcClient(t, s1)
|
|
|
|
defer client.Close()
|
|
|
|
|
2015-10-13 23:43:52 +00:00
|
|
|
testutil.WaitForLeader(t, s1.RPC, "dc1")
|
2014-08-11 21:54:18 +00:00
|
|
|
|
|
|
|
// Resolve the token
|
|
|
|
acl, err := s1.resolveToken("foobar")
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
if acl == nil {
|
|
|
|
t.Fatalf("missing acl")
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check the policy, should allow all
|
|
|
|
if !acl.KeyRead("foo/test") {
|
|
|
|
t.Fatalf("unexpected failed read")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-08-12 17:38:57 +00:00
|
|
|
func TestACL_Authority_Management(t *testing.T) {
|
|
|
|
dir1, s1 := testServerWithConfig(t, func(c *Config) {
|
|
|
|
c.ACLDatacenter = "dc1" // Enable ACLs!
|
|
|
|
c.ACLMasterToken = "foobar"
|
|
|
|
c.ACLDefaultPolicy = "deny"
|
|
|
|
})
|
|
|
|
defer os.RemoveAll(dir1)
|
|
|
|
defer s1.Shutdown()
|
|
|
|
client := rpcClient(t, s1)
|
|
|
|
defer client.Close()
|
|
|
|
|
2015-10-13 23:43:52 +00:00
|
|
|
testutil.WaitForLeader(t, s1.RPC, "dc1")
|
2014-08-12 17:38:57 +00:00
|
|
|
|
|
|
|
// Resolve the token
|
|
|
|
acl, err := s1.resolveToken("foobar")
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
if acl == nil {
|
|
|
|
t.Fatalf("missing acl")
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check the policy, should allow all
|
|
|
|
if !acl.KeyRead("foo/test") {
|
|
|
|
t.Fatalf("unexpected failed read")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-08-11 21:01:45 +00:00
|
|
|
func TestACL_NonAuthority_NotFound(t *testing.T) {
|
|
|
|
dir1, s1 := testServerWithConfig(t, func(c *Config) {
|
|
|
|
c.ACLDatacenter = "dc1"
|
|
|
|
})
|
|
|
|
defer os.RemoveAll(dir1)
|
|
|
|
defer s1.Shutdown()
|
|
|
|
|
|
|
|
dir2, s2 := testServerWithConfig(t, func(c *Config) {
|
|
|
|
c.ACLDatacenter = "dc1" // Enable ACLs!
|
|
|
|
c.Bootstrap = false // Disable bootstrap
|
|
|
|
})
|
|
|
|
defer os.RemoveAll(dir2)
|
|
|
|
defer s2.Shutdown()
|
|
|
|
|
|
|
|
// Try to join
|
|
|
|
addr := fmt.Sprintf("127.0.0.1:%d",
|
|
|
|
s1.config.SerfLANConfig.MemberlistConfig.BindPort)
|
|
|
|
if _, err := s2.JoinLAN([]string{addr}); err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
testutil.WaitForResult(func() (bool, error) {
|
|
|
|
p1, _ := s1.raftPeers.Peers()
|
|
|
|
return len(p1) == 2, errors.New(fmt.Sprintf("%v", p1))
|
|
|
|
}, func(err error) {
|
|
|
|
t.Fatalf("should have 2 peers: %v", err)
|
|
|
|
})
|
|
|
|
|
|
|
|
client := rpcClient(t, s1)
|
|
|
|
defer client.Close()
|
2015-10-13 23:43:52 +00:00
|
|
|
testutil.WaitForLeader(t, s1.RPC, "dc1")
|
2014-08-11 21:01:45 +00:00
|
|
|
|
|
|
|
// find the non-authoritative server
|
|
|
|
var nonAuth *Server
|
|
|
|
if !s1.IsLeader() {
|
|
|
|
nonAuth = s1
|
|
|
|
} else {
|
|
|
|
nonAuth = s2
|
|
|
|
}
|
|
|
|
|
|
|
|
acl, err := nonAuth.resolveToken("does not exist")
|
|
|
|
if err == nil || err.Error() != aclNotFound {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
if acl != nil {
|
|
|
|
t.Fatalf("got acl")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestACL_NonAuthority_Found(t *testing.T) {
|
|
|
|
dir1, s1 := testServerWithConfig(t, func(c *Config) {
|
|
|
|
c.ACLDatacenter = "dc1"
|
2014-08-12 22:32:44 +00:00
|
|
|
c.ACLMasterToken = "root"
|
2014-08-11 21:01:45 +00:00
|
|
|
})
|
|
|
|
defer os.RemoveAll(dir1)
|
|
|
|
defer s1.Shutdown()
|
|
|
|
client := rpcClient(t, s1)
|
|
|
|
defer client.Close()
|
|
|
|
|
|
|
|
dir2, s2 := testServerWithConfig(t, func(c *Config) {
|
|
|
|
c.ACLDatacenter = "dc1" // Enable ACLs!
|
|
|
|
c.Bootstrap = false // Disable bootstrap
|
|
|
|
})
|
|
|
|
defer os.RemoveAll(dir2)
|
|
|
|
defer s2.Shutdown()
|
|
|
|
|
|
|
|
// Try to join
|
|
|
|
addr := fmt.Sprintf("127.0.0.1:%d",
|
|
|
|
s1.config.SerfLANConfig.MemberlistConfig.BindPort)
|
|
|
|
if _, err := s2.JoinLAN([]string{addr}); err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
testutil.WaitForResult(func() (bool, error) {
|
|
|
|
p1, _ := s1.raftPeers.Peers()
|
|
|
|
return len(p1) == 2, errors.New(fmt.Sprintf("%v", p1))
|
|
|
|
}, func(err error) {
|
|
|
|
t.Fatalf("should have 2 peers: %v", err)
|
|
|
|
})
|
2015-10-13 23:43:52 +00:00
|
|
|
testutil.WaitForLeader(t, s1.RPC, "dc1")
|
2014-08-11 21:01:45 +00:00
|
|
|
|
|
|
|
// Create a new token
|
|
|
|
arg := structs.ACLRequest{
|
|
|
|
Datacenter: "dc1",
|
|
|
|
Op: structs.ACLSet,
|
|
|
|
ACL: structs.ACL{
|
|
|
|
Name: "User token",
|
|
|
|
Type: structs.ACLTypeClient,
|
|
|
|
Rules: testACLPolicy,
|
|
|
|
},
|
2014-08-12 22:32:44 +00:00
|
|
|
WriteRequest: structs.WriteRequest{Token: "root"},
|
2014-08-11 21:01:45 +00:00
|
|
|
}
|
|
|
|
var id string
|
2015-10-13 23:43:52 +00:00
|
|
|
if err := s1.RPC("ACL.Apply", &arg, &id); err != nil {
|
2014-08-11 21:01:45 +00:00
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// find the non-authoritative server
|
|
|
|
var nonAuth *Server
|
|
|
|
if !s1.IsLeader() {
|
|
|
|
nonAuth = s1
|
|
|
|
} else {
|
|
|
|
nonAuth = s2
|
|
|
|
}
|
|
|
|
|
|
|
|
// Token should resolve
|
|
|
|
acl, err := nonAuth.resolveToken(id)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
if acl == nil {
|
|
|
|
t.Fatalf("missing acl")
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check the policy
|
|
|
|
if acl.KeyRead("bar") {
|
|
|
|
t.Fatalf("unexpected read")
|
|
|
|
}
|
|
|
|
if !acl.KeyRead("foo/test") {
|
|
|
|
t.Fatalf("unexpected failed read")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-08-12 17:54:56 +00:00
|
|
|
func TestACL_NonAuthority_Management(t *testing.T) {
|
|
|
|
dir1, s1 := testServerWithConfig(t, func(c *Config) {
|
|
|
|
c.ACLDatacenter = "dc1" // Enable ACLs!
|
|
|
|
c.ACLMasterToken = "foobar"
|
|
|
|
c.ACLDefaultPolicy = "deny"
|
|
|
|
})
|
|
|
|
defer os.RemoveAll(dir1)
|
|
|
|
defer s1.Shutdown()
|
|
|
|
client := rpcClient(t, s1)
|
|
|
|
defer client.Close()
|
|
|
|
|
|
|
|
dir2, s2 := testServerWithConfig(t, func(c *Config) {
|
|
|
|
c.ACLDatacenter = "dc1" // Enable ACLs!
|
|
|
|
c.ACLDefaultPolicy = "deny"
|
|
|
|
c.Bootstrap = false // Disable bootstrap
|
|
|
|
})
|
|
|
|
defer os.RemoveAll(dir2)
|
|
|
|
defer s2.Shutdown()
|
|
|
|
|
|
|
|
// Try to join
|
|
|
|
addr := fmt.Sprintf("127.0.0.1:%d",
|
|
|
|
s1.config.SerfLANConfig.MemberlistConfig.BindPort)
|
|
|
|
if _, err := s2.JoinLAN([]string{addr}); err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
testutil.WaitForResult(func() (bool, error) {
|
|
|
|
p1, _ := s1.raftPeers.Peers()
|
|
|
|
return len(p1) == 2, errors.New(fmt.Sprintf("%v", p1))
|
|
|
|
}, func(err error) {
|
|
|
|
t.Fatalf("should have 2 peers: %v", err)
|
|
|
|
})
|
2015-10-13 23:43:52 +00:00
|
|
|
testutil.WaitForLeader(t, s1.RPC, "dc1")
|
2014-08-12 17:54:56 +00:00
|
|
|
|
|
|
|
// find the non-authoritative server
|
|
|
|
var nonAuth *Server
|
|
|
|
if !s1.IsLeader() {
|
|
|
|
nonAuth = s1
|
|
|
|
} else {
|
|
|
|
nonAuth = s2
|
|
|
|
}
|
|
|
|
|
|
|
|
// Resolve the token
|
|
|
|
acl, err := nonAuth.resolveToken("foobar")
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
if acl == nil {
|
|
|
|
t.Fatalf("missing acl")
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check the policy, should allow all
|
|
|
|
if !acl.KeyRead("foo/test") {
|
|
|
|
t.Fatalf("unexpected failed read")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-08-11 21:18:51 +00:00
|
|
|
func TestACL_DownPolicy_Deny(t *testing.T) {
|
|
|
|
dir1, s1 := testServerWithConfig(t, func(c *Config) {
|
|
|
|
c.ACLDatacenter = "dc1"
|
|
|
|
c.ACLDownPolicy = "deny"
|
2014-08-12 22:32:44 +00:00
|
|
|
c.ACLMasterToken = "root"
|
2014-08-11 21:18:51 +00:00
|
|
|
})
|
|
|
|
defer os.RemoveAll(dir1)
|
|
|
|
defer s1.Shutdown()
|
|
|
|
client := rpcClient(t, s1)
|
|
|
|
defer client.Close()
|
|
|
|
|
|
|
|
dir2, s2 := testServerWithConfig(t, func(c *Config) {
|
|
|
|
c.ACLDatacenter = "dc1" // Enable ACLs!
|
|
|
|
c.ACLDownPolicy = "deny"
|
|
|
|
c.Bootstrap = false // Disable bootstrap
|
|
|
|
})
|
|
|
|
defer os.RemoveAll(dir2)
|
|
|
|
defer s2.Shutdown()
|
|
|
|
|
|
|
|
// Try to join
|
|
|
|
addr := fmt.Sprintf("127.0.0.1:%d",
|
|
|
|
s1.config.SerfLANConfig.MemberlistConfig.BindPort)
|
|
|
|
if _, err := s2.JoinLAN([]string{addr}); err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
testutil.WaitForResult(func() (bool, error) {
|
|
|
|
p1, _ := s1.raftPeers.Peers()
|
|
|
|
return len(p1) == 2, errors.New(fmt.Sprintf("%v", p1))
|
|
|
|
}, func(err error) {
|
|
|
|
t.Fatalf("should have 2 peers: %v", err)
|
|
|
|
})
|
2015-10-13 23:43:52 +00:00
|
|
|
testutil.WaitForLeader(t, s1.RPC, "dc1")
|
2014-08-11 21:18:51 +00:00
|
|
|
|
|
|
|
// Create a new token
|
|
|
|
arg := structs.ACLRequest{
|
|
|
|
Datacenter: "dc1",
|
|
|
|
Op: structs.ACLSet,
|
|
|
|
ACL: structs.ACL{
|
|
|
|
Name: "User token",
|
|
|
|
Type: structs.ACLTypeClient,
|
|
|
|
Rules: testACLPolicy,
|
|
|
|
},
|
2014-08-12 22:32:44 +00:00
|
|
|
WriteRequest: structs.WriteRequest{Token: "root"},
|
2014-08-11 21:18:51 +00:00
|
|
|
}
|
|
|
|
var id string
|
2015-10-13 23:43:52 +00:00
|
|
|
if err := s1.RPC("ACL.Apply", &arg, &id); err != nil {
|
2014-08-11 21:18:51 +00:00
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// find the non-authoritative server
|
|
|
|
var nonAuth *Server
|
|
|
|
var auth *Server
|
|
|
|
if !s1.IsLeader() {
|
|
|
|
nonAuth = s1
|
|
|
|
auth = s2
|
|
|
|
} else {
|
|
|
|
nonAuth = s2
|
|
|
|
auth = s1
|
|
|
|
}
|
|
|
|
|
|
|
|
// Kill the authoritative server
|
|
|
|
auth.Shutdown()
|
|
|
|
|
|
|
|
// Token should resolve into a DenyAll
|
|
|
|
aclR, err := nonAuth.resolveToken(id)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
if aclR != acl.DenyAll() {
|
|
|
|
t.Fatalf("bad acl: %#v", aclR)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestACL_DownPolicy_Allow(t *testing.T) {
|
|
|
|
dir1, s1 := testServerWithConfig(t, func(c *Config) {
|
|
|
|
c.ACLDatacenter = "dc1"
|
|
|
|
c.ACLDownPolicy = "allow"
|
2014-08-12 22:32:44 +00:00
|
|
|
c.ACLMasterToken = "root"
|
2014-08-11 21:18:51 +00:00
|
|
|
})
|
|
|
|
defer os.RemoveAll(dir1)
|
|
|
|
defer s1.Shutdown()
|
|
|
|
client := rpcClient(t, s1)
|
|
|
|
defer client.Close()
|
|
|
|
|
|
|
|
dir2, s2 := testServerWithConfig(t, func(c *Config) {
|
|
|
|
c.ACLDatacenter = "dc1" // Enable ACLs!
|
|
|
|
c.ACLDownPolicy = "allow"
|
|
|
|
c.Bootstrap = false // Disable bootstrap
|
|
|
|
})
|
|
|
|
defer os.RemoveAll(dir2)
|
|
|
|
defer s2.Shutdown()
|
|
|
|
|
|
|
|
// Try to join
|
|
|
|
addr := fmt.Sprintf("127.0.0.1:%d",
|
|
|
|
s1.config.SerfLANConfig.MemberlistConfig.BindPort)
|
|
|
|
if _, err := s2.JoinLAN([]string{addr}); err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
testutil.WaitForResult(func() (bool, error) {
|
|
|
|
p1, _ := s1.raftPeers.Peers()
|
|
|
|
return len(p1) == 2, errors.New(fmt.Sprintf("%v", p1))
|
|
|
|
}, func(err error) {
|
|
|
|
t.Fatalf("should have 2 peers: %v", err)
|
|
|
|
})
|
2015-10-13 23:43:52 +00:00
|
|
|
testutil.WaitForLeader(t, s1.RPC, "dc1")
|
2014-08-11 21:18:51 +00:00
|
|
|
|
|
|
|
// Create a new token
|
|
|
|
arg := structs.ACLRequest{
|
|
|
|
Datacenter: "dc1",
|
|
|
|
Op: structs.ACLSet,
|
|
|
|
ACL: structs.ACL{
|
|
|
|
Name: "User token",
|
|
|
|
Type: structs.ACLTypeClient,
|
|
|
|
Rules: testACLPolicy,
|
|
|
|
},
|
2014-08-12 22:32:44 +00:00
|
|
|
WriteRequest: structs.WriteRequest{Token: "root"},
|
2014-08-11 21:18:51 +00:00
|
|
|
}
|
|
|
|
var id string
|
2015-10-13 23:43:52 +00:00
|
|
|
if err := s1.RPC("ACL.Apply", &arg, &id); err != nil {
|
2014-08-11 21:18:51 +00:00
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// find the non-authoritative server
|
|
|
|
var nonAuth *Server
|
|
|
|
var auth *Server
|
|
|
|
if !s1.IsLeader() {
|
|
|
|
nonAuth = s1
|
|
|
|
auth = s2
|
|
|
|
} else {
|
|
|
|
nonAuth = s2
|
|
|
|
auth = s1
|
|
|
|
}
|
|
|
|
|
|
|
|
// Kill the authoritative server
|
|
|
|
auth.Shutdown()
|
|
|
|
|
|
|
|
// Token should resolve into a AllowAll
|
|
|
|
aclR, err := nonAuth.resolveToken(id)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
if aclR != acl.AllowAll() {
|
|
|
|
t.Fatalf("bad acl: %#v", aclR)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestACL_DownPolicy_ExtendCache(t *testing.T) {
|
|
|
|
dir1, s1 := testServerWithConfig(t, func(c *Config) {
|
|
|
|
c.ACLDatacenter = "dc1"
|
|
|
|
c.ACLTTL = 0
|
|
|
|
c.ACLDownPolicy = "extend-cache"
|
2014-08-12 22:32:44 +00:00
|
|
|
c.ACLMasterToken = "root"
|
2014-08-11 21:18:51 +00:00
|
|
|
})
|
|
|
|
defer os.RemoveAll(dir1)
|
|
|
|
defer s1.Shutdown()
|
|
|
|
client := rpcClient(t, s1)
|
|
|
|
defer client.Close()
|
|
|
|
|
|
|
|
dir2, s2 := testServerWithConfig(t, func(c *Config) {
|
|
|
|
c.ACLDatacenter = "dc1" // Enable ACLs!
|
|
|
|
c.ACLTTL = 0
|
|
|
|
c.ACLDownPolicy = "extend-cache"
|
|
|
|
c.Bootstrap = false // Disable bootstrap
|
|
|
|
})
|
|
|
|
defer os.RemoveAll(dir2)
|
|
|
|
defer s2.Shutdown()
|
|
|
|
|
|
|
|
// Try to join
|
|
|
|
addr := fmt.Sprintf("127.0.0.1:%d",
|
|
|
|
s1.config.SerfLANConfig.MemberlistConfig.BindPort)
|
|
|
|
if _, err := s2.JoinLAN([]string{addr}); err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
testutil.WaitForResult(func() (bool, error) {
|
|
|
|
p1, _ := s1.raftPeers.Peers()
|
|
|
|
return len(p1) == 2, errors.New(fmt.Sprintf("%v", p1))
|
|
|
|
}, func(err error) {
|
|
|
|
t.Fatalf("should have 2 peers: %v", err)
|
|
|
|
})
|
2015-10-13 23:43:52 +00:00
|
|
|
testutil.WaitForLeader(t, s1.RPC, "dc1")
|
2014-08-11 21:18:51 +00:00
|
|
|
|
|
|
|
// Create a new token
|
|
|
|
arg := structs.ACLRequest{
|
|
|
|
Datacenter: "dc1",
|
|
|
|
Op: structs.ACLSet,
|
|
|
|
ACL: structs.ACL{
|
|
|
|
Name: "User token",
|
|
|
|
Type: structs.ACLTypeClient,
|
|
|
|
Rules: testACLPolicy,
|
|
|
|
},
|
2014-08-12 22:32:44 +00:00
|
|
|
WriteRequest: structs.WriteRequest{Token: "root"},
|
2014-08-11 21:18:51 +00:00
|
|
|
}
|
|
|
|
var id string
|
2015-10-13 23:43:52 +00:00
|
|
|
if err := s1.RPC("ACL.Apply", &arg, &id); err != nil {
|
2014-08-11 21:18:51 +00:00
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// find the non-authoritative server
|
|
|
|
var nonAuth *Server
|
|
|
|
var auth *Server
|
|
|
|
if !s1.IsLeader() {
|
|
|
|
nonAuth = s1
|
|
|
|
auth = s2
|
|
|
|
} else {
|
|
|
|
nonAuth = s2
|
|
|
|
auth = s1
|
|
|
|
}
|
|
|
|
|
|
|
|
// Warm the caches
|
|
|
|
aclR, err := nonAuth.resolveToken(id)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
if aclR == nil {
|
|
|
|
t.Fatalf("bad acl: %#v", aclR)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Kill the authoritative server
|
|
|
|
auth.Shutdown()
|
|
|
|
|
|
|
|
// Token should resolve into cached copy
|
|
|
|
aclR2, err := nonAuth.resolveToken(id)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
if aclR2 != aclR {
|
|
|
|
t.Fatalf("bad acl: %#v", aclR)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestACL_MultiDC_Found(t *testing.T) {
|
|
|
|
dir1, s1 := testServerWithConfig(t, func(c *Config) {
|
|
|
|
c.ACLDatacenter = "dc1"
|
2014-08-12 22:32:44 +00:00
|
|
|
c.ACLMasterToken = "root"
|
2014-08-11 21:18:51 +00:00
|
|
|
})
|
|
|
|
defer os.RemoveAll(dir1)
|
|
|
|
defer s1.Shutdown()
|
|
|
|
client := rpcClient(t, s1)
|
|
|
|
defer client.Close()
|
|
|
|
|
|
|
|
dir2, s2 := testServerWithConfig(t, func(c *Config) {
|
|
|
|
c.Datacenter = "dc2"
|
|
|
|
c.ACLDatacenter = "dc1" // Enable ACLs!
|
|
|
|
})
|
|
|
|
defer os.RemoveAll(dir2)
|
|
|
|
defer s2.Shutdown()
|
|
|
|
|
|
|
|
// Try to join
|
|
|
|
addr := fmt.Sprintf("127.0.0.1:%d",
|
|
|
|
s1.config.SerfWANConfig.MemberlistConfig.BindPort)
|
|
|
|
if _, err := s2.JoinWAN([]string{addr}); err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
2015-10-13 23:43:52 +00:00
|
|
|
testutil.WaitForLeader(t, s1.RPC, "dc1")
|
|
|
|
testutil.WaitForLeader(t, s1.RPC, "dc2")
|
2014-08-11 21:18:51 +00:00
|
|
|
|
|
|
|
// Create a new token
|
|
|
|
arg := structs.ACLRequest{
|
|
|
|
Datacenter: "dc1",
|
|
|
|
Op: structs.ACLSet,
|
|
|
|
ACL: structs.ACL{
|
|
|
|
Name: "User token",
|
|
|
|
Type: structs.ACLTypeClient,
|
|
|
|
Rules: testACLPolicy,
|
|
|
|
},
|
2014-08-12 22:32:44 +00:00
|
|
|
WriteRequest: structs.WriteRequest{Token: "root"},
|
2014-08-11 21:18:51 +00:00
|
|
|
}
|
|
|
|
var id string
|
2015-10-13 23:43:52 +00:00
|
|
|
if err := s1.RPC("ACL.Apply", &arg, &id); err != nil {
|
2014-08-11 21:18:51 +00:00
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Token should resolve
|
|
|
|
acl, err := s2.resolveToken(id)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
if acl == nil {
|
|
|
|
t.Fatalf("missing acl")
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check the policy
|
|
|
|
if acl.KeyRead("bar") {
|
|
|
|
t.Fatalf("unexpected read")
|
|
|
|
}
|
|
|
|
if !acl.KeyRead("foo/test") {
|
|
|
|
t.Fatalf("unexpected failed read")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-06-11 21:14:43 +00:00
|
|
|
func TestACL_filterHealthChecks(t *testing.T) {
|
|
|
|
// Create some health checks
|
|
|
|
hc := structs.HealthChecks{
|
|
|
|
&structs.HealthCheck{
|
|
|
|
Node: "node1",
|
|
|
|
CheckID: "check1",
|
|
|
|
ServiceName: "foo",
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
// Try permissive filtering
|
|
|
|
filt := newAclFilter(acl.AllowAll(), nil)
|
|
|
|
filt.filterHealthChecks(&hc)
|
|
|
|
if len(hc) != 1 {
|
|
|
|
t.Fatalf("bad: %#v", hc)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Try restrictive filtering
|
|
|
|
filt = newAclFilter(acl.DenyAll(), nil)
|
|
|
|
filt.filterHealthChecks(&hc)
|
|
|
|
if len(hc) != 0 {
|
|
|
|
t.Fatalf("bad: %#v", hc)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestACL_filterServices(t *testing.T) {
|
|
|
|
// Create some services
|
|
|
|
services := structs.Services{
|
|
|
|
"service1": []string{},
|
|
|
|
"service2": []string{},
|
|
|
|
}
|
|
|
|
|
|
|
|
// Try permissive filtering
|
|
|
|
filt := newAclFilter(acl.AllowAll(), nil)
|
|
|
|
filt.filterServices(services)
|
|
|
|
if len(services) != 2 {
|
|
|
|
t.Fatalf("bad: %#v", services)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Try restrictive filtering
|
|
|
|
filt = newAclFilter(acl.DenyAll(), nil)
|
|
|
|
filt.filterServices(services)
|
|
|
|
if len(services) != 0 {
|
|
|
|
t.Fatalf("bad: %#v", services)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestACL_filterServiceNodes(t *testing.T) {
|
|
|
|
// Create some service nodes
|
|
|
|
nodes := structs.ServiceNodes{
|
2015-09-10 21:40:11 +00:00
|
|
|
&structs.ServiceNode{
|
2015-06-11 21:14:43 +00:00
|
|
|
Node: "node1",
|
|
|
|
ServiceName: "foo",
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
// Try permissive filtering
|
|
|
|
filt := newAclFilter(acl.AllowAll(), nil)
|
|
|
|
filt.filterServiceNodes(&nodes)
|
|
|
|
if len(nodes) != 1 {
|
|
|
|
t.Fatalf("bad: %#v", nodes)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Try restrictive filtering
|
|
|
|
filt = newAclFilter(acl.DenyAll(), nil)
|
|
|
|
filt.filterServiceNodes(&nodes)
|
|
|
|
if len(nodes) != 0 {
|
|
|
|
t.Fatalf("bad: %#v", nodes)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestACL_filterNodeServices(t *testing.T) {
|
|
|
|
// Create some node services
|
|
|
|
services := structs.NodeServices{
|
2015-09-10 21:40:11 +00:00
|
|
|
Node: &structs.Node{
|
2015-06-11 21:14:43 +00:00
|
|
|
Node: "node1",
|
|
|
|
},
|
|
|
|
Services: map[string]*structs.NodeService{
|
|
|
|
"foo": &structs.NodeService{
|
|
|
|
ID: "foo",
|
|
|
|
Service: "foo",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
// Try permissive filtering
|
|
|
|
filt := newAclFilter(acl.AllowAll(), nil)
|
|
|
|
filt.filterNodeServices(&services)
|
|
|
|
if len(services.Services) != 1 {
|
|
|
|
t.Fatalf("bad: %#v", services.Services)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Try restrictive filtering
|
|
|
|
filt = newAclFilter(acl.DenyAll(), nil)
|
|
|
|
filt.filterNodeServices(&services)
|
|
|
|
if len(services.Services) != 0 {
|
|
|
|
t.Fatalf("bad: %#v", services.Services)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestACL_filterCheckServiceNodes(t *testing.T) {
|
|
|
|
// Create some nodes
|
|
|
|
nodes := structs.CheckServiceNodes{
|
|
|
|
structs.CheckServiceNode{
|
2015-09-10 21:40:11 +00:00
|
|
|
Node: &structs.Node{
|
2015-06-11 21:14:43 +00:00
|
|
|
Node: "node1",
|
|
|
|
},
|
2015-09-10 21:40:11 +00:00
|
|
|
Service: &structs.NodeService{
|
2015-06-11 21:14:43 +00:00
|
|
|
ID: "foo",
|
|
|
|
Service: "foo",
|
|
|
|
},
|
|
|
|
Checks: structs.HealthChecks{
|
|
|
|
&structs.HealthCheck{
|
|
|
|
Node: "node1",
|
|
|
|
CheckID: "check1",
|
|
|
|
ServiceName: "foo",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
// Try permissive filtering
|
|
|
|
filt := newAclFilter(acl.AllowAll(), nil)
|
|
|
|
filt.filterCheckServiceNodes(&nodes)
|
|
|
|
if len(nodes) != 1 {
|
|
|
|
t.Fatalf("bad: %#v", nodes)
|
|
|
|
}
|
|
|
|
if len(nodes[0].Checks) != 1 {
|
|
|
|
t.Fatalf("bad: %#v", nodes[0].Checks)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Try restrictive filtering
|
|
|
|
filt = newAclFilter(acl.DenyAll(), nil)
|
|
|
|
filt.filterCheckServiceNodes(&nodes)
|
|
|
|
if len(nodes) != 0 {
|
|
|
|
t.Fatalf("bad: %#v", nodes)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestACL_filterNodeDump(t *testing.T) {
|
|
|
|
// Create a node dump
|
|
|
|
dump := structs.NodeDump{
|
|
|
|
&structs.NodeInfo{
|
|
|
|
Node: "node1",
|
|
|
|
Services: []*structs.NodeService{
|
|
|
|
&structs.NodeService{
|
|
|
|
ID: "foo",
|
|
|
|
Service: "foo",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
Checks: []*structs.HealthCheck{
|
|
|
|
&structs.HealthCheck{
|
|
|
|
Node: "node1",
|
|
|
|
CheckID: "check1",
|
|
|
|
ServiceName: "foo",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
// Try permissive filtering
|
|
|
|
filt := newAclFilter(acl.AllowAll(), nil)
|
|
|
|
filt.filterNodeDump(&dump)
|
|
|
|
if len(dump) != 1 {
|
|
|
|
t.Fatalf("bad: %#v", dump)
|
|
|
|
}
|
|
|
|
if len(dump[0].Services) != 1 {
|
|
|
|
t.Fatalf("bad: %#v", dump[0].Services)
|
|
|
|
}
|
|
|
|
if len(dump[0].Checks) != 1 {
|
|
|
|
t.Fatalf("bad: %#v", dump[0].Checks)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Try restrictive filtering
|
|
|
|
filt = newAclFilter(acl.DenyAll(), nil)
|
|
|
|
filt.filterNodeDump(&dump)
|
|
|
|
if len(dump) != 1 {
|
|
|
|
t.Fatalf("bad: %#v", dump)
|
|
|
|
}
|
|
|
|
if len(dump[0].Services) != 0 {
|
|
|
|
t.Fatalf("bad: %#v", dump[0].Services)
|
|
|
|
}
|
|
|
|
if len(dump[0].Checks) != 0 {
|
|
|
|
t.Fatalf("bad: %#v", dump[0].Checks)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Creates new "prepared-query" ACL type and new token capture behavior.
Prior to this change, prepared queries had the following behavior for
ACLs, which will need to change to support templates:
1. A management token, or a token with read access to the service being
queried needed to be provided in order to create a prepared query.
2. The token used to create the prepared query was stored with the query
in the state store and used to execute the query.
3. A management token, or the token used to create the query needed to be
supplied to perform and CRUD operations on an existing prepared query.
This was pretty subtle and complicated behavior, and won't work for
templates since the service name is computed at execution time. To solve
this, we introduce a new "prepared-query" ACL type, where the prefix
applies to the query name for static prepared query types and to the
prefix for template prepared query types.
With this change, the new behavior is:
1. A management token, or a token with "prepared-query" write access to
the query name or (soon) the given template prefix is required to do
any CRUD operations on a prepared query, or to list prepared queries
(the list is filtered by this ACL).
2. You will no longer need a management token to list prepared queries,
but you will only be able to see prepared queries that you have access
to (you get an empty list instead of permission denied).
3. When listing or getting a query, because it was easy to capture
management tokens given the past behavior, this will always blank out
the "Token" field (replacing the contents as <hidden>) for all tokens
unless a management token is supplied. Going forward, we should
discourage people from binding tokens for execution unless strictly
necessary.
4. No token will be captured by default when a prepared query is created.
If the user wishes to supply an execution token then can pass it in via
the "Token" field in the prepared query definition. Otherwise, this
field will default to empty.
5. At execution time, we will use the captured token if it exists with the
prepared query definition, otherwise we will use the token that's passed
in with the request, just like we do for other RPCs (or you can use the
agent's configured token for DNS).
6. Prepared queries with no name (accessible only by ID) will not require
ACLs to create or modify (execution time will depend on the service ACL
configuration). Our argument here is that these are designed to be
ephemeral and the IDs are as good as an ACL. Management tokens will be
able to list all of these.
These changes enable templates, but also enable delegation of authority to
manage the prepared query namespace.
2016-02-23 08:12:58 +00:00
|
|
|
func TestACL_filterPreparedQueries(t *testing.T) {
|
|
|
|
queries := structs.PreparedQueries{
|
|
|
|
&structs.PreparedQuery{
|
|
|
|
ID: "f004177f-2c28-83b7-4229-eacc25fe55d1",
|
|
|
|
Service: structs.ServiceQuery{
|
|
|
|
Service: "foo",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
&structs.PreparedQuery{
|
|
|
|
ID: "f004177f-2c28-83b7-4229-eacc25fe55d2",
|
|
|
|
Token: "root",
|
|
|
|
Service: structs.ServiceQuery{
|
|
|
|
Service: "bar",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
expected := structs.PreparedQueries{
|
|
|
|
&structs.PreparedQuery{
|
|
|
|
ID: "f004177f-2c28-83b7-4229-eacc25fe55d1",
|
|
|
|
Service: structs.ServiceQuery{
|
|
|
|
Service: "foo",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
&structs.PreparedQuery{
|
|
|
|
ID: "f004177f-2c28-83b7-4229-eacc25fe55d2",
|
|
|
|
Token: "root",
|
|
|
|
Service: structs.ServiceQuery{
|
|
|
|
Service: "bar",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
// Try permissive filtering with a management token. This will allow the
|
|
|
|
// embedded tokens to be seen.
|
|
|
|
filt := newAclFilter(acl.ManageAll(), nil)
|
|
|
|
filt.filterPreparedQueries(&queries)
|
|
|
|
if !reflect.DeepEqual(queries, expected) {
|
|
|
|
t.Fatalf("bad: %#v", queries)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Hang on to the entry with a token, which needs to survive the next
|
|
|
|
// operation.
|
|
|
|
original := queries[1]
|
|
|
|
|
|
|
|
// Now try permissive filtering with a client token, which should cause
|
|
|
|
// the embedded tokens to get redacted.
|
|
|
|
filt = newAclFilter(acl.AllowAll(), nil)
|
|
|
|
filt.filterPreparedQueries(&queries)
|
|
|
|
expected[1].Token = redactedToken
|
|
|
|
if !reflect.DeepEqual(queries, expected) {
|
|
|
|
t.Fatalf("bad: %#v", queries)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Make sure that the original object didn't lose its token.
|
|
|
|
if original.Token != "root" {
|
|
|
|
t.Fatalf("bad token: %s", original.Token)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Now try restrictive filtering.
|
|
|
|
filt = newAclFilter(acl.DenyAll(), nil)
|
|
|
|
filt.filterPreparedQueries(&queries)
|
|
|
|
if len(queries) != 0 {
|
|
|
|
t.Fatalf("bad: %#v", queries)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-06-11 23:46:15 +00:00
|
|
|
func TestACL_unhandledFilterType(t *testing.T) {
|
|
|
|
defer func(t *testing.T) {
|
|
|
|
if recover() == nil {
|
|
|
|
t.Fatalf("should panic")
|
|
|
|
}
|
|
|
|
}(t)
|
|
|
|
|
|
|
|
// Create the server
|
|
|
|
dir, token, srv, client := testACLFilterServer(t)
|
|
|
|
defer os.RemoveAll(dir)
|
|
|
|
defer srv.Shutdown()
|
|
|
|
defer client.Close()
|
|
|
|
|
|
|
|
// Pass an unhandled type into the ACL filter.
|
|
|
|
srv.filterACL(token, &structs.HealthCheck{})
|
|
|
|
}
|
|
|
|
|
2014-08-11 21:01:45 +00:00
|
|
|
var testACLPolicy = `
|
|
|
|
key "" {
|
|
|
|
policy = "deny"
|
|
|
|
}
|
|
|
|
key "foo/" {
|
|
|
|
policy = "write"
|
|
|
|
}
|
|
|
|
`
|