entd: require a per-entd-invocation session id in every request

main.cc

 // Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdio.h>
 #include <iostream>
 #include <string>
 
 #include <base/command_line.h>
 #include <base/file_util.h>
@@ skipping 38 matching lines @@
 
 // Syslogging is enabled by default if stdout is not a tty.  These flags can
 // be used to override the default logic.
 static const char *kEnableSyslog = "enable-syslog";
 static const char *kDisableSyslog = "disable-syslog";
 
 static const char *kLibcrosLocation = "libcros-location";
 
 static const char *kCallbackOrigin = "callback-origin";
 
+static const char *kSessionId = "session-id";
+
 }  // namespace switches
 
 // Return values:
 //   0: Entd completed successfully and should not be restarted.
 //   1: Entd encountered a failure, but will probably fail again if restarted,
 //      so please don't.
 //   2: Entd has NOT encountered a failure, but would like to be restarted.
 //  >2: Entd has encountered a failure, restarting may help.
 //
 // So, exit with a zero or one means leave it down, otherwise restart.
@@ skipping 88 matching lines @@
     entd::Pkcs11::enable_opencryptoki = false;
   }
 
   if (cl->HasSwitch(switches::kCallbackOrigin)) {
     entd::CallbackServer::required_origin = cl->GetSwitchValueASCII(
         switches::kCallbackOrigin);
     LOG(INFO) << "Setting callback origin: " <<
         entd::CallbackServer::required_origin;
   }
 
+  if (cl->HasSwitch(switches::kSessionId)) {
+    entd::CallbackServer::set_session_id(cl->GetSwitchValueASCII(
+        switches::kSessionId));
+    LOG(INFO) << "Setting session id: " <<
+        entd::CallbackServer::session_id();
+  }
+
   entd::Entd d;
   d.Initialize();
 
   if (!username.empty())
     d.SetUsername(username);
 
   if (!utility.empty())
     d.SetUtilityFile(utility);
 
   if (!manifest.empty())
     d.SetManifestFile(manifest);
 
   if (!policy.empty())
     d.SetPolicyFile(policy);
 
   uint32_t rv = d.Run();
   LOG(INFO) << "Exiting entd with code: " << rv;
   return rv;
 }