port to use centralized constants files, and add input validation

session_manager_service.h

 // Copyright (c) 2009-2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef LOGIN_MANAGER_SESSION_MANAGER_H_
-#define LOGIN_MANAGER_SESSION_MANAGER_H_
+#ifndef LOGIN_MANAGER_SESSION_MANAGER_SERVICE_H_
+#define LOGIN_MANAGER_SESSION_MANAGER_SERVICE_H_
 
 #include <gtest/gtest.h>
 
 #include <errno.h>
 #include <glib.h>
 #include <signal.h>
 #include <unistd.h>
 #include <string>
 #include <vector>
 
 #include <base/basictypes.h>
 #include <base/scoped_ptr.h>
 #include <chromeos/dbus/abstract_dbus_service.h>
 #include <chromeos/dbus/dbus.h>
+#include <chromeos/dbus/service_constants.h>
 
 #include "login_manager/child_job.h"
-#include "login_manager/constants.h"
+#include "login_manager/system_utils.h"
 
 class CommandLine;
 
 namespace login_manager {
 namespace gobject {
 struct SessionManager;
 }  // namespace gobject
 
 class ChildJob;
 
 // Provides a wrapper for exporting SessionManagerInterface to
 // D-Bus and entering the glib run loop.
 //
 // ::g_type_init() must be called before this class is used.
 class SessionManagerService : public chromeos::dbus::AbstractDbusService {
  public:
   // Takes ownership of |child|.
   explicit SessionManagerService(ChildJob* child);
-  SessionManagerService(ChildJob* child, bool exit_on_child_done);
   virtual ~SessionManagerService();
 
   ////////////////////////////////////////////////////////////////////////////
   // Implementing chromeos::dbus::AbstractDbusService
   virtual bool Initialize();
   virtual bool Reset();
 
   // Runs the command specified on the command line as |desired_uid_| and
   // watches it, restarting it whenever it exits abnormally -- UNLESS
   // |magic_chrome_file| exists.
@@ skipping 12 matching lines @@
     return kSessionManagerServicePath;
   }
   virtual const char* service_interface() const {
     return kSessionManagerInterface;
   }
   virtual GObject* service_object() const {
     return G_OBJECT(session_manager_.get());
   }
 
 
+  // If you want to call any of these setters, you should do so before calling
+  // any other methods on this class.
+  void set_child_pgid(pid_t pgid) { child_pgid_ = pgid; }
+  void set_systemutils(SystemUtils* utils) { system_.reset(utils); }
+  void set_exit_on_child_done(bool do_exit) { exit_on_child_done_ = do_exit; }
+
   // Returns true if |child_job_| believes it should be run.
   bool should_run_child() { return child_job_->ShouldRun(); }
 
   // Fork, then call child_job_->Run() in the child and set a
   // babysitter in the parent's glib default context that calls
   // HandleChildExit when the child is done.
   int RunChild();
 
   // Tell us that, if we want, we can cause a graceful exit from g_main_loop.
   void AllowGracefulExit();
@@ skipping 23 matching lines @@
  private:
   // |data| is a SessionManagerService*
   static void HandleChildExit(GPid pid,
                               gint status,
                               gpointer data);
 
   // So that we can enqueue an event that will exit the main loop.
   // |data| is a SessionManagerService*
   static gboolean ServiceShutdown(gpointer data);
 
+  // Perform very, very basic validation of |email_address|.
+  static bool ValidateEmail(const std::string& email_address);
+
   // Setup any necessary signal handlers.
   void SetupHandlers();
 
+  // Terminate all children, with increasing prejudice.
+  void CleanupChildren(int max_tries);
+
+  static const uint32 kMaxEmailSize;
+  static const char kEmailSeparator;
+  static const char kLegalCharacters[];
+
   scoped_ptr<ChildJob> child_job_;
   bool exit_on_child_done_;
+  pid_t child_pgid_;
 
   scoped_ptr<gobject::SessionManager> session_manager_;
   GMainLoop* main_loop_;
 
-  FRIEND_TEST(SessionManagerTest, BadExitTest);
-  FRIEND_TEST(SessionManagerTest, CleanExitTest);
+  scoped_ptr<SystemUtils> system_;
+
+  FRIEND_TEST(SessionManagerTest, EasyCleanupTest);
+  FRIEND_TEST(SessionManagerTest, HarderCleanupTest);
+  FRIEND_TEST(SessionManagerTest, KillCleanupTest);
+  FRIEND_TEST(SessionManagerTest, EmailAddressTest);
+  FRIEND_TEST(SessionManagerTest, EmailAddressNonAsciiTest);
+  FRIEND_TEST(SessionManagerTest, EmailAddressNoAtTest);
+  FRIEND_TEST(SessionManagerTest, EmailAddressTooMuchAtTest);
   DISALLOW_COPY_AND_ASSIGN(SessionManagerService);
 };
 }  // namespace login_manager
 
-#endif  // LOGIN_MANAGER_SESSION_MANAGER_H_
+#endif  // LOGIN_MANAGER_SESSION_MANAGER_SERVICE_H_