GlcoinCore/faraday
1
0
Fork 0
mirror of https://github.com/lightninglabs/faraday.git synced 2026-08-13 12:33:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #134 from lightninglabs/macaroon-stateless

Browse source 
Macaroon stateless
This commit is contained in:
Oliver Gugger 2021-11-05 10:47:27 +01:00 • committed by GitHub
commit a68cb47ee2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
frdrpc/macaroons.go
View file

@ -96,7 +96,7 @@ var (
// startMacaroonService starts the macaroon validation service, creates or
// unlocks the macaroon database and creates the default macaroon if it doesn't
// exist yet.
func (s *RPCServer) startMacaroonService() error {
func (s *RPCServer) startMacaroonService(createDefaultMacaroonFile bool) error {
var err error
s.macaroonDB, err = kvdb.GetBoltBackend(&kvdb.BoltBackendConfig{
DBPath: s.cfg.FaradayDir,
@ -131,8 +131,11 @@ func (s *RPCServer) startMacaroonService() error {
return fmt.Errorf("unable to unlock macaroon DB: %v", err)
}
// Create macaroon files for faraday CLI to use if they don't exist.
if !lnrpc.FileExists(s.cfg.MacaroonPath) {
// There are situations in which we don't want a macaroon to be created
// on disk (for example when running inside LiT stateless integrated
// mode). For any other cases, we create macaroon files for the faraday
// CLI in the default directory.
if createDefaultMacaroonFile && !lnrpc.FileExists(s.cfg.MacaroonPath) {
// We don't offer the ability to rotate macaroon root keys yet,
// so just use the default one since the service expects some
// value to be set.

10
frdrpc/rpcserver.go
View file

@ -182,7 +182,7 @@ func (s *RPCServer) Start() error {
// Start the macaroon service and let it create its default macaroon in
// case it doesn't exist yet.
if err := s.startMacaroonService(); err != nil {
if err := s.startMacaroonService(true); err != nil {
return fmt.Errorf("error starting macaroon service: %v", err)
}
shutdownFuncs["macaroon"] = s.stopMacaroonService
@ -301,14 +301,16 @@ func (s *RPCServer) Start() error {
// create its own gRPC server but registers to an existing one. The same goes
// for REST (if enabled), instead of creating an own mux and HTTP server, we
// register to an existing one.
func (s *RPCServer) StartAsSubserver(lndClient lndclient.LndServices) error {
func (s *RPCServer) StartAsSubserver(lndClient lndclient.LndServices,
createDefaultMacaroonFile bool) error {
if atomic.AddInt32(&s.started, 1) != 1 {
return errServerAlreadyStarted
}
// Start the macaroon service and let it create its default macaroon in
// case it doesn't exist yet.
if err := s.startMacaroonService(); err != nil {
if err := s.startMacaroonService(createDefaultMacaroonFile); err != nil {
return fmt.Errorf("error starting macaroon service: %v", err)
}
@ -345,7 +347,7 @@ func (s *RPCServer) Stop() error {
}
}
if err := s.macaroonService.Close(); err != nil {
if err := s.stopMacaroonService(); err != nil {
log.Errorf("Error stopping macaroon service: %v", err)
}