mirrors/ctrl
1
0
Fork 0
mirror of https://github.com/postmannen/ctrl.git synced 2025-03-31 01:24:31 +00:00
Code Activity

renamed acl add/delete methods

Browse source
This commit is contained in:
postmannen 2022-05-09 07:10:19 +02:00
parent 2c44c08081
commit 6c4a1b4d38
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/concept/auth/main.go
View file

@ -149,7 +149,7 @@ func (a *authSchema) convertToActualCommandSlice(c command) []command {
// will also be generated.
//
// TODO: Rename to aclAdd
func (a *authSchema) aclCommandAdd(n node, fn node, cmd command) {
func (a *authSchema) aclAdd(n node, fn node, cmd command) {
a.schemaMain.mu.Lock()
defer a.schemaMain.mu.Unlock()
@ -177,8 +177,8 @@ func (a *authSchema) aclCommandAdd(n node, fn node, cmd command) {
}
// aclNodeFromNodeCommandDelete will delete the specified command from the fromnode.
func (a *authSchema) aclCommandDelete(host node, source node, cmd command) error {
// aclDeleteCommand will delete the specified command from the fromnode.
func (a *authSchema) aclDeleteCommand(host node, source node, cmd command) error {
a.schemaMain.mu.Lock()
defer a.schemaMain.mu.Unlock()
@ -207,7 +207,7 @@ func (a *authSchema) aclCommandDelete(host node, source node, cmd command) error
}
// aclNodeFromnodeDelete will delete specified fromnode and all commands specified for it.
func (a *authSchema) aclSourceDelete(host node, source node) error {
func (a *authSchema) aclDeleteSource(host node, source node) error {
a.schemaMain.mu.Lock()
defer a.schemaMain.mu.Unlock()

28
doc/concept/auth/main_test.go
View file

@ -18,8 +18,8 @@ func TestACLSingleNode(t *testing.T) {
}
c := newCentralAuth()
c.authorization.authSchema.aclCommandAdd("ship101", "admin", "HORSE")
c.authorization.authSchema.aclCommandAdd("ship101", "admin", "PIG")
c.authorization.authSchema.aclAdd("ship101", "admin", "HORSE")
c.authorization.authSchema.aclAdd("ship101", "admin", "PIG")
// --- TESTS ---
@ -62,10 +62,10 @@ func TestACLWithGroups(t *testing.T) {
c.authorization.authSchema.groupCommandsAddCommand(grp_cmds_commandset1, "dmesg")
c.authorization.authSchema.groupCommandsAddCommand(grp_cmds_commandset1, "date")
c.authorization.authSchema.aclCommandAdd(grp_nodes_ships, "admin", "useradd -m kongen")
c.authorization.authSchema.aclCommandAdd("ship101", "admin", "HORSE")
c.authorization.authSchema.aclAdd(grp_nodes_ships, "admin", "useradd -m kongen")
c.authorization.authSchema.aclAdd("ship101", "admin", "HORSE")
c.authorization.authSchema.aclCommandAdd(grp_nodes_ships, grp_nodes_operators, grp_cmds_commandset1)
c.authorization.authSchema.aclAdd(grp_nodes_ships, grp_nodes_operators, grp_cmds_commandset1)
// --- Tests ---
@ -120,10 +120,10 @@ func TestACLSingleNodeAndNodeGroup(t *testing.T) {
c := newCentralAuth()
c.authorization.authSchema.aclCommandAdd("ship101", "admin", "HORSE")
c.authorization.authSchema.aclAdd("ship101", "admin", "HORSE")
c.authorization.authSchema.groupNodesAddNode("grp_nodes_ships", "ship101")
c.authorization.authSchema.aclCommandAdd("grp_nodes_ships", "admin", "HEN")
c.authorization.authSchema.aclAdd("grp_nodes_ships", "admin", "HEN")
// --- TESTS ---
@ -158,8 +158,8 @@ func TestSchemaMainACLMap(t *testing.T) {
//c.authorization.authSchema.aclNodeFromnodeCommandAdd("ship101", "admin", "PIG")
fmt.Printf("---------------ADDING COMMAND-------------\n")
c.authorization.authSchema.aclCommandAdd("ship0", "admin", "systemctl")
c.authorization.authSchema.aclCommandAdd("ship1", "admin", "tcpdump")
c.authorization.authSchema.aclAdd("ship0", "admin", "systemctl")
c.authorization.authSchema.aclAdd("ship1", "admin", "tcpdump")
if _, ok := c.authorization.authSchema.schemaMain.ACLMap["ship0"]["admin"]["systemctl"]; !ok {
t.Fatalf(" \U0001F631 [FAILED]: missing map entry: ship0, admin, systemctl")
@ -171,21 +171,21 @@ func TestSchemaMainACLMap(t *testing.T) {
fmt.Printf("---------------ADDING COMMAND-------------\n")
c.authorization.authSchema.groupNodesAddNode("grp_nodes_ships", "ship1")
c.authorization.authSchema.groupNodesAddNode("grp_nodes_ships", "ship2")
c.authorization.authSchema.aclCommandAdd("grp_nodes_ships", "admin", "dmesg")
c.authorization.authSchema.aclAdd("grp_nodes_ships", "admin", "dmesg")
if _, ok := c.authorization.authSchema.schemaMain.ACLMap["grp_nodes_ships"]["admin"]["dmesg"]; !ok {
t.Fatalf(" \U0001F631 [FAILED]: missing map entry: ship1, admin, tcpdump")
}
fmt.Printf("---------------ADDING COMMAND-------------\n")
c.authorization.authSchema.aclCommandAdd("ship2", "admin", "echo")
c.authorization.authSchema.aclAdd("ship2", "admin", "echo")
if _, ok := c.authorization.authSchema.schemaMain.ACLMap["ship2"]["admin"]["echo"]; !ok {
t.Fatalf(" \U0001F631 [FAILED]: missing map entry: ship1, admin, tcpdump")
}
fmt.Printf("---------------DELETING COMMAND grp_nodes_ships, admin, dmesg-------------\n")
c.authorization.authSchema.aclCommandDelete("grp_nodes_ships", "admin", "dmesg")
c.authorization.authSchema.aclDeleteCommand("grp_nodes_ships", "admin", "dmesg")
if _, ok := c.authorization.authSchema.schemaMain.ACLMap["grp_nodes_ships"]["admin"]["dmesg"]; ok {
t.Fatalf(" \U0001F631 [FAILED]: found map entry: grp_nodes_ships, admin, dmesg")
@ -202,7 +202,7 @@ func TestSchemaMainACLMap(t *testing.T) {
}
fmt.Printf("---------------DELETING COMMAND ship0, admin, systemctl-------------\n")
c.authorization.authSchema.aclCommandDelete("ship0", "admin", "systemctl")
c.authorization.authSchema.aclDeleteCommand("ship0", "admin", "systemctl")
if _, ok := c.authorization.authSchema.schemaMain.ACLMap["ship0"]["admin"]["systemctl"]; ok {
t.Fatalf(" \U0001F631 [FAILED]: missing map entry: ship0, admin, systemctl")
@ -216,7 +216,7 @@ func TestSchemaMainACLMap(t *testing.T) {
}
fmt.Printf("---------------DELETING SOURCE ship1, admin-------------\n")
c.authorization.authSchema.aclSourceDelete("ship1", "admin")
c.authorization.authSchema.aclDeleteSource("ship1", "admin")
if _, ok := c.authorization.authSchema.schemaMain.ACLMap["ship1"]["admin"]; ok {
t.Fatalf(" \U0001F631 [FAILED]: missing map entry: ship1, admin, tcpdump")