Security patches: RestartJob ignores pid, argv[0]; kill runs as child UID

session_manager_unittest.cc

 // Copyright (c) 2009-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 "login_manager/session_manager_service.h"
 
 #include <errno.h>
 #include <gtest/gtest.h>
 #include <signal.h>
 #include <unistd.h>
@@ skipping 89 matching lines @@
   static char kFakeEmail[];
   static char kPropName[];
   static char kPropValue[];
 
   // Creates the manager with the jobs. Mocks the file checker.
   // The second job can be NULL.
   void InitManager(MockChildJob* job1, MockChildJob* job2) {
     std::vector<ChildJobInterface*> jobs;
     EXPECT_CALL(*job1, GetName())
         .WillRepeatedly(Return(std::string("job1")));
+    EXPECT_CALL(*job1, IsDesiredUidSet())
+        .WillRepeatedly(Return(false));
     jobs.push_back(job1);
     if (job2) {
       EXPECT_CALL(*job2, GetName())
           .WillRepeatedly(Return(std::string("job2")));
+      EXPECT_CALL(*job2, IsDesiredUidSet())
+          .WillRepeatedly(Return(false));
       jobs.push_back(job2);
     }
     manager_ = new SessionManagerService(jobs);
     manager_->set_file_checker(file_checker_);
     manager_->test_api().set_exit_on_child_done(true);
     manager_->test_api().set_prefstore(store_);
   }
 
   void MockUtils() {
     manager_->test_api().set_systemutils(utils_.release());
@@ skipping 225 matching lines @@
 
   SimpleRunManager();
 }
 
 static const pid_t kDummyPid = 4;
 TEST_F(SessionManagerTest, SessionNotStartedCleanupTest) {
   MockChildJob* job = CreateTrivialMockJob(MAYBE_NEVER);
   manager_->test_api().set_child_pid(0, kDummyPid);
 
   int timeout = 3;
-  EXPECT_CALL(*(utils_.get()), kill(kDummyPid, SIGKILL))
+  EXPECT_CALL(*(utils_.get()), kill(kDummyPid, getuid(), SIGKILL))
       .WillOnce(Return(0));
   EXPECT_CALL(*(utils_.get()), ChildIsGone(kDummyPid, timeout))
       .WillOnce(Return(true));
   MockUtils();
 
   manager_->test_api().CleanupChildren(timeout);
 }
 
 TEST_F(SessionManagerTest, SessionNotStartedSlowKillCleanupTest) {
   MockChildJob* job = CreateTrivialMockJob(MAYBE_NEVER);
   manager_->test_api().set_child_pid(0, kDummyPid);
 
   int timeout = 3;
-  EXPECT_CALL(*(utils_.get()), kill(kDummyPid, SIGKILL))
+  EXPECT_CALL(*(utils_.get()), kill(kDummyPid, getuid(), SIGKILL))
       .WillOnce(Return(0));
   EXPECT_CALL(*(utils_.get()), ChildIsGone(kDummyPid, timeout))
       .WillOnce(Return(false));
-  EXPECT_CALL(*(utils_.get()), kill(kDummyPid, SIGABRT))
+  EXPECT_CALL(*(utils_.get()), kill(kDummyPid, getuid(), SIGABRT))
       .WillOnce(Return(0));
   MockUtils();
 
   manager_->test_api().CleanupChildren(timeout);
 }
 
 TEST_F(SessionManagerTest, SessionStartedCleanupTest) {
   MockChildJob* job = CreateTrivialMockJob(MAYBE_NEVER);
   manager_->test_api().set_child_pid(0, kDummyPid);
 
   gboolean out;
   gchar email[] = "user@somewhere";
   gchar nothing[] = "";
   int timeout = 3;
-  EXPECT_CALL(*(utils_.get()), kill(kDummyPid, SIGTERM))
+  EXPECT_CALL(*(utils_.get()), kill(kDummyPid, getuid(), SIGTERM))
       .WillOnce(Return(0));
   EXPECT_CALL(*(utils_.get()), ChildIsGone(kDummyPid, timeout))
       .WillOnce(Return(true));
   MockUtils();
 
   std::string email_string(email);
   EXPECT_CALL(*job, StartSession(email_string))
       .Times(1);
 
   manager_->StartSession(email, nothing, &out, NULL);
   manager_->test_api().CleanupChildren(timeout);
 }
 
 TEST_F(SessionManagerTest, SessionStartedSlowKillCleanupTest) {
   MockChildJob* job = CreateTrivialMockJob(MAYBE_NEVER);
   SessionManagerService::TestApi test_api = manager_->test_api();
   test_api.set_child_pid(0, kDummyPid);
 
   int timeout = 3;
-  EXPECT_CALL(*(utils_.get()), kill(kDummyPid, SIGTERM))
+  EXPECT_CALL(*(utils_.get()), kill(kDummyPid, getuid(), SIGTERM))
       .WillOnce(Return(0));
   EXPECT_CALL(*(utils_.get()), ChildIsGone(kDummyPid, timeout))
       .WillOnce(Return(false));
-  EXPECT_CALL(*(utils_.get()), kill(kDummyPid, SIGABRT))
+  EXPECT_CALL(*(utils_.get()), kill(kDummyPid, getuid(), SIGABRT))
       .WillOnce(Return(0));
   MockUtils();
 
   gboolean out;
   gchar email[] = "user@somewhere";
   gchar nothing[] = "";
 
   std::string email_string(email);
   EXPECT_CALL(*job, StartSession(email_string))
       .Times(1);
@@ skipping 541 matching lines @@
   GError* error = NULL;
   EXPECT_EQ(FALSE, manager_->RestartJob(pid, arguments, &out, &error));
   EXPECT_EQ(CHROMEOS_LOGIN_ERROR_UNKNOWN_PID, error->code);
   EXPECT_EQ(FALSE, out);
 }
 
 TEST_F(SessionManagerTest, RestartJob) {
   MockChildJob* job = CreateTrivialMockJob(MAYBE_NEVER);
   SessionManagerService::TestApi test_api = manager_->test_api();
   test_api.set_child_pid(0, kDummyPid);
-  EXPECT_CALL(*(utils_.get()), kill(-kDummyPid, SIGKILL))
+  EXPECT_CALL(*(utils_.get()), kill(-kDummyPid, getuid(), SIGKILL))
       .WillOnce(Return(0));
   MockUtils();
 
+  EXPECT_CALL(*job, GetName())
+      .WillRepeatedly(Return(std::string("chrome")));
   EXPECT_CALL(*job, SetArguments("dummy"))
       .Times(1);
   EXPECT_CALL(*job, RecordTime())
       .Times(1);
   std::string email_string("");
   EXPECT_CALL(*job, StartSession(email_string))
       .Times(1);
   ON_CALL(*job, Run())
       .WillByDefault(Invoke(CleanExit));
 
   gboolean out;
   gint pid = kDummyPid;
   gchar arguments[] = "dummy";
   GError* error = NULL;
   EXPECT_EQ(TRUE, manager_->RestartJob(pid, arguments, &out, &error));
   EXPECT_EQ(TRUE, out);
 }
 
+TEST_F(SessionManagerTest, RestartJobWrongPid) {
+  MockChildJob* job = CreateTrivialMockJob(MAYBE_NEVER);
+  SessionManagerService::TestApi test_api = manager_->test_api();
+  test_api.set_child_pid(0, kDummyPid);
+
+  gboolean out;
+  gint pid = kDummyPid;
+  gchar arguments[] = "dummy";
+  GError* error = NULL;
+  EXPECT_EQ(FALSE, manager_->RestartJob(pid, arguments, &out, &error));
+  EXPECT_EQ(FALSE, out);
+}
+
 TEST(SessionManagerTestStatic, EmailAddressTest) {
   const char valid[] = "user@somewhere";
   EXPECT_TRUE(login_manager::SessionManagerService::ValidateEmail(valid));
 }
 
 TEST(SessionManagerTestStatic, EmailAddressNonAsciiTest) {
   char invalid[4] = "a@m";
   invalid[2] = 254;
   EXPECT_FALSE(login_manager::SessionManagerService::ValidateEmail(invalid));
 }
@@ skipping 47 matching lines @@
 }
 
 TEST(SessionManagerTestStatic, GetArgLists3_InitialDashes) {
   const char* c_args[] = {"--", "a", "b", "c", NULL};
   std::vector<std::vector<std::string> > arg_lists = GetArgs(c_args);
   EXPECT_EQ(1, arg_lists.size());
   EXPECT_EQ(3, arg_lists[0].size());
 }
 
 }  // namespace login_manager