reynir/albatross
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

check that bridges with the provided names exist before creating tap devices

Browse source
This commit is contained in:
Hannes Mehnert 2020-11-27 22:40:15 +01:00
parent 466e2d52b8
commit bc71e26756
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/vmm_unix.ml
View file

@ -227,6 +227,21 @@ let manifest_devices_match ~bridges ~block_devices image_file =
let bridges = List.map fst bridges in let bridges = List.map fst bridges in
devices_match ~bridges ~block_devices devices_match ~bridges ~block_devices
let bridge_name (service, b) = match b with None -> service | Some b -> b
let bridge_exists bridge_name =
let cmd =
match Lazy.force uname with
| FreeBSD -> Bos.Cmd.(v "ifconfig" % bridge_name)
| Linux -> Bos.Cmd.(v "ip" % "tuntap" % "show" % bridge_name)
in
Bos.OS.Cmd.(run_out ~err:err_null cmd |> out_null |> success)
let bridges_exist bridges =
List.fold_left
(fun acc b -> acc >>= fun () -> bridge_exists (bridge_name b))
(Ok ()) bridges
let prepare name vm = let prepare name vm =
(match vm.Unikernel.typ with (match vm.Unikernel.typ with
| `Solo5 -> | `Solo5 ->
@ -241,6 +256,7 @@ let prepare name vm =
solo5_image_target filename >>= fun target -> solo5_image_target filename >>= fun target ->
check_solo5_cmd (solo5_tender target) >>= fun _ -> check_solo5_cmd (solo5_tender target) >>= fun _ ->
manifest_devices_match ~bridges:vm.Unikernel.bridges ~block_devices:vm.Unikernel.block_devices filename >>= fun () -> manifest_devices_match ~bridges:vm.Unikernel.bridges ~block_devices:vm.Unikernel.block_devices filename >>= fun () ->
bridges_exist vm.Unikernel.bridges >>= fun () ->
let fifo = Name.fifo_file name in let fifo = Name.fifo_file name in
begin match fifo_exists fifo with begin match fifo_exists fifo with
| Ok true -> Ok () | Ok true -> Ok ()
@ -257,11 +273,11 @@ let prepare name vm =
let _ = Unix.umask old_umask in let _ = Unix.umask old_umask in
R.error_msgf "file %a error in %s: %a" Fpath.pp fifo f pp_unix_err e R.error_msgf "file %a error in %s: %a" Fpath.pp fifo f pp_unix_err e
end >>= fun () -> end >>= fun () ->
List.fold_left (fun acc (net, bri) -> List.fold_left (fun acc arg ->
acc >>= fun acc -> acc >>= fun acc ->
let bridge = match bri with None -> net | Some b -> b in let bridge = bridge_name arg in
create_tap bridge >>= fun tap -> create_tap bridge >>= fun tap ->
Ok ((net, tap) :: acc)) Ok ((fst arg, tap) :: acc))
(Ok []) vm.Unikernel.bridges >>= fun taps -> (Ok []) vm.Unikernel.bridges >>= fun taps ->
Ok (List.rev taps) Ok (List.rev taps)