You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ti...@apache.org on 2017/04/18 14:43:05 UTC

mesos git commit: Removed containerizer flag logging to prevent leak of sensitive data.

Repository: mesos
Updated Branches:
  refs/heads/1.0.x 71e41f166 -> b4289ab4d


Removed containerizer flag logging to prevent leak of sensitive data.

* backported for 1.0.x *

Review: https://reviews.apache.org/r/58502/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b4289ab4
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b4289ab4
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b4289ab4

Branch: refs/heads/1.0.x
Commit: b4289ab4d603d74447517da4591cb78a65823279
Parents: 71e41f1
Author: Till Toenshoff <to...@me.com>
Authored: Tue Apr 18 16:41:42 2017 +0200
Committer: Till Toenshoff <to...@me.com>
Committed: Tue Apr 18 16:41:42 2017 +0200

----------------------------------------------------------------------
 src/launcher/posix/executor.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/b4289ab4/src/launcher/posix/executor.cpp
----------------------------------------------------------------------
diff --git a/src/launcher/posix/executor.cpp b/src/launcher/posix/executor.cpp
index 1c423f0..d6b3663 100644
--- a/src/launcher/posix/executor.cpp
+++ b/src/launcher/posix/executor.cpp
@@ -110,11 +110,14 @@ pid_t launchTaskPosix(
   launchFlags.rootfs = rootfs;
   launchFlags.user = user;
 
+  // TODO(tillt): Consider using a flag allowing / disallowing the
+  // log output of possibly sensitive data. See MESOS-7292.
   string commandString = strings::format(
-      "%s %s %s",
+      "%s %s <POSSIBLY-SENSITIVE-DATA>",
       path::join(launcherDir, MESOS_CONTAINERIZER),
-      MesosContainerizerLaunch::NAME,
-      stringify(launchFlags)).get();
+      MesosContainerizerLaunch::NAME).get();
+
+  cout << "Running '" << commandString << "'" << endl;
 
   // Fork the child using launcher.
   vector<string> argv(2);
@@ -134,8 +137,6 @@ pid_t launchTaskPosix(
     ABORT("Failed to launch '" + commandString + "': " + s.error());
   }
 
-  cout << commandString << endl;
-
   return s->pid();
 }