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

pool: conditionally create default macaroon file

Browse source 
In some cases we don't want the default macaroon file to be created on
disk, so we allow passing in a boolean that toggles the macaroon
creation.
This commit is contained in:
Turtle 2021-09-13 22:33:50 -04:00 • committed by Oliver Gugger
parent df007ad9b5
commit 5b44ae53de
No known key found for this signature in database
GPG key ID: 8E4256593F177720
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
macaroons.go
View file

@ -193,7 +193,7 @@ var (
// unlocks the macaroon database and creates the default macaroon if it doesn't
// exist yet. If macaroons are disabled in general in the configuration, none of
// these actions are taken.
func (s *Server) startMacaroonService() error {
func (s *Server) startMacaroonService(createDefaultMacaroonFile bool) error {
var err error
s.macaroonDB, err = kvdb.GetBoltBackend(&kvdb.BoltBackendConfig{
DBPath: s.cfg.BaseDir,
@ -227,8 +227,11 @@ func (s *Server) startMacaroonService() error {
return fmt.Errorf("unable to unlock macaroon DB: %v", err)
}
// Create macaroon files for pool 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 pool 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.

7
server.go
View file

@ -144,7 +144,7 @@ func (s *Server) 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 err
}
shutdownFuncs["macaroon"] = s.stopMacaroonService
@ -310,7 +310,8 @@ func (s *Server) Start() error {
// StartAsSubserver is an alternative start method where the RPC server does not
// create its own gRPC server but registers on an existing one.
func (s *Server) StartAsSubserver(lndClient lnrpc.LightningClient,
lndGrpc *lndclient.GrpcLndServices) error {
lndGrpc *lndclient.GrpcLndServices,
createDefaultMacaroonFile bool) error {
if atomic.AddInt32(&s.started, 1) != 1 {
return fmt.Errorf("trader can only be started once")
@ -337,7 +338,7 @@ func (s *Server) StartAsSubserver(lndClient lnrpc.LightningClient,
// 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 err
}
shutdownFuncs["macaroon"] = s.stopMacaroonService