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

name changes

Browse source
This commit is contained in:
postmannen 2022-05-09 20:06:22 +02:00
parent 56cd575716
commit 1f00b24b63
2 changed files with 18 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -72,15 +72,15 @@ func newSchemaMain() *schemaMain {
}
type schemaGenerated struct {
ACLsToConvert map[node]map[node]map[command]struct{}
NodeMap map[node]NodeDataWithHash
mu sync.Mutex
ACLsToConvert map[node]map[node]map[command]struct{}
GeneratedACLsMap map[node]NodeDataWithHash
mu sync.Mutex
}
func newSchemaGenerated() *schemaGenerated {
s := schemaGenerated{
ACLsToConvert: map[node]map[node]map[command]struct{}{},
NodeMap: make(map[node]NodeDataWithHash),
ACLsToConvert: map[node]map[node]map[command]struct{}{},
GeneratedACLsMap: make(map[node]NodeDataWithHash),
}
return &s
}
@ -289,7 +289,7 @@ func (a *authSchema) generateACLsForAllNodes() error {
}
// and then store the cbor encoded data and the hash in the generated map.
a.schemaGenerated.NodeMap[n] = nd
a.schemaGenerated.GeneratedACLsMap[n] = nd
}
}()
@ -467,7 +467,7 @@ func (c *centralAuth) printMaps() {
fmt.Println("----schemaGenerated------")
c.authorization.authSchema.schemaGenerated.mu.Lock()
for k, v := range c.authorization.authSchema.schemaGenerated.NodeMap {
for k, v := range c.authorization.authSchema.schemaGenerated.GeneratedACLsMap {
fmt.Printf("node: %v, NodeDataSerialized: %v\n", k, string(v.Data))
fmt.Printf("node: %v, Hash: %v\n", k, v.Hash)
}

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

@ -3,7 +3,6 @@ package main
import (
"bytes"
"flag"
"fmt"
"io"
"log"
"testing"
@ -26,13 +25,11 @@ func TestACLSingleNode(t *testing.T) {
// --- TESTS ---
mapOfFromNodeCommands := make(map[node]map[command]struct{})
err := cbor.Unmarshal(c.authorization.authSchema.schemaGenerated.NodeMap["ship101"].Data, &mapOfFromNodeCommands)
err := cbor.Unmarshal(c.authorization.authSchema.schemaGenerated.GeneratedACLsMap["ship101"].Data, &mapOfFromNodeCommands)
if err != nil {
t.Fatal(err)
}
fmt.Printf(" DEBUG : mapOfFromNodeCommands: %v\n", mapOfFromNodeCommands)
if _, ok := mapOfFromNodeCommands["admin"]["HORSE"]; !ok {
t.Fatal(" \U0001F631 [FAILED]: missing map entry")
}
@ -82,13 +79,11 @@ func TestACLWithGroups(t *testing.T) {
// }
mapOfFromNodeCommands := make(map[node]map[command]struct{})
err := cbor.Unmarshal(c.authorization.authSchema.schemaGenerated.NodeMap["ship101"].Data, &mapOfFromNodeCommands)
err := cbor.Unmarshal(c.authorization.authSchema.schemaGenerated.GeneratedACLsMap["ship101"].Data, &mapOfFromNodeCommands)
if err != nil {
t.Fatal(err)
}
fmt.Printf(" DEBUG : mapOfFromNodeCommands: %v\n", mapOfFromNodeCommands)
if _, ok := mapOfFromNodeCommands["admin"]["useradd -m kongen"]; !ok {
t.Fatal(" \U0001F631 [FAILED]: missing map entry")
}
@ -130,13 +125,11 @@ func TestACLSingleNodeAndNodeGroup(t *testing.T) {
// --- TESTS ---
mapOfFromNodeCommands := make(map[node]map[command]struct{})
err := cbor.Unmarshal(c.authorization.authSchema.schemaGenerated.NodeMap["ship101"].Data, &mapOfFromNodeCommands)
err := cbor.Unmarshal(c.authorization.authSchema.schemaGenerated.GeneratedACLsMap["ship101"].Data, &mapOfFromNodeCommands)
if err != nil {
t.Fatal(err)
}
fmt.Printf(" DEBUG : mapOfFromNodeCommands: %+v\n", mapOfFromNodeCommands)
//if _, ok := mapOfFromNodeCommands["admin"]["PIG"]; !ok {
// t.Fatalf(" \U0001F631 [FAILED]: missing map entry: PIG: Content of Map: %v", mapOfFromNodeCommands)
//}
@ -159,7 +152,7 @@ func TestSchemaMainACLMap(t *testing.T) {
c := newCentralAuth()
//c.authorization.authSchema.aclNodeFromnodeCommandAdd("ship101", "admin", "PIG")
fmt.Printf("---------------ADDING COMMAND-------------\n")
// fmt.Printf("---------------ADDING COMMAND-------------\n")
c.authorization.authSchema.aclAdd("ship0", "admin", "systemctl")
c.authorization.authSchema.aclAdd("ship1", "admin", "tcpdump")
@ -170,7 +163,7 @@ func TestSchemaMainACLMap(t *testing.T) {
t.Fatalf(" \U0001F631 [FAILED]: missing map entry: ship1, admin, tcpdump")
}
fmt.Printf("---------------ADDING COMMAND-------------\n")
// fmt.Printf("---------------ADDING COMMAND-------------\n")
c.authorization.authSchema.groupNodesAddNode("grp_nodes_ships", "ship1")
c.authorization.authSchema.groupNodesAddNode("grp_nodes_ships", "ship2")
c.authorization.authSchema.aclAdd("grp_nodes_ships", "admin", "dmesg")
@ -179,14 +172,14 @@ func TestSchemaMainACLMap(t *testing.T) {
t.Fatalf(" \U0001F631 [FAILED]: missing map entry: ship1, admin, tcpdump")
}
fmt.Printf("---------------ADDING COMMAND-------------\n")
// fmt.Printf("---------------ADDING COMMAND-------------\n")
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")
// fmt.Printf("---------------DELETING COMMAND grp_nodes_ships, admin, dmesg-------------\n")
c.authorization.authSchema.aclDeleteCommand("grp_nodes_ships", "admin", "dmesg")
if _, ok := c.authorization.authSchema.schemaMain.ACLMap["grp_nodes_ships"]["admin"]["dmesg"]; ok {
@ -203,7 +196,7 @@ func TestSchemaMainACLMap(t *testing.T) {
t.Fatalf(" \U0001F631 [FAILED]: missing map entry: ship1, admin, tcpdump")
}
fmt.Printf("---------------DELETING COMMAND ship0, admin, systemctl-------------\n")
// fmt.Printf("---------------DELETING COMMAND ship0, admin, systemctl-------------\n")
c.authorization.authSchema.aclDeleteCommand("ship0", "admin", "systemctl")
if _, ok := c.authorization.authSchema.schemaMain.ACLMap["ship0"]["admin"]["systemctl"]; ok {
@ -217,7 +210,7 @@ func TestSchemaMainACLMap(t *testing.T) {
t.Fatalf(" \U0001F631 [FAILED]: missing map entry: ship1, admin, tcpdump")
}
fmt.Printf("---------------DELETING SOURCE ship1, admin-------------\n")
// fmt.Printf("---------------DELETING SOURCE ship1, admin-------------\n")
c.authorization.authSchema.aclDeleteSource("ship1", "admin")
if _, ok := c.authorization.authSchema.schemaMain.ACLMap["ship1"]["admin"]; ok {
@ -243,8 +236,8 @@ func TestHash(t *testing.T) {
c.authorization.authSchema.aclAdd("grp_nodes_ships", "admin", "HEN")
hash := [32]uint8{0xa4, 0x99, 0xbd, 0xa3, 0x18, 0x26, 0x52, 0xc2, 0x92, 0x60, 0x23, 0x19, 0x3c, 0xa, 0x7, 0xa9, 0xb7, 0x77, 0x4f, 0x11, 0x34, 0xd5, 0x2d, 0xd1, 0x8d, 0xab, 0x6c, 0x4b, 0x2, 0xfa, 0x5c, 0x7a}
value := c.authorization.authSchema.schemaGenerated.NodeMap["ship101"].Hash
fmt.Printf("%#v\n", c.authorization.authSchema.schemaGenerated.NodeMap["ship101"].Hash)
value := c.authorization.authSchema.schemaGenerated.GeneratedACLsMap["ship101"].Hash
// fmt.Printf("%#v\n", c.authorization.authSchema.schemaGenerated.GeneratedACLsMap["ship101"].Hash)
if bytes.Equal(hash[:], value[:]) == false {
t.Fatalf(" \U0001F631 [FAILED]: hash mismatch")