mirror of https://github.com/poanetwork/quorum.git
permission: minor changes to disconnet node while updating permissioned-nodes.json file
This commit is contained in:
parent
f97e7920c6
commit
cfd7e95bd9
|
@ -423,9 +423,9 @@ func (p *PermissionCtrl) manageNodePermissions() {
|
||||||
types.NodeInfoMap.UpsertNode(evtNodeActivated.OrgId, evtNodeActivated.EnodeId, types.NodeApproved)
|
types.NodeInfoMap.UpsertNode(evtNodeActivated.OrgId, evtNodeActivated.EnodeId, types.NodeApproved)
|
||||||
|
|
||||||
case evtNodeBlacklisted = <-chNodeBlacklisted:
|
case evtNodeBlacklisted = <-chNodeBlacklisted:
|
||||||
p.updatePermissionedNodes(evtNodeBlacklisted.EnodeId, NodeDelete)
|
|
||||||
p.updateDisallowedNodes(evtNodeBlacklisted.EnodeId, NodeAdd)
|
|
||||||
types.NodeInfoMap.UpsertNode(evtNodeBlacklisted.OrgId, evtNodeBlacklisted.EnodeId, types.NodeBlackListed)
|
types.NodeInfoMap.UpsertNode(evtNodeBlacklisted.OrgId, evtNodeBlacklisted.EnodeId, types.NodeBlackListed)
|
||||||
|
p.updateDisallowedNodes(evtNodeBlacklisted.EnodeId, NodeAdd)
|
||||||
|
p.updatePermissionedNodes(evtNodeBlacklisted.EnodeId, NodeDelete)
|
||||||
|
|
||||||
case evtNodeRecoveryInit = <-chNodeRecoveryInit:
|
case evtNodeRecoveryInit = <-chNodeRecoveryInit:
|
||||||
types.NodeInfoMap.UpsertNode(evtNodeRecoveryInit.OrgId, evtNodeRecoveryInit.EnodeId, types.NodeRecoveryInitiated)
|
types.NodeInfoMap.UpsertNode(evtNodeRecoveryInit.OrgId, evtNodeRecoveryInit.EnodeId, types.NodeRecoveryInitiated)
|
||||||
|
@ -478,7 +478,6 @@ func (p *PermissionCtrl) updateFile(fileName, enodeId string, operation NodeOper
|
||||||
nodeList = append(nodeList, enodeId)
|
nodeList = append(nodeList, enodeId)
|
||||||
} else {
|
} else {
|
||||||
nodeList = append(nodeList[:index], nodeList[index+1:]...)
|
nodeList = append(nodeList[:index], nodeList[index+1:]...)
|
||||||
p.disconnectNode(enodeId)
|
|
||||||
}
|
}
|
||||||
blob, _ := json.Marshal(nodeList)
|
blob, _ := json.Marshal(nodeList)
|
||||||
|
|
||||||
|
@ -502,6 +501,9 @@ func (p *PermissionCtrl) updatePermissionedNodes(enodeId string, operation NodeO
|
||||||
}
|
}
|
||||||
|
|
||||||
p.updateFile(path, enodeId, operation, false)
|
p.updateFile(path, enodeId, operation, false)
|
||||||
|
if operation == NodeDelete {
|
||||||
|
p.disconnectNode(enodeId)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//this function populates the black listed node information into the disallowed-nodes.json file
|
//this function populates the black listed node information into the disallowed-nodes.json file
|
||||||
|
@ -525,9 +527,6 @@ func (p *PermissionCtrl) updateDisallowedNodes(url string, operation NodeOperati
|
||||||
} else {
|
} else {
|
||||||
p.updateFile(path, url, operation, true)
|
p.updateFile(path, url, operation, true)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Disconnect the peer if it is already connected
|
|
||||||
p.disconnectNode(url)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Monitors account access related events and updates the cache accordingly
|
// Monitors account access related events and updates the cache accordingly
|
||||||
|
|
Loading…
Reference in New Issue