multi: let the subServerMgr handle loop, pool & faraday

Author: ellemouton

rpc_proxy.go

@@ -59,7 +59,8 @@ func (e *proxyErr) Unwrap() error {
 // component.
 func newRpcProxy(cfg *Config, validator macaroons.MacaroonValidator,
 	superMacValidator session.SuperMacaroonValidator,
-	permsMgr *PermissionsManager) *rpcProxy {
+	permsMgr *PermissionsManager, statusServer *statusServer,
+	subServerMgr *subServerMgr) *rpcProxy {
 
 	// The gRPC web calls are protected by HTTP basic auth which is defined
 	// by base64(username:password). Because we only have a password, we
@@ -79,6 +80,8 @@ func newRpcProxy(cfg *Config, validator macaroons.MacaroonValidator,
 		permsMgr:          permsMgr,
 		macValidator:      validator,
 		superMacValidator: superMacValidator,
+		statusServer:      statusServer,
+		subServerMgr:      subServerMgr,
 	}
 	p.grpcServer = grpc.NewServer(
 		// From the grpxProxy doc: This codec is *crucial* to the
@@ -153,10 +156,10 @@ type rpcProxy struct {
 
 	superMacaroon string
 
-	lndConn     *grpc.ClientConn
-	faradayConn *grpc.ClientConn
-	loopConn    *grpc.ClientConn
-	poolConn    *grpc.ClientConn
+	lndConn *grpc.ClientConn
+
+	statusServer *statusServer
+	subServerMgr *subServerMgr
 
 	grpcServer   *grpc.Server
 	grpcWebProxy *grpcweb.WrappedGrpcServer
@@ -167,44 +170,8 @@ type rpcProxy struct {
 
 // Start creates initial connection to lnd.
 func (p *rpcProxy) Start(lndConn *grpc.ClientConn) error {
-	var err error
 	p.lndConn = lndConn
 
-	// Make sure we can connect to all the daemons that are configured to be
-	// running in remote mode.
-	if p.cfg.faradayRemote {
-		p.faradayConn, err = dialBackend(
-			"faraday", p.cfg.Remote.Faraday.RPCServer,
-			lncfg.CleanAndExpandPath(
-				p.cfg.Remote.Faraday.TLSCertPath,
-			),
-		)
-		if err != nil {
-			return fmt.Errorf("could not dial remote faraday: %v",
-				err)
-		}
-	}
-
-	if p.cfg.loopRemote {
-		p.loopConn, err = dialBackend(
-			"loop", p.cfg.Remote.Loop.RPCServer,
-			lncfg.CleanAndExpandPath(p.cfg.Remote.Loop.TLSCertPath),
-		)
-		if err != nil {
-			return fmt.Errorf("could not dial remote loop: %v", err)
-		}
-	}
-
-	if p.cfg.poolRemote {
-		p.poolConn, err = dialBackend(
-			"pool", p.cfg.Remote.Pool.RPCServer,
-			lncfg.CleanAndExpandPath(p.cfg.Remote.Pool.TLSCertPath),
-		)
-		if err != nil {
-			return fmt.Errorf("could not dial remote pool: %v", err)
-		}
-	}
-
 	// Set started to true to indicate that the rpcProxy is now ready to
 	// handle requests.
 	p.mu.Lock()
@@ -218,27 +185,6 @@ func (p *rpcProxy) Start(lndConn *grpc.ClientConn) error {
 func (p *rpcProxy) Stop() error {
 	p.grpcServer.Stop()
 
-	if p.faradayConn != nil {
-		if err := p.faradayConn.Close(); err != nil {
-			log.Errorf("Error closing faraday connection: %v", err)
-			return err
-		}
-	}
-
-	if p.loopConn != nil {
-		if err := p.loopConn.Close(); err != nil {
-			log.Errorf("Error closing loop connection: %v", err)
-			return err
-		}
-	}
-
-	if p.poolConn != nil {
-		if err := p.poolConn.Close(); err != nil {
-			log.Errorf("Error closing pool connection: %v", err)
-			return err
-		}
-	}
-
 	return nil
 }
 
@@ -303,6 +249,12 @@ func (p *rpcProxy) makeDirector(allowLitRPC bool) func(ctx context.Context,
 
 		outCtx := metadata.NewOutgoingContext(ctx, mdCopy)
 
+		// Check that the target subsystem is running.
+		err := p.checkSubSystemStarted(requestURI)
+		if err != nil {
+			return nil, nil, err
+		}
+
 		// Is there a basic auth or super macaroon set?
 		authHeaders := md.Get("authorization")
 		macHeader := md.Get(HeaderMacaroon)
@@ -344,26 +296,20 @@ func (p *rpcProxy) makeDirector(allowLitRPC bool) func(ctx context.Context,
 		// since it must either be an lnd call or something that'll be
 		// handled by the integrated daemons that are hooking into lnd's
 		// gRPC server.
-		switch {
-		case p.permsMgr.IsFaradayURI(requestURI) && p.cfg.faradayRemote:
-			return outCtx, p.faradayConn, nil
-
-		case p.permsMgr.IsLoopURI(requestURI) && p.cfg.loopRemote:
-			return outCtx, p.loopConn, nil
-
-		case p.permsMgr.IsPoolURI(requestURI) && p.cfg.poolRemote:
-			return outCtx, p.poolConn, nil
+		handled, conn := p.subServerMgr.GetRemoteConn(requestURI)
+		if handled {
+			return outCtx, conn, nil
+		}
 
 		// Calls to LiT session RPC aren't allowed in some cases.
-		case p.permsMgr.IsLitURI(requestURI) && !allowLitRPC:
+		if p.permsMgr.IsLitURI(requestURI) && !allowLitRPC {
 			return outCtx, nil, status.Errorf(
 				codes.Unimplemented, "unknown service %s",
 				requestURI,
 			)
-
-		default:
-			return outCtx, p.lndConn, nil
 		}
+
+		return outCtx, p.lndConn, nil
 	}
 }
 
@@ -379,6 +325,12 @@ func (p *rpcProxy) UnaryServerInterceptor(ctx context.Context, req interface{},
 			"required for method", info.FullMethod)
 	}
 
+	// Check that the target subsystem is running.
+	err := p.checkSubSystemStarted(info.FullMethod)
+	if err != nil {
+		return nil, err
+	}
+
 	// For now, basic authentication is just a quick fix until we
 	// have proper macaroon support implemented in the UI. We allow
 	// gRPC web requests to have it and "convert" the auth into a
@@ -420,6 +372,12 @@ func (p *rpcProxy) StreamServerInterceptor(srv interface{},
 			"for method", info.FullMethod)
 	}
 
+	// Check that the target subsystem is running.
+	err := p.checkSubSystemStarted(info.FullMethod)
+	if err != nil {
+		return err
+	}
+
 	// For now, basic authentication is just a quick fix until we
 	// have proper macaroon support implemented in the UI. We allow
 	// gRPC web requests to have it and "convert" the auth into a
@@ -451,6 +409,35 @@ func (p *rpcProxy) StreamServerInterceptor(srv interface{},
 	return handler(srv, ss)
 }
 
+// checkSubSystemStarted checks if the subsystem responsible for handling the
+// given URI has started.
+func (p *rpcProxy) checkSubSystemStarted(requestURI string) error {
+	var system string
+
+	handled, subServerName := p.subServerMgr.HandledBy(requestURI)
+
+	switch {
+	case handled:
+		system = subServerName
+
+	case p.permsMgr.IsLndURI(requestURI):
+		return nil
+
+	case p.permsMgr.IsLitURI(requestURI):
+		return nil
+
+	default:
+		return fmt.Errorf("unknown gRPC web request: %v", requestURI)
+	}
+
+	started, startErr := p.statusServer.getSubServerState(system)
+	if !started {
+		return fmt.Errorf("%s has not running: %s", system, startErr)
+	}
+
+	return nil
+}
+
 // convertBasicAuth tries to convert the HTTP authorization header into a
 // macaroon based authentication header.
 func (p *rpcProxy) convertBasicAuth(ctx context.Context,
@@ -502,30 +489,15 @@ func (p *rpcProxy) basicAuthToMacaroon(basicAuth, requestURI string,
 		macPath string
 		macData []byte
 	)
+
+	handled, path := p.subServerMgr.MacaroonPath(requestURI)
+
 	switch {
 	case p.permsMgr.IsLndURI(requestURI):
 		_, _, _, macPath, macData = p.cfg.lndConnectParams()
 
-	case p.permsMgr.IsFaradayURI(requestURI):
-		if p.cfg.faradayRemote {
-			macPath = p.cfg.Remote.Faraday.MacaroonPath
-		} else {
-			macPath = p.cfg.Faraday.MacaroonPath
-		}
-
-	case p.permsMgr.IsLoopURI(requestURI):
-		if p.cfg.loopRemote {
-			macPath = p.cfg.Remote.Loop.MacaroonPath
-		} else {
-			macPath = p.cfg.Loop.MacaroonPath
-		}
-
-	case p.permsMgr.IsPoolURI(requestURI):
-		if p.cfg.poolRemote {
-			macPath = p.cfg.Remote.Pool.MacaroonPath
-		} else {
-			macPath = p.cfg.Pool.MacaroonPath
-		}
+	case handled:
+		macPath = path
 
 	case p.permsMgr.IsLitURI(requestURI):
 		macPath = p.cfg.MacaroonPath
@@ -604,21 +576,9 @@ func (p *rpcProxy) convertSuperMacaroon(ctx context.Context, macHex string,
 
 	// Is this actually a request that goes to a daemon that is running
 	// remotely?
-	switch {
-	case p.permsMgr.IsFaradayURI(fullMethod) && p.cfg.faradayRemote:
-		return readMacaroon(lncfg.CleanAndExpandPath(
-			p.cfg.Remote.Faraday.MacaroonPath,
-		))
-
-	case p.permsMgr.IsLoopURI(fullMethod) && p.cfg.loopRemote:
-		return readMacaroon(lncfg.CleanAndExpandPath(
-			p.cfg.Remote.Loop.MacaroonPath,
-		))
-
-	case p.permsMgr.IsPoolURI(fullMethod) && p.cfg.poolRemote:
-		return readMacaroon(lncfg.CleanAndExpandPath(
-			p.cfg.Remote.Pool.MacaroonPath,
-		))
+	handled, macBytes, err := p.subServerMgr.ReadRemoteMacaroon(fullMethod)
+	if handled {
+		return macBytes, err
 	}
 
 	return nil, nil