rpc_proxy: always allow Proxy calls

Author: ellemouton

itest/litd_mode_integrated_test.go

@@ -196,6 +196,7 @@ var (
 		restWebURI        string
 		restPOST          bool
 		canDisable        bool
+		litOnly           bool
 	}{{
 		name:              "lnrpc",
 		macaroonFn:        lndMacaroonFn,
@@ -292,6 +293,7 @@ var (
 		allowedThroughLNC: false,
 		grpcWebURI:        "/litrpc.Proxy/GetInfo",
 		restWebURI:        "/v1/proxy/info",
+		litOnly:           true,
 	}}
 
 	// customURIs is a map of endpoint URIs that we want to allow via a
@@ -416,7 +418,7 @@ func integratedTestSuite(ctx context.Context, net *NetworkHarness, t *testing.T,
 					endpoint.macaroonFn(cfg),
 					endpoint.requestFn,
 					endpoint.successPattern,
-					endpointDisabled,
+					endpointDisabled || endpoint.litOnly,
 					"Unimplemented desc = unknown service",
 				)
 			})
@@ -447,7 +449,7 @@ func integratedTestSuite(ctx context.Context, net *NetworkHarness, t *testing.T,
 					ttt, cfg.RPCAddr(), cfg.TLSCertPath,
 					cfg.UIPassword, endpoint.requestFn,
 					true, endpoint.successPattern,
-					endpointDisabled,
+					endpointDisabled || endpoint.litOnly,
 					"Unimplemented desc = unknown service",
 				)
 			})
@@ -516,7 +518,7 @@ func integratedTestSuite(ctx context.Context, net *NetworkHarness, t *testing.T,
 					superMacFile,
 					endpoint.requestFn,
 					endpoint.successPattern,
-					endpointDisabled,
+					endpointDisabled || endpoint.litOnly,
 					"Unimplemented desc = unknown service",
 				)
 			})

rpc_proxy.go

@@ -577,8 +577,8 @@ func (p *rpcProxy) convertSuperMacaroon(ctx context.Context, macHex string,
 // checkSubSystemStarted checks if the subsystem responsible for handling the
 // given URI has started.
 func (p *rpcProxy) checkSubSystemStarted(requestURI string) error {
-	// A request to Lit's status server is always allowed.
-	if isStatusReq(requestURI) {
+	// A request to Lit's status and proxy services is always allowed.
+	if isStatusReq(requestURI) || isProxyReq(requestURI) {
 		return nil
 	}
 
@@ -645,3 +645,11 @@ func isStatusReq(uri string) bool {
 		uri, fmt.Sprintf("/%s", litrpc.Status_ServiceDesc.ServiceName),
 	)
 }
+
+// isProxyReq returns true if the given request is intended for the litrpc.Proxy
+// service.
+func isProxyReq(uri string) bool {
+	return strings.HasPrefix(
+		uri, fmt.Sprintf("/%s", litrpc.Proxy_ServiceDesc.ServiceName),
+	)
+}