diff --git a/CHANGELOG.md b/CHANGELOG.md index bade81d..ccdf8ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,11 @@ since 0.4.1, and this project adheres to [Semantic Versioning](https://semver.or ## [Unreleased](https://github.com/freedomofpress/dangerzone/compare/v0.8.0...HEAD) +### Added + +- Disable gVisor's DirectFS feature ([#226](https://github.com/freedomofpress/dangerzone/issues/226)). + Thanks [EtiennePerot](https://github.com/EtiennePerot) for the contribution. + ## [0.8.0](https://github.com/freedomofpress/dangerzone/compare/v0.8.0...0.7.1) ### Added diff --git a/Dockerfile b/Dockerfile index 83896eb..c89c5a4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -74,9 +74,7 @@ FROM alpine:latest RUN apk --no-cache -U upgrade && \ apk --no-cache add python3 -# Temporarily pin gVisor to the latest working version (release-20240826.0). -# See: https://github.com/freedomofpress/dangerzone/issues/928 -RUN GVISOR_URL="https://storage.googleapis.com/gvisor/releases/release/20240826/$(uname -m)"; \ +RUN GVISOR_URL="https://storage.googleapis.com/gvisor/releases/release/latest/$(uname -m)"; \ wget "${GVISOR_URL}/runsc" "${GVISOR_URL}/runsc.sha512" && \ sha512sum -c runsc.sha512 && \ rm -f runsc.sha512 && \ diff --git a/dangerzone/gvisor_wrapper/entrypoint.py b/dangerzone/gvisor_wrapper/entrypoint.py index f9941ed..8d09eb2 100755 --- a/dangerzone/gvisor_wrapper/entrypoint.py +++ b/dangerzone/gvisor_wrapper/entrypoint.py @@ -142,6 +142,9 @@ runsc_argv = [ "--rootless=true", "--network=none", "--root=/home/dangerzone/.containers", + # Disable DirectFS for to make the seccomp filter even stricter, + # at some performance cost. + "--directfs=false", ] if os.environ.get("RUNSC_DEBUG"): runsc_argv += ["--debug=true", "--alsologtostderr=true"]