davide/purple-electrumwallet
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10548 from SomberNight/202603_lockdown_rpcserver

Browse Source 
in GUI mode, only start a limited minimal RPC server
This commit is contained in:
ghost43
2026-03-31 15:25:52 +00:00
committed by GitHub
parent 8942ceace8 726d3995f4
commit 09a09057f6
3 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
electrum/daemon.py
+16 -7
View File
@@ -287,25 +287,31 @@ class AuthenticatedServer(Logger):
class CommandsServer(AuthenticatedServer):
def __init__(self, daemon: 'Daemon', fd):
def __init__(self, daemon: 'Daemon', fd, *, only_minimal_jsonrpc: bool):
rpc_user, rpc_password = get_rpc_credentials(daemon.config)
AuthenticatedServer.__init__(self, rpc_user, rpc_password)
self.daemon = daemon
self.fd = fd
self._only_minimal_jsonrpc = only_minimal_jsonrpc
self.config = daemon.config
sockettype = self.config.RPC_SOCKET_TYPE
self.socktype = sockettype if sockettype != 'auto' else get_rpcsock_default_type(self.config)
self.sockpath = self.config.RPC_SOCKET_FILEPATH or get_rpcsock_defaultpath(self.config)
self.host = self.config.RPC_HOST
self.port = self.config.RPC_PORT
self.cmd_runner = Commands(config=self.config, network=self.daemon.network, daemon=self.daemon)
self.app = web.Application()
self.app.router.add_post("/", self.handle)
# First add always-enabled commands that are also available for "minimal" rpc server.
# - "ping" RPC is needed for the lockfile fd to work.
self.register_method('ping', self.ping)
# - "gui" RPC is needed for URI handling. (TODO restrict further: disallow opening arbitrary file paths)
self.register_method('gui', self.gui)
self.cmd_runner = Commands(config=self.config, network=self.daemon.network, daemon=self.daemon)
for cmdname in known_commands:
self.register_method(cmdname, getattr(self.cmd_runner, cmdname))
self.register_method('run_cmdline', self.run_cmdline)
# Add other commands:
if not only_minimal_jsonrpc:
for cmdname in known_commands:
self.register_method(cmdname, getattr(self.cmd_runner, cmdname))
self.register_method('run_cmdline', self.run_cmdline)
def _socket_config_str(self) -> str:
if self.socktype == 'unix':
@@ -343,7 +349,9 @@ class CommandsServer(AuthenticatedServer):
raise Exception(f"impossible socktype ({self.socktype!r})")
os.write(self.fd, bytes(repr((self.socktype, addr, time.time())), 'utf8'))
os.close(self.fd)
self.logger.info(f"now running and listening. socktype={self.socktype}, addr={addr}")
self.logger.info(
f"now running and listening. socktype={self.socktype}, addr={addr}. "
f"only_minimal_jsonrpc={self._only_minimal_jsonrpc}")
async def ping(self):
return True
@@ -401,6 +409,7 @@ class Daemon(Logger):
fd=None,
*,
listen_jsonrpc: bool = True,
only_minimal_jsonrpc: bool = True,
start_network: bool = True, # setting to False allows customising network settings before starting it
):
Logger.__init__(self)
@@ -430,7 +439,7 @@ class Daemon(Logger):
# Setup commands server
self.commands_server = None
if listen_jsonrpc:
self.commands_server = CommandsServer(self, fd)
self.commands_server = CommandsServer(self, fd, only_minimal_jsonrpc=only_minimal_jsonrpc)
asyncio.run_coroutine_threadsafe(self.taskgroup.spawn(self.commands_server.run()), self.asyncio_loop)
@log_exceptions