Skip to content

Limit permissions on temporary directories #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
talex5 merged 2 commits into from
Apr 6, 2021
Merged

Limit permissions on temporary directories #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eab6311
Limit permissions on temporary directories
talex5 Apr 6, 2021
a33ca7f
Try to avoid race in Travis tests
talex5 Apr 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .run-travis-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ export OPAMYES=true
sudo wget https://github.com/opencontainers/runc/releases/download/v1.0.0-rc92/runc.amd64 -O /usr/local/bin/runc
sudo chmod a+x /usr/local/bin/runc

ZFS_LOOP=$(sudo losetup -f)
dd if=/dev/zero of=/tmp/zfs.img bs=100M count=50
ZFS_LOOP=$(sudo losetup -f)
sudo losetup -P $ZFS_LOOP /tmp/zfs.img
sudo zpool create zfs $ZFS_LOOP

BTRFS_LOOP=$(sudo losetup -f)
dd if=/dev/zero of=/tmp/btrfs.img bs=100M count=50
BTRFS_LOOP=$(sudo losetup -f)
sudo losetup -P $BTRFS_LOOP /tmp/btrfs.img
sudo mkfs.btrfs -f $BTRFS_LOOP
sudo mkdir /btrfs
Expand Down
2 changes: 1 addition & 1 deletion lib/runc_sandbox.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ let copy_to_log ~src ~dst =
aux ()

let run ~cancelled ?stdin:stdin ~log t config results_dir =
Lwt_io.with_temp_dir ~prefix:"obuilder-runc-" @@ fun tmp ->
Lwt_io.with_temp_dir ~perm:0o700 ~prefix:"obuilder-runc-" @@ fun tmp ->
let json_config = Json_config.make config ~config_dir:tmp ~results_dir t in
Os.write_file ~path:(tmp / "config.json") (Yojson.Safe.pretty_to_string json_config ^ "\n") >>= fun () ->
Os.write_file ~path:(tmp / "hosts") "127.0.0.1 localhost builder" >>= fun () ->
Expand Down