|
@@ -183,10 +183,26 @@ func TestNodeACLs(t *testing.T) {
|
|
|
assert.Nil(t, err)
|
|
|
assert.NotNil(t, node1ACL)
|
|
|
assert.NotNil(t, node2ACL)
|
|
|
- currentACL, err := nodeacls.ChangeNodesAccess(nodeacls.NetworkID(node1.Network), nodeacls.NodeID(node1.ID), nodeacls.NodeID(node2.ID), acls.NotAllowed)
|
|
|
+ currentACL, err := nodeacls.DisallowNodes(nodeacls.NetworkID(node1.Network), nodeacls.NodeID(node1.ID), nodeacls.NodeID(node2.ID))
|
|
|
assert.Nil(t, err)
|
|
|
assert.Equal(t, acls.NotAllowed, currentACL[acls.AclID(node1.ID)][acls.AclID(node2.ID)])
|
|
|
assert.Equal(t, acls.NotAllowed, currentACL[acls.AclID(node2.ID)][acls.AclID(node1.ID)])
|
|
|
+ currentACL.Save(acls.ContainerID(node1.Network))
|
|
|
+ })
|
|
|
+ t.Run("node acls correct after add new node not allowed", func(t *testing.T) {
|
|
|
+ node3 := models.Node{PublicKey: "DM5qhLAE20FG7BbfBCger+Ac9D2NDOwCtY1rbYDXv24=", Name: "testnode3", Endpoint: "10.0.0.100", MacAddress: "01:02:03:04:05:07", Password: "password", Network: "skynet", OS: "linux"}
|
|
|
+ logic.CreateNode(&node3)
|
|
|
+ var currentACL, err = nodeacls.FetchAllACLs(nodeacls.NetworkID(node3.Network))
|
|
|
+ assert.Nil(t, err)
|
|
|
+ assert.NotNil(t, currentACL)
|
|
|
+ assert.Equal(t, acls.NotPresent, currentACL[acls.AclID(node1.ID)][acls.AclID(node3.ID)])
|
|
|
+ nodeACL, err := nodeacls.CreateNodeACL(nodeacls.NetworkID(node3.Network), nodeacls.NodeID(node3.ID), acls.NotAllowed)
|
|
|
+ assert.Nil(t, err)
|
|
|
+ nodeACL.Save(acls.ContainerID(node3.Network), acls.AclID(node3.ID))
|
|
|
+ currentACL, err = nodeacls.FetchAllACLs(nodeacls.NetworkID(node3.Network))
|
|
|
+ assert.Nil(t, err)
|
|
|
+ assert.Equal(t, acls.NotAllowed, currentACL[acls.AclID(node1.ID)][acls.AclID(node3.ID)])
|
|
|
+ assert.Equal(t, acls.NotAllowed, currentACL[acls.AclID(node2.ID)][acls.AclID(node3.ID)])
|
|
|
})
|
|
|
t.Run("node acls removed", func(t *testing.T) {
|
|
|
retNetworkACL, err := nodeacls.RemoveNodeACL(nodeacls.NetworkID(node1.Network), nodeacls.NodeID(node1.ID))
|