Revert "Adds --disable-sandbox to esy b (and esy-build-package)"

This reverts commit df516af.
esy · Oct 15, 2019 · 2334202 · 2334202
1 parent 1badd89
commit 2334202
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 136 deletions.
diff --git a/bin/Project.re b/bin/Project.re
@@ -158,7 +158,6 @@ let makeProject = (makeSolved, projcfg: ProjectConfig.t) => {
     RunAsync.ofBosError(
       EsyBuildPackage.Config.make(
         ~globalStorePrefix,
-        ~disableSandbox=false,
         ~storePath,
         ~localStorePath=EsyInstall.SandboxSpec.storePath(projcfg.spec),
         ~projectPath=projcfg.spec.path,
@@ -717,15 +716,13 @@ let buildDependencies =
   };
 };
 
-let buildPackage =
-    (~quiet, ~disableSandbox, ~buildOnly, projcfg, sandbox, plan, pkg) => {
+let buildPackage = (~quiet, ~buildOnly, projcfg, sandbox, plan, pkg) => {
   checkSymlinks();
   let () =
     Logs.info(m =>
       m(
-        "running:@[<v>@;%s build-package (disable-sandbox: %s)\\@;%a@]",
+        "running:@[<v>@;%s build-package \\@;%a@]",
         projcfg.ProjectConfig.mainprg,
-        string_of_bool(disableSandbox),
         PackageId.pp,
         pkg.Package.id,
       )
@@ -735,7 +732,6 @@ let buildPackage =
     ~force=true,
     ~quiet,
     ~buildOnly,
-    ~disableSandbox,
     sandbox,
     plan,
     pkg.id,

diff --git a/bin/Project.rei b/bin/Project.rei
@@ -69,7 +69,6 @@ let buildDependencies:
 let buildPackage:
   (
     ~quiet: bool,
-    ~disableSandbox: bool,
     ~buildOnly: bool,
     ProjectConfig.t,
     BuildSandbox.t,

diff --git a/bin/esy.re b/bin/esy.re
@@ -462,7 +462,6 @@ let build =
       ~skipStalenessCheck=false,
       mode,
       pkgarg,
-      disableSandbox,
       cmd,
       proj: Project.t,
     ) => {
@@ -486,7 +485,6 @@ let build =
       Project.buildPackage(
         ~quiet=true,
         ~buildOnly,
-        ~disableSandbox,
         proj.projcfg,
         fetched.Project.sandbox,
         plan,
@@ -549,10 +547,9 @@ let execEnv = (asJson, pkgarg, proj: Project.t) =>
     (),
   );
 
-let exec = (mode, chdir, pkgarg, disableSandbox, cmd, proj: Project.t) => {
+let exec = (mode, chdir, pkgarg, cmd, proj: Project.t) => {
   open RunAsync.Syntax;
-  let%bind () =
-    build(~buildOnly=false, mode, PkgArg.root, disableSandbox, None, proj);
+  let%bind () = build(~buildOnly=false, mode, PkgArg.root, None, proj);
   let f = pkg =>
     Project.execCommand(
       ~checkIfDependenciesAreBuilt=false, /* not needed as we build an entire sandbox above */
@@ -1385,12 +1382,11 @@ let printHeader = (~spec=?, name) =>
 
 let default = (chdir, cmdAndPkg, proj: Project.t) => {
   open RunAsync.Syntax;
-  let disableSandbox = false;
   let%lwt fetched = Project.fetched(proj);
   switch (fetched, cmdAndPkg) {
   | (Ok(_), None) =>
     let%lwt () = printHeader(~spec=proj.projcfg.spec, "esy");
-    build(BuildDev, PkgArg.root, disableSandbox, None, proj);
+    build(BuildDev, PkgArg.root, None, proj);
   | (Ok(_), Some((None, cmd))) =>
     switch (Scripts.find(Cmd.getTool(cmd), proj.scripts)) {
     | Some(script) => runScript(script, Cmd.getArgs(cmd), proj)
@@ -1405,7 +1401,7 @@ let default = (chdir, cmdAndPkg, proj: Project.t) => {
     let%bind () = solveAndFetch(proj);
     let%bind (proj, files) = Project.make(proj.projcfg);
     let%bind () = Project.write(proj, files);
-    build(BuildDev, PkgArg.root, disableSandbox, None, proj);
+    build(BuildDev, PkgArg.root, None, proj);
   | (Error(_) as err, Some((None, cmd))) =>
     switch (Scripts.find(Cmd.getTool(cmd), proj.scripts)) {
     | Some(script) => runScript(script, Cmd.getArgs(cmd), proj)
@@ -1503,16 +1499,7 @@ let commandsConfig = {
 
   let commands = {
     let buildCommand = {
-      let run =
-          (
-            mode,
-            pkgarg,
-            disableSandbox,
-            install,
-            skipStalenessCheck,
-            cmd,
-            proj,
-          ) => {
+      let run = (mode, pkgarg, install, skipStalenessCheck, cmd, proj) => {
         let () =
           switch (cmd) {
           | None =>
@@ -1527,7 +1514,6 @@ let commandsConfig = {
           ~skipStalenessCheck,
           mode,
           pkgarg,
-          disableSandbox,
           cmd,
           proj,
         );
@@ -1543,11 +1529,6 @@ let commandsConfig = {
           const(run)
           $ modeTerm
           $ pkgTerm
-          $ Arg.(
-              value
-              & flag
-              & info(["disable-sandbox"], ~doc="Disables sandbox")
-            )
           $ Arg.(
               value
               & flag
@@ -1612,11 +1593,6 @@ let commandsConfig = {
           $ modeTerm
           $ chdirTerm
           $ pkgTerm
-          $ Arg.(
-              value
-              & flag
-              & info(["disable-sandbox"], ~doc="Disables sandbox")
-            )
           $ Cli.cmdTerm(
               ~doc="Command to execute within the sandbox environment.",
               ~docv="COMMAND",

diff --git a/esy-build-package/Build.re b/esy-build-package/Build.re
@@ -211,7 +211,7 @@ let configureBuild = (~cfg: Config.t, plan: Plan.t) => {
         };
       Ok({Sandbox.allowWrite: allowWrite});
     };
-    Sandbox.init(config, ~noSandbox=cfg.disableSandbox);
+    Sandbox.init(config);
   };
 
   return({

diff --git a/esy-build-package/Config.re b/esy-build-package/Config.re
@@ -6,7 +6,6 @@ type t = {
   globalStorePrefix: EsyLib.Path.t,
   storePath: EsyLib.Path.t,
   localStorePath: EsyLib.Path.t,
-  disableSandbox: bool,
 };
 
 type config = t;
@@ -47,15 +46,7 @@ let rec configureStorePath = (cfg, globalStorePrefix) => {
   return(path);
 };
 
-let make =
-    (
-      ~globalStorePrefix,
-      ~storePath,
-      ~projectPath,
-      ~localStorePath,
-      ~disableSandbox,
-      (),
-    ) => {
+let make = (~globalStorePrefix, ~storePath, ~projectPath, ~localStorePath, ()) => {
   open Run;
   let%bind storePath = configureStorePath(storePath, globalStorePrefix);
   let%bind () =
@@ -74,13 +65,7 @@ let make =
       };
     };
   let%bind () = initStore(localStorePath);
-  return({
-    projectPath,
-    globalStorePrefix,
-    storePath,
-    localStorePath,
-    disableSandbox,
-  });
+  return({projectPath, globalStorePrefix, storePath, localStorePath});
 };
 
 let render = (cfg, v) => {

diff --git a/esy-build-package/Config.rei b/esy-build-package/Config.rei
@@ -4,7 +4,6 @@ type t =
     globalStorePrefix: Fpath.t,
     storePath: Fpath.t,
     localStorePath: Fpath.t,
-    disableSandbox: bool,
   };
 
 let pp: Fmt.t(t);
@@ -25,7 +24,6 @@ let make:
     ~storePath: storePathConfig,
     ~projectPath: Fpath.t,
     ~localStorePath: Fpath.t,
-    ~disableSandbox: bool,
     unit
   ) =>
   Run.t(t, _);

diff --git a/esy-build-package/Sandbox.re b/esy-build-package/Sandbox.re
@@ -115,21 +115,14 @@ module NoSandbox = {
   };
 };
 
-let init = (config: config, ~noSandbox) =>
-  if (noSandbox) {
-    NoSandbox.sandboxExec(config);
-  } else {
-    switch (EsyLib.System.Platform.host) {
-    | Windows => Windows.sandboxExec(config)
-    | Darwin => Darwin.sandboxExec(config)
-    | _ => NoSandbox.sandboxExec(config)
-    };
+let init = (config: config) =>
+  switch (EsyLib.System.Platform.host) {
+  | Windows => Windows.sandboxExec(config)
+  | Darwin => Darwin.sandboxExec(config)
+  | _ => NoSandbox.sandboxExec(config)
   };
 
 let exec = (~env, sandbox: sandbox, cmd) => {
-  /* print_endline(Astring.String.Map.get("PATH", env)); */
-  /* print_endline(Astring.String.Map.get("LD_LIBRARY_PATH", env)); */
-  /* print_endline(Astring.String.Map.get("PKG_CONFIG_PATH", env)); */
   let result = sandbox(~env, cmd);
   (result: result(_, err) :> Run.t(_, _));
 };
diff --git a/esy-build-package/Sandbox.rei b/esy-build-package/Sandbox.rei
@@ -13,7 +13,7 @@ type config = {allowWrite: list(pattern)};
 type sandbox;
 
 /* Init sandbox */
-let init: (config, ~noSandbox: bool) => Run.t(sandbox, _);
+let init: config => Run.t(sandbox, _);
 
 /* Exec command in the sandbox. */
 let exec:

diff --git a/esy-build-package/bin/esyBuildPackageCommand.re b/esy-build-package/bin/esyBuildPackageCommand.re
@@ -14,7 +14,6 @@ type commonOpts = {
   localStorePath: option(Fpath.t),
   projectPath: option(Fpath.t),
   logLevel: option(Logs.level),
-  disableSandbox: bool,
 };
 
 let setupLog = (style_renderer, level) => {
@@ -27,7 +26,7 @@ let setupLog = (style_renderer, level) => {
 
 let createConfig = (copts: commonOpts) => {
   open Run;
-  let {globalStorePrefix, localStorePath, projectPath, disableSandbox, _} = copts;
+  let {globalStorePrefix, localStorePath, projectPath, _} = copts;
   let%bind currentPath = Bos.OS.Dir.current();
   let projectPath = Option.orDefault(~default=currentPath, projectPath);
   let storePath =
@@ -46,7 +45,6 @@ let createConfig = (copts: commonOpts) => {
     ~localStorePath=
       Option.orDefault(~default=projectPath / "_store", localStorePath),
     ~projectPath,
-    ~disableSandbox,
     (),
   );
 };
@@ -244,33 +242,15 @@ let () = {
         & info(["plan", "p"], ~env, ~docs, ~docv="PATH", ~doc)
       );
     };
-    let disableSandbox = {
-      let doc = "Disables sandboxing and builds the package without. CAUTION: this can be dangerous";
-      Arg.(value & flag & info(["disable-sandbox"], ~docs, ~doc));
-    };
     let setupLogT =
       Term.(
         const(setupLog)
         $ Fmt_cli.style_renderer()
         $ Logs_cli.level(~env=Arg.env_var("ESY__LOG"), ())
       );
     let parse =
-        (
-          projectPath,
-          globalStorePrefix,
-          localStorePath,
-          planPath,
-          logLevel,
-          disableSandbox,
-        ) => {
-      {
-        projectPath,
-        globalStorePrefix,
-        localStorePath,
-        planPath,
-        logLevel,
-        disableSandbox,
-      };
+        (projectPath, globalStorePrefix, localStorePath, planPath, logLevel) => {
+      {projectPath, globalStorePrefix, localStorePath, planPath, logLevel};
     };
     Term.(
       const(parse)
@@ -279,7 +259,6 @@ let () = {
       $ localStorePath
       $ planPath
       $ setupLogT
-      $ disableSandbox
     );
   };
   /* Command terms */

diff --git a/esy-build/BuildSandbox.re b/esy-build/BuildSandbox.re
@@ -1097,8 +1097,7 @@ let makeSymlinksToStore = (sandbox, task) => {
   return();
 };
 
-let buildTask =
-    (~quiet=?, ~buildOnly=?, ~logPath=?, ~disableSandbox=?, sandbox, task) => {
+let buildTask = (~quiet=?, ~buildOnly=?, ~logPath=?, sandbox, task) => {
   open RunAsync.Syntax;
   let%lwt () = Logs_lwt.debug(m => m("build %a", Task.pp, task));
   let plan = Task.plan(task);
@@ -1109,7 +1108,6 @@ let buildTask =
         ~quiet?,
         ~buildOnly?,
         ~logPath?,
-        ~disableSandbox?,
         sandbox.cfg,
         plan,
       )
@@ -1127,41 +1125,18 @@ let buildTask =
 };
 
 let buildOnly =
-    (
-      ~force,
-      ~quiet=?,
-      ~buildOnly=?,
-      ~logPath=?,
-      ~disableSandbox=?,
-      sandbox,
-      plan,
-      id,
-    ) =>
+    (~force, ~quiet=?, ~buildOnly=?, ~logPath=?, sandbox, plan, id) =>
   RunAsync.Syntax.(
     switch (Plan.get(plan, id)) {
     | Some(task) =>
       if (!force) {
         if%bind (isBuilt(sandbox, task)) {
           return();
         } else {
-          buildTask(
-            ~quiet?,
-            ~buildOnly?,
-            ~logPath?,
-            ~disableSandbox?,
-            sandbox,
-            task,
-          );
+          buildTask(~quiet?, ~buildOnly?, ~logPath?, sandbox, task);
         };
       } else {
-        buildTask(
-          ~quiet?,
-          ~buildOnly?,
-          ~logPath?,
-          ~disableSandbox?,
-          sandbox,
-          task,
-        );
+        buildTask(~quiet?, ~buildOnly?, ~logPath?, sandbox, task);
       }
     | None => RunAsync.return()
     }

diff --git a/esy-build/BuildSandbox.rei b/esy-build/BuildSandbox.rei
@@ -100,7 +100,6 @@ let buildOnly:
     ~quiet: bool=?,
     ~buildOnly: bool=?,
     ~logPath: Path.t=?,
-    ~disableSandbox: bool=?,
     t,
     Plan.t,
     PackageId.t