mirror of https://github.com/hashicorp/consul
add a test case
parent
31d96f5fb2
commit
78dbcfbeee
|
@ -442,7 +442,7 @@ func (s *HTTPHandlers) aclTokenSetInternal(req *http.Request, tokenAccessorID st
|
||||||
}
|
}
|
||||||
|
|
||||||
if !create {
|
if !create {
|
||||||
// NOTE: AccessorID in the request body is optional not creating a new token.
|
// NOTE: AccessorID in the request body is optional when not creating a new token.
|
||||||
// If not present in the body and only in the URL then it will be filled in by Consul.
|
// If not present in the body and only in the URL then it will be filled in by Consul.
|
||||||
if args.ACLToken.AccessorID == "" {
|
if args.ACLToken.AccessorID == "" {
|
||||||
args.ACLToken.AccessorID = tokenAccessorID
|
args.ACLToken.AccessorID = tokenAccessorID
|
||||||
|
|
|
@ -907,6 +907,48 @@ func TestACL_HTTP(t *testing.T) {
|
||||||
tokenMap[token.AccessorID] = token
|
tokenMap[token.AccessorID] = token
|
||||||
})
|
})
|
||||||
|
|
||||||
|
t.Run("Update without AccessorID in request body", func(t *testing.T) {
|
||||||
|
originalToken := tokenMap[idMap["token-cloned"]]
|
||||||
|
|
||||||
|
// Secret will be filled in
|
||||||
|
tokenInput := &structs.ACLToken{
|
||||||
|
Description: "Better description for this cloned token",
|
||||||
|
Policies: []structs.ACLTokenPolicyLink{
|
||||||
|
{
|
||||||
|
ID: idMap["policy-read-all-nodes"],
|
||||||
|
Name: policyMap[idMap["policy-read-all-nodes"]].Name,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
NodeIdentities: []*structs.ACLNodeIdentity{
|
||||||
|
{
|
||||||
|
NodeName: "foo",
|
||||||
|
Datacenter: "bar",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
req, _ := http.NewRequest("PUT", "/v1/acl/token/"+originalToken.AccessorID, jsonBody(tokenInput))
|
||||||
|
req.Header.Add("X-Consul-Token", "root")
|
||||||
|
resp := httptest.NewRecorder()
|
||||||
|
obj, err := a.srv.ACLTokenCRUD(resp, req)
|
||||||
|
require.NoError(t, err)
|
||||||
|
token, ok := obj.(*structs.ACLToken)
|
||||||
|
require.True(t, ok)
|
||||||
|
|
||||||
|
require.Equal(t, originalToken.AccessorID, token.AccessorID)
|
||||||
|
require.Equal(t, originalToken.SecretID, token.SecretID)
|
||||||
|
require.Equal(t, tokenInput.Description, token.Description)
|
||||||
|
require.Equal(t, tokenInput.Policies, token.Policies)
|
||||||
|
require.Equal(t, tokenInput.NodeIdentities, token.NodeIdentities)
|
||||||
|
require.True(t, token.CreateIndex > 0)
|
||||||
|
require.True(t, token.CreateIndex < token.ModifyIndex)
|
||||||
|
require.NotNil(t, token.Hash)
|
||||||
|
require.NotEqual(t, token.Hash, []byte{})
|
||||||
|
require.NotEqual(t, token.Hash, originalToken.Hash)
|
||||||
|
|
||||||
|
tokenMap[token.AccessorID] = token
|
||||||
|
})
|
||||||
|
|
||||||
t.Run("CRUD Missing Token Accessor ID", func(t *testing.T) {
|
t.Run("CRUD Missing Token Accessor ID", func(t *testing.T) {
|
||||||
req, _ := http.NewRequest("GET", "/v1/acl/token/", nil)
|
req, _ := http.NewRequest("GET", "/v1/acl/token/", nil)
|
||||||
req.Header.Add("X-Consul-Token", "root")
|
req.Header.Add("X-Consul-Token", "root")
|
||||||
|
|
Loading…
Reference in New Issue