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 grp_cmds_ to grp_commands_

Browse source
This commit is contained in:
postmannen 2022-05-10 08:25:02 +02:00
parent 85a7124bf3
commit 718b7fb7d6
2 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -138,7 +138,7 @@ func (a *authSchema) commandAsSlice(c command) []command {
// Check if we are given a nodeGroup variable, and if we are, get all the
// nodes for that group.
if strings.HasPrefix(string(c), "grp_cmds_") {
if strings.HasPrefix(string(c), "grp_commands_") {
for cmd := range a.schemaMain.CommandGroupMap[commandGroup(c)] {
commands = append(commands, cmd)
}
@ -415,9 +415,9 @@ func (a *authSchema) groupNodesDeleteGroup(ng nodeGroup) {
// groupCommandsAddCommand adds a command to a group. If the group does
// not exist it will be created.
func (a *authSchema) groupCommandsAddCommand(cg commandGroup, c command) {
err := a.validator.Var(cg, "startswith=grp_cmds_")
err := a.validator.Var(cg, "startswith=grp_commands_")
if err != nil {
log.Printf("error: group name do not start with grp_cmds_ : %v\n", err)
log.Printf("error: group name do not start with grp_commands_ : %v\n", err)
return
}

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

@ -49,9 +49,9 @@ func TestACLWithGroups(t *testing.T) {
c := newCentralAuth()
const (
grp_nodes_operators = "grp_nodes_operators"
grp_nodes_ships = "grp_nodes_ships"
grp_cmds_commandset1 = "grp_cmds_commandset1"
grp_nodes_operators = "grp_nodes_operators"
grp_nodes_ships = "grp_nodes_ships"
grp_commands_commandset1 = "grp_commands_commandset1"
)
c.authorization.authSchema.groupNodesAddNode(grp_nodes_operators, "operator1")
@ -60,13 +60,13 @@ func TestACLWithGroups(t *testing.T) {
c.authorization.authSchema.groupNodesAddNode(grp_nodes_ships, "ship100")
c.authorization.authSchema.groupNodesAddNode(grp_nodes_ships, "ship101")
c.authorization.authSchema.groupCommandsAddCommand(grp_cmds_commandset1, "dmesg")
c.authorization.authSchema.groupCommandsAddCommand(grp_cmds_commandset1, "date")
c.authorization.authSchema.groupCommandsAddCommand(grp_commands_commandset1, "dmesg")
c.authorization.authSchema.groupCommandsAddCommand(grp_commands_commandset1, "date")
c.authorization.authSchema.aclAdd(grp_nodes_ships, "admin", "useradd -m kongen")
c.authorization.authSchema.aclAdd("ship101", "admin", "HORSE")
c.authorization.authSchema.aclAdd(grp_nodes_ships, grp_nodes_operators, grp_cmds_commandset1)
c.authorization.authSchema.aclAdd(grp_nodes_ships, grp_nodes_operators, grp_commands_commandset1)
// --- Tests ---
@ -112,7 +112,7 @@ func TestACLWithGroups(t *testing.T) {
}
func TestACLSingleNodeAndNodeGroup(t *testing.T) {
func TestACLGenerated(t *testing.T) {
if !*logging {
log.SetOutput(io.Discard)
}
@ -124,6 +124,10 @@ func TestACLSingleNodeAndNodeGroup(t *testing.T) {
c.authorization.authSchema.groupNodesAddNode("grp_nodes_ships", "ship101")
c.authorization.authSchema.aclAdd("grp_nodes_ships", "admin", "HEN")
c.authorization.authSchema.groupCommandsAddCommand("grp_commands_test", "echo")
c.authorization.authSchema.groupCommandsAddCommand("grp_commands_test", "dmesg")
c.authorization.authSchema.aclAdd("grp_nodes_ships", "admin", "grp_commands_test")
// --- TESTS ---
mapOfFromNodeCommands := make(map[node]map[command]struct{})
@ -142,11 +146,20 @@ func TestACLSingleNodeAndNodeGroup(t *testing.T) {
if _, ok := mapOfFromNodeCommands["admin"]["HEN"]; !ok {
t.Fatalf(" \U0001F631 [FAILED]: missing map entry: HEN: Content of Map: %v", mapOfFromNodeCommands)
}
if _, ok := mapOfFromNodeCommands["admin"]["echo"]; !ok {
t.Fatalf(" \U0001F631 [FAILED]: missing map entry: echo: Content of Map: %v", mapOfFromNodeCommands)
}
if _, ok := mapOfFromNodeCommands["admin"]["dmesg"]; !ok {
t.Fatalf(" \U0001F631 [FAILED]: missing map entry: echo: Content of Map: %v", mapOfFromNodeCommands)
}
}
func TestSchemaMainACLMap(t *testing.T) {
func TestACLSchemaMainACLMap(t *testing.T) {
if !*logging {
log.SetOutput(io.Discard)
}
@ -225,7 +238,7 @@ func TestSchemaMainACLMap(t *testing.T) {
// --- TESTS ---
}
func TestHash(t *testing.T) {
func TestACLHash(t *testing.T) {
if !*logging {
log.SetOutput(io.Discard)
}