GithubBackup/MoviePilot
1
0
Fork 0
mirror of https://github.com/jxxghp/MoviePilot.git synced 2026-08-09 15:34:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(docker): repair helper resource permissions (#6177)

Browse Source
This commit is contained in:
qqcomeup
2026-07-23 22:19:41 +00:00
committed by GitHub
parent 14fed2d70b
commit 059a50f7f8
2 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
docker/entrypoint.sh
View File

@@ -409,6 +409,14 @@ function chown_plugin_runtime_path() {
chown -h moviepilot:moviepilot "${plugin_path}"
}
function correct_helper_resource_permissions() {
local helper_dir="${IMAGE_HELPER_DIR:-/app/app/helper}"
[ -e "${helper_dir}" ] || return 0
INFO "→ 正在修复资源包目录权限：${helper_dir}"
chown -R moviepilot:moviepilot "${helper_dir}"
}
function correct_file_permissions() {
local chown_start
local chown_end
@@ -416,6 +424,7 @@ function correct_file_permissions() {
INFO "→ 正在校正文件权限..."
force_chown_image_paths_if_requested /app /public
correct_helper_resource_permissions
chown_plugin_runtime_path /app/app/plugins
correct_home_permissions
chown -R moviepilot:moviepilot \

18
tests/test_docker_entrypoint_permissions.py
View File

@@ -38,13 +38,17 @@ def _run_permission_case(tmp_path: Path, body: str, env: dict[str, str] | None =
fake_bin = _write_fake_chown(tmp_path)
chown_log = tmp_path / "chown.log"
app_dir = tmp_path / "app"
helper_dir = app_dir / "app" / "helper"
public_dir = tmp_path / "public"
home_dir = tmp_path / "home"
(app_dir / "app" / "plugins").mkdir(parents=True)
helper_dir.mkdir(parents=True)
public_dir.mkdir()
(home_dir / ".cloakbrowser").mkdir(parents=True)
(home_dir / "runtime").mkdir()
(app_dir / "app" / "plugins" / "plugin.py").write_text("# plugin\n", encoding="utf-8")
(helper_dir / "user.sites.v2.bin").write_text("resources\n", encoding="utf-8")
(helper_dir / "sites.cpython-312-x86_64-linux-gnu.so").write_text("plugin\n", encoding="utf-8")
(public_dir / "index.html").write_text("<!doctype html>\n", encoding="utf-8")
(home_dir / ".cloakbrowser" / "chrome").write_text("browser cache\n", encoding="utf-8")
(home_dir / "runtime" / "state").write_text("state\n", encoding="utf-8")
@@ -60,6 +64,7 @@ def _run_permission_case(tmp_path: Path, body: str, env: dict[str, str] | None =
"APP_DIR": str(app_dir),
"PUBLIC_DIR": str(public_dir),
"HOME_DIR": str(home_dir),
"IMAGE_HELPER_DIR": str(helper_dir),
"CONFIG_DIR": str(tmp_path / "config"),
"PUID": str(os.getuid()),
"PGID": str(os.getgid()),
@@ -187,11 +192,24 @@ def test_runtime_writable_paths_are_still_corrected(tmp_path: Path) -> None:
assert f"-R moviepilot:moviepilot {tmp_path}/home/runtime" in lines
assert f"-R moviepilot:moviepilot {tmp_path}/config /var/lib/nginx /var/log/nginx" in lines
assert "moviepilot:moviepilot /etc/hosts /tmp" in lines
assert f"-R moviepilot:moviepilot {tmp_path}/app/app/helper" in lines
assert not any(line.startswith("-R ") and ".cloakbrowser" in line for line in lines)
assert not any(f"{tmp_path}/app " in line for line in lines)
assert not any(f"{tmp_path}/public" in line for line in lines)
def test_helper_resource_permissions_are_repaired_even_when_owner_matches(tmp_path: Path) -> None:
log = _run_permission_case(
tmp_path,
'correct_helper_resource_permissions',
)
lines = log.splitlines()
assert f"-R moviepilot:moviepilot {tmp_path}/app/app/helper" in lines
assert not any(line.startswith("-R ") and f"{tmp_path}/app " in line for line in lines)
assert not any(line.startswith("-R ") and f"{tmp_path}/public" in line for line in lines)
def test_backend_ready_log_uses_configured_ports(tmp_path: Path) -> None:
curl_log = tmp_path / "curl.log"
output = _run_entrypoint_case(