luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

acl: made acl rules in tests slightly more specific 

When converting these tests from the legacy ACL system to the new RPC endpoints I
initially changed most things to use _prefix rules, because that was equivalent to
the old legacy rules.

This commit modifies a few of those rules to be a bit more specific by replacing the _prefix
rule with a non-prefix one where possible.
This commit is contained in:
Daniel Nephin 2021-09-22 18:24:56 -04:00
parent ab91d254a3
commit 2ce64e2837
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
agent/consul/catalog_endpoint_test.go
View File

@ -2413,10 +2413,15 @@ func TestCatalog_ListServiceNodes_ConnectProxy_ACL(t *testing.T) {
testrpc.WaitForLeader(t, s1.RPC, "dc1")
rules := `
service_prefix "foo" {
service "foo-proxy" {
policy = "write"
}
node_prefix "" { policy = "read" }
service "foo" {
policy = "write"
}
node "foo" {
policy = "read"
}
`
token := createToken(t, codec, rules)
@ -2694,7 +2699,7 @@ func testACLFilterServer(t *testing.T) (dir, token string, srv *Server, codec rp
testrpc.WaitForTestAgent(t, srv.RPC, "dc1", testrpc.WithToken("root"))
rules := `
service_prefix "foo" {
service "foo" {
policy = "write"
}
node_prefix "" {
@ -2861,7 +2866,7 @@ func TestCatalog_NodeServices_ACLDeny(t *testing.T) {
}
rules := fmt.Sprintf(`
node_prefix "%s" {
node "%s" {
policy = "read"
}
`, s1.config.NodeName)

7
agent/consul/health_endpoint_test.go
View File

@ -994,10 +994,13 @@ func TestHealth_ServiceNodes_ConnectProxy_ACL(t *testing.T) {
testrpc.WaitForLeader(t, s1.RPC, "dc1", testrpc.WithToken("root"))
rules := `
service_prefix "foo" {
service "foo" {
policy = "write"
}
node_prefix "foo" {
service "foo-proxy" {
policy = "write"
}
node "foo" {
policy = "write"
}
`

10
agent/consul/intention_endpoint_test.go
View File

@ -878,7 +878,7 @@ func TestIntentionApply_aclDeny(t *testing.T) {
waitForLeaderEstablishment(t, s1)
rules := `
service_prefix "foo" {
service "foobar" {
policy = "deny"
intentions = "write"
}`
@ -1268,7 +1268,7 @@ func TestIntentionApply_aclDelete(t *testing.T) {
waitForLeaderEstablishment(t, s1)
rules := `
service_prefix "foo" {
service "foobar" {
policy = "deny"
intentions = "write"
}`
@ -1334,7 +1334,7 @@ func TestIntentionApply_aclUpdate(t *testing.T) {
waitForLeaderEstablishment(t, s1)
rules := `
service_prefix "foo" {
service "foobar" {
policy = "deny"
intentions = "write"
}`
@ -1433,7 +1433,7 @@ func TestIntentionApply_aclUpdateChange(t *testing.T) {
waitForLeaderEstablishment(t, s1)
rules := `
service_prefix "foo" {
service "foobar" {
policy = "deny"
intentions = "write"
}`
@ -1959,7 +1959,7 @@ func TestIntentionCheck_aclDeny(t *testing.T) {
waitForLeaderEstablishment(t, s1)
rules := `
service_prefix "bar" {
service "bar" {
policy = "read"
}`
token := createToken(t, codec, rules)