poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

permission: Code changes as per review comments

This commit is contained in:
vsmk98 2019-05-31 14:25:56 +08:00
parent c7827f276e
commit b6f4529629
3 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/geth/main.go
View File

@ -400,7 +400,7 @@ func startQuorumPermissionService(ctx *cli.Context, stack *node.Node) error {
}
// start the permissions management service
pc, err := permission.NewQuorumPermissionCtrl(stack, ctx.GlobalBool(utils.EnableNodePermissionFlag.Name), ctx.GlobalBool(utils.RaftModeFlag.Name), &permissionConfig)
pc, err := permission.NewQuorumPermissionCtrl(stack, ctx.GlobalBool(utils.EnableNodePermissionFlag.Name), &permissionConfig)
if err != nil {
return err
}

36
core/quorum/api.go
View File

@ -207,8 +207,42 @@ func (q *QuorumControlsAPI) GetOrgDetails(orgId string) types.OrgDetailInfo {
return types.OrgDetailInfo{NodeList: nodeList, RoleList: roleList, AcctList: acctList, SubOrgList: types.OrgInfoMap.GetOrg(orgId).SubOrgList}
}
func (q *QuorumControlsAPI) initOp(txa ethapi.SendTxArgs) (*pbind.PermInterfaceSession, ExecStatus) {
if !q.permEnabled {
return nil, ErrPermissionDisabled
}
var err error
var w accounts.Wallet
w, err = q.validateAccount(txa.From)
if err != nil {
return nil, ErrInvalidAccount
}
pinterf := q.newPermInterfaceSession(w, txa)
return pinterf, ExecSuccess
}
func (q *QuorumControlsAPI) AddOrg(orgId string, url string, acct common.Address, txa ethapi.SendTxArgs) ExecStatus {
return q.executePermAction(AddOrg, txArgs{orgId: orgId, url: url, acctId: acct, txa: txa})
pinterf, execStatus := q.initOp(txa)
if execStatus != ExecSuccess {
return execStatus
}
args := txArgs{orgId: orgId, url: url, acctId: acct, txa: txa}
if execStatus := q.valAddOrg(args, pinterf); execStatus != ExecSuccess {
return execStatus
}
tx, err := pinterf.AddOrg(args.orgId, args.url, args.acctId)
if err != nil {
log.Error("Failed to execute permission action", "action", AddOrg, "err", err)
msg := fmt.Sprintf("failed to execute permissions action: %v", err)
return ExecStatus{false, msg}
}
log.Debug("executed permission action", "action", AddOrg, "tx", tx)
return ExecSuccess
//return q.executePermAction(AddOrg, txArgs{orgId: orgId, url: url, acctId: acct, txa: txa})
}
func (q *QuorumControlsAPI) AddSubOrg(porgId, orgId string, url string, txa ethapi.SendTxArgs) ExecStatus {

11
permission/permission.go
View File

@ -4,6 +4,7 @@ import (
"crypto/ecdsa"
"encoding/json"
"errors"
"github.com/ethereum/go-ethereum/raft"
"io/ioutil"
"math/big"
"os"
@ -22,7 +23,6 @@ import (
"github.com/ethereum/go-ethereum/p2p/enode"
"github.com/ethereum/go-ethereum/params"
pbind "github.com/ethereum/go-ethereum/permission/bind"
"github.com/ethereum/go-ethereum/raft"
)
type NodeOperation uint8
@ -55,7 +55,6 @@ type PermissionCtrl struct {
node *node.Node
ethClnt *ethclient.Client
eth *eth.Ethereum
isRaft bool
permissionedMode bool
key *ecdsa.PrivateKey
dataDir string
@ -147,7 +146,7 @@ func waitForSync(e *eth.Ethereum) {
}
// Creates the controls structure for permissions
func NewQuorumPermissionCtrl(stack *node.Node, permissionedMode, isRaft bool, pconfig *types.PermissionConfig) (*PermissionCtrl, error) {
func NewQuorumPermissionCtrl(stack *node.Node, permissionedMode bool, pconfig *types.PermissionConfig) (*PermissionCtrl, error) {
// Create a new eth client to for interfacing with the contract
stateReader, e, err := CreateEthClient(stack)
waitForSync(e)
@ -199,7 +198,6 @@ func NewQuorumPermissionCtrl(stack *node.Node, permissionedMode, isRaft bool, pc
node: stack,
ethClnt: stateReader,
eth: e,
isRaft: isRaft,
permissionedMode: permissionedMode,
key: stack.GetNodeKey(),
dataDir: stack.DataDir(),
@ -502,7 +500,7 @@ func (p *PermissionCtrl) manageAccountPermissions() {
// Disconnect the node from the network
func (p *PermissionCtrl) disconnectNode(enodeId string) {
if p.isRaft {
if p.eth.ChainConfig().Istanbul == nil && p.eth.ChainConfig().Clique == nil {
var raftService *raft.RaftService
if err := p.node.Service(&raftService); err == nil {
raftApi := raft.NewPublicRaftAPI(raftService)
@ -516,7 +514,7 @@ func (p *PermissionCtrl) disconnectNode(enodeId string) {
}
}
} else {
// Istanbul - disconnect the peer
// Istanbul or clique - disconnect the peer
server := p.node.Server()
if server != nil {
node, err := enode.ParseV4(enodeId)
@ -527,6 +525,7 @@ func (p *PermissionCtrl) disconnectNode(enodeId string) {
}
}
}
}
// Thus function checks if the initial network boot up status and if no