akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3245 from breez/non_static_permissions

Browse Source 
rpc: fix calculating RPC permissions.
This commit is contained in:
Johan T. Halseth 2019-07-10 13:33:54 +02:00 committed by GitHub
commit 7a5247b766
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rpcserver.go
View File

@ -168,9 +168,12 @@ var (
Action: "write", Action: "write",
}, },
} }
)
// permissions maps RPC calls to the permissions they require. // mainRPCServerPermissions returns a mapping of the main RPC server calls to
permissions = map[string][]bakery.Op{ // the permissions they require.
func mainRPCServerPermissions() map[string][]bakery.Op {
return map[string][]bakery.Op{
"/lnrpc.Lightning/SendCoins": {{ "/lnrpc.Lightning/SendCoins": {{
Entity: "onchain", Entity: "onchain",
Action: "write", Action: "write",
@ -381,7 +384,7 @@ var (
Action: "read", Action: "read",
}}, }},
} }
) }
// rpcServer is a gRPC, RPC front end to the lnd daemon. // rpcServer is a gRPC, RPC front end to the lnd daemon.
// TODO(roasbeef): pagination support for the list-style calls // TODO(roasbeef): pagination support for the list-style calls
@ -520,6 +523,7 @@ func newRPCServer(s *server, macService *macaroons.Service,
// Next, we need to merge the set of sub server macaroon permissions // Next, we need to merge the set of sub server macaroon permissions
// with the main RPC server permissions so we can unite them under a // with the main RPC server permissions so we can unite them under a
// single set of interceptors. // single set of interceptors.
permissions := mainRPCServerPermissions()
for _, subServerPerm := range subServerPerms { for _, subServerPerm := range subServerPerms {
for method, ops := range subServerPerm { for method, ops := range subServerPerm {
// For each new method:ops combo, we also ensure that // For each new method:ops combo, we also ensure that