ServerKit is a lightweight, modern server control panel for managing web applications, databases, and services on your VPS or dedicated server. Built with Python/Flask backend and React frontend.
Python astracloudflarecontrol-panelcyberpaneldnsfablehosting-control-panelhosting-panelkimi-k3server-managementserverkitubuntu-web-panelwebserver
Bound Docker metadata reads with a timeout
Juan Denisec8cd9462e26
diff --git a/backend/app/services/docker_service.py b/backend/app/services/docker_service.pyindex 7d2da33f..20fe6842 100644--- a/backend/app/services/docker_service.py+++ b/backend/app/services/docker_service.py@@ -12,6 +12,11 @@ from app.utils.system import run_checkedlogger = logging.getLogger(__name__)+# Metadata reads (ps, inspect, info, version) answer in well under a second+# on a healthy daemon. Unbounded, a wedged dockerd held each request thread+# forever; the panel runs one worker process, so they add up.+QUICK_TIMEOUT = 30+# Docker-style memory limit: a number plus a one-letter unit (bytes/kilo/mega/giga)._MEMORY_LIMIT_RE = re.compile(r'^\d+(\.\d+)?(b|k|m|g)$', re.IGNORECASE)@@ -35,7 +40,7 @@ class DockerService:# dropping the guard here made a broken Popen surface as# `compose up` exit_code -1 instead of falling back to v1.try:- if run_checked(['docker', 'compose', 'version'], timeout=None)['success']:+ if run_checked(['docker', 'compose', 'version'], timeout=QUICK_TIMEOUT)['success']:cls._compose_cmd = ['docker', 'compose']return cls._compose_cmdexcept Exception as e: # noqa: BLE001@@ -86,7 +91,7 @@ class DockerService:@staticmethoddef is_docker_installed():"""Check if Docker is installed and running."""- result = DockerService.run(['version', '--format', 'json'], timeout=None)+ result = DockerService.run(['version', '--format', 'json'], timeout=QUICK_TIMEOUT)if not result['success']:return {'installed': False, 'error': result['error']}try:@@ -97,7 +102,7 @@ class DockerService:@staticmethoddef get_docker_info():"""Get Docker system information."""- result = DockerService.run(['info', '--format', '{{json .}}'], timeout=None)+ result = DockerService.run(['info', '--format', '{{json .}}'], timeout=QUICK_TIMEOUT)if not result['success']:logger.error('Failed to get Docker info: %s', result['error'])return None@@ -151,7 +156,7 @@ class DockerService:if all_containers:args.insert(1, '-a')- result = DockerService.run(args, timeout=None)+ result = DockerService.run(args, timeout=QUICK_TIMEOUT)if not result['success']:raise DependencyUnavailableError('Docker is not reachable: '@@ -226,7 +231,7 @@ class DockerService:if all_containers:args.insert(1, '-a')- result = cls.run(args, timeout=None)+ result = cls.run(args, timeout=QUICK_TIMEOUT)if not result['success']:logger.warning('docker ps (bulk) failed: %s', result['error'])return []@@ -251,7 +256,7 @@ class DockerService:@staticmethoddef get_container(container_id):"""Get detailed container information."""- result = DockerService.run(['inspect', container_id], timeout=None)+ result = DockerService.run(['inspect', container_id], timeout=QUICK_TIMEOUT)if not result['success']:return Nonetry:@@ -853,7 +858,7 @@ class DockerService:def tag_image(source, target):"""Tag an image."""try:- result = DockerService.run(['tag', source, target], timeout=None)+ result = DockerService.run(['tag', source, target], timeout=QUICK_TIMEOUT)if result['success']:return {'success': True}return {'success': False, 'error': result['error']}@@ -904,7 +909,7 @@ class DockerService:The shared external ``serverkit`` network lets manifest-generated appprojects resolve each other by container name (fromService.host)."""- if DockerService.run(['network', 'inspect', name], timeout=None)['success']:+ if DockerService.run(['network', 'inspect', name], timeout=QUICK_TIMEOUT)['success']:return {'success': True, 'existed': True}created = DockerService.create_network(name, driver=driver)created['existed'] = False@@ -978,7 +983,7 @@ class DockerService:def inspect_volume(name):"""Live state of a named volume: {'present', 'mountpoint', 'driver'}."""try:- result = DockerService.run(['volume', 'inspect', name], timeout=None)+ result = DockerService.run(['volume', 'inspect', name], timeout=QUICK_TIMEOUT)if not result['success']:return {'present': False, 'mountpoint': None, 'driver': None}data = json.loads(result['output'] or '[]')diff --git a/backend/tests/test_docker_quick_timeouts.py b/backend/tests/test_docker_quick_timeouts.pynew file mode 100644index 00000000..98f43caa--- /dev/null+++ b/backend/tests/test_docker_quick_timeouts.py@@ -0,0 +1,30 @@+"""Docker metadata reads are bounded.++ps / inspect / info / version ran with timeout=None, so a wedged dockerd+held every request thread that asked forever. Long operations (pull,+build, compose up, logs) stay unbounded on purpose.+"""+from unittest.mock import patch++import pytest++from app.services.docker_service import QUICK_TIMEOUT, DockerService++OK = {'success': True, 'output': '', 'stderr': '', 'error': None, 'returncode': 0}++[email protected]('call', [+ lambda: DockerService.list_containers(),+ lambda: DockerService.get_container('abc'),+ lambda: DockerService.get_docker_info(),+ lambda: DockerService.is_docker_installed(),+ lambda: DockerService.tag_image('a:1', 'a:2'),+])+def test_metadata_reads_pass_a_timeout(call):+ with patch.object(DockerService, 'run', return_value=OK) as run:+ call()+ assert run.call_args.kwargs['timeout'] == QUICK_TIMEOUT+++def test_quick_timeout_is_bounded():+ assert 0 < QUICK_TIMEOUT <= 60