Merge pull request #6739 from ellemouton/indexOutOfRange

rpcperms: re-init mw lookup map after removal of one
This commit is contained in:
Oliver Gugger 2022-07-19 16:59:45 +02:00 committed by GitHub
commit 0ac421907a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions

View File

@ -89,6 +89,9 @@
* [Fixes a key scope issue preventing new remote signing setups to be created
with `v0.15.0-beta`](https://github.com/lightningnetwork/lnd/pull/6714).
* [Re-initialise registered middleware index lookup map after removal of a
registered middleware](https://github.com/lightningnetwork/lnd/pull/6739)
## Code Health
### Code cleanup, refactor, typo fixes

View File

@ -489,10 +489,17 @@ func (r *InterceptorChain) RemoveMiddleware(middlewareName string) {
return
}
delete(r.registeredMiddlewareNames, middlewareName)
r.registeredMiddleware = append(
r.registeredMiddleware[:index],
r.registeredMiddleware[index+1:]...,
)
// Re-initialise the middleware look-up map with the updated indexes.
r.registeredMiddlewareNames = make(map[string]int)
for i, mw := range r.registeredMiddleware {
r.registeredMiddlewareNames[mw.middlewareName] = i
}
}
// CustomCaveatSupported makes sure a middleware that handles the given custom