2016-08-04 01:44:24 +00:00
|
|
|
package consul
|
|
|
|
|
|
|
|
import (
|
|
|
|
"fmt"
|
2016-08-04 23:33:40 +00:00
|
|
|
"os"
|
2016-08-04 01:44:24 +00:00
|
|
|
"reflect"
|
|
|
|
"sort"
|
|
|
|
"strconv"
|
|
|
|
"strings"
|
|
|
|
"testing"
|
2016-08-04 23:33:40 +00:00
|
|
|
"time"
|
2016-08-04 01:44:24 +00:00
|
|
|
|
pkg refactor
command/agent/* -> agent/*
command/consul/* -> agent/consul/*
command/agent/command{,_test}.go -> command/agent{,_test}.go
command/base/command.go -> command/base.go
command/base/* -> command/*
commands.go -> command/commands.go
The script which did the refactor is:
(
cd $GOPATH/src/github.com/hashicorp/consul
git mv command/agent/command.go command/agent.go
git mv command/agent/command_test.go command/agent_test.go
git mv command/agent/flag_slice_value{,_test}.go command/
git mv command/agent .
git mv command/base/command.go command/base.go
git mv command/base/config_util{,_test}.go command/
git mv commands.go command/
git mv consul agent
rmdir command/base/
gsed -i -e 's|package agent|package command|' command/agent{,_test}.go
gsed -i -e 's|package agent|package command|' command/flag_slice_value{,_test}.go
gsed -i -e 's|package base|package command|' command/base.go command/config_util{,_test}.go
gsed -i -e 's|package main|package command|' command/commands.go
gsed -i -e 's|base.Command|BaseCommand|' command/commands.go
gsed -i -e 's|agent.Command|AgentCommand|' command/commands.go
gsed -i -e 's|\tCommand:|\tBaseCommand:|' command/commands.go
gsed -i -e 's|base\.||' command/commands.go
gsed -i -e 's|command\.||' command/commands.go
gsed -i -e 's|command|c|' main.go
gsed -i -e 's|range Commands|range command.Commands|' main.go
gsed -i -e 's|Commands: Commands|Commands: command.Commands|' main.go
gsed -i -e 's|base\.BoolValue|BoolValue|' command/operator_autopilot_set.go
gsed -i -e 's|base\.DurationValue|DurationValue|' command/operator_autopilot_set.go
gsed -i -e 's|base\.StringValue|StringValue|' command/operator_autopilot_set.go
gsed -i -e 's|base\.UintValue|UintValue|' command/operator_autopilot_set.go
gsed -i -e 's|\bCommand\b|BaseCommand|' command/base.go
gsed -i -e 's|BaseCommand Options|Command Options|' command/base.go
gsed -i -e 's|base.Command|BaseCommand|' command/*.go
gsed -i -e 's|c\.Command|c.BaseCommand|g' command/*.go
gsed -i -e 's|\tCommand:|\tBaseCommand:|' command/*_test.go
gsed -i -e 's|base\.||' command/*_test.go
gsed -i -e 's|\bCommand\b|AgentCommand|' command/agent{,_test}.go
gsed -i -e 's|cmd.AgentCommand|cmd.BaseCommand|' command/agent.go
gsed -i -e 's|cli.AgentCommand = new(Command)|cli.Command = new(AgentCommand)|' command/agent_test.go
gsed -i -e 's|exec.AgentCommand|exec.Command|' command/agent_test.go
gsed -i -e 's|exec.BaseCommand|exec.Command|' command/agent_test.go
gsed -i -e 's|NewTestAgent|agent.NewTestAgent|' command/agent_test.go
gsed -i -e 's|= TestConfig|= agent.TestConfig|' command/agent_test.go
gsed -i -e 's|: RetryJoin|: agent.RetryJoin|' command/agent_test.go
gsed -i -e 's|\.\./\.\./|../|' command/config_util_test.go
gsed -i -e 's|\bverifyUniqueListeners|VerifyUniqueListeners|' agent/config{,_test}.go command/agent.go
gsed -i -e 's|\bserfLANKeyring\b|SerfLANKeyring|g' agent/{agent,keyring,testagent}.go command/agent.go
gsed -i -e 's|\bserfWANKeyring\b|SerfWANKeyring|g' agent/{agent,keyring,testagent}.go command/agent.go
gsed -i -e 's|\bNewAgent\b|agent.New|g' command/agent{,_test}.go
gsed -i -e 's|\bNewAgent|New|' agent/{acl_test,agent,testagent}.go
gsed -i -e 's|\bAgent\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bBool\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bConfig\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bDefaultConfig\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bDevConfig\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bMergeConfig\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bReadConfigPaths\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bParseMetaPair\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bSerfLANKeyring\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bSerfWANKeyring\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|circonus\.agent|circonus|g' command/agent{,_test}.go
gsed -i -e 's|logger\.agent|logger|g' command/agent{,_test}.go
gsed -i -e 's|metrics\.agent|metrics|g' command/agent{,_test}.go
gsed -i -e 's|// agent.Agent|// agent|' command/agent{,_test}.go
gsed -i -e 's|a\.agent\.Config|a.Config|' command/agent{,_test}.go
gsed -i -e 's|agent\.AppendSliceValue|AppendSliceValue|' command/{configtest,validate}.go
gsed -i -e 's|consul/consul|agent/consul|' GNUmakefile
gsed -i -e 's|\.\./test|../../test|' agent/consul/server_test.go
# fix imports
f=$(grep -rl 'github.com/hashicorp/consul/command/agent' * | grep '\.go')
gsed -i -e 's|github.com/hashicorp/consul/command/agent|github.com/hashicorp/consul/agent|' $f
goimports -w $f
f=$(grep -rl 'github.com/hashicorp/consul/consul' * | grep '\.go')
gsed -i -e 's|github.com/hashicorp/consul/consul|github.com/hashicorp/consul/agent/consul|' $f
goimports -w $f
goimports -w command/*.go main.go
)
2017-06-09 22:28:28 +00:00
|
|
|
"github.com/hashicorp/consul/agent/consul/structs"
|
2017-04-19 23:00:11 +00:00
|
|
|
"github.com/hashicorp/consul/testrpc"
|
2017-04-29 16:34:02 +00:00
|
|
|
"github.com/hashicorp/consul/testutil/retry"
|
2016-08-04 01:44:24 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
func TestACLReplication_Sorter(t *testing.T) {
|
2017-05-22 22:14:27 +00:00
|
|
|
t.Parallel()
|
2016-08-04 01:44:24 +00:00
|
|
|
acls := structs.ACLs{
|
|
|
|
&structs.ACL{ID: "a"},
|
|
|
|
&structs.ACL{ID: "b"},
|
|
|
|
&structs.ACL{ID: "c"},
|
|
|
|
}
|
|
|
|
|
2016-08-09 18:08:26 +00:00
|
|
|
sorter := &aclIterator{acls, 0}
|
2016-08-04 01:44:24 +00:00
|
|
|
if len := sorter.Len(); len != 3 {
|
|
|
|
t.Fatalf("bad: %d", len)
|
|
|
|
}
|
|
|
|
if !sorter.Less(0, 1) {
|
|
|
|
t.Fatalf("should be less")
|
|
|
|
}
|
|
|
|
if sorter.Less(1, 0) {
|
|
|
|
t.Fatalf("should not be less")
|
|
|
|
}
|
|
|
|
if !sort.IsSorted(sorter) {
|
|
|
|
t.Fatalf("should be sorted")
|
|
|
|
}
|
|
|
|
|
|
|
|
expected := structs.ACLs{
|
|
|
|
&structs.ACL{ID: "b"},
|
|
|
|
&structs.ACL{ID: "a"},
|
|
|
|
&structs.ACL{ID: "c"},
|
|
|
|
}
|
|
|
|
sorter.Swap(0, 1)
|
|
|
|
if !reflect.DeepEqual(acls, expected) {
|
|
|
|
t.Fatalf("bad: %v", acls)
|
|
|
|
}
|
|
|
|
if sort.IsSorted(sorter) {
|
|
|
|
t.Fatalf("should not be sorted")
|
|
|
|
}
|
|
|
|
sort.Sort(sorter)
|
|
|
|
if !sort.IsSorted(sorter) {
|
|
|
|
t.Fatalf("should be sorted")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestACLReplication_Iterator(t *testing.T) {
|
2017-05-22 22:14:27 +00:00
|
|
|
t.Parallel()
|
2016-08-04 01:44:24 +00:00
|
|
|
acls := structs.ACLs{}
|
|
|
|
|
|
|
|
iter := newACLIterator(acls)
|
|
|
|
if front := iter.Front(); front != nil {
|
|
|
|
t.Fatalf("bad: %v", front)
|
|
|
|
}
|
|
|
|
iter.Next()
|
|
|
|
if front := iter.Front(); front != nil {
|
|
|
|
t.Fatalf("bad: %v", front)
|
|
|
|
}
|
|
|
|
|
|
|
|
acls = structs.ACLs{
|
|
|
|
&structs.ACL{ID: "a"},
|
|
|
|
&structs.ACL{ID: "b"},
|
|
|
|
&structs.ACL{ID: "c"},
|
|
|
|
}
|
|
|
|
iter = newACLIterator(acls)
|
|
|
|
if front := iter.Front(); front != acls[0] {
|
|
|
|
t.Fatalf("bad: %v", front)
|
|
|
|
}
|
|
|
|
iter.Next()
|
|
|
|
if front := iter.Front(); front != acls[1] {
|
|
|
|
t.Fatalf("bad: %v", front)
|
|
|
|
}
|
|
|
|
iter.Next()
|
|
|
|
if front := iter.Front(); front != acls[2] {
|
|
|
|
t.Fatalf("bad: %v", front)
|
|
|
|
}
|
|
|
|
iter.Next()
|
|
|
|
if front := iter.Front(); front != nil {
|
|
|
|
t.Fatalf("bad: %v", front)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestACLReplication_reconcileACLs(t *testing.T) {
|
2017-05-22 22:14:27 +00:00
|
|
|
t.Parallel()
|
2016-08-04 01:44:24 +00:00
|
|
|
parseACLs := func(raw string) structs.ACLs {
|
|
|
|
var acls structs.ACLs
|
|
|
|
for _, key := range strings.Split(raw, "|") {
|
|
|
|
if len(key) == 0 {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
tuple := strings.Split(key, ":")
|
|
|
|
index, err := strconv.Atoi(tuple[1])
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
acl := &structs.ACL{
|
|
|
|
ID: tuple[0],
|
|
|
|
Rules: tuple[2],
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
ModifyIndex: uint64(index),
|
|
|
|
},
|
|
|
|
}
|
|
|
|
acls = append(acls, acl)
|
|
|
|
}
|
|
|
|
return acls
|
|
|
|
}
|
|
|
|
|
|
|
|
parseChanges := func(changes structs.ACLRequests) string {
|
|
|
|
var ret string
|
|
|
|
for i, change := range changes {
|
|
|
|
if i > 0 {
|
|
|
|
ret += "|"
|
|
|
|
}
|
|
|
|
ret += fmt.Sprintf("%s:%s:%s", change.Op, change.ACL.ID, change.ACL.Rules)
|
|
|
|
}
|
|
|
|
return ret
|
|
|
|
}
|
|
|
|
|
|
|
|
tests := []struct {
|
|
|
|
local string
|
|
|
|
remote string
|
|
|
|
lastRemoteIndex uint64
|
|
|
|
expected string
|
|
|
|
}{
|
|
|
|
// Everything empty.
|
|
|
|
{
|
|
|
|
local: "",
|
|
|
|
remote: "",
|
|
|
|
lastRemoteIndex: 0,
|
|
|
|
expected: "",
|
|
|
|
},
|
|
|
|
// First time with empty local.
|
|
|
|
{
|
|
|
|
local: "",
|
|
|
|
remote: "bbb:3:X|ccc:9:X|ddd:2:X|eee:11:X",
|
|
|
|
lastRemoteIndex: 0,
|
|
|
|
expected: "set:bbb:X|set:ccc:X|set:ddd:X|set:eee:X",
|
|
|
|
},
|
|
|
|
// Remote not sorted.
|
|
|
|
{
|
|
|
|
local: "",
|
|
|
|
remote: "ddd:2:X|bbb:3:X|ccc:9:X|eee:11:X",
|
|
|
|
lastRemoteIndex: 0,
|
|
|
|
expected: "set:bbb:X|set:ccc:X|set:ddd:X|set:eee:X",
|
|
|
|
},
|
|
|
|
// Neither side sorted.
|
|
|
|
{
|
|
|
|
local: "ddd:2:X|bbb:3:X|ccc:9:X|eee:11:X",
|
|
|
|
remote: "ccc:9:X|bbb:3:X|ddd:2:X|eee:11:X",
|
|
|
|
lastRemoteIndex: 0,
|
|
|
|
expected: "",
|
|
|
|
},
|
|
|
|
// Fully replicated, nothing to do.
|
|
|
|
{
|
|
|
|
local: "bbb:3:X|ccc:9:X|ddd:2:X|eee:11:X",
|
|
|
|
remote: "bbb:3:X|ccc:9:X|ddd:2:X|eee:11:X",
|
|
|
|
lastRemoteIndex: 0,
|
|
|
|
expected: "",
|
|
|
|
},
|
|
|
|
// Change an ACL.
|
|
|
|
{
|
|
|
|
local: "bbb:3:X|ccc:9:X|ddd:2:X|eee:11:X",
|
|
|
|
remote: "bbb:3:X|ccc:33:Y|ddd:2:X|eee:11:X",
|
|
|
|
lastRemoteIndex: 0,
|
|
|
|
expected: "set:ccc:Y",
|
|
|
|
},
|
|
|
|
// Change an ACL, but mask the change by the last replicated
|
|
|
|
// index. This isn't how things work normally, but it proves
|
|
|
|
// we are skipping the full compare based on the index.
|
|
|
|
{
|
|
|
|
local: "bbb:3:X|ccc:9:X|ddd:2:X|eee:11:X",
|
|
|
|
remote: "bbb:3:X|ccc:33:Y|ddd:2:X|eee:11:X",
|
|
|
|
lastRemoteIndex: 33,
|
|
|
|
expected: "",
|
|
|
|
},
|
|
|
|
// Empty everything out.
|
|
|
|
{
|
|
|
|
local: "bbb:3:X|ccc:9:X|ddd:2:X|eee:11:X",
|
|
|
|
remote: "",
|
|
|
|
lastRemoteIndex: 0,
|
|
|
|
expected: "delete:bbb:X|delete:ccc:X|delete:ddd:X|delete:eee:X",
|
|
|
|
},
|
|
|
|
// Adds on the ends and in the middle.
|
|
|
|
{
|
|
|
|
local: "bbb:3:X|ccc:9:X|ddd:2:X|eee:11:X",
|
|
|
|
remote: "aaa:99:X|bbb:3:X|ccc:9:X|ccx:101:X|ddd:2:X|eee:11:X|fff:102:X",
|
|
|
|
lastRemoteIndex: 0,
|
|
|
|
expected: "set:aaa:X|set:ccx:X|set:fff:X",
|
|
|
|
},
|
|
|
|
// Deletes on the ends and in the middle.
|
|
|
|
{
|
|
|
|
local: "bbb:3:X|ccc:9:X|ddd:2:X|eee:11:X",
|
|
|
|
remote: "ccc:9:X",
|
|
|
|
lastRemoteIndex: 0,
|
|
|
|
expected: "delete:bbb:X|delete:ddd:X|delete:eee:X",
|
|
|
|
},
|
|
|
|
// Everything.
|
|
|
|
{
|
|
|
|
local: "bbb:3:X|ccc:9:X|ddd:2:X|eee:11:X",
|
|
|
|
remote: "aaa:99:X|bbb:3:X|ccx:101:X|ddd:103:Y|eee:11:X|fff:102:X",
|
2016-08-04 23:33:40 +00:00
|
|
|
lastRemoteIndex: 11,
|
2016-08-04 01:44:24 +00:00
|
|
|
expected: "set:aaa:X|delete:ccc:X|set:ccx:X|set:ddd:Y|set:fff:X",
|
|
|
|
},
|
|
|
|
}
|
|
|
|
for i, test := range tests {
|
|
|
|
local, remote := parseACLs(test.local), parseACLs(test.remote)
|
|
|
|
changes := reconcileACLs(local, remote, test.lastRemoteIndex)
|
|
|
|
if actual := parseChanges(changes); actual != test.expected {
|
|
|
|
t.Errorf("test case %d failed: %s", i, actual)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2016-08-04 23:33:40 +00:00
|
|
|
|
|
|
|
func TestACLReplication_updateLocalACLs_RateLimit(t *testing.T) {
|
2017-06-27 13:22:18 +00:00
|
|
|
t.Parallel()
|
2016-08-04 23:33:40 +00:00
|
|
|
dir1, s1 := testServerWithConfig(t, func(c *Config) {
|
|
|
|
c.Datacenter = "dc2"
|
|
|
|
c.ACLDatacenter = "dc1"
|
|
|
|
c.ACLReplicationToken = "secret"
|
|
|
|
c.ACLReplicationApplyLimit = 1
|
|
|
|
})
|
|
|
|
defer os.RemoveAll(dir1)
|
|
|
|
defer s1.Shutdown()
|
2017-04-19 23:00:11 +00:00
|
|
|
testrpc.WaitForLeader(t, s1.RPC, "dc2")
|
2016-08-04 23:33:40 +00:00
|
|
|
|
|
|
|
changes := structs.ACLRequests{
|
|
|
|
&structs.ACLRequest{
|
|
|
|
Op: structs.ACLSet,
|
|
|
|
ACL: structs.ACL{
|
|
|
|
ID: "secret",
|
|
|
|
Type: "client",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
2016-08-09 18:29:12 +00:00
|
|
|
// Should be throttled to 1 Hz.
|
2016-08-04 23:33:40 +00:00
|
|
|
start := time.Now()
|
|
|
|
if err := s1.updateLocalACLs(changes); err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
2016-08-09 18:29:12 +00:00
|
|
|
if dur := time.Now().Sub(start); dur < time.Second {
|
2016-08-04 23:33:40 +00:00
|
|
|
t.Fatalf("too slow: %9.6f", dur.Seconds())
|
|
|
|
}
|
|
|
|
|
|
|
|
changes = append(changes,
|
|
|
|
&structs.ACLRequest{
|
|
|
|
Op: structs.ACLSet,
|
|
|
|
ACL: structs.ACL{
|
|
|
|
ID: "secret",
|
|
|
|
Type: "client",
|
|
|
|
},
|
|
|
|
})
|
|
|
|
|
2016-08-09 18:29:12 +00:00
|
|
|
// Should be throttled to 1 Hz.
|
2016-08-04 23:33:40 +00:00
|
|
|
start = time.Now()
|
|
|
|
if err := s1.updateLocalACLs(changes); err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
2016-08-09 18:29:12 +00:00
|
|
|
if dur := time.Now().Sub(start); dur < 2*time.Second {
|
2016-08-04 23:33:40 +00:00
|
|
|
t.Fatalf("too fast: %9.6f", dur.Seconds())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestACLReplication_IsACLReplicationEnabled(t *testing.T) {
|
2017-06-27 13:22:18 +00:00
|
|
|
t.Parallel()
|
2016-08-04 23:33:40 +00:00
|
|
|
// ACLs not enabled.
|
|
|
|
dir1, s1 := testServerWithConfig(t, func(c *Config) {
|
|
|
|
c.ACLDatacenter = ""
|
|
|
|
})
|
|
|
|
defer os.RemoveAll(dir1)
|
|
|
|
defer s1.Shutdown()
|
|
|
|
if s1.IsACLReplicationEnabled() {
|
|
|
|
t.Fatalf("should not be enabled")
|
|
|
|
}
|
|
|
|
|
|
|
|
// ACLs enabled but not replication.
|
|
|
|
dir2, s2 := testServerWithConfig(t, func(c *Config) {
|
|
|
|
c.Datacenter = "dc2"
|
|
|
|
c.ACLDatacenter = "dc1"
|
|
|
|
})
|
|
|
|
defer os.RemoveAll(dir2)
|
|
|
|
defer s2.Shutdown()
|
|
|
|
if s2.IsACLReplicationEnabled() {
|
|
|
|
t.Fatalf("should not be enabled")
|
|
|
|
}
|
|
|
|
|
|
|
|
// ACLs enabled with replication.
|
|
|
|
dir3, s3 := testServerWithConfig(t, func(c *Config) {
|
|
|
|
c.Datacenter = "dc2"
|
|
|
|
c.ACLDatacenter = "dc1"
|
|
|
|
c.ACLReplicationToken = "secret"
|
|
|
|
})
|
|
|
|
defer os.RemoveAll(dir3)
|
|
|
|
defer s3.Shutdown()
|
|
|
|
if !s3.IsACLReplicationEnabled() {
|
|
|
|
t.Fatalf("should be enabled")
|
|
|
|
}
|
|
|
|
|
|
|
|
// ACLs enabled and replication token set, but inside the ACL datacenter
|
|
|
|
// so replication should be disabled.
|
|
|
|
dir4, s4 := testServerWithConfig(t, func(c *Config) {
|
|
|
|
c.Datacenter = "dc1"
|
|
|
|
c.ACLDatacenter = "dc1"
|
|
|
|
c.ACLReplicationToken = "secret"
|
|
|
|
})
|
|
|
|
defer os.RemoveAll(dir4)
|
|
|
|
defer s4.Shutdown()
|
|
|
|
if s4.IsACLReplicationEnabled() {
|
|
|
|
t.Fatalf("should not be enabled")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestACLReplication(t *testing.T) {
|
2017-06-27 13:22:18 +00:00
|
|
|
t.Parallel()
|
2016-08-04 23:33:40 +00:00
|
|
|
dir1, s1 := testServerWithConfig(t, func(c *Config) {
|
|
|
|
c.ACLDatacenter = "dc1"
|
|
|
|
c.ACLMasterToken = "root"
|
|
|
|
})
|
|
|
|
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"
|
|
|
|
c.ACLReplicationToken = "root"
|
2017-05-04 22:35:33 +00:00
|
|
|
c.ACLReplicationInterval = 10 * time.Millisecond
|
2016-08-04 23:33:40 +00:00
|
|
|
c.ACLReplicationApplyLimit = 1000000
|
|
|
|
})
|
|
|
|
defer os.RemoveAll(dir2)
|
|
|
|
defer s2.Shutdown()
|
|
|
|
|
|
|
|
// Try to join.
|
2017-05-05 10:29:49 +00:00
|
|
|
joinWAN(t, s2, s1)
|
2017-04-19 23:00:11 +00:00
|
|
|
testrpc.WaitForLeader(t, s1.RPC, "dc1")
|
|
|
|
testrpc.WaitForLeader(t, s1.RPC, "dc2")
|
2016-08-04 23:33:40 +00:00
|
|
|
|
|
|
|
// Create a bunch of new tokens.
|
|
|
|
var id string
|
2017-05-04 22:35:33 +00:00
|
|
|
for i := 0; i < 50; i++ {
|
2016-08-04 23:33:40 +00:00
|
|
|
arg := structs.ACLRequest{
|
|
|
|
Datacenter: "dc1",
|
|
|
|
Op: structs.ACLSet,
|
|
|
|
ACL: structs.ACL{
|
|
|
|
Name: "User token",
|
|
|
|
Type: structs.ACLTypeClient,
|
|
|
|
Rules: testACLPolicy,
|
|
|
|
},
|
|
|
|
WriteRequest: structs.WriteRequest{Token: "root"},
|
|
|
|
}
|
|
|
|
if err := s1.RPC("ACL.Apply", &arg, &id); err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-04-29 16:34:02 +00:00
|
|
|
checkSame := func() error {
|
2017-01-24 08:00:06 +00:00
|
|
|
index, remote, err := s1.fsm.State().ACLList(nil)
|
2016-08-04 23:33:40 +00:00
|
|
|
if err != nil {
|
2017-04-29 16:34:02 +00:00
|
|
|
return err
|
2016-08-04 23:33:40 +00:00
|
|
|
}
|
2017-01-24 08:00:06 +00:00
|
|
|
_, local, err := s2.fsm.State().ACLList(nil)
|
2016-08-04 23:33:40 +00:00
|
|
|
if err != nil {
|
2017-04-29 16:34:02 +00:00
|
|
|
return err
|
2016-08-04 23:33:40 +00:00
|
|
|
}
|
2017-04-29 16:34:02 +00:00
|
|
|
if got, want := len(remote), len(local); got != want {
|
|
|
|
return fmt.Errorf("got %d remote ACLs want %d", got, want)
|
2016-08-04 23:33:40 +00:00
|
|
|
}
|
|
|
|
for i, acl := range remote {
|
|
|
|
if !acl.IsSame(local[i]) {
|
2017-04-29 16:34:02 +00:00
|
|
|
return fmt.Errorf("ACLs differ")
|
2016-08-04 23:33:40 +00:00
|
|
|
}
|
|
|
|
}
|
2016-08-05 04:32:36 +00:00
|
|
|
|
|
|
|
var status structs.ACLReplicationStatus
|
|
|
|
s2.aclReplicationStatusLock.RLock()
|
|
|
|
status = s2.aclReplicationStatus
|
|
|
|
s2.aclReplicationStatusLock.RUnlock()
|
|
|
|
if !status.Enabled || !status.Running ||
|
|
|
|
status.ReplicatedIndex != index ||
|
|
|
|
status.SourceDatacenter != "dc1" {
|
2017-04-29 16:34:02 +00:00
|
|
|
return fmt.Errorf("ACL replication status differs")
|
2016-08-05 04:32:36 +00:00
|
|
|
}
|
|
|
|
|
2017-04-29 16:34:02 +00:00
|
|
|
return nil
|
2016-08-04 23:33:40 +00:00
|
|
|
}
|
|
|
|
// Wait for the replica to converge.
|
2017-05-04 22:52:53 +00:00
|
|
|
retry.Run(t, func(r *retry.R) {
|
2017-04-29 16:34:02 +00:00
|
|
|
if err := checkSame(); err != nil {
|
|
|
|
r.Fatal(err)
|
|
|
|
}
|
|
|
|
})
|
2016-08-04 23:33:40 +00:00
|
|
|
|
|
|
|
// Create more new tokens.
|
2017-05-04 22:35:33 +00:00
|
|
|
for i := 0; i < 50; i++ {
|
2016-08-04 23:33:40 +00:00
|
|
|
arg := structs.ACLRequest{
|
|
|
|
Datacenter: "dc1",
|
|
|
|
Op: structs.ACLSet,
|
|
|
|
ACL: structs.ACL{
|
|
|
|
Name: "User token",
|
|
|
|
Type: structs.ACLTypeClient,
|
|
|
|
Rules: testACLPolicy,
|
|
|
|
},
|
|
|
|
WriteRequest: structs.WriteRequest{Token: "root"},
|
|
|
|
}
|
|
|
|
var dontCare string
|
|
|
|
if err := s1.RPC("ACL.Apply", &arg, &dontCare); err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// Wait for the replica to converge.
|
2017-05-04 22:52:53 +00:00
|
|
|
retry.Run(t, func(r *retry.R) {
|
2017-04-29 16:34:02 +00:00
|
|
|
if err := checkSame(); err != nil {
|
|
|
|
r.Fatal(err)
|
|
|
|
}
|
|
|
|
})
|
2016-08-04 23:33:40 +00:00
|
|
|
|
|
|
|
// Delete a token.
|
|
|
|
arg := structs.ACLRequest{
|
|
|
|
Datacenter: "dc1",
|
|
|
|
Op: structs.ACLDelete,
|
|
|
|
ACL: structs.ACL{
|
|
|
|
ID: id,
|
|
|
|
},
|
|
|
|
WriteRequest: structs.WriteRequest{Token: "root"},
|
|
|
|
}
|
|
|
|
var dontCare string
|
|
|
|
if err := s1.RPC("ACL.Apply", &arg, &dontCare); err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
// Wait for the replica to converge.
|
2017-05-04 22:52:53 +00:00
|
|
|
retry.Run(t, func(r *retry.R) {
|
2017-04-29 16:34:02 +00:00
|
|
|
if err := checkSame(); err != nil {
|
|
|
|
r.Fatal(err)
|
|
|
|
}
|
|
|
|
})
|
2016-08-04 23:33:40 +00:00
|
|
|
}
|