mirrors/ctrl
1
0
Fork 0
mirror of https://github.com/postmannen/ctrl.git synced 2025-01-18 21:59:30 +00:00
Code Activity

renamed generete json method to generateACLsForAllNodes

Browse source
This commit is contained in:
postmannen 2022-05-09 19:56:40 +02:00
parent 7cc50d4680
commit 56cd575716
2 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -166,7 +166,7 @@ func (a *authSchema) aclAdd(host node, source node, cmd command) {
a.schemaMain.ACLMap[host][source][cmd] = struct{}{} a.schemaMain.ACLMap[host][source][cmd] = struct{}{}
// err := a.generateJSONForHostOrGroup(n) // err := a.generateJSONForHostOrGroup(n)
err := a.generateJSONForAllNodes() err := a.generateACLsForAllNodes()
if err != nil { if err != nil {
er := fmt.Errorf("error: addCommandForFromNode: %v", err) er := fmt.Errorf("error: addCommandForFromNode: %v", err)
log.Printf("%v\n", er) log.Printf("%v\n", er)
@ -196,7 +196,7 @@ func (a *authSchema) aclDeleteCommand(host node, source node, cmd command) error
delete(a.schemaMain.ACLMap[host][source], cmd) delete(a.schemaMain.ACLMap[host][source], cmd)
err := a.generateJSONForAllNodes() err := a.generateACLsForAllNodes()
if err != nil { if err != nil {
er := fmt.Errorf("error: aclNodeFromNodeCommandDelete: %v", err) er := fmt.Errorf("error: aclNodeFromNodeCommandDelete: %v", err)
log.Printf("%v\n", er) log.Printf("%v\n", er)
@ -221,7 +221,7 @@ func (a *authSchema) aclDeleteSource(host node, source node) error {
delete(a.schemaMain.ACLMap[host], source) delete(a.schemaMain.ACLMap[host], source)
err := a.generateJSONForAllNodes() err := a.generateACLsForAllNodes()
if err != nil { if err != nil {
er := fmt.Errorf("error: aclNodeFromnodeDelete: %v", err) er := fmt.Errorf("error: aclNodeFromnodeDelete: %v", err)
log.Printf("%v\n", er) log.Printf("%v\n", er)
@ -230,14 +230,14 @@ func (a *authSchema) aclDeleteSource(host node, source node) error {
return nil return nil
} }
// generateJSONForAllNodes will generate a json encoded representation of the node specific // generateACLsForAllNodes will generate a json encoded representation of the node specific
// map values of authSchema, along with a hash of the data. // map values of authSchema, along with a hash of the data.
// //
// Will range over all the host elements defined in the ACL, create a new authParser for each one, // Will range over all the host elements defined in the ACL, create a new authParser for each one,
// and run a small state machine on each element to create the final ACL result to be used at host // and run a small state machine on each element to create the final ACL result to be used at host
// nodes. // nodes.
// The result will be written to the schemaGenerated.ACLsToConvert map. // The result will be written to the schemaGenerated.ACLsToConvert map.
func (a *authSchema) generateJSONForAllNodes() error { func (a *authSchema) generateACLsForAllNodes() error {
a.schemaGenerated.ACLsToConvert = make(map[node]map[node]map[command]struct{}) a.schemaGenerated.ACLsToConvert = make(map[node]map[node]map[command]struct{})
// Rangle all ACL's. Both for single hosts, and group of hosts. // Rangle all ACL's. Both for single hosts, and group of hosts.
@ -297,12 +297,18 @@ func (a *authSchema) generateJSONForAllNodes() error {
return nil return nil
} }
type sourceNodes struct { // sourceNode is used to convert the ACL map structure of a host into a slice,
Node node // and we then use the slice representation of the ACL to create the hash for
SourceCommands []sourceCommands // a specific host node.
type sourceNode struct {
HostNode node
SourceCommands []sourceNodeCommands
} }
type sourceCommands struct { // sourceNodeCommand is used to convert the ACL map structure of a host into a slice,
// and we then use the slice representation of the ACL to create the hash for
// a specific host node.
type sourceNodeCommands struct {
Source node Source node
Commands []command Commands []command
} }
@ -312,13 +318,13 @@ type sourceCommands struct {
// defined for each fromNode are sorted. // defined for each fromNode are sorted.
// This function is used when creating the hash of the nodeMap since we can not // This function is used when creating the hash of the nodeMap since we can not
// guarantee the order of a hash map, but we can with a slice. // guarantee the order of a hash map, but we can with a slice.
func (a *authSchema) nodeMapToSlice(host node) sourceNodes { func (a *authSchema) nodeMapToSlice(host node) sourceNode {
srcNodes := sourceNodes{ srcNodes := sourceNode{
Node: host, HostNode: host,
} }
for sn, commandMap := range a.schemaGenerated.ACLsToConvert[host] { for sn, commandMap := range a.schemaGenerated.ACLsToConvert[host] {
srcC := sourceCommands{ srcC := sourceNodeCommands{
Source: sn, Source: sn,
} }

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

@ -242,7 +242,7 @@ func TestHash(t *testing.T) {
c.authorization.authSchema.groupNodesAddNode("grp_nodes_ships", "ship101") c.authorization.authSchema.groupNodesAddNode("grp_nodes_ships", "ship101")
c.authorization.authSchema.aclAdd("grp_nodes_ships", "admin", "HEN") c.authorization.authSchema.aclAdd("grp_nodes_ships", "admin", "HEN")
hash := [32]uint8{0x70, 0xac, 0xe, 0xf5, 0x98, 0x1e, 0x82, 0xe0, 0xb6, 0x5b, 0xc7, 0xd8, 0xa2, 0xf4, 0xa2, 0x30, 0xb2, 0xb8, 0x42, 0x5c, 0x4, 0xc, 0xce, 0x8d, 0xcc, 0x7a, 0xa1, 0xa3, 0xb7, 0xb9, 0x2c, 0xa8} 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 value := c.authorization.authSchema.schemaGenerated.NodeMap["ship101"].Hash
fmt.Printf("%#v\n", c.authorization.authSchema.schemaGenerated.NodeMap["ship101"].Hash) fmt.Printf("%#v\n", c.authorization.authSchema.schemaGenerated.NodeMap["ship101"].Hash)